Changeset caed8e0 in clfs-sysroot


Ignore:
Timestamp:
Jul 9, 2009, 6:40:13 PM (15 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
master
Children:
ceca635c
Parents:
cba3e93
Message:

Add patch.

File:
1 moved

Legend:

Unmodified
Added
Removed

  • patches/ncurses-5.7-branch_update-14.patch

    rcba3e93 rcaed8e0  
    11Submitted By: Jim Gifford (jim at cross-lfs dot org)
    2 Date: 02-28-2009
     2Date: 06-05-2009
    33Initial Package Version: 5.7
    44Origin: Upstream
    55Upstream Status: Applied
    66Description: This is a branch update for NCurses-5.7, and should be
    7              rechecked periodically. This patch covers up to 5.7-20090228.
     7             rechecked periodically. This patch covers up to 5.7-20090530.
    88
    99diff -Naur ncurses-5.7.orig/aclocal.m4 ncurses-5.7/aclocal.m4
    1010--- ncurses-5.7.orig/aclocal.m4 2008-10-25 15:15:32.000000000 -0700
    11 +++ ncurses-5.7/aclocal.m4      2009-02-28 20:38:54.327061041 -0800
     11+++ ncurses-5.7/aclocal.m4      2009-06-05 14:01:31.000000000 -0700
    1212@@ -1,5 +1,5 @@
    1313 dnl***************************************************************************
    … …  
    2222 dnl
    2323-dnl $Id: aclocal.m4,v 1.470 2008/10/25 22:15:32 tom Exp $
    24 +dnl $Id: aclocal.m4,v 1.483 2009/02/07 19:12:17 tom Exp $
     24+dnl $Id: aclocal.m4,v 1.487 2009/04/04 22:32:42 tom Exp $
    2525 dnl Macros used in NCURSES auto-configuration script.
    2626 dnl
    … …  
    189189 
    190190     cf_save_CPPFLAGS="$CPPFLAGS"
    191 @@ -1998,11 +2033,31 @@
     191@@ -1451,7 +1486,7 @@
     192 fi
     193 ])dnl
     194 dnl ---------------------------------------------------------------------------
     195-dnl CF_GCC_WARNINGS version: 23 updated: 2008/07/26 17:54:02
     196+dnl CF_GCC_WARNINGS version: 24 updated: 2009/02/01 15:21:00
     197 dnl ---------------
     198 dnl Check if the compiler supports useful warning options.  There's a few that
     199 dnl we don't use, simply because they're too noisy:
     200@@ -1484,7 +1519,6 @@
     201 then
     202 # The "-wdXXX" options suppress warnings:
     203 # remark #1419: external declaration in primary source file
     204-# remark #1682: implicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem)
     205 # remark #1683: explicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem)
     206 # remark #1684: conversion from pointer to same-sized integral type (potential portability problem)
     207 # remark #193: zero used for undefined preprocessing identifier
     208@@ -1492,19 +1526,18 @@
     209 # remark #810: conversion from "int" to "Dimension={unsigned short}" may lose significant bits
     210 # remark #869: parameter "tw" was never referenced
     211 # remark #981: operands are evaluated in unspecified order
     212-# warning #269: invalid format string conversion
     213+# warning #279: controlling expression is constant
     214 
     215        AC_CHECKING([for $CC warning options])
     216        cf_save_CFLAGS="$CFLAGS"
     217        EXTRA_CFLAGS="-Wall"
     218        for cf_opt in \
     219                wd1419 \
     220-               wd1682 \
     221                wd1683 \
     222                wd1684 \
     223                wd193 \
     224-               wd279 \
     225                wd593 \
     226+               wd279 \
     227                wd810 \
     228                wd869 \
     229                wd981
     230@@ -1998,11 +2031,31 @@
    192231 ])
    193232 ])dnl
    … …  
    224263 test "$includedir" != "/usr/include" && \
    225264 test -d "$includedir" && {
    226 @@ -2017,6 +2072,7 @@
     265@@ -2017,6 +2070,7 @@
    227266        test -d $oldincludedir/$2 && $1="[$]$1 $oldincludedir/$2"
    228267 }
    … …  
    232271 dnl ---------------------------------------------------------------------------
    233272 dnl CF_HELP_MESSAGE version: 3 updated: 1998/01/14 10:56:23
    234 @@ -2026,7 +2082,7 @@
     273@@ -2026,7 +2080,7 @@
    235274 [AC_DIVERT_HELP([$1])dnl
    236275 ])dnl
    … …  
    241280 dnl Construct the list of include-options according to whether we're building
    242281 dnl in the source directory or using '--srcdir=DIR' option.  If we're building
    243 @@ -2034,9 +2090,9 @@
     282@@ -2034,9 +2088,9 @@
    244283 dnl since that usually breaks gcc's shadow-includes.
    245284 AC_DEFUN([CF_INCLUDE_DIRS],
    … …  
    253292 if test "$GCC" != yes; then
    254293        CPPFLAGS="$CPPFLAGS -I\${includedir}"
    255 @@ -2143,7 +2199,7 @@
     294@@ -2143,7 +2197,7 @@
    256295 ])
    257296 ])
    258297 dnl ---------------------------------------------------------------------------
    259298-dnl CF_LDFLAGS_STATIC version: 4 updated: 2008/10/18 17:58:20
    260 +dnl CF_LDFLAGS_STATIC version: 5 updated: 2008/12/27 12:30:03
     299+dnl CF_LDFLAGS_STATIC version: 7 updated: 2009/04/04 18:31:04
    261300 dnl -----------------
    262301 dnl Check for compiler/linker flags used to temporarily force usage of static
    263302 dnl libraries.  This depends on the compiler and platform.  Use this to help
    264 @@ -2153,7 +2209,7 @@
     303@@ -2153,7 +2207,7 @@
    265304 
    266305 if test "$GCC" = yes ; then
    267306        case $cf_cv_system_name in #(
    268307-       OS/2*|os2*|aix[[45]]*)  #( vi
    269 +       OS/2*|os2*|aix[[4]]*)   #( vi
     308+       OS/2*|os2*|aix[[4]]*|solaris2.1[[0-9]]|darwin*)         #( vi
    270309                LDFLAGS_STATIC=
    271310                LDFLAGS_SHARED=
    272311                ;;
    273 @@ -2164,7 +2220,7 @@
     312@@ -2164,7 +2218,7 @@
    274313     esac
    275314 else
    … …  
    280319                LDFLAGS_SHARED=-bdynamic
    281320                ;;
    282 @@ -2179,7 +2235,7 @@
     321@@ -2179,7 +2233,7 @@
    283322                ;;
    284323        osf[[45]]*)     #( from ld manpage osf4.0d, osf5.1
    … …  
    289328                ;;
    290329        solaris2*)
    291 @@ -2193,11 +2249,33 @@
     330@@ -2193,11 +2247,33 @@
    292331 AC_SUBST(LDFLAGS_SHARED)
    293332 ])
    … …  
    326365 dnl CF_LIB_PREFIX version: 8 updated: 2008/09/13 11:34:16
    327366 dnl -------------
    328 @@ -2216,7 +2294,7 @@
     367@@ -2216,7 +2292,7 @@
    329368        AC_SUBST(LIB_PREFIX)
    330369 ])dnl
    … …  
    335374 dnl Append definitions and rules for the given models to the subdirectory
    336375 dnl Makefiles, and the recursion rule for the top-level Makefile.  If the
    337 @@ -2504,18 +2582,28 @@
     376@@ -2504,18 +2580,28 @@
    338377 install.libs uninstall.libs \\
    339378 install.data uninstall.data ::
    … …  
    364403 if test -f $srcdir/$tack.h; then
    365404 cat >> Makefile <<CF_EOF
    366 @@ -2526,6 +2614,7 @@
     405@@ -2526,6 +2612,7 @@
    367406 CF_EOF
    368407 fi
    … …  
    372411 dnl If we're installing into a subdirectory of /usr/include, etc., we should
    373412 dnl prepend the subdirectory's name to the "#include" paths.  It won't hurt
    374 @@ -2679,7 +2768,7 @@
     413@@ -2679,7 +2766,7 @@
    375414 ])
    376415 ])
    … …  
    381420 dnl Compute the library file-suffix from the given model name
    382421 dnl $1 = model name
    383 @@ -2689,40 +2778,44 @@
     422@@ -2689,40 +2776,44 @@
    384423 AC_DEFUN([CF_LIB_SUFFIX],
    385424 [
    … …  
    437476                                $3=[$]$2
    438477                                ;;
    439 @@ -2755,7 +2848,7 @@
     478@@ -2755,7 +2846,7 @@
    440479        test -n "$LIB_SUFFIX" && $2="${LIB_SUFFIX}[$]{$2}"
    441480 ])dnl
    … …  
    446485 dnl Some systems have a non-ANSI linker that doesn't pull in modules that have
    447486 dnl only data (i.e., no functions), for example NeXT.  On those systems we'll
    448 @@ -2772,7 +2865,7 @@
     487@@ -2772,7 +2863,7 @@
    449488 EOF
    450489        if AC_TRY_EVAL(ac_compile) ; then
    … …  
    455494        rm -f conftest.$ac_ext data.o
    456495        cat >conftest.$ac_ext <<EOF
    457 @@ -2791,7 +2884,7 @@
     496@@ -2791,7 +2882,7 @@
    458497 EOF
    459498        if AC_TRY_EVAL(ac_compile); then
    … …  
    464503        rm -f conftest.$ac_ext func.o
    465504        ( eval $RANLIB conftest.a ) 2>&AC_FD_CC >/dev/null
    466 @@ -2956,7 +3049,7 @@
     505@@ -2956,7 +3047,7 @@
    467506 AC_SUBST(MAKE_LOWER_TAGS)
    468507 ])dnl
    … …  
    473512 dnl Option to allow user to override automatic configuration of manpage format.
    474513 dnl There are several special cases:
    475 @@ -2998,7 +3091,7 @@
     514@@ -2998,7 +3089,7 @@
    476515   cf_catonly=yes
    477516   cf_example=date
    … …  
    482521     test -z "$cf_dir" && cf_dir=/usr/man
    483522     for cf_name in $cf_dir/man*/$cf_example.[[01]]* $cf_dir/cat*/$cf_example.[[01]]* $cf_dir/man*/$cf_example $cf_dir/cat*/$cf_example
    484 @@ -3687,17 +3780,17 @@
     523@@ -3687,17 +3778,17 @@
    485524        esac
    486525 ])dnl
    … …  
    505544 dnl ---------------------------------------------------------------------------
    506545 dnl CF_PATH_SYNTAX version: 12 updated: 2008/03/23 14:45:59
    507 @@ -3737,6 +3830,38 @@
     546@@ -3737,6 +3828,38 @@
    508547 esac
    509548 ])dnl
    … …  
    544583 dnl -----------------
    545584 dnl Define _POSIX_C_SOURCE to the given level, and _POSIX_SOURCE if needed.
    546 @@ -3872,6 +3997,13 @@
     585@@ -3872,6 +3995,13 @@
    547586 
    548587 ])dnl
    … …  
    558597 dnl -----------
    559598 dnl Check for awk, ensure that the check found something.
    560 @@ -4003,7 +4135,7 @@
     599@@ -4003,7 +4133,7 @@
    561600 esac
    562601 ])dnl
    … …  
    567606 dnl Check for ldconfig, needed to fixup shared libraries that would be built
    568607 dnl and then used in the install.
    569 @@ -4012,7 +4144,7 @@
     608@@ -4012,7 +4142,7 @@
    570609   LDCONFIG=:
    571610 else
    … …  
    576615   ;;
    577616 *) LDPATH=$PATH:/sbin:/usr/sbin
    578 @@ -4147,7 +4279,7 @@
     617@@ -4147,7 +4277,7 @@
    579618 fi
    580619 ])dnl
    … …  
    585624 dnl --------------
    586625 dnl Attempt to determine the appropriate CC/LD options for creating a shared
    587 @@ -4176,6 +4308,7 @@
     626@@ -4176,6 +4306,7 @@
    588627        AC_REQUIRE([CF_SUBST_NCURSES_VERSION])
    589628        LOCAL_LDFLAGS=
    … …  
    593632        INSTALL_LIB="-m 644"
    594633 
    595 @@ -4219,6 +4352,12 @@
     634@@ -4219,6 +4350,12 @@
    596635        cf_cv_shlib_version_infix=no
    597636 
    … …  
    606645                MK_SHARED_LIB='${CC} ${CFLAGS} -o $[@] -Xlinker -soname=`basename $[@]` -nostart -e 0'
    607646                ;;
    608 @@ -4239,7 +4378,7 @@
     647@@ -4239,7 +4376,7 @@
    609648 EOF
    610649                exec \[$]* -shared -Wl,--out-implib=../lib/\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\[$]{SHARED_LIB}
    … …  
    615654        darwin*)
    616655                EXTRA_CFLAGS="-no-cpp-precomp"
    617 @@ -4272,10 +4411,10 @@
     656@@ -4272,10 +4409,10 @@
    618657        irix*)
    619658                if test "$cf_cv_ld_rpath" = yes ; then
    … …  
    628667                        fi
    629668                fi
    630 @@ -4294,7 +4433,7 @@
     669@@ -4294,7 +4431,7 @@
    631670                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
    632671                fi
    … …  
    637676                fi
    638677                CF_SHARED_SONAME
    639 @@ -4306,12 +4445,12 @@
     678@@ -4306,12 +4443,12 @@
    640679                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
    641680                fi
    … …  
    652691        nto-qnx*|openbsd*|freebsd[[12]].*)
    653692                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
    654 @@ -4323,15 +4462,15 @@
     693@@ -4323,15 +4460,15 @@
    655694                if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_ld_rpath" = yes ; then
    656695                        LOCAL_LDFLAGS="-rpath \$(LOCAL_LIBDIR)"
    … …  
    671710                        LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)"
    672711                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
    673 @@ -4346,7 +4485,7 @@
     712@@ -4346,7 +4483,7 @@
    674713                        CF_SHARED_SONAME
    675714                        MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $[@]'
    … …  
    680719                ;;
    681720        osf*|mls+*)
    682 @@ -4365,7 +4504,7 @@
     721@@ -4365,7 +4502,7 @@
    683722                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
    684723                fi
    … …  
    689728                fi
    690729                cf_cv_rm_so_locs=yes
    691 @@ -4400,12 +4539,19 @@
     730@@ -4400,12 +4537,19 @@
    692731                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
    693732                fi
    … …  
    711750                else
    712751                        MK_SHARED_LIB='${CC} -shared -dy -G -h '$cf_cv_shared_soname' -o $[@]'
    713 @@ -4438,18 +4584,19 @@
     752@@ -4438,18 +4582,19 @@
    714753                ;;
    715754        esac
    … …  
    735774        AC_SUBST(MK_SHARED_LIB)
    736775        AC_SUBST(LINK_PROGS)
    737 @@ -4642,7 +4789,7 @@
     776@@ -4642,7 +4787,7 @@
    738777 fi
    739778 ])dnl
    … …  
    744783 dnl For each parameter, test if the source-directory exists, and if it contains
    745784 dnl a 'modules' file.  If so, add to the list $cf_cv_src_modules which we'll
    746 @@ -4717,7 +4864,11 @@
     785@@ -4717,7 +4862,11 @@
    747786 AC_SUBST(TEST_ARG2)
    748787 AC_SUBST(TEST_DEP2)
    … …  
    757796 do
    758797        SRC_SUBDIRS="$SRC_SUBDIRS $cf_dir"
    759 @@ -4728,8 +4879,8 @@
     798@@ -4728,8 +4877,8 @@
    760799 
    761800 ADA_SUBDIRS=
    … …  
    768807 
    769808 SUB_MAKEFILES=
    770 @@ -4739,11 +4890,11 @@
     809@@ -4739,11 +4888,11 @@
    771810 done
    772811 
    … …  
    785824 ])dnl
    786825 dnl ---------------------------------------------------------------------------
    787 @@ -5241,7 +5392,7 @@
     826@@ -5241,7 +5390,7 @@
    788827 fi
    789828 ])
    790829 dnl ---------------------------------------------------------------------------
    791830-dnl CF_WITH_LIBTOOL version: 19 updated: 2008/03/29 15:46:43
    792 +dnl CF_WITH_LIBTOOL version: 20 updated: 2008/12/27 12:31:39
     831+dnl CF_WITH_LIBTOOL version: 23 updated: 2009/03/28 14:26:27
    793832 dnl ---------------
    794833 dnl Provide a configure option to incorporate libtool.  Define several useful
    795834 dnl symbols for the makefile rules.
    796 @@ -5261,18 +5412,18 @@
     835@@ -5261,18 +5410,18 @@
    797836 dnl            echo cannot find libtool.m4 file
    798837 dnl            exit 1
    … …  
    817856 dnl
    818857 AC_DEFUN([CF_WITH_LIBTOOL],
    819 @@ -5306,15 +5457,15 @@
     858@@ -5306,17 +5455,17 @@
    820859        AC_PROG_LIBTOOL
    821860        # missing_content_AC_PROG_LIBTOOL}}
    … …  
    837876+       fi
    838877 ])dnl
    839         LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} -o'
     878-       LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} -o'
     879+       LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} -o'
    840880        LIB_OBJECT='${OBJECTS:.o=.lo}'
    841 @@ -5393,7 +5544,7 @@
     881        LIB_SUFFIX=.la
     882        LIB_CLEAN='${LIBTOOL} --mode=clean'
     883@@ -5331,16 +5480,25 @@
     884 
     885        # Save the version in a cache variable - this is not entirely a good
     886        # thing, but the version string from libtool is very ugly, and for
     887-       # bug reports it might be useful to have the original string.
     888+       # bug reports it might be useful to have the original string. "("
     889        cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([[^)]]*)//g' -e 's/^[[^1-9]]*//' -e 's/[[^0-9.]].*//'`
     890        AC_MSG_RESULT($cf_cv_libtool_version)
     891        if test -z "$cf_cv_libtool_version" ; then
     892                AC_MSG_ERROR(This is not GNU libtool)
     893        fi
     894 
     895+       # special hack to add -no-undefined (which libtool should do for itself)
     896+       LT_UNDEF=
     897+       case "$cf_cv_system_name" in #(vi
     898+       cygwin*|mingw32*|uwin*|aix[[456]]) #(vi
     899+               LT_UNDEF=-no-undefined
     900+               ;;
     901+       esac
     902+       AC_SUBST([LT_UNDEF])
     903+
     904        # special hack to add --tag option for C++ compiler
     905-       case $cf_cv_libtool_version in
     906-       1.[[5-9]]*|[[2-9]]*)
     907+       case $cf_cv_libtool_version in #(vi
     908+       1.[[5-9]]*|[[2-9]].[[0-9.a-z]]*) #(vi
     909                LIBTOOL_CXX="$LIBTOOL --tag=CXX"
     910                LIBTOOL="$LIBTOOL --tag=CC"
     911                ;;
     912@@ -5393,7 +5551,7 @@
    842913 AC_SUBST($3)dnl
    843914 ])dnl
    … …  
    848919 dnl Process an option specifying a list of colon-separated paths.
    849920 dnl
    850 @@ -5409,7 +5560,7 @@
     921@@ -5409,7 +5567,7 @@
    851922 AC_ARG_WITH($1,[$2 ](default: ifelse($4,,empty,$4)),,
    852923 ifelse($4,,[withval=${$3}],[withval=${$3-ifelse($5,,$4,$5)}]))dnl
    … …  
    857928 for cf_src_path in $withval
    858929 do
    859 @@ -5535,7 +5686,7 @@
     930@@ -5535,7 +5693,7 @@
    860931        [USE_VALGRIND])
    861932 ])dnl
    … …  
    866937 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
    867938 dnl or adapt to the vendor's definitions to get equivalent functionality,
    868 @@ -5552,7 +5703,7 @@
     939@@ -5552,7 +5710,7 @@
    869940 cf_POSIX_C_SOURCE=ifelse($2,,199506L,$2)
    870941 
    … …  
    875946        ;;
    876947 freebsd*|dragonfly*) #(vi
    877 @@ -5569,7 +5720,7 @@
     948@@ -5569,7 +5727,7 @@
    878949 irix[[56]].*) #(vi
    879950        CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
    … …  
    886957diff -Naur ncurses-5.7.orig/Ada95/gen/adacurses-config.in ncurses-5.7/Ada95/gen/adacurses-config.in
    887958--- ncurses-5.7.orig/Ada95/gen/adacurses-config.in      2007-04-07 14:06:50.000000000 -0700
    888 +++ ncurses-5.7/Ada95/gen/adacurses-config.in   2009-02-28 20:38:50.310805699 -0800
     959+++ ncurses-5.7/Ada95/gen/adacurses-config.in   2009-06-05 14:01:07.000000000 -0700
    889960@@ -1,18 +1,47 @@
    890961 #! /bin/sh
    … …  
    9581029         ;;
    9591030 esac
     1031diff -Naur ncurses-5.7.orig/Ada95/gen/gen.c ncurses-5.7/Ada95/gen/gen.c
     1032--- ncurses-5.7.orig/Ada95/gen/gen.c    2008-10-04 14:59:37.000000000 -0700
     1033+++ ncurses-5.7/Ada95/gen/gen.c 2009-06-05 14:01:24.000000000 -0700
     1034@@ -1,5 +1,5 @@
     1035 /****************************************************************************
     1036- * Copyright (c) 1998,2007,2008 Free Software Foundation, Inc.              *
     1037+ * Copyright (c) 1998,2008,2009 Free Software Foundation, Inc.              *
     1038  *                                                                          *
     1039  * Permission is hereby granted, free of charge, to any person obtaining a  *
     1040  * copy of this software and associated documentation files (the            *
     1041@@ -32,7 +32,7 @@
     1042 
     1043 /*
     1044     Version Control
     1045-    $Id: gen.c,v 1.49 2008/10/04 21:59:37 tom Exp $
     1046+    $Id: gen.c,v 1.50 2009/03/21 21:34:20 tom Exp $
     1047   --------------------------------------------------------------------------*/
     1048 /*
     1049   This program generates various record structures and constants from the
     1050@@ -778,7 +778,9 @@
     1051 #if USE_REENTRANT || BROKEN_LINKER
     1052   printf("   type C_ACS_Ptr is access C_ACS_Map;\n");
     1053   printf("   function ACS_Map return C_ACS_Ptr;\n");
     1054-  printf("   pragma Import (C, ACS_Map, \"_nc_acs_map\");\n");
     1055+  printf("   pragma Import (C, ACS_Map, \""
     1056+        NCURSES_WRAP_PREFIX
     1057+        "acs_map\");\n");
     1058 #else
     1059   printf("   ACS_Map : C_ACS_Map;\n");
     1060   printf("   pragma Import (C, ACS_Map, \"acs_map\");\n");
     1061@@ -1034,7 +1036,7 @@
     1062   printf("   function %s return %s\n", ada_func, ada_type);
     1063   printf("   is\n");
     1064   printf("      function Result return %s;\n", c_type);
     1065-  printf("      pragma Import (C, Result, \"_nc_%s\");\n", c_var);
     1066+  printf("      pragma Import (C, Result, \"" NCURSES_WRAP_PREFIX "%s\");\n", c_var);
     1067   printf("   begin\n");
     1068   if (strcmp(c_type, ada_type))
     1069     printf("      return %s (Result);\n", ada_type);
    9601070diff -Naur ncurses-5.7.orig/Ada95/gen/Makefile.in ncurses-5.7/Ada95/gen/Makefile.in
    9611071--- ncurses-5.7.orig/Ada95/gen/Makefile.in      2008-10-04 15:58:31.000000000 -0700
    962 +++ ncurses-5.7/Ada95/gen/Makefile.in   2009-02-28 20:38:50.306805140 -0800
     1072+++ ncurses-5.7/Ada95/gen/Makefile.in   2009-06-05 14:01:07.000000000 -0700
    9631073@@ -1,5 +1,5 @@
    9641074 ##############################################################################
    … …  
    10161126diff -Naur ncurses-5.7.orig/Ada95/samples/Makefile.in ncurses-5.7/Ada95/samples/Makefile.in
    10171127--- ncurses-5.7.orig/Ada95/samples/Makefile.in  2006-12-17 08:45:02.000000000 -0800
    1018 +++ ncurses-5.7/Ada95/samples/Makefile.in       2009-02-28 20:38:50.310805699 -0800
     1128+++ ncurses-5.7/Ada95/samples/Makefile.in       2009-06-05 14:01:07.000000000 -0700
    10191129@@ -1,5 +1,5 @@
    10201130 ##############################################################################
    … …  
    10551165diff -Naur ncurses-5.7.orig/Ada95/src/Makefile.in ncurses-5.7/Ada95/src/Makefile.in
    10561166--- ncurses-5.7.orig/Ada95/src/Makefile.in      2007-09-15 11:22:24.000000000 -0700
    1057 +++ ncurses-5.7/Ada95/src/Makefile.in   2009-02-28 20:38:50.310805699 -0800
     1167+++ ncurses-5.7/Ada95/src/Makefile.in   2009-06-05 14:01:07.000000000 -0700
    10581168@@ -1,5 +1,5 @@
    10591169 ##############################################################################
    … …  
    11471257diff -Naur ncurses-5.7.orig/Ada95/src/terminal_interface-curses-mouse.adb ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb
    11481258--- ncurses-5.7.orig/Ada95/src/terminal_interface-curses-mouse.adb      2008-07-26 11:51:11.000000000 -0700
    1149 +++ ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb   2009-02-28 20:38:37.153962564 -0800
     1259+++ ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb   2009-06-05 14:00:52.000000000 -0700
    11501260@@ -35,8 +35,8 @@
    11511261 ------------------------------------------------------------------------------
    … …  
    11701280diff -Naur ncurses-5.7.orig/c++/cursesw.cc ncurses-5.7/c++/cursesw.cc
    11711281--- ncurses-5.7.orig/c++/cursesw.cc     2007-12-15 15:01:57.000000000 -0800
    1172 +++ ncurses-5.7/c++/cursesw.cc  2009-02-28 20:38:37.161961447 -0800
     1282+++ ncurses-5.7/c++/cursesw.cc  2009-06-05 14:01:30.000000000 -0700
    11731283@@ -1,6 +1,6 @@
    11741284 // * this is for making emacs happy: -*-Mode: C++;-*-
    11751285 /****************************************************************************
    11761286- * Copyright (c) 2007 Free Software Foundation, Inc.                        *
    1177 + * Copyright (c) 2007,2008 Free Software Foundation, Inc.                   *
     1287+ * Copyright (c) 2007-2008,2009 Free Software Foundation, Inc.              *
    11781288  *                                                                          *
    11791289  * Permission is hereby granted, free of charge, to any person obtaining a  *
    … …  
    11841294 
    11851295-MODULE_ID("$Id: cursesw.cc,v 1.49 2007/12/15 23:01:57 tom Exp $")
    1186 +MODULE_ID("$Id: cursesw.cc,v 1.50 2008/11/23 00:17:31 juergen Exp $")
     1296+MODULE_ID("$Id: cursesw.cc,v 1.51 2009/03/28 21:31:37 tom Exp $")
    11871297 
    11881298 #define COLORS_NEED_INITIALIZATION  -1
    … …  
    11961306 
    11971307 int _nc_xx_ripoff_init(WINDOW *w, int ncols)
    1198 @@ -464,7 +463,7 @@
     1308@@ -296,8 +295,7 @@
     1309 
     1310     RIPOFFINIT init = *prip++;
     1311     if (init) {
     1312-       NCursesWindow* W = new NCursesWindow(w,ncols);
     1313-       res = init(*W);
     1314+       res = init(*(new NCursesWindow(w,ncols)));
     1315     }
     1316     return res;
     1317 }
     1318@@ -464,7 +462,7 @@
    11991319 #if HAVE_HAS_KEY
    12001320 bool NCursesWindow::has_mouse() const
    … …  
    12051325 }
    12061326 #endif
     1327diff -Naur ncurses-5.7.orig/c++/demo.cc ncurses-5.7/c++/demo.cc
     1328--- ncurses-5.7.orig/c++/demo.cc        2008-08-04 10:16:57.000000000 -0700
     1329+++ ncurses-5.7/c++/demo.cc     2009-06-05 14:01:49.000000000 -0700
     1330@@ -35,7 +35,7 @@
     1331  *   Demo code for NCursesMenu and NCursesForm written by
     1332  *   Juergen Pfeifer
     1333  *
     1334- * $Id: demo.cc,v 1.38 2008/08/04 17:16:57 tom Exp $
     1335+ * $Id: demo.cc,v 1.39 2008/12/07 02:07:34 juergen Exp $
     1336  */
     1337 
     1338 #include "internal.h"
     1339@@ -43,7 +43,13 @@
     1340 #include "cursesm.h"
     1341 #include "cursesf.h"
     1342 
     1343+#ifdef __MINGW32__
     1344+#undef KEY_EVENT
     1345+#endif
     1346+
     1347+#ifndef __MINGW32__
     1348 extern "C" unsigned int sleep(unsigned int);
     1349+#endif
     1350 
     1351 #undef index // needed for NeXT
     1352 
     1353diff -Naur ncurses-5.7.orig/c++/internal.h ncurses-5.7/c++/internal.h
     1354--- ncurses-5.7.orig/c++/internal.h     2008-10-25 14:35:44.000000000 -0700
     1355+++ ncurses-5.7/c++/internal.h  2009-06-05 14:01:49.000000000 -0700
     1356@@ -31,7 +31,7 @@
     1357  *   Author: Juergen Pfeifer, 1997                                          *
     1358  ****************************************************************************/
     1359 
     1360-// $Id: internal.h,v 1.16 2008/10/25 21:35:44 tom Exp $
     1361+// $Id: internal.h,v 1.17 2008/12/07 02:07:34 juergen Exp $
     1362 
     1363 #ifndef NCURSES_CPLUS_INTERNAL_H
     1364 #define NCURSES_CPLUS_INTERNAL_H 1
     1365@@ -44,6 +44,11 @@
     1366 #define MODULE_ID(id) /*nothing*/
     1367 #endif
     1368 
     1369+#ifdef __MINGW32__
     1370+#include <nc_mingw.h>
     1371+#undef KEY_EVENT
     1372+#endif
     1373+
     1374 #ifndef _QNX_SOURCE
     1375 #include <stdlib.h>
     1376 #include <string.h>
    12071377diff -Naur ncurses-5.7.orig/c++/Makefile.in ncurses-5.7/c++/Makefile.in
    12081378--- ncurses-5.7.orig/c++/Makefile.in    2007-04-28 08:29:12.000000000 -0700
    1209 +++ ncurses-5.7/c++/Makefile.in 2009-02-28 20:38:46.290546165 -0800
     1379+++ ncurses-5.7/c++/Makefile.in 2009-06-05 14:01:30.000000000 -0700
    12101380@@ -1,6 +1,6 @@
    12111381-# $Id: Makefile.in,v 1.84 2007/04/28 15:29:12 tom Exp $
    1212 +# $Id: Makefile.in,v 1.85 2009/01/03 19:10:40 tom Exp $
     1382+# $Id: Makefile.in,v 1.87 2009/03/28 18:22:39 Charles.Wilson Exp $
    12131383 ##############################################################################
    12141384-# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
    … …  
    12171387 # Permission is hereby granted, free of charge, to any person obtaining a    #
    12181388 # copy of this software and associated documentation files (the "Software"), #
    1219 @@ -61,10 +61,10 @@
     1389@@ -55,16 +55,17 @@
     1390 LIBTOOL_LINK   = @LIB_LINK@
     1391 LIBTOOL_INSTALL        = @LIB_INSTALL@
     1392 LIBTOOL_UNINSTALL = @LIB_UNINSTALL@
     1393+LT_UNDEF       = @LT_UNDEF@
     1394 
     1395 INSTALL                = @INSTALL@
     1396 INSTALL_LIB    = @INSTALL@ @INSTALL_LIB@
    12201397 INSTALL_DATA   = @INSTALL_DATA@
    12211398 
    … …  
    12301407 
    12311408 CXX            = @CXX@
    1232 @@ -153,7 +153,7 @@
     1409@@ -95,7 +96,7 @@
     1410 
     1411 LINK           = @LINK_PROGS@ $(LIBTOOL_LINK) @CXXLDFLAGS@
     1412 SHLIB_DIRS     = -L../lib
     1413-SHLIB_LIST     = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
     1414+SHLIB_LIST     = $(SHLIB_DIRS) -lform@LIB_SUFFIX@ -lmenu@LIB_SUFFIX@ -lpanel@LIB_SUFFIX@ -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
     1415 
     1416 LIBROOT                = ncurses++
     1417 
     1418@@ -153,14 +154,14 @@
    12331419        $(MODEL)/cursesmain$o
    12341420 
    … …  
    12391425 
    12401426 ../lib/$(LIBNAME_LIBTOOL) : $(LIB_OBJS)
     1427        cd ../lib && $(LIBTOOL_LINK) $(CXX) $(CXXFLAGS) \
     1428                -o $(LIBNAME) $(LIB_OBJS:$o=.lo) \
     1429                -rpath $(INSTALL_PREFIX)$(libdir) \
     1430-               -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(SHLIB_LIST)
     1431+               -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(SHLIB_LIST)
     1432 
     1433 OBJS_DEMO = $(MODEL)/demo$o
     1434 
    12411435diff -Naur ncurses-5.7.orig/config.guess ncurses-5.7/config.guess
    12421436--- ncurses-5.7.orig/config.guess       2008-08-30 13:25:07.000000000 -0700
    1243 +++ ncurses-5.7/config.guess    2009-02-28 20:38:46.290546165 -0800
     1437+++ ncurses-5.7/config.guess    2009-06-05 14:01:03.000000000 -0700
    12441438@@ -4,7 +4,7 @@
    12451439 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
    … …  
    13111505diff -Naur ncurses-5.7.orig/config.sub ncurses-5.7/config.sub
    13121506--- ncurses-5.7.orig/config.sub 2008-08-30 13:25:02.000000000 -0700
    1313 +++ ncurses-5.7/config.sub      2009-02-28 20:38:46.290546165 -0800
     1507+++ ncurses-5.7/config.sub      2009-06-05 14:01:03.000000000 -0700
    13141508@@ -4,7 +4,7 @@
    13151509 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
    … …  
    13951589diff -Naur ncurses-5.7.orig/configure ncurses-5.7/configure
    13961590--- ncurses-5.7.orig/configure  2008-10-25 17:04:38.000000000 -0700
    1397 +++ ncurses-5.7/configure       2009-02-28 20:38:57.039235088 -0800
     1591+++ ncurses-5.7/configure       2009-06-05 14:01:31.000000000 -0700
    13981592@@ -1,7 +1,7 @@
    13991593 #! /bin/sh
    14001594-# From configure.in Revision: 1.454 .
    1401 +# From configure.in Revision: 1.466 .
     1595+# From configure.in Revision: 1.470 .
    14021596 # Guess values for system-dependent variables and create Makefiles.
    14031597-# Generated by Autoconf 2.52.20080325.
    … …  
    14261620   --enable-ext-colors     compile for 256-color support
    14271621   --enable-ext-mouse      compile for extended mouse-encoding
    1428 @@ -870,7 +874,7 @@
     1622@@ -780,6 +784,7 @@
     1623   --with-pthread          use POSIX thread library
     1624   --enable-weak-symbols   enable weak-symbols for pthreads
     1625   --enable-reentrant      compile with experimental reentrant code
     1626+  --with-wrap-prefix=XXX  override prefix used for public variables
     1627   --enable-safe-sprintf   compile with experimental safe-sprintf code
     1628   --disable-scroll-hints  compile without scroll-hints code
     1629   --enable-wgetch-events  compile with experimental wgetch-events code
     1630@@ -870,7 +875,7 @@
    14291631 running configure, to aid debugging if configure makes a mistake.
    14301632 
    … …  
    14351637   $ $0 $@
    14361638 
    1437 @@ -994,7 +998,7 @@
     1639@@ -994,7 +999,7 @@
    14381640 fi
    14391641 for ac_site_file in $CONFIG_SITE; do
    14401642   if test -r "$ac_site_file"; then
    14411643-    { echo "$as_me:997: loading site script $ac_site_file" >&5
    1442 +    { echo "$as_me:1001: loading site script $ac_site_file" >&5
     1644+    { echo "$as_me:1002: loading site script $ac_site_file" >&5
    14431645 echo "$as_me: loading site script $ac_site_file" >&6;}
    14441646     cat "$ac_site_file" >&5
    14451647     . "$ac_site_file"
    1446 @@ -1005,7 +1009,7 @@
     1648@@ -1005,7 +1010,7 @@
    14471649   # Some versions of bash will fail to source /dev/null (special
    14481650   # files actually), so we avoid doing that.
    14491651   if test -f "$cache_file"; then
    14501652-    { echo "$as_me:1008: loading cache $cache_file" >&5
    1451 +    { echo "$as_me:1012: loading cache $cache_file" >&5
     1653+    { echo "$as_me:1013: loading cache $cache_file" >&5
    14521654 echo "$as_me: loading cache $cache_file" >&6;}
    14531655     case $cache_file in
    14541656       [\\/]* | ?:[\\/]* ) . $cache_file;;
    1455 @@ -1013,7 +1017,7 @@
     1657@@ -1013,7 +1018,7 @@
    14561658     esac
    14571659   fi
    14581660 else
    14591661-  { echo "$as_me:1016: creating cache $cache_file" >&5
    1460 +  { echo "$as_me:1020: creating cache $cache_file" >&5
     1662+  { echo "$as_me:1021: creating cache $cache_file" >&5
    14611663 echo "$as_me: creating cache $cache_file" >&6;}
    14621664   >$cache_file
    14631665 fi
    1464 @@ -1029,21 +1033,21 @@
     1666@@ -1029,21 +1034,21 @@
    14651667   eval ac_new_val="\$ac_env_${ac_var}_value"
    14661668   case $ac_old_set,$ac_new_set in
    14671669     set,)
    14681670-      { echo "$as_me:1032: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
    1469 +      { echo "$as_me:1036: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
     1671+      { echo "$as_me:1037: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
    14701672 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
    14711673       ac_cache_corrupted=: ;;
    14721674     ,set)
    14731675-      { echo "$as_me:1036: error: \`$ac_var' was not set in the previous run" >&5
    1474 +      { echo "$as_me:1040: error: \`$ac_var' was not set in the previous run" >&5
     1676+      { echo "$as_me:1041: error: \`$ac_var' was not set in the previous run" >&5
    14751677 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
    14761678       ac_cache_corrupted=: ;;
    … …  
    14791681       if test "x$ac_old_val" != "x$ac_new_val"; then
    14801682-        { echo "$as_me:1042: error: \`$ac_var' has changed since the previous run:" >&5
    1481 +        { echo "$as_me:1046: error: \`$ac_var' has changed since the previous run:" >&5
     1683+        { echo "$as_me:1047: error: \`$ac_var' has changed since the previous run:" >&5
    14821684 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
    14831685-        { echo "$as_me:1044:   former value:  $ac_old_val" >&5
    1484 +        { echo "$as_me:1048:   former value:  $ac_old_val" >&5
     1686+        { echo "$as_me:1049:   former value:  $ac_old_val" >&5
    14851687 echo "$as_me:   former value:  $ac_old_val" >&2;}
    14861688-        { echo "$as_me:1046:   current value: $ac_new_val" >&5
    1487 +        { echo "$as_me:1050:   current value: $ac_new_val" >&5
     1689+        { echo "$as_me:1051:   current value: $ac_new_val" >&5
    14881690 echo "$as_me:   current value: $ac_new_val" >&2;}
    14891691         ac_cache_corrupted=:
    14901692       fi;;
    1491 @@ -1062,9 +1066,9 @@
     1693@@ -1062,9 +1067,9 @@
    14921694   fi
    14931695 done
    14941696 if $ac_cache_corrupted; then
    14951697-  { echo "$as_me:1065: error: changes in the environment can compromise the build" >&5
    1496 +  { echo "$as_me:1069: error: changes in the environment can compromise the build" >&5
     1698+  { echo "$as_me:1070: error: changes in the environment can compromise the build" >&5
    14971699 echo "$as_me: error: changes in the environment can compromise the build" >&2;}
    14981700-  { { echo "$as_me:1067: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
    1499 +  { { echo "$as_me:1071: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
     1701+  { { echo "$as_me:1072: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
    15001702 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    15011703    { (exit 1); exit 1; }; }
    15021704 fi
    1503 @@ -1085,10 +1089,10 @@
     1705@@ -1085,10 +1090,10 @@
    15041706 echo "#! $SHELL" >conftest.sh
    15051707 echo  "exit 0"   >>conftest.sh
    15061708 chmod +x conftest.sh
    15071709-if { (echo "$as_me:1088: PATH=\".;.\"; conftest.sh") >&5
    1508 +if { (echo "$as_me:1092: PATH=\".;.\"; conftest.sh") >&5
     1710+if { (echo "$as_me:1093: PATH=\".;.\"; conftest.sh") >&5
    15091711   (PATH=".;."; conftest.sh) 2>&5
    15101712   ac_status=$?
    15111713-  echo "$as_me:1091: \$? = $ac_status" >&5
    1512 +  echo "$as_me:1095: \$? = $ac_status" >&5
     1714+  echo "$as_me:1096: \$? = $ac_status" >&5
    15131715   (exit $ac_status); }; then
    15141716   ac_path_separator=';'
    15151717 else
    1516 @@ -1101,7 +1105,7 @@
     1718@@ -1101,7 +1106,7 @@
    15171719 
    15181720 top_builddir=`pwd`
    15191721 
    15201722-echo "$as_me:1104: checking for egrep" >&5
    1521 +echo "$as_me:1108: checking for egrep" >&5
     1723+echo "$as_me:1109: checking for egrep" >&5
    15221724 echo $ECHO_N "checking for egrep... $ECHO_C" >&6
    15231725 if test "${ac_cv_prog_egrep+set}" = set; then
    15241726   echo $ECHO_N "(cached) $ECHO_C" >&6
    1525 @@ -1111,11 +1115,11 @@
     1727@@ -1111,11 +1116,11 @@
    15261728     else ac_cv_prog_egrep='egrep'
    15271729     fi
    15281730 fi
    15291731-echo "$as_me:1114: result: $ac_cv_prog_egrep" >&5
    1530 +echo "$as_me:1118: result: $ac_cv_prog_egrep" >&5
     1732+echo "$as_me:1119: result: $ac_cv_prog_egrep" >&5
    15311733 echo "${ECHO_T}$ac_cv_prog_egrep" >&6
    15321734  EGREP=$ac_cv_prog_egrep
    15331735 
    15341736-test -z "$EGREP" && { { echo "$as_me:1118: error: No egrep program found" >&5
    1535 +test -z "$EGREP" && { { echo "$as_me:1122: error: No egrep program found" >&5
     1737+test -z "$EGREP" && { { echo "$as_me:1123: error: No egrep program found" >&5
    15361738 echo "$as_me: error: No egrep program found" >&2;}
    15371739    { (exit 1); exit 1; }; }
    15381740 
    1539 @@ -1125,7 +1129,7 @@
     1741@@ -1125,7 +1130,7 @@
    15401742 cf_cv_abi_version=${NCURSES_MAJOR}
    15411743 cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
    15421744 cf_cv_timestamp=`date`
    15431745-echo "$as_me:1128: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
    1544 +echo "$as_me:1132: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
     1746+echo "$as_me:1133: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
    15451747 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6
    15461748 
    15471749 test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0
    1548 @@ -1133,7 +1137,7 @@
     1750@@ -1133,7 +1138,7 @@
    15491751 # Check whether --with-rel-version or --without-rel-version was given.
    15501752 if test "${with_rel_version+set}" = set; then
    15511753   withval="$with_rel_version"
    15521754-  { echo "$as_me:1136: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
    1553 +  { echo "$as_me:1140: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
     1755+  { echo "$as_me:1141: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
    15541756 echo "$as_me: WARNING: overriding release version $cf_cv_rel_version to $withval" >&2;}
    15551757  cf_cv_rel_version=$withval
    15561758 fi;
    1557 @@ -1146,13 +1150,13 @@
     1759@@ -1146,13 +1151,13 @@
    15581760   [0-9]*) #(vi
    15591761        ;;
    15601762   *)
    15611763-       { { echo "$as_me:1149: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
    1562 +       { { echo "$as_me:1153: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
     1764+       { { echo "$as_me:1154: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
    15631765 echo "$as_me: error: Release major-version is not a number: $NCURSES_MAJOR" >&2;}
    15641766    { (exit 1); exit 1; }; }
    … …  
    15671769 else
    15681770-  { { echo "$as_me:1155: error: Release major-version value is empty" >&5
    1569 +  { { echo "$as_me:1159: error: Release major-version value is empty" >&5
     1771+  { { echo "$as_me:1160: error: Release major-version value is empty" >&5
    15701772 echo "$as_me: error: Release major-version value is empty" >&2;}
    15711773    { (exit 1); exit 1; }; }
    15721774 fi
    1573 @@ -1162,13 +1166,13 @@
     1775@@ -1162,13 +1167,13 @@
    15741776   [0-9]*) #(vi
    15751777        ;;
    15761778   *)
    15771779-       { { echo "$as_me:1165: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
    1578 +       { { echo "$as_me:1169: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
     1780+       { { echo "$as_me:1170: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
    15791781 echo "$as_me: error: Release minor-version is not a number: $NCURSES_MINOR" >&2;}
    15801782    { (exit 1); exit 1; }; }
    … …  
    15831785 else
    15841786-  { { echo "$as_me:1171: error: Release minor-version value is empty" >&5
    1585 +  { { echo "$as_me:1175: error: Release minor-version value is empty" >&5
     1787+  { { echo "$as_me:1176: error: Release minor-version value is empty" >&5
    15861788 echo "$as_me: error: Release minor-version value is empty" >&2;}
    15871789    { (exit 1); exit 1; }; }
    15881790 fi
    1589 @@ -1178,7 +1182,7 @@
     1791@@ -1178,7 +1183,7 @@
    15901792 # Check whether --with-abi-version or --without-abi-version was given.
    15911793 if test "${with_abi_version+set}" = set; then
    15921794   withval="$with_abi_version"
    15931795-  { echo "$as_me:1181: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
    1594 +  { echo "$as_me:1185: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
     1796+  { echo "$as_me:1186: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
    15951797 echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&2;}
    15961798  cf_cv_abi_version=$withval
    15971799 fi;
    1598 @@ -1188,13 +1192,13 @@
     1800@@ -1188,13 +1193,13 @@
    15991801   [0-9]*) #(vi
    16001802        ;;
    16011803   *)
    16021804-       { { echo "$as_me:1191: error: ABI version is not a number: $cf_cv_abi_version" >&5
    1603 +       { { echo "$as_me:1195: error: ABI version is not a number: $cf_cv_abi_version" >&5
     1805+       { { echo "$as_me:1196: error: ABI version is not a number: $cf_cv_abi_version" >&5
    16041806 echo "$as_me: error: ABI version is not a number: $cf_cv_abi_version" >&2;}
    16051807    { (exit 1); exit 1; }; }
    … …  
    16081810 else
    16091811-  { { echo "$as_me:1197: error: ABI version value is empty" >&5
    1610 +  { { echo "$as_me:1201: error: ABI version value is empty" >&5
     1812+  { { echo "$as_me:1202: error: ABI version value is empty" >&5
    16111813 echo "$as_me: error: ABI version value is empty" >&2;}
    16121814    { (exit 1); exit 1; }; }
    16131815 fi
    1614 @@ -1216,7 +1220,7 @@
     1816@@ -1216,7 +1221,7 @@
    16151817   fi
    16161818 done
    16171819 if test -z "$ac_aux_dir"; then
    16181820-  { { echo "$as_me:1219: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
    1619 +  { { echo "$as_me:1223: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
     1821+  { { echo "$as_me:1224: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
    16201822 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
    16211823    { (exit 1); exit 1; }; }
    16221824 fi
    1623 @@ -1226,11 +1230,11 @@
     1825@@ -1226,11 +1231,11 @@
    16241826 
    16251827 # Make sure we can run config.sub.
    16261828 $ac_config_sub sun4 >/dev/null 2>&1 ||
    16271829-  { { echo "$as_me:1229: error: cannot run $ac_config_sub" >&5
    1628 +  { { echo "$as_me:1233: error: cannot run $ac_config_sub" >&5
     1830+  { { echo "$as_me:1234: error: cannot run $ac_config_sub" >&5
    16291831 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    16301832    { (exit 1); exit 1; }; }
    16311833 
    16321834-echo "$as_me:1233: checking build system type" >&5
    1633 +echo "$as_me:1237: checking build system type" >&5
     1835+echo "$as_me:1238: checking build system type" >&5
    16341836 echo $ECHO_N "checking build system type... $ECHO_C" >&6
    16351837 if test "${ac_cv_build+set}" = set; then
    16361838   echo $ECHO_N "(cached) $ECHO_C" >&6
    1637 @@ -1239,23 +1243,23 @@
     1839@@ -1239,23 +1244,23 @@
    16381840 test -z "$ac_cv_build_alias" &&
    16391841   ac_cv_build_alias=`$ac_config_guess`
    16401842 test -z "$ac_cv_build_alias" &&
    16411843-  { { echo "$as_me:1242: error: cannot guess build type; you must specify one" >&5
    1642 +  { { echo "$as_me:1246: error: cannot guess build type; you must specify one" >&5
     1844+  { { echo "$as_me:1247: error: cannot guess build type; you must specify one" >&5
    16431845 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    16441846    { (exit 1); exit 1; }; }
    16451847 ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
    16461848-  { { echo "$as_me:1246: error: $ac_config_sub $ac_cv_build_alias failed." >&5
    1647 +  { { echo "$as_me:1250: error: $ac_config_sub $ac_cv_build_alias failed." >&5
     1849+  { { echo "$as_me:1251: error: $ac_config_sub $ac_cv_build_alias failed." >&5
    16481850 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
    16491851    { (exit 1); exit 1; }; }
    … …  
    16511853 fi
    16521854-echo "$as_me:1251: result: $ac_cv_build" >&5
    1653 +echo "$as_me:1255: result: $ac_cv_build" >&5
     1855+echo "$as_me:1256: result: $ac_cv_build" >&5
    16541856 echo "${ECHO_T}$ac_cv_build" >&6
    16551857 build=$ac_cv_build
    … …  
    16591861 
    16601862-echo "$as_me:1258: checking host system type" >&5
    1661 +echo "$as_me:1262: checking host system type" >&5
     1863+echo "$as_me:1263: checking host system type" >&5
    16621864 echo $ECHO_N "checking host system type... $ECHO_C" >&6
    16631865 if test "${ac_cv_host+set}" = set; then
    16641866   echo $ECHO_N "(cached) $ECHO_C" >&6
    1665 @@ -1264,12 +1268,12 @@
     1867@@ -1264,12 +1269,12 @@
    16661868 test -z "$ac_cv_host_alias" &&
    16671869   ac_cv_host_alias=$ac_cv_build_alias
    16681870 ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
    16691871-  { { echo "$as_me:1267: error: $ac_config_sub $ac_cv_host_alias failed" >&5
    1670 +  { { echo "$as_me:1271: error: $ac_config_sub $ac_cv_host_alias failed" >&5
     1872+  { { echo "$as_me:1272: error: $ac_config_sub $ac_cv_host_alias failed" >&5
    16711873 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
    16721874    { (exit 1); exit 1; }; }
    … …  
    16741876 fi
    16751877-echo "$as_me:1272: result: $ac_cv_host" >&5
    1676 +echo "$as_me:1276: result: $ac_cv_host" >&5
     1878+echo "$as_me:1277: result: $ac_cv_host" >&5
    16771879 echo "${ECHO_T}$ac_cv_host" >&6
    16781880 host=$ac_cv_host
    16791881 host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
    1680 @@ -1277,7 +1281,7 @@
     1882@@ -1277,7 +1282,7 @@
    16811883 host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
    16821884 
    16831885 if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
    16841886-       echo "$as_me:1280: checking target system type" >&5
    1685 +       echo "$as_me:1284: checking target system type" >&5
     1887+       echo "$as_me:1285: checking target system type" >&5
    16861888 echo $ECHO_N "checking target system type... $ECHO_C" >&6
    16871889 if test "${ac_cv_target+set}" = set; then
    16881890   echo $ECHO_N "(cached) $ECHO_C" >&6
    1689 @@ -1286,12 +1290,12 @@
     1891@@ -1286,12 +1291,12 @@
    16901892 test "x$ac_cv_target_alias" = "x" &&
    16911893   ac_cv_target_alias=$ac_cv_host_alias
    16921894 ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
    16931895-  { { echo "$as_me:1289: error: $ac_config_sub $ac_cv_target_alias failed" >&5
    1694 +  { { echo "$as_me:1293: error: $ac_config_sub $ac_cv_target_alias failed" >&5
     1896+  { { echo "$as_me:1294: error: $ac_config_sub $ac_cv_target_alias failed" >&5
    16951897 echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
    16961898    { (exit 1); exit 1; }; }
    … …  
    16981900 fi
    16991901-echo "$as_me:1294: result: $ac_cv_target" >&5
    1700 +echo "$as_me:1298: result: $ac_cv_target" >&5
     1902+echo "$as_me:1299: result: $ac_cv_target" >&5
    17011903 echo "${ECHO_T}$ac_cv_target" >&6
    17021904 target=$ac_cv_target
    17031905 target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
    1704 @@ -1322,13 +1326,13 @@
     1906@@ -1322,13 +1327,13 @@
    17051907 fi
    17061908 
    17071909 test -z "$system_name" && system_name="$cf_cv_system_name"
    17081910-test -n "$cf_cv_system_name" && echo "$as_me:1325: result: Configuring for $cf_cv_system_name" >&5
    1709 +test -n "$cf_cv_system_name" && echo "$as_me:1329: result: Configuring for $cf_cv_system_name" >&5
     1911+test -n "$cf_cv_system_name" && echo "$as_me:1330: result: Configuring for $cf_cv_system_name" >&5
    17101912 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
    17111913 
    17121914 if test ".$system_name" != ".$cf_cv_system_name" ; then
    17131915-       echo "$as_me:1329: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
    1714 +       echo "$as_me:1333: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
     1916+       echo "$as_me:1334: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
    17151917 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
    17161918-       { { echo "$as_me:1331: error: \"Please remove config.cache and try again.\"" >&5
    1717 +       { { echo "$as_me:1335: error: \"Please remove config.cache and try again.\"" >&5
     1919+       { { echo "$as_me:1336: error: \"Please remove config.cache and try again.\"" >&5
    17181920 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
    17191921    { (exit 1); exit 1; }; }
    17201922 fi
    1721 @@ -1336,7 +1340,7 @@
     1923@@ -1336,7 +1341,7 @@
    17221924 # Check whether --with-system-type or --without-system-type was given.
    17231925 if test "${with_system_type+set}" = set; then
    17241926   withval="$with_system_type"
    17251927-  { echo "$as_me:1339: WARNING: overriding system type to $withval" >&5
    1726 +  { echo "$as_me:1343: WARNING: overriding system type to $withval" >&5
     1928+  { echo "$as_me:1344: WARNING: overriding system type to $withval" >&5
    17271929 echo "$as_me: WARNING: overriding system type to $withval" >&2;}
    17281930  cf_cv_system_name=$withval
    17291931 fi;
    1730 @@ -1346,7 +1350,7 @@
     1932@@ -1346,7 +1351,7 @@
    17311933 
    17321934 ###    Default install-location
    17331935 
    17341936-echo "$as_me:1349: checking for prefix" >&5
    1735 +echo "$as_me:1353: checking for prefix" >&5
     1937+echo "$as_me:1354: checking for prefix" >&5
    17361938 echo $ECHO_N "checking for prefix... $ECHO_C" >&6
    17371939 if test "x$prefix" = "xNONE" ; then
    17381940        case "$cf_cv_system_name" in
    1739 @@ -1358,11 +1362,11 @@
     1941@@ -1358,11 +1363,11 @@
    17401942                ;;
    17411943        esac
    17421944 fi
    17431945-echo "$as_me:1361: result: $prefix" >&5
    1744 +echo "$as_me:1365: result: $prefix" >&5
     1946+echo "$as_me:1366: result: $prefix" >&5
    17451947 echo "${ECHO_T}$prefix" >&6
    17461948 
    17471949 if test "x$prefix" = "xNONE" ; then
    17481950-echo "$as_me:1365: checking for default include-directory" >&5
    1749 +echo "$as_me:1369: checking for default include-directory" >&5
     1951+echo "$as_me:1370: checking for default include-directory" >&5
    17501952 echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6
    17511953 test -n "$verbose" && echo 1>&6
    17521954 for cf_symbol in \
    1753 @@ -1385,7 +1389,7 @@
     1955@@ -1385,7 +1390,7 @@
    17541956        fi
    17551957        test -n "$verbose"  && echo "   tested $cf_dir" 1>&6
    17561958 done
    17571959-echo "$as_me:1388: result: $includedir" >&5
    1758 +echo "$as_me:1392: result: $includedir" >&5
     1960+echo "$as_me:1393: result: $includedir" >&5
    17591961 echo "${ECHO_T}$includedir" >&6
    17601962 fi
    17611963 
    1762 @@ -1399,7 +1403,7 @@
     1964@@ -1399,7 +1404,7 @@
    17631965 if test -n "$ac_tool_prefix"; then
    17641966   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
    17651967 set dummy ${ac_tool_prefix}gcc; ac_word=$2
    17661968-echo "$as_me:1402: checking for $ac_word" >&5
    1767 +echo "$as_me:1406: checking for $ac_word" >&5
     1969+echo "$as_me:1407: checking for $ac_word" >&5
    17681970 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    17691971 if test "${ac_cv_prog_CC+set}" = set; then
    17701972   echo $ECHO_N "(cached) $ECHO_C" >&6
    1771 @@ -1414,7 +1418,7 @@
     1973@@ -1414,7 +1419,7 @@
    17721974   test -z "$ac_dir" && ac_dir=.
    17731975   $as_executable_p "$ac_dir/$ac_word" || continue
    17741976 ac_cv_prog_CC="${ac_tool_prefix}gcc"
    17751977-echo "$as_me:1417: found $ac_dir/$ac_word" >&5
    1776 +echo "$as_me:1421: found $ac_dir/$ac_word" >&5
     1978+echo "$as_me:1422: found $ac_dir/$ac_word" >&5
    17771979 break
    17781980 done
    17791981 
    1780 @@ -1422,10 +1426,10 @@
     1982@@ -1422,10 +1427,10 @@
    17811983 fi
    17821984 CC=$ac_cv_prog_CC
    17831985 if test -n "$CC"; then
    17841986-  echo "$as_me:1425: result: $CC" >&5
    1785 +  echo "$as_me:1429: result: $CC" >&5
     1987+  echo "$as_me:1430: result: $CC" >&5
    17861988 echo "${ECHO_T}$CC" >&6
    17871989 else
    17881990-  echo "$as_me:1428: result: no" >&5
    1789 +  echo "$as_me:1432: result: no" >&5
     1991+  echo "$as_me:1433: result: no" >&5
    17901992 echo "${ECHO_T}no" >&6
    17911993 fi
    17921994 
    1793 @@ -1434,7 +1438,7 @@
     1995@@ -1434,7 +1439,7 @@
    17941996   ac_ct_CC=$CC
    17951997   # Extract the first word of "gcc", so it can be a program name with args.
    17961998 set dummy gcc; ac_word=$2
    17971999-echo "$as_me:1437: checking for $ac_word" >&5
    1798 +echo "$as_me:1441: checking for $ac_word" >&5
     2000+echo "$as_me:1442: checking for $ac_word" >&5
    17992001 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    18002002 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    18012003   echo $ECHO_N "(cached) $ECHO_C" >&6
    1802 @@ -1449,7 +1453,7 @@
     2004@@ -1449,7 +1454,7 @@
    18032005   test -z "$ac_dir" && ac_dir=.
    18042006   $as_executable_p "$ac_dir/$ac_word" || continue
    18052007 ac_cv_prog_ac_ct_CC="gcc"
    18062008-echo "$as_me:1452: found $ac_dir/$ac_word" >&5
    1807 +echo "$as_me:1456: found $ac_dir/$ac_word" >&5
     2009+echo "$as_me:1457: found $ac_dir/$ac_word" >&5
    18082010 break
    18092011 done
    18102012 
    1811 @@ -1457,10 +1461,10 @@
     2013@@ -1457,10 +1462,10 @@
    18122014 fi
    18132015 ac_ct_CC=$ac_cv_prog_ac_ct_CC
    18142016 if test -n "$ac_ct_CC"; then
    18152017-  echo "$as_me:1460: result: $ac_ct_CC" >&5
    1816 +  echo "$as_me:1464: result: $ac_ct_CC" >&5
     2018+  echo "$as_me:1465: result: $ac_ct_CC" >&5
    18172019 echo "${ECHO_T}$ac_ct_CC" >&6
    18182020 else
    18192021-  echo "$as_me:1463: result: no" >&5
    1820 +  echo "$as_me:1467: result: no" >&5
     2022+  echo "$as_me:1468: result: no" >&5
    18212023 echo "${ECHO_T}no" >&6
    18222024 fi
    18232025 
    1824 @@ -1473,7 +1477,7 @@
     2026@@ -1473,7 +1478,7 @@
    18252027   if test -n "$ac_tool_prefix"; then
    18262028   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
    18272029 set dummy ${ac_tool_prefix}cc; ac_word=$2
    18282030-echo "$as_me:1476: checking for $ac_word" >&5
    1829 +echo "$as_me:1480: checking for $ac_word" >&5
     2031+echo "$as_me:1481: checking for $ac_word" >&5
    18302032 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    18312033 if test "${ac_cv_prog_CC+set}" = set; then
    18322034   echo $ECHO_N "(cached) $ECHO_C" >&6
    1833 @@ -1488,7 +1492,7 @@
     2035@@ -1488,7 +1493,7 @@
    18342036   test -z "$ac_dir" && ac_dir=.
    18352037   $as_executable_p "$ac_dir/$ac_word" || continue
    18362038 ac_cv_prog_CC="${ac_tool_prefix}cc"
    18372039-echo "$as_me:1491: found $ac_dir/$ac_word" >&5
    1838 +echo "$as_me:1495: found $ac_dir/$ac_word" >&5
     2040+echo "$as_me:1496: found $ac_dir/$ac_word" >&5
    18392041 break
    18402042 done
    18412043 
    1842 @@ -1496,10 +1500,10 @@
     2044@@ -1496,10 +1501,10 @@
    18432045 fi
    18442046 CC=$ac_cv_prog_CC
    18452047 if test -n "$CC"; then
    18462048-  echo "$as_me:1499: result: $CC" >&5
    1847 +  echo "$as_me:1503: result: $CC" >&5
     2049+  echo "$as_me:1504: result: $CC" >&5
    18482050 echo "${ECHO_T}$CC" >&6
    18492051 else
    18502052-  echo "$as_me:1502: result: no" >&5
    1851 +  echo "$as_me:1506: result: no" >&5
     2053+  echo "$as_me:1507: result: no" >&5
    18522054 echo "${ECHO_T}no" >&6
    18532055 fi
    18542056 
    1855 @@ -1508,7 +1512,7 @@
     2057@@ -1508,7 +1513,7 @@
    18562058   ac_ct_CC=$CC
    18572059   # Extract the first word of "cc", so it can be a program name with args.
    18582060 set dummy cc; ac_word=$2
    18592061-echo "$as_me:1511: checking for $ac_word" >&5
    1860 +echo "$as_me:1515: checking for $ac_word" >&5
     2062+echo "$as_me:1516: checking for $ac_word" >&5
    18612063 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    18622064 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    18632065   echo $ECHO_N "(cached) $ECHO_C" >&6
    1864 @@ -1523,7 +1527,7 @@
     2066@@ -1523,7 +1528,7 @@
    18652067   test -z "$ac_dir" && ac_dir=.
    18662068   $as_executable_p "$ac_dir/$ac_word" || continue
    18672069 ac_cv_prog_ac_ct_CC="cc"
    18682070-echo "$as_me:1526: found $ac_dir/$ac_word" >&5
    1869 +echo "$as_me:1530: found $ac_dir/$ac_word" >&5
     2071+echo "$as_me:1531: found $ac_dir/$ac_word" >&5
    18702072 break
    18712073 done
    18722074 
    1873 @@ -1531,10 +1535,10 @@
     2075@@ -1531,10 +1536,10 @@
    18742076 fi
    18752077 ac_ct_CC=$ac_cv_prog_ac_ct_CC
    18762078 if test -n "$ac_ct_CC"; then
    18772079-  echo "$as_me:1534: result: $ac_ct_CC" >&5
    1878 +  echo "$as_me:1538: result: $ac_ct_CC" >&5
     2080+  echo "$as_me:1539: result: $ac_ct_CC" >&5
    18792081 echo "${ECHO_T}$ac_ct_CC" >&6
    18802082 else
    18812083-  echo "$as_me:1537: result: no" >&5
    1882 +  echo "$as_me:1541: result: no" >&5
     2084+  echo "$as_me:1542: result: no" >&5
    18832085 echo "${ECHO_T}no" >&6
    18842086 fi
    18852087 
    1886 @@ -1547,7 +1551,7 @@
     2088@@ -1547,7 +1552,7 @@
    18872089 if test -z "$CC"; then
    18882090   # Extract the first word of "cc", so it can be a program name with args.
    18892091 set dummy cc; ac_word=$2
    18902092-echo "$as_me:1550: checking for $ac_word" >&5
    1891 +echo "$as_me:1554: checking for $ac_word" >&5
     2093+echo "$as_me:1555: checking for $ac_word" >&5
    18922094 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    18932095 if test "${ac_cv_prog_CC+set}" = set; then
    18942096   echo $ECHO_N "(cached) $ECHO_C" >&6
    1895 @@ -1567,7 +1571,7 @@
     2097@@ -1567,7 +1572,7 @@
    18962098   continue
    18972099 fi
    18982100 ac_cv_prog_CC="cc"
    18992101-echo "$as_me:1570: found $ac_dir/$ac_word" >&5
    1900 +echo "$as_me:1574: found $ac_dir/$ac_word" >&5
     2102+echo "$as_me:1575: found $ac_dir/$ac_word" >&5
    19012103 break
    19022104 done
    19032105 
    1904 @@ -1589,10 +1593,10 @@
     2106@@ -1589,10 +1594,10 @@
    19052107 fi
    19062108 CC=$ac_cv_prog_CC
    19072109 if test -n "$CC"; then
    19082110-  echo "$as_me:1592: result: $CC" >&5
    1909 +  echo "$as_me:1596: result: $CC" >&5
     2111+  echo "$as_me:1597: result: $CC" >&5
    19102112 echo "${ECHO_T}$CC" >&6
    19112113 else
    19122114-  echo "$as_me:1595: result: no" >&5
    1913 +  echo "$as_me:1599: result: no" >&5
     2115+  echo "$as_me:1600: result: no" >&5
    19142116 echo "${ECHO_T}no" >&6
    19152117 fi
    19162118 
    1917 @@ -1603,7 +1607,7 @@
     2119@@ -1603,7 +1608,7 @@
    19182120   do
    19192121     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
    19202122 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
    19212123-echo "$as_me:1606: checking for $ac_word" >&5
    1922 +echo "$as_me:1610: checking for $ac_word" >&5
     2124+echo "$as_me:1611: checking for $ac_word" >&5
    19232125 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    19242126 if test "${ac_cv_prog_CC+set}" = set; then
    19252127   echo $ECHO_N "(cached) $ECHO_C" >&6
    1926 @@ -1618,7 +1622,7 @@
     2128@@ -1618,7 +1623,7 @@
    19272129   test -z "$ac_dir" && ac_dir=.
    19282130   $as_executable_p "$ac_dir/$ac_word" || continue
    19292131 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
    19302132-echo "$as_me:1621: found $ac_dir/$ac_word" >&5
    1931 +echo "$as_me:1625: found $ac_dir/$ac_word" >&5
     2133+echo "$as_me:1626: found $ac_dir/$ac_word" >&5
    19322134 break
    19332135 done
    19342136 
    1935 @@ -1626,10 +1630,10 @@
     2137@@ -1626,10 +1631,10 @@
    19362138 fi
    19372139 CC=$ac_cv_prog_CC
    19382140 if test -n "$CC"; then
    19392141-  echo "$as_me:1629: result: $CC" >&5
    1940 +  echo "$as_me:1633: result: $CC" >&5
     2142+  echo "$as_me:1634: result: $CC" >&5
    19412143 echo "${ECHO_T}$CC" >&6
    19422144 else
    19432145-  echo "$as_me:1632: result: no" >&5
    1944 +  echo "$as_me:1636: result: no" >&5
     2146+  echo "$as_me:1637: result: no" >&5
    19452147 echo "${ECHO_T}no" >&6
    19462148 fi
    19472149 
    1948 @@ -1642,7 +1646,7 @@
     2150@@ -1642,7 +1647,7 @@
    19492151 do
    19502152   # Extract the first word of "$ac_prog", so it can be a program name with args.
    19512153 set dummy $ac_prog; ac_word=$2
    19522154-echo "$as_me:1645: checking for $ac_word" >&5
    1953 +echo "$as_me:1649: checking for $ac_word" >&5
     2155+echo "$as_me:1650: checking for $ac_word" >&5
    19542156 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    19552157 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    19562158   echo $ECHO_N "(cached) $ECHO_C" >&6
    1957 @@ -1657,7 +1661,7 @@
     2159@@ -1657,7 +1662,7 @@
    19582160   test -z "$ac_dir" && ac_dir=.
    19592161   $as_executable_p "$ac_dir/$ac_word" || continue
    19602162 ac_cv_prog_ac_ct_CC="$ac_prog"
    19612163-echo "$as_me:1660: found $ac_dir/$ac_word" >&5
    1962 +echo "$as_me:1664: found $ac_dir/$ac_word" >&5
     2164+echo "$as_me:1665: found $ac_dir/$ac_word" >&5
    19632165 break
    19642166 done
    19652167 
    1966 @@ -1665,10 +1669,10 @@
     2168@@ -1665,10 +1670,10 @@
    19672169 fi
    19682170 ac_ct_CC=$ac_cv_prog_ac_ct_CC
    19692171 if test -n "$ac_ct_CC"; then
    19702172-  echo "$as_me:1668: result: $ac_ct_CC" >&5
    1971 +  echo "$as_me:1672: result: $ac_ct_CC" >&5
     2173+  echo "$as_me:1673: result: $ac_ct_CC" >&5
    19722174 echo "${ECHO_T}$ac_ct_CC" >&6
    19732175 else
    19742176-  echo "$as_me:1671: result: no" >&5
    1975 +  echo "$as_me:1675: result: no" >&5
     2177+  echo "$as_me:1676: result: no" >&5
    19762178 echo "${ECHO_T}no" >&6
    19772179 fi
    19782180 
    1979 @@ -1680,32 +1684,32 @@
     2181@@ -1680,32 +1685,32 @@
    19802182 
    19812183 fi
    19822184 
    19832185-test -z "$CC" && { { echo "$as_me:1683: error: no acceptable cc found in \$PATH" >&5
    1984 +test -z "$CC" && { { echo "$as_me:1687: error: no acceptable cc found in \$PATH" >&5
     2186+test -z "$CC" && { { echo "$as_me:1688: error: no acceptable cc found in \$PATH" >&5
    19852187 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
    19862188    { (exit 1); exit 1; }; }
    … …  
    19882190 # Provide some information about the compiler.
    19892191-echo "$as_me:1688:" \
    1990 +echo "$as_me:1692:" \
     2192+echo "$as_me:1693:" \
    19912193      "checking for C compiler version" >&5
    19922194 ac_compiler=`set X $ac_compile; echo $2`
    19932195-{ (eval echo "$as_me:1691: \"$ac_compiler --version </dev/null >&5\"") >&5
    1994 +{ (eval echo "$as_me:1695: \"$ac_compiler --version </dev/null >&5\"") >&5
     2196+{ (eval echo "$as_me:1696: \"$ac_compiler --version </dev/null >&5\"") >&5
    19952197   (eval $ac_compiler --version </dev/null >&5) 2>&5
    19962198   ac_status=$?
    19972199-  echo "$as_me:1694: \$? = $ac_status" >&5
    1998 +  echo "$as_me:1698: \$? = $ac_status" >&5
     2200+  echo "$as_me:1699: \$? = $ac_status" >&5
    19992201   (exit $ac_status); }
    20002202-{ (eval echo "$as_me:1696: \"$ac_compiler -v </dev/null >&5\"") >&5
    2001 +{ (eval echo "$as_me:1700: \"$ac_compiler -v </dev/null >&5\"") >&5
     2203+{ (eval echo "$as_me:1701: \"$ac_compiler -v </dev/null >&5\"") >&5
    20022204   (eval $ac_compiler -v </dev/null >&5) 2>&5
    20032205   ac_status=$?
    20042206-  echo "$as_me:1699: \$? = $ac_status" >&5
    2005 +  echo "$as_me:1703: \$? = $ac_status" >&5
     2207+  echo "$as_me:1704: \$? = $ac_status" >&5
    20062208   (exit $ac_status); }
    20072209-{ (eval echo "$as_me:1701: \"$ac_compiler -V </dev/null >&5\"") >&5
    2008 +{ (eval echo "$as_me:1705: \"$ac_compiler -V </dev/null >&5\"") >&5
     2210+{ (eval echo "$as_me:1706: \"$ac_compiler -V </dev/null >&5\"") >&5
    20092211   (eval $ac_compiler -V </dev/null >&5) 2>&5
    20102212   ac_status=$?
    20112213-  echo "$as_me:1704: \$? = $ac_status" >&5
    2012 +  echo "$as_me:1708: \$? = $ac_status" >&5
     2214+  echo "$as_me:1709: \$? = $ac_status" >&5
    20132215   (exit $ac_status); }
    20142216 
    20152217 cat >conftest.$ac_ext <<_ACEOF
    20162218-#line 1708 "configure"
    2017 +#line 1712 "configure"
     2219+#line 1713 "configure"
    20182220 #include "confdefs.h"
    20192221 
    20202222 int
    2021 @@ -1721,13 +1725,13 @@
     2223@@ -1721,13 +1726,13 @@
    20222224 # Try to create an executable without -o first, disregard a.out.
    20232225 # It will help us diagnose broken compilers, and finding out an intuition
    20242226 # of exeext.
    20252227-echo "$as_me:1724: checking for C compiler default output" >&5
    2026 +echo "$as_me:1728: checking for C compiler default output" >&5
     2228+echo "$as_me:1729: checking for C compiler default output" >&5
    20272229 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
    20282230 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
    20292231-if { (eval echo "$as_me:1727: \"$ac_link_default\"") >&5
    2030 +if { (eval echo "$as_me:1731: \"$ac_link_default\"") >&5
     2232+if { (eval echo "$as_me:1732: \"$ac_link_default\"") >&5
    20312233   (eval $ac_link_default) 2>&5
    20322234   ac_status=$?
    20332235-  echo "$as_me:1730: \$? = $ac_status" >&5
    2034 +  echo "$as_me:1734: \$? = $ac_status" >&5
     2236+  echo "$as_me:1735: \$? = $ac_status" >&5
    20352237   (exit $ac_status); }; then
    20362238   # Find the output, starting from the most likely.  This scheme is
    20372239 # not robust to junk in `.', hence go to wildcards (a.*) only as a last
    2038 @@ -1736,7 +1740,7 @@
     2240@@ -1736,7 +1741,7 @@
    20392241                 ls a.out conftest 2>/dev/null;
    20402242                 ls a.* conftest.* 2>/dev/null`; do
    … …  
    20452247             # certainly right.
    20462248             break;;
    2047 @@ -1750,34 +1754,34 @@
     2249@@ -1750,34 +1755,34 @@
    20482250 else
    20492251   echo "$as_me: failed program was:" >&5
    20502252 cat conftest.$ac_ext >&5
    20512253-{ { echo "$as_me:1753: error: C compiler cannot create executables" >&5
    2052 +{ { echo "$as_me:1757: error: C compiler cannot create executables" >&5
     2254+{ { echo "$as_me:1758: error: C compiler cannot create executables" >&5
    20532255 echo "$as_me: error: C compiler cannot create executables" >&2;}
    20542256    { (exit 77); exit 77; }; }
    … …  
    20572259 ac_exeext=$ac_cv_exeext
    20582260-echo "$as_me:1759: result: $ac_file" >&5
    2059 +echo "$as_me:1763: result: $ac_file" >&5
     2261+echo "$as_me:1764: result: $ac_file" >&5
    20602262 echo "${ECHO_T}$ac_file" >&6
    20612263 
    … …  
    20632265 # the compiler is broken, or we cross compile.
    20642266-echo "$as_me:1764: checking whether the C compiler works" >&5
    2065 +echo "$as_me:1768: checking whether the C compiler works" >&5
     2267+echo "$as_me:1769: checking whether the C compiler works" >&5
    20662268 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
    20672269 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
    … …  
    20702272   if { ac_try='./$ac_file'
    20712273-  { (eval echo "$as_me:1770: \"$ac_try\"") >&5
    2072 +  { (eval echo "$as_me:1774: \"$ac_try\"") >&5
     2274+  { (eval echo "$as_me:1775: \"$ac_try\"") >&5
    20732275   (eval $ac_try) 2>&5
    20742276   ac_status=$?
    20752277-  echo "$as_me:1773: \$? = $ac_status" >&5
    2076 +  echo "$as_me:1777: \$? = $ac_status" >&5
     2278+  echo "$as_me:1778: \$? = $ac_status" >&5
    20772279   (exit $ac_status); }; }; then
    20782280     cross_compiling=no
    … …  
    20822284     else
    20832285-       { { echo "$as_me:1780: error: cannot run C compiled programs.
    2084 +       { { echo "$as_me:1784: error: cannot run C compiled programs.
     2286+       { { echo "$as_me:1785: error: cannot run C compiled programs.
    20852287 If you meant to cross compile, use \`--host'." >&5
    20862288 echo "$as_me: error: cannot run C compiled programs.
    20872289 If you meant to cross compile, use \`--host'." >&2;}
    2088 @@ -1785,24 +1789,24 @@
     2290@@ -1785,24 +1790,24 @@
    20892291     fi
    20902292   fi
    20912293 fi
    20922294-echo "$as_me:1788: result: yes" >&5
    2093 +echo "$as_me:1792: result: yes" >&5
     2295+echo "$as_me:1793: result: yes" >&5
    20942296 echo "${ECHO_T}yes" >&6
    20952297 
    … …  
    20992301 # the compiler is broken, or we cross compile.
    21002302-echo "$as_me:1795: checking whether we are cross compiling" >&5
    2101 +echo "$as_me:1799: checking whether we are cross compiling" >&5
     2303+echo "$as_me:1800: checking whether we are cross compiling" >&5
    21022304 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
    21032305-echo "$as_me:1797: result: $cross_compiling" >&5
    2104 +echo "$as_me:1801: result: $cross_compiling" >&5
     2306+echo "$as_me:1802: result: $cross_compiling" >&5
    21052307 echo "${ECHO_T}$cross_compiling" >&6
    21062308 
    21072309-echo "$as_me:1800: checking for executable suffix" >&5
    2108 +echo "$as_me:1804: checking for executable suffix" >&5
     2310+echo "$as_me:1805: checking for executable suffix" >&5
    21092311 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
    21102312-if { (eval echo "$as_me:1802: \"$ac_link\"") >&5
    2111 +if { (eval echo "$as_me:1806: \"$ac_link\"") >&5
     2313+if { (eval echo "$as_me:1807: \"$ac_link\"") >&5
    21122314   (eval $ac_link) 2>&5
    21132315   ac_status=$?
    21142316-  echo "$as_me:1805: \$? = $ac_status" >&5
    2115 +  echo "$as_me:1809: \$? = $ac_status" >&5
     2317+  echo "$as_me:1810: \$? = $ac_status" >&5
    21162318   (exit $ac_status); }; then
    21172319   # If both `conftest.exe' and `conftest' are `present' (well, observable)
    21182320 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
    2119 @@ -1810,7 +1814,7 @@
     2321@@ -1810,7 +1815,7 @@
    21202322 # `rm'.
    21212323 for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
    … …  
    21262328           export ac_cv_exeext
    21272329           break;;
    2128 @@ -1818,25 +1822,25 @@
     2330@@ -1818,25 +1823,25 @@
    21292331   esac
    21302332 done
    21312333 else
    21322334-  { { echo "$as_me:1821: error: cannot compute EXEEXT: cannot compile and link" >&5
    2133 +  { { echo "$as_me:1825: error: cannot compute EXEEXT: cannot compile and link" >&5
     2335+  { { echo "$as_me:1826: error: cannot compute EXEEXT: cannot compile and link" >&5
    21342336 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
    21352337    { (exit 1); exit 1; }; }
    … …  
    21382340 rm -f conftest$ac_cv_exeext
    21392341-echo "$as_me:1827: result: $ac_cv_exeext" >&5
    2140 +echo "$as_me:1831: result: $ac_cv_exeext" >&5
     2342+echo "$as_me:1832: result: $ac_cv_exeext" >&5
    21412343 echo "${ECHO_T}$ac_cv_exeext" >&6
    21422344 
    … …  
    21452347 ac_exeext=$EXEEXT
    21462348-echo "$as_me:1833: checking for object suffix" >&5
    2147 +echo "$as_me:1837: checking for object suffix" >&5
     2349+echo "$as_me:1838: checking for object suffix" >&5
    21482350 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
    21492351 if test "${ac_cv_objext+set}" = set; then
    … …  
    21522354   cat >conftest.$ac_ext <<_ACEOF
    21532355-#line 1839 "configure"
    2154 +#line 1843 "configure"
     2356+#line 1844 "configure"
    21552357 #include "confdefs.h"
    21562358 
    21572359 int
    2158 @@ -1848,14 +1852,14 @@
     2360@@ -1848,14 +1853,14 @@
    21592361 }
    21602362 _ACEOF
    21612363 rm -f conftest.o conftest.obj
    21622364-if { (eval echo "$as_me:1851: \"$ac_compile\"") >&5
    2163 +if { (eval echo "$as_me:1855: \"$ac_compile\"") >&5
     2365+if { (eval echo "$as_me:1856: \"$ac_compile\"") >&5
    21642366   (eval $ac_compile) 2>&5
    21652367   ac_status=$?
    21662368-  echo "$as_me:1854: \$? = $ac_status" >&5
    2167 +  echo "$as_me:1858: \$? = $ac_status" >&5
     2369+  echo "$as_me:1859: \$? = $ac_status" >&5
    21682370   (exit $ac_status); }; then
    21692371   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
    … …  
    21742376        break;;
    21752377   esac
    2176 @@ -1863,24 +1867,24 @@
     2378@@ -1863,24 +1868,24 @@
    21772379 else
    21782380   echo "$as_me: failed program was:" >&5
    21792381 cat conftest.$ac_ext >&5
    21802382-{ { echo "$as_me:1866: error: cannot compute OBJEXT: cannot compile" >&5
    2181 +{ { echo "$as_me:1870: error: cannot compute OBJEXT: cannot compile" >&5
     2383+{ { echo "$as_me:1871: error: cannot compute OBJEXT: cannot compile" >&5
    21822384 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
    21832385    { (exit 1); exit 1; }; }
    … …  
    21872389 fi
    21882390-echo "$as_me:1873: result: $ac_cv_objext" >&5
    2189 +echo "$as_me:1877: result: $ac_cv_objext" >&5
     2391+echo "$as_me:1878: result: $ac_cv_objext" >&5
    21902392 echo "${ECHO_T}$ac_cv_objext" >&6
    21912393 OBJEXT=$ac_cv_objext
    21922394 ac_objext=$OBJEXT
    21932395-echo "$as_me:1877: checking whether we are using the GNU C compiler" >&5
    2194 +echo "$as_me:1881: checking whether we are using the GNU C compiler" >&5
     2396+echo "$as_me:1882: checking whether we are using the GNU C compiler" >&5
    21952397 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
    21962398 if test "${ac_cv_c_compiler_gnu+set}" = set; then
    … …  
    21992401   cat >conftest.$ac_ext <<_ACEOF
    22002402-#line 1883 "configure"
    2201 +#line 1887 "configure"
     2403+#line 1888 "configure"
    22022404 #include "confdefs.h"
    22032405 
    22042406 int
    2205 @@ -1895,16 +1899,16 @@
     2407@@ -1895,16 +1900,16 @@
    22062408 }
    22072409 _ACEOF
    22082410 rm -f conftest.$ac_objext
    22092411-if { (eval echo "$as_me:1898: \"$ac_compile\"") >&5
    2210 +if { (eval echo "$as_me:1902: \"$ac_compile\"") >&5
     2412+if { (eval echo "$as_me:1903: \"$ac_compile\"") >&5
    22112413   (eval $ac_compile) 2>&5
    22122414   ac_status=$?
    22132415-  echo "$as_me:1901: \$? = $ac_status" >&5
    2214 +  echo "$as_me:1905: \$? = $ac_status" >&5
     2416+  echo "$as_me:1906: \$? = $ac_status" >&5
    22152417   (exit $ac_status); } &&
    22162418          { ac_try='test -s conftest.$ac_objext'
    22172419-  { (eval echo "$as_me:1904: \"$ac_try\"") >&5
    2218 +  { (eval echo "$as_me:1908: \"$ac_try\"") >&5
     2420+  { (eval echo "$as_me:1909: \"$ac_try\"") >&5
    22192421   (eval $ac_try) 2>&5
    22202422   ac_status=$?
    22212423-  echo "$as_me:1907: \$? = $ac_status" >&5
    2222 +  echo "$as_me:1911: \$? = $ac_status" >&5
     2424+  echo "$as_me:1912: \$? = $ac_status" >&5
    22232425   (exit $ac_status); }; }; then
    22242426   ac_compiler_gnu=yes
    22252427 else
    2226 @@ -1916,19 +1920,19 @@
     2428@@ -1916,19 +1921,19 @@
    22272429 ac_cv_c_compiler_gnu=$ac_compiler_gnu
    22282430 
    22292431 fi
    22302432-echo "$as_me:1919: result: $ac_cv_c_compiler_gnu" >&5
    2231 +echo "$as_me:1923: result: $ac_cv_c_compiler_gnu" >&5
     2433+echo "$as_me:1924: result: $ac_cv_c_compiler_gnu" >&5
    22322434 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
    22332435 GCC=`test $ac_compiler_gnu = yes && echo yes`
    … …  
    22362438 CFLAGS="-g"
    22372439-echo "$as_me:1925: checking whether $CC accepts -g" >&5
    2238 +echo "$as_me:1929: checking whether $CC accepts -g" >&5
     2440+echo "$as_me:1930: checking whether $CC accepts -g" >&5
    22392441 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
    22402442 if test "${ac_cv_prog_cc_g+set}" = set; then
    … …  
    22432445   cat >conftest.$ac_ext <<_ACEOF
    22442446-#line 1931 "configure"
    2245 +#line 1935 "configure"
     2447+#line 1936 "configure"
    22462448 #include "confdefs.h"
    22472449 
    22482450 int
    2249 @@ -1940,16 +1944,16 @@
     2451@@ -1940,16 +1945,16 @@
    22502452 }
    22512453 _ACEOF
    22522454 rm -f conftest.$ac_objext
    22532455-if { (eval echo "$as_me:1943: \"$ac_compile\"") >&5
    2254 +if { (eval echo "$as_me:1947: \"$ac_compile\"") >&5
     2456+if { (eval echo "$as_me:1948: \"$ac_compile\"") >&5
    22552457   (eval $ac_compile) 2>&5
    22562458   ac_status=$?
    22572459-  echo "$as_me:1946: \$? = $ac_status" >&5
    2258 +  echo "$as_me:1950: \$? = $ac_status" >&5
     2460+  echo "$as_me:1951: \$? = $ac_status" >&5
    22592461   (exit $ac_status); } &&
    22602462          { ac_try='test -s conftest.$ac_objext'
    22612463-  { (eval echo "$as_me:1949: \"$ac_try\"") >&5
    2262 +  { (eval echo "$as_me:1953: \"$ac_try\"") >&5
     2464+  { (eval echo "$as_me:1954: \"$ac_try\"") >&5
    22632465   (eval $ac_try) 2>&5
    22642466   ac_status=$?
    22652467-  echo "$as_me:1952: \$? = $ac_status" >&5
    2266 +  echo "$as_me:1956: \$? = $ac_status" >&5
     2468+  echo "$as_me:1957: \$? = $ac_status" >&5
    22672469   (exit $ac_status); }; }; then
    22682470   ac_cv_prog_cc_g=yes
    22692471 else
    2270 @@ -1959,7 +1963,7 @@
     2472@@ -1959,7 +1964,7 @@
    22712473 fi
    22722474 rm -f conftest.$ac_objext conftest.$ac_ext
    22732475 fi
    22742476-echo "$as_me:1962: result: $ac_cv_prog_cc_g" >&5
    2275 +echo "$as_me:1966: result: $ac_cv_prog_cc_g" >&5
     2477+echo "$as_me:1967: result: $ac_cv_prog_cc_g" >&5
    22762478 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
    22772479 if test "$ac_test_CFLAGS" = set; then
    22782480   CFLAGS=$ac_save_CFLAGS
    2279 @@ -1986,16 +1990,16 @@
     2481@@ -1986,16 +1991,16 @@
    22802482 #endif
    22812483 _ACEOF
    22822484 rm -f conftest.$ac_objext
    22832485-if { (eval echo "$as_me:1989: \"$ac_compile\"") >&5
    2284 +if { (eval echo "$as_me:1993: \"$ac_compile\"") >&5
     2486+if { (eval echo "$as_me:1994: \"$ac_compile\"") >&5
    22852487   (eval $ac_compile) 2>&5
    22862488   ac_status=$?
    22872489-  echo "$as_me:1992: \$? = $ac_status" >&5
    2288 +  echo "$as_me:1996: \$? = $ac_status" >&5
     2490+  echo "$as_me:1997: \$? = $ac_status" >&5
    22892491   (exit $ac_status); } &&
    22902492          { ac_try='test -s conftest.$ac_objext'
    22912493-  { (eval echo "$as_me:1995: \"$ac_try\"") >&5
    2292 +  { (eval echo "$as_me:1999: \"$ac_try\"") >&5
     2494+  { (eval echo "$as_me:2000: \"$ac_try\"") >&5
    22932495   (eval $ac_try) 2>&5
    22942496   ac_status=$?
    22952497-  echo "$as_me:1998: \$? = $ac_status" >&5
    2296 +  echo "$as_me:2002: \$? = $ac_status" >&5
     2498+  echo "$as_me:2003: \$? = $ac_status" >&5
    22972499   (exit $ac_status); }; }; then
    22982500   for ac_declaration in \
    22992501    ''\
    2300 @@ -2007,7 +2011,7 @@
     2502@@ -2007,7 +2012,7 @@
    23012503    'void exit (int);'
    23022504 do
    23032505   cat >conftest.$ac_ext <<_ACEOF
    23042506-#line 2010 "configure"
    2305 +#line 2014 "configure"
     2507+#line 2015 "configure"
    23062508 #include "confdefs.h"
    23072509 #include <stdlib.h>
    23082510 $ac_declaration
    2309 @@ -2020,16 +2024,16 @@
     2511@@ -2020,16 +2025,16 @@
    23102512 }
    23112513 _ACEOF
    23122514 rm -f conftest.$ac_objext
    23132515-if { (eval echo "$as_me:2023: \"$ac_compile\"") >&5
    2314 +if { (eval echo "$as_me:2027: \"$ac_compile\"") >&5
     2516+if { (eval echo "$as_me:2028: \"$ac_compile\"") >&5
    23152517   (eval $ac_compile) 2>&5
    23162518   ac_status=$?
    23172519-  echo "$as_me:2026: \$? = $ac_status" >&5
    2318 +  echo "$as_me:2030: \$? = $ac_status" >&5
     2520+  echo "$as_me:2031: \$? = $ac_status" >&5
    23192521   (exit $ac_status); } &&
    23202522          { ac_try='test -s conftest.$ac_objext'
    23212523-  { (eval echo "$as_me:2029: \"$ac_try\"") >&5
    2322 +  { (eval echo "$as_me:2033: \"$ac_try\"") >&5
     2524+  { (eval echo "$as_me:2034: \"$ac_try\"") >&5
    23232525   (eval $ac_try) 2>&5
    23242526   ac_status=$?
    23252527-  echo "$as_me:2032: \$? = $ac_status" >&5
    2326 +  echo "$as_me:2036: \$? = $ac_status" >&5
     2528+  echo "$as_me:2037: \$? = $ac_status" >&5
    23272529   (exit $ac_status); }; }; then
    23282530   :
    23292531 else
    2330 @@ -2039,7 +2043,7 @@
     2532@@ -2039,7 +2044,7 @@
    23312533 fi
    23322534 rm -f conftest.$ac_objext conftest.$ac_ext
    23332535   cat >conftest.$ac_ext <<_ACEOF
    23342536-#line 2042 "configure"
    2335 +#line 2046 "configure"
     2537+#line 2047 "configure"
    23362538 #include "confdefs.h"
    23372539 $ac_declaration
    23382540 int
    2339 @@ -2051,16 +2055,16 @@
     2541@@ -2051,16 +2056,16 @@
    23402542 }
    23412543 _ACEOF
    23422544 rm -f conftest.$ac_objext
    23432545-if { (eval echo "$as_me:2054: \"$ac_compile\"") >&5
    2344 +if { (eval echo "$as_me:2058: \"$ac_compile\"") >&5
     2546+if { (eval echo "$as_me:2059: \"$ac_compile\"") >&5
    23452547   (eval $ac_compile) 2>&5
    23462548   ac_status=$?
    23472549-  echo "$as_me:2057: \$? = $ac_status" >&5
    2348 +  echo "$as_me:2061: \$? = $ac_status" >&5
     2550+  echo "$as_me:2062: \$? = $ac_status" >&5
    23492551   (exit $ac_status); } &&
    23502552          { ac_try='test -s conftest.$ac_objext'
    23512553-  { (eval echo "$as_me:2060: \"$ac_try\"") >&5
    2352 +  { (eval echo "$as_me:2064: \"$ac_try\"") >&5
     2554+  { (eval echo "$as_me:2065: \"$ac_try\"") >&5
    23532555   (eval $ac_try) 2>&5
    23542556   ac_status=$?
    23552557-  echo "$as_me:2063: \$? = $ac_status" >&5
    2356 +  echo "$as_me:2067: \$? = $ac_status" >&5
     2558+  echo "$as_me:2068: \$? = $ac_status" >&5
    23572559   (exit $ac_status); }; }; then
    23582560   break
    23592561 else
    2360 @@ -2090,11 +2094,11 @@
     2562@@ -2090,11 +2095,11 @@
    23612563 
    23622564 GCC_VERSION=none
    23632565 if test "$GCC" = yes ; then
    23642566-       echo "$as_me:2093: checking version of $CC" >&5
    2365 +       echo "$as_me:2097: checking version of $CC" >&5
     2567+       echo "$as_me:2098: checking version of $CC" >&5
    23662568 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
    23672569        GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
    23682570        test -z "$GCC_VERSION" && GCC_VERSION=unknown
    23692571-       echo "$as_me:2097: result: $GCC_VERSION" >&5
    2370 +       echo "$as_me:2101: result: $GCC_VERSION" >&5
     2572+       echo "$as_me:2102: result: $GCC_VERSION" >&5
    23712573 echo "${ECHO_T}$GCC_VERSION" >&6
    23722574 fi
    23732575 
    2374 @@ -2104,7 +2108,7 @@
     2576@@ -2104,7 +2109,7 @@
    23752577 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    23762578 ac_compiler_gnu=$ac_cv_c_compiler_gnu
    23772579 ac_main_return=return
    23782580-echo "$as_me:2107: checking how to run the C preprocessor" >&5
    2379 +echo "$as_me:2111: checking how to run the C preprocessor" >&5
     2581+echo "$as_me:2112: checking how to run the C preprocessor" >&5
    23802582 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
    23812583 # On Suns, sometimes $CPP names a directory.
    23822584 if test -n "$CPP" && test -d "$CPP"; then
    2383 @@ -2125,18 +2129,18 @@
     2585@@ -2125,18 +2130,18 @@
    23842586   # On the NeXT, cc -E runs the code through the compiler's parser,
    23852587   # not just through cpp. "Syntax error" is here to catch this case.
    23862588   cat >conftest.$ac_ext <<_ACEOF
    23872589-#line 2128 "configure"
    2388 +#line 2132 "configure"
     2590+#line 2133 "configure"
    23892591 #include "confdefs.h"
    23902592 #include <assert.h>
    … …  
    23922594 _ACEOF
    23932595-if { (eval echo "$as_me:2133: \"$ac_cpp conftest.$ac_ext\"") >&5
    2394 +if { (eval echo "$as_me:2137: \"$ac_cpp conftest.$ac_ext\"") >&5
     2596+if { (eval echo "$as_me:2138: \"$ac_cpp conftest.$ac_ext\"") >&5
    23952597   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    23962598   ac_status=$?
    … …  
    23992601   cat conftest.err >&5
    24002602-  echo "$as_me:2139: \$? = $ac_status" >&5
    2401 +  echo "$as_me:2143: \$? = $ac_status" >&5
     2603+  echo "$as_me:2144: \$? = $ac_status" >&5
    24022604   (exit $ac_status); } >/dev/null; then
    24032605   if test -s conftest.err; then
    24042606     ac_cpp_err=$ac_c_preproc_warn_flag
    2405 @@ -2159,17 +2163,17 @@
     2607@@ -2159,17 +2164,17 @@
    24062608   # OK, works on sane cases.  Now check whether non-existent headers
    24072609   # can be detected and how.
    24082610   cat >conftest.$ac_ext <<_ACEOF
    24092611-#line 2162 "configure"
    2410 +#line 2166 "configure"
     2612+#line 2167 "configure"
    24112613 #include "confdefs.h"
    24122614 #include <ac_nonexistent.h>
    24132615 _ACEOF
    24142616-if { (eval echo "$as_me:2166: \"$ac_cpp conftest.$ac_ext\"") >&5
    2415 +if { (eval echo "$as_me:2170: \"$ac_cpp conftest.$ac_ext\"") >&5
     2617+if { (eval echo "$as_me:2171: \"$ac_cpp conftest.$ac_ext\"") >&5
    24162618   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    24172619   ac_status=$?
    … …  
    24202622   cat conftest.err >&5
    24212623-  echo "$as_me:2172: \$? = $ac_status" >&5
    2422 +  echo "$as_me:2176: \$? = $ac_status" >&5
     2624+  echo "$as_me:2177: \$? = $ac_status" >&5
    24232625   (exit $ac_status); } >/dev/null; then
    24242626   if test -s conftest.err; then
    24252627     ac_cpp_err=$ac_c_preproc_warn_flag
    2426 @@ -2206,7 +2210,7 @@
     2628@@ -2206,7 +2211,7 @@
    24272629 else
    24282630   ac_cv_prog_CPP=$CPP
    24292631 fi
    24302632-echo "$as_me:2209: result: $CPP" >&5
    2431 +echo "$as_me:2213: result: $CPP" >&5
     2633+echo "$as_me:2214: result: $CPP" >&5
    24322634 echo "${ECHO_T}$CPP" >&6
    24332635 ac_preproc_ok=false
    24342636 for ac_c_preproc_warn_flag in '' yes
    2435 @@ -2216,18 +2220,18 @@
     2637@@ -2216,18 +2221,18 @@
    24362638   # On the NeXT, cc -E runs the code through the compiler's parser,
    24372639   # not just through cpp. "Syntax error" is here to catch this case.
    24382640   cat >conftest.$ac_ext <<_ACEOF
    24392641-#line 2219 "configure"
    2440 +#line 2223 "configure"
     2642+#line 2224 "configure"
    24412643 #include "confdefs.h"
    24422644 #include <assert.h>
    … …  
    24442646 _ACEOF
    24452647-if { (eval echo "$as_me:2224: \"$ac_cpp conftest.$ac_ext\"") >&5
    2446 +if { (eval echo "$as_me:2228: \"$ac_cpp conftest.$ac_ext\"") >&5
     2648+if { (eval echo "$as_me:2229: \"$ac_cpp conftest.$ac_ext\"") >&5
    24472649   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    24482650   ac_status=$?
    … …  
    24512653   cat conftest.err >&5
    24522654-  echo "$as_me:2230: \$? = $ac_status" >&5
    2453 +  echo "$as_me:2234: \$? = $ac_status" >&5
     2655+  echo "$as_me:2235: \$? = $ac_status" >&5
    24542656   (exit $ac_status); } >/dev/null; then
    24552657   if test -s conftest.err; then
    24562658     ac_cpp_err=$ac_c_preproc_warn_flag
    2457 @@ -2250,17 +2254,17 @@
     2659@@ -2250,17 +2255,17 @@
    24582660   # OK, works on sane cases.  Now check whether non-existent headers
    24592661   # can be detected and how.
    24602662   cat >conftest.$ac_ext <<_ACEOF
    24612663-#line 2253 "configure"
    2462 +#line 2257 "configure"
     2664+#line 2258 "configure"
    24632665 #include "confdefs.h"
    24642666 #include <ac_nonexistent.h>
    24652667 _ACEOF
    24662668-if { (eval echo "$as_me:2257: \"$ac_cpp conftest.$ac_ext\"") >&5
    2467 +if { (eval echo "$as_me:2261: \"$ac_cpp conftest.$ac_ext\"") >&5
     2669+if { (eval echo "$as_me:2262: \"$ac_cpp conftest.$ac_ext\"") >&5
    24682670   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    24692671   ac_status=$?
    … …  
    24722674   cat conftest.err >&5
    24732675-  echo "$as_me:2263: \$? = $ac_status" >&5
    2474 +  echo "$as_me:2267: \$? = $ac_status" >&5
     2676+  echo "$as_me:2268: \$? = $ac_status" >&5
    24752677   (exit $ac_status); } >/dev/null; then
    24762678   if test -s conftest.err; then
    24772679     ac_cpp_err=$ac_c_preproc_warn_flag
    2478 @@ -2288,7 +2292,7 @@
     2680@@ -2288,7 +2293,7 @@
    24792681 if $ac_preproc_ok; then
    24802682   :
    24812683 else
    24822684-  { { echo "$as_me:2291: error: C preprocessor \"$CPP\" fails sanity check" >&5
    2483 +  { { echo "$as_me:2295: error: C preprocessor \"$CPP\" fails sanity check" >&5
     2685+  { { echo "$as_me:2296: error: C preprocessor \"$CPP\" fails sanity check" >&5
    24842686 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    24852687    { (exit 1); exit 1; }; }
    24862688 fi
    2487 @@ -2301,14 +2305,14 @@
     2689@@ -2301,14 +2306,14 @@
    24882690 ac_main_return=return
    24892691 
    24902692 if test $ac_cv_c_compiler_gnu = yes; then
    24912693-    echo "$as_me:2304: checking whether $CC needs -traditional" >&5
    2492 +    echo "$as_me:2308: checking whether $CC needs -traditional" >&5
     2694+    echo "$as_me:2309: checking whether $CC needs -traditional" >&5
    24932695 echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
    24942696 if test "${ac_cv_prog_gcc_traditional+set}" = set; then
    … …  
    24982700   cat >conftest.$ac_ext <<_ACEOF
    24992701-#line 2311 "configure"
    2500 +#line 2315 "configure"
     2702+#line 2316 "configure"
    25012703 #include "confdefs.h"
    25022704 #include <sgtty.h>
    25032705 int Autoconf = TIOCGETP;
    2504 @@ -2323,7 +2327,7 @@
     2706@@ -2323,7 +2328,7 @@
    25052707 
    25062708   if test $ac_cv_prog_gcc_traditional = no; then
    25072709     cat >conftest.$ac_ext <<_ACEOF
    25082710-#line 2326 "configure"
    2509 +#line 2330 "configure"
     2711+#line 2331 "configure"
    25102712 #include "confdefs.h"
    25112713 #include <termio.h>
    25122714 int Autoconf = TCGETA;
    2513 @@ -2336,14 +2340,14 @@
     2715@@ -2336,14 +2341,14 @@
    25142716 
    25152717   fi
    25162718 fi
    25172719-echo "$as_me:2339: result: $ac_cv_prog_gcc_traditional" >&5
    2518 +echo "$as_me:2343: result: $ac_cv_prog_gcc_traditional" >&5
     2720+echo "$as_me:2344: result: $ac_cv_prog_gcc_traditional" >&5
    25192721 echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
    25202722   if test $ac_cv_prog_gcc_traditional = yes; then
    … …  
    25242726 
    25252727-echo "$as_me:2346: checking whether $CC understands -c and -o together" >&5
    2526 +echo "$as_me:2350: checking whether $CC understands -c and -o together" >&5
     2728+echo "$as_me:2351: checking whether $CC understands -c and -o together" >&5
    25272729 echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6
    25282730 if test "${cf_cv_prog_CC_c_o+set}" = set; then
    25292731   echo $ECHO_N "(cached) $ECHO_C" >&6
    2530 @@ -2359,15 +2363,15 @@
     2732@@ -2359,15 +2364,15 @@
    25312733 # We do the test twice because some compilers refuse to overwrite an
    25322734 # existing .o file with -o, though they will create one.
    25332735 ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
    25342736-if { (eval echo "$as_me:2362: \"$ac_try\"") >&5
    2535 +if { (eval echo "$as_me:2366: \"$ac_try\"") >&5
     2737+if { (eval echo "$as_me:2367: \"$ac_try\"") >&5
    25362738   (eval $ac_try) 2>&5
    25372739   ac_status=$?
    25382740-  echo "$as_me:2365: \$? = $ac_status" >&5
    2539 +  echo "$as_me:2369: \$? = $ac_status" >&5
     2741+  echo "$as_me:2370: \$? = $ac_status" >&5
    25402742   (exit $ac_status); } &&
    25412743-  test -f conftest2.$ac_objext && { (eval echo "$as_me:2367: \"$ac_try\"") >&5
    2542 +  test -f conftest2.$ac_objext && { (eval echo "$as_me:2371: \"$ac_try\"") >&5
     2744+  test -f conftest2.$ac_objext && { (eval echo "$as_me:2372: \"$ac_try\"") >&5
    25432745   (eval $ac_try) 2>&5
    25442746   ac_status=$?
    25452747-  echo "$as_me:2370: \$? = $ac_status" >&5
    2546 +  echo "$as_me:2374: \$? = $ac_status" >&5
     2748+  echo "$as_me:2375: \$? = $ac_status" >&5
    25472749   (exit $ac_status); };
    25482750 then
    25492751   eval cf_cv_prog_CC_c_o=yes
    2550 @@ -2378,19 +2382,19 @@
     2752@@ -2378,19 +2383,19 @@
    25512753 
    25522754 fi
    25532755 if test $cf_cv_prog_CC_c_o = yes; then
    25542756-  echo "$as_me:2381: result: yes" >&5
    2555 +  echo "$as_me:2385: result: yes" >&5
     2757+  echo "$as_me:2386: result: yes" >&5
    25562758 echo "${ECHO_T}yes" >&6
    25572759 else
    25582760-  echo "$as_me:2384: result: no" >&5
    2559 +  echo "$as_me:2388: result: no" >&5
     2761+  echo "$as_me:2389: result: no" >&5
    25602762 echo "${ECHO_T}no" >&6
    25612763 fi
    25622764 
    25632765-echo "$as_me:2388: checking for POSIXized ISC" >&5
    2564 +echo "$as_me:2392: checking for POSIXized ISC" >&5
     2766+echo "$as_me:2393: checking for POSIXized ISC" >&5
    25652767 echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6
    25662768 if test -d /etc/conf/kconfig.d &&
    … …  
    25682770 then
    25692771-  echo "$as_me:2393: result: yes" >&5
    2570 +  echo "$as_me:2397: result: yes" >&5
     2772+  echo "$as_me:2398: result: yes" >&5
    25712773 echo "${ECHO_T}yes" >&6
    25722774   ISC=yes # If later tests want to check for ISC.
    25732775 
    2574 @@ -2404,12 +2408,12 @@
     2776@@ -2404,12 +2409,12 @@
    25752777     CC="$CC -Xp"
    25762778   fi
    25772779 else
    25782780-  echo "$as_me:2407: result: no" >&5
    2579 +  echo "$as_me:2411: result: no" >&5
     2781+  echo "$as_me:2412: result: no" >&5
    25802782 echo "${ECHO_T}no" >&6
    25812783   ISC=
    … …  
    25832785 
    25842786-echo "$as_me:2412: checking for ${CC-cc} option to accept ANSI C" >&5
    2585 +echo "$as_me:2416: checking for ${CC-cc} option to accept ANSI C" >&5
     2787+echo "$as_me:2417: checking for ${CC-cc} option to accept ANSI C" >&5
    25862788 echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6
    25872789 if test "${cf_cv_ansi_cc+set}" = set; then
    25882790   echo $ECHO_N "(cached) $ECHO_C" >&6
    2589 @@ -2494,7 +2498,7 @@
     2791@@ -2494,7 +2499,7 @@
    25902792 
    25912793 if test -n "$cf_new_cppflags" ; then
    … …  
    25962798 
    25972799 if test -n "$cf_new_extra_cppflags" ; then
    2598 @@ -2503,7 +2507,7 @@
     2800@@ -2503,7 +2508,7 @@
    25992801 fi
    26002802 
    26012803        cat >conftest.$ac_ext <<_ACEOF
    26022804-#line 2506 "configure"
    2603 +#line 2510 "configure"
     2805+#line 2511 "configure"
    26042806 #include "confdefs.h"
    26052807 
    26062808 #ifndef CC_HAS_PROTOS
    2607 @@ -2524,16 +2528,16 @@
     2809@@ -2524,16 +2529,16 @@
    26082810 }
    26092811 _ACEOF
    26102812 rm -f conftest.$ac_objext
    26112813-if { (eval echo "$as_me:2527: \"$ac_compile\"") >&5
    2612 +if { (eval echo "$as_me:2531: \"$ac_compile\"") >&5
     2814+if { (eval echo "$as_me:2532: \"$ac_compile\"") >&5
    26132815   (eval $ac_compile) 2>&5
    26142816   ac_status=$?
    26152817-  echo "$as_me:2530: \$? = $ac_status" >&5
    2616 +  echo "$as_me:2534: \$? = $ac_status" >&5
     2818+  echo "$as_me:2535: \$? = $ac_status" >&5
    26172819   (exit $ac_status); } &&
    26182820          { ac_try='test -s conftest.$ac_objext'
    26192821-  { (eval echo "$as_me:2533: \"$ac_try\"") >&5
    2620 +  { (eval echo "$as_me:2537: \"$ac_try\"") >&5
     2822+  { (eval echo "$as_me:2538: \"$ac_try\"") >&5
    26212823   (eval $ac_try) 2>&5
    26222824   ac_status=$?
    26232825-  echo "$as_me:2536: \$? = $ac_status" >&5
    2624 +  echo "$as_me:2540: \$? = $ac_status" >&5
     2826+  echo "$as_me:2541: \$? = $ac_status" >&5
    26252827   (exit $ac_status); }; }; then
    26262828   cf_cv_ansi_cc="$cf_arg"; break
    26272829 else
    2628 @@ -2546,7 +2550,7 @@
     2830@@ -2546,7 +2551,7 @@
    26292831 CPPFLAGS="$cf_save_CPPFLAGS"
    26302832 
    26312833 fi
    26322834-echo "$as_me:2549: result: $cf_cv_ansi_cc" >&5
    2633 +echo "$as_me:2553: result: $cf_cv_ansi_cc" >&5
     2835+echo "$as_me:2554: result: $cf_cv_ansi_cc" >&5
    26342836 echo "${ECHO_T}$cf_cv_ansi_cc" >&6
    26352837 
    26362838 if test "$cf_cv_ansi_cc" != "no"; then
    2637 @@ -2612,7 +2616,7 @@
     2839@@ -2612,7 +2617,7 @@
    26382840 
    26392841 if test -n "$cf_new_cppflags" ; then
    … …  
    26442846 
    26452847 if test -n "$cf_new_extra_cppflags" ; then
    2646 @@ -2629,7 +2633,7 @@
     2848@@ -2629,7 +2634,7 @@
    26472849 fi
    26482850 
    26492851 if test "$cf_cv_ansi_cc" = "no"; then
    26502852-       { { echo "$as_me:2632: error: Your compiler does not appear to recognize prototypes.
    2651 +       { { echo "$as_me:2636: error: Your compiler does not appear to recognize prototypes.
     2853+       { { echo "$as_me:2637: error: Your compiler does not appear to recognize prototypes.
    26522854 You have the following choices:
    26532855        a. adjust your compiler options
    26542856        b. get an up-to-date compiler
    2655 @@ -2663,13 +2667,13 @@
     2857@@ -2663,13 +2668,13 @@
    26562858   LDCONFIG=:
    26572859 else
    … …  
    26652867 set dummy ldconfig; ac_word=$2
    26662868-echo "$as_me:2672: checking for $ac_word" >&5
    2667 +echo "$as_me:2676: checking for $ac_word" >&5
     2869+echo "$as_me:2677: checking for $ac_word" >&5
    26682870 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    26692871 if test "${ac_cv_path_LDCONFIG+set}" = set; then
    26702872   echo $ECHO_N "(cached) $ECHO_C" >&6
    2671 @@ -2686,7 +2690,7 @@
     2873@@ -2686,7 +2691,7 @@
    26722874   test -z "$ac_dir" && ac_dir=.
    26732875   if $as_executable_p "$ac_dir/$ac_word"; then
    26742876    ac_cv_path_LDCONFIG="$ac_dir/$ac_word"
    26752877-   echo "$as_me:2689: found $ac_dir/$ac_word" >&5
    2676 +   echo "$as_me:2693: found $ac_dir/$ac_word" >&5
     2878+   echo "$as_me:2694: found $ac_dir/$ac_word" >&5
    26772879    break
    26782880 fi
    26792881 done
    2680 @@ -2697,10 +2701,10 @@
     2882@@ -2697,10 +2702,10 @@
    26812883 LDCONFIG=$ac_cv_path_LDCONFIG
    26822884 
    26832885 if test -n "$LDCONFIG"; then
    26842886-  echo "$as_me:2700: result: $LDCONFIG" >&5
    2685 +  echo "$as_me:2704: result: $LDCONFIG" >&5
     2887+  echo "$as_me:2705: result: $LDCONFIG" >&5
    26862888 echo "${ECHO_T}$LDCONFIG" >&6
    26872889 else
    26882890-  echo "$as_me:2703: result: no" >&5
    2689 +  echo "$as_me:2707: result: no" >&5
     2891+  echo "$as_me:2708: result: no" >&5
    26902892 echo "${ECHO_T}no" >&6
    26912893 fi
    26922894 
    2693 @@ -2708,7 +2712,7 @@
     2895@@ -2708,7 +2713,7 @@
    26942896 esac
    26952897 fi
    26962898 
    26972899-echo "$as_me:2711: checking if you want to ensure bool is consistent with C++" >&5
    2698 +echo "$as_me:2715: checking if you want to ensure bool is consistent with C++" >&5
     2900+echo "$as_me:2716: checking if you want to ensure bool is consistent with C++" >&5
    26992901 echo $ECHO_N "checking if you want to ensure bool is consistent with C++... $ECHO_C" >&6
    27002902 
    27012903 # Check whether --with-cxx or --without-cxx was given.
    2702 @@ -2718,7 +2722,7 @@
     2904@@ -2718,7 +2723,7 @@
    27032905 else
    27042906   cf_with_cxx=yes
    27052907 fi;
    27062908-echo "$as_me:2721: result: $cf_with_cxx" >&5
    2707 +echo "$as_me:2725: result: $cf_with_cxx" >&5
     2909+echo "$as_me:2726: result: $cf_with_cxx" >&5
    27082910 echo "${ECHO_T}$cf_with_cxx" >&6
    27092911 if test "X$cf_with_cxx" = Xno ; then
    27102912        CXX=""
    2711 @@ -2736,7 +2740,7 @@
     2913@@ -2736,7 +2741,7 @@
    27122914   do
    27132915     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
    27142916 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
    27152917-echo "$as_me:2739: checking for $ac_word" >&5
    2716 +echo "$as_me:2743: checking for $ac_word" >&5
     2918+echo "$as_me:2744: checking for $ac_word" >&5
    27172919 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    27182920 if test "${ac_cv_prog_CXX+set}" = set; then
    27192921   echo $ECHO_N "(cached) $ECHO_C" >&6
    2720 @@ -2751,7 +2755,7 @@
     2922@@ -2751,7 +2756,7 @@
    27212923   test -z "$ac_dir" && ac_dir=.
    27222924   $as_executable_p "$ac_dir/$ac_word" || continue
    27232925 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
    27242926-echo "$as_me:2754: found $ac_dir/$ac_word" >&5
    2725 +echo "$as_me:2758: found $ac_dir/$ac_word" >&5
     2927+echo "$as_me:2759: found $ac_dir/$ac_word" >&5
    27262928 break
    27272929 done
    27282930 
    2729 @@ -2759,10 +2763,10 @@
     2931@@ -2759,10 +2764,10 @@
    27302932 fi
    27312933 CXX=$ac_cv_prog_CXX
    27322934 if test -n "$CXX"; then
    27332935-  echo "$as_me:2762: result: $CXX" >&5
    2734 +  echo "$as_me:2766: result: $CXX" >&5
     2936+  echo "$as_me:2767: result: $CXX" >&5
    27352937 echo "${ECHO_T}$CXX" >&6
    27362938 else
    27372939-  echo "$as_me:2765: result: no" >&5
    2738 +  echo "$as_me:2769: result: no" >&5
     2940+  echo "$as_me:2770: result: no" >&5
    27392941 echo "${ECHO_T}no" >&6
    27402942 fi
    27412943 
    2742 @@ -2775,7 +2779,7 @@
     2944@@ -2775,7 +2780,7 @@
    27432945 do
    27442946   # Extract the first word of "$ac_prog", so it can be a program name with args.
    27452947 set dummy $ac_prog; ac_word=$2
    27462948-echo "$as_me:2778: checking for $ac_word" >&5
    2747 +echo "$as_me:2782: checking for $ac_word" >&5
     2949+echo "$as_me:2783: checking for $ac_word" >&5
    27482950 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    27492951 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
    27502952   echo $ECHO_N "(cached) $ECHO_C" >&6
    2751 @@ -2790,7 +2794,7 @@
     2953@@ -2790,7 +2795,7 @@
    27522954   test -z "$ac_dir" && ac_dir=.
    27532955   $as_executable_p "$ac_dir/$ac_word" || continue
    27542956 ac_cv_prog_ac_ct_CXX="$ac_prog"
    27552957-echo "$as_me:2793: found $ac_dir/$ac_word" >&5
    2756 +echo "$as_me:2797: found $ac_dir/$ac_word" >&5
     2958+echo "$as_me:2798: found $ac_dir/$ac_word" >&5
    27572959 break
    27582960 done
    27592961 
    2760 @@ -2798,10 +2802,10 @@
     2962@@ -2798,10 +2803,10 @@
    27612963 fi
    27622964 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
    27632965 if test -n "$ac_ct_CXX"; then
    27642966-  echo "$as_me:2801: result: $ac_ct_CXX" >&5
    2765 +  echo "$as_me:2805: result: $ac_ct_CXX" >&5
     2967+  echo "$as_me:2806: result: $ac_ct_CXX" >&5
    27662968 echo "${ECHO_T}$ac_ct_CXX" >&6
    27672969 else
    27682970-  echo "$as_me:2804: result: no" >&5
    2769 +  echo "$as_me:2808: result: no" >&5
     2971+  echo "$as_me:2809: result: no" >&5
    27702972 echo "${ECHO_T}no" >&6
    27712973 fi
    27722974 
    2773 @@ -2813,32 +2817,32 @@
     2975@@ -2813,32 +2818,32 @@
    27742976 fi
    27752977 
    27762978 # Provide some information about the compiler.
    27772979-echo "$as_me:2816:" \
    2778 +echo "$as_me:2820:" \
     2980+echo "$as_me:2821:" \
    27792981      "checking for C++ compiler version" >&5
    27802982 ac_compiler=`set X $ac_compile; echo $2`
    27812983-{ (eval echo "$as_me:2819: \"$ac_compiler --version </dev/null >&5\"") >&5
    2782 +{ (eval echo "$as_me:2823: \"$ac_compiler --version </dev/null >&5\"") >&5
     2984+{ (eval echo "$as_me:2824: \"$ac_compiler --version </dev/null >&5\"") >&5
    27832985   (eval $ac_compiler --version </dev/null >&5) 2>&5
    27842986   ac_status=$?
    27852987-  echo "$as_me:2822: \$? = $ac_status" >&5
    2786 +  echo "$as_me:2826: \$? = $ac_status" >&5
     2988+  echo "$as_me:2827: \$? = $ac_status" >&5
    27872989   (exit $ac_status); }
    27882990-{ (eval echo "$as_me:2824: \"$ac_compiler -v </dev/null >&5\"") >&5
    2789 +{ (eval echo "$as_me:2828: \"$ac_compiler -v </dev/null >&5\"") >&5
     2991+{ (eval echo "$as_me:2829: \"$ac_compiler -v </dev/null >&5\"") >&5
    27902992   (eval $ac_compiler -v </dev/null >&5) 2>&5
    27912993   ac_status=$?
    27922994-  echo "$as_me:2827: \$? = $ac_status" >&5
    2793 +  echo "$as_me:2831: \$? = $ac_status" >&5
     2995+  echo "$as_me:2832: \$? = $ac_status" >&5
    27942996   (exit $ac_status); }
    27952997-{ (eval echo "$as_me:2829: \"$ac_compiler -V </dev/null >&5\"") >&5
    2796 +{ (eval echo "$as_me:2833: \"$ac_compiler -V </dev/null >&5\"") >&5
     2998+{ (eval echo "$as_me:2834: \"$ac_compiler -V </dev/null >&5\"") >&5
    27972999   (eval $ac_compiler -V </dev/null >&5) 2>&5
    27983000   ac_status=$?
    27993001-  echo "$as_me:2832: \$? = $ac_status" >&5
    2800 +  echo "$as_me:2836: \$? = $ac_status" >&5
     3002+  echo "$as_me:2837: \$? = $ac_status" >&5
    28013003   (exit $ac_status); }
    28023004 
    28033005-echo "$as_me:2835: checking whether we are using the GNU C++ compiler" >&5
    2804 +echo "$as_me:2839: checking whether we are using the GNU C++ compiler" >&5
     3006+echo "$as_me:2840: checking whether we are using the GNU C++ compiler" >&5
    28053007 echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
    28063008 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
    … …  
    28093011   cat >conftest.$ac_ext <<_ACEOF
    28103012-#line 2841 "configure"
    2811 +#line 2845 "configure"
     3013+#line 2846 "configure"
    28123014 #include "confdefs.h"
    28133015 
    28143016 int
    2815 @@ -2853,16 +2857,16 @@
     3017@@ -2853,16 +2858,16 @@
    28163018 }
    28173019 _ACEOF
    28183020 rm -f conftest.$ac_objext
    28193021-if { (eval echo "$as_me:2856: \"$ac_compile\"") >&5
    2820 +if { (eval echo "$as_me:2860: \"$ac_compile\"") >&5
     3022+if { (eval echo "$as_me:2861: \"$ac_compile\"") >&5
    28213023   (eval $ac_compile) 2>&5
    28223024   ac_status=$?
    28233025-  echo "$as_me:2859: \$? = $ac_status" >&5
    2824 +  echo "$as_me:2863: \$? = $ac_status" >&5
     3026+  echo "$as_me:2864: \$? = $ac_status" >&5
    28253027   (exit $ac_status); } &&
    28263028          { ac_try='test -s conftest.$ac_objext'
    28273029-  { (eval echo "$as_me:2862: \"$ac_try\"") >&5
    2828 +  { (eval echo "$as_me:2866: \"$ac_try\"") >&5
     3030+  { (eval echo "$as_me:2867: \"$ac_try\"") >&5
    28293031   (eval $ac_try) 2>&5
    28303032   ac_status=$?
    28313033-  echo "$as_me:2865: \$? = $ac_status" >&5
    2832 +  echo "$as_me:2869: \$? = $ac_status" >&5
     3034+  echo "$as_me:2870: \$? = $ac_status" >&5
    28333035   (exit $ac_status); }; }; then
    28343036   ac_compiler_gnu=yes
    28353037 else
    2836 @@ -2874,19 +2878,19 @@
     3038@@ -2874,19 +2879,19 @@
    28373039 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
    28383040 
    28393041 fi
    28403042-echo "$as_me:2877: result: $ac_cv_cxx_compiler_gnu" >&5
    2841 +echo "$as_me:2881: result: $ac_cv_cxx_compiler_gnu" >&5
     3043+echo "$as_me:2882: result: $ac_cv_cxx_compiler_gnu" >&5
    28423044 echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
    28433045 GXX=`test $ac_compiler_gnu = yes && echo yes`
    … …  
    28463048 CXXFLAGS="-g"
    28473049-echo "$as_me:2883: checking whether $CXX accepts -g" >&5
    2848 +echo "$as_me:2887: checking whether $CXX accepts -g" >&5
     3050+echo "$as_me:2888: checking whether $CXX accepts -g" >&5
    28493051 echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
    28503052 if test "${ac_cv_prog_cxx_g+set}" = set; then
    … …  
    28533055   cat >conftest.$ac_ext <<_ACEOF
    28543056-#line 2889 "configure"
    2855 +#line 2893 "configure"
     3057+#line 2894 "configure"
    28563058 #include "confdefs.h"
    28573059 
    28583060 int
    2859 @@ -2898,16 +2902,16 @@
     3061@@ -2898,16 +2903,16 @@
    28603062 }
    28613063 _ACEOF
    28623064 rm -f conftest.$ac_objext
    28633065-if { (eval echo "$as_me:2901: \"$ac_compile\"") >&5
    2864 +if { (eval echo "$as_me:2905: \"$ac_compile\"") >&5
     3066+if { (eval echo "$as_me:2906: \"$ac_compile\"") >&5
    28653067   (eval $ac_compile) 2>&5
    28663068   ac_status=$?
    28673069-  echo "$as_me:2904: \$? = $ac_status" >&5
    2868 +  echo "$as_me:2908: \$? = $ac_status" >&5
     3070+  echo "$as_me:2909: \$? = $ac_status" >&5
    28693071   (exit $ac_status); } &&
    28703072          { ac_try='test -s conftest.$ac_objext'
    28713073-  { (eval echo "$as_me:2907: \"$ac_try\"") >&5
    2872 +  { (eval echo "$as_me:2911: \"$ac_try\"") >&5
     3074+  { (eval echo "$as_me:2912: \"$ac_try\"") >&5
    28733075   (eval $ac_try) 2>&5
    28743076   ac_status=$?
    28753077-  echo "$as_me:2910: \$? = $ac_status" >&5
    2876 +  echo "$as_me:2914: \$? = $ac_status" >&5
     3078+  echo "$as_me:2915: \$? = $ac_status" >&5
    28773079   (exit $ac_status); }; }; then
    28783080   ac_cv_prog_cxx_g=yes
    28793081 else
    2880 @@ -2917,7 +2921,7 @@
     3082@@ -2917,7 +2922,7 @@
    28813083 fi
    28823084 rm -f conftest.$ac_objext conftest.$ac_ext
    28833085 fi
    28843086-echo "$as_me:2920: result: $ac_cv_prog_cxx_g" >&5
    2885 +echo "$as_me:2924: result: $ac_cv_prog_cxx_g" >&5
     3087+echo "$as_me:2925: result: $ac_cv_prog_cxx_g" >&5
    28863088 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
    28873089 if test "$ac_test_CXXFLAGS" = set; then
    28883090   CXXFLAGS=$ac_save_CXXFLAGS
    2889 @@ -2944,7 +2948,7 @@
     3091@@ -2944,7 +2949,7 @@
    28903092    'void exit (int);'
    28913093 do
    28923094   cat >conftest.$ac_ext <<_ACEOF
    28933095-#line 2947 "configure"
    2894 +#line 2951 "configure"
     3096+#line 2952 "configure"
    28953097 #include "confdefs.h"
    28963098 #include <stdlib.h>
    28973099 $ac_declaration
    2898 @@ -2957,16 +2961,16 @@
     3100@@ -2957,16 +2962,16 @@
    28993101 }
    29003102 _ACEOF
    29013103 rm -f conftest.$ac_objext
    29023104-if { (eval echo "$as_me:2960: \"$ac_compile\"") >&5
    2903 +if { (eval echo "$as_me:2964: \"$ac_compile\"") >&5
     3105+if { (eval echo "$as_me:2965: \"$ac_compile\"") >&5
    29043106   (eval $ac_compile) 2>&5
    29053107   ac_status=$?
    29063108-  echo "$as_me:2963: \$? = $ac_status" >&5
    2907 +  echo "$as_me:2967: \$? = $ac_status" >&5
     3109+  echo "$as_me:2968: \$? = $ac_status" >&5
    29083110   (exit $ac_status); } &&
    29093111          { ac_try='test -s conftest.$ac_objext'
    29103112-  { (eval echo "$as_me:2966: \"$ac_try\"") >&5
    2911 +  { (eval echo "$as_me:2970: \"$ac_try\"") >&5
     3113+  { (eval echo "$as_me:2971: \"$ac_try\"") >&5
    29123114   (eval $ac_try) 2>&5
    29133115   ac_status=$?
    29143116-  echo "$as_me:2969: \$? = $ac_status" >&5
    2915 +  echo "$as_me:2973: \$? = $ac_status" >&5
     3117+  echo "$as_me:2974: \$? = $ac_status" >&5
    29163118   (exit $ac_status); }; }; then
    29173119   :
    29183120 else
    2919 @@ -2976,7 +2980,7 @@
     3121@@ -2976,7 +2981,7 @@
    29203122 fi
    29213123 rm -f conftest.$ac_objext conftest.$ac_ext
    29223124   cat >conftest.$ac_ext <<_ACEOF
    29233125-#line 2979 "configure"
    2924 +#line 2983 "configure"
     3126+#line 2984 "configure"
    29253127 #include "confdefs.h"
    29263128 $ac_declaration
    29273129 int
    2928 @@ -2988,16 +2992,16 @@
     3130@@ -2988,16 +2993,16 @@
    29293131 }
    29303132 _ACEOF
    29313133 rm -f conftest.$ac_objext
    29323134-if { (eval echo "$as_me:2991: \"$ac_compile\"") >&5
    2933 +if { (eval echo "$as_me:2995: \"$ac_compile\"") >&5
     3135+if { (eval echo "$as_me:2996: \"$ac_compile\"") >&5
    29343136   (eval $ac_compile) 2>&5
    29353137   ac_status=$?
    29363138-  echo "$as_me:2994: \$? = $ac_status" >&5
    2937 +  echo "$as_me:2998: \$? = $ac_status" >&5
     3139+  echo "$as_me:2999: \$? = $ac_status" >&5
    29383140   (exit $ac_status); } &&
    29393141          { ac_try='test -s conftest.$ac_objext'
    29403142-  { (eval echo "$as_me:2997: \"$ac_try\"") >&5
    2941 +  { (eval echo "$as_me:3001: \"$ac_try\"") >&5
     3143+  { (eval echo "$as_me:3002: \"$ac_try\"") >&5
    29423144   (eval $ac_try) 2>&5
    29433145   ac_status=$?
    29443146-  echo "$as_me:3000: \$? = $ac_status" >&5
    2945 +  echo "$as_me:3004: \$? = $ac_status" >&5
     3147+  echo "$as_me:3005: \$? = $ac_status" >&5
    29463148   (exit $ac_status); }; }; then
    29473149   break
    29483150 else
    2949 @@ -3024,7 +3028,7 @@
     3151@@ -3024,7 +3029,7 @@
    29503152        if test "$CXX" = "g++" ; then
    29513153                # Extract the first word of "g++", so it can be a program name with args.
    29523154 set dummy g++; ac_word=$2
    29533155-echo "$as_me:3027: checking for $ac_word" >&5
    2954 +echo "$as_me:3031: checking for $ac_word" >&5
     3156+echo "$as_me:3032: checking for $ac_word" >&5
    29553157 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    29563158 if test "${ac_cv_path_CXX+set}" = set; then
    29573159   echo $ECHO_N "(cached) $ECHO_C" >&6
    2958 @@ -3041,7 +3045,7 @@
     3160@@ -3041,7 +3046,7 @@
    29593161   test -z "$ac_dir" && ac_dir=.
    29603162   if $as_executable_p "$ac_dir/$ac_word"; then
    29613163    ac_cv_path_CXX="$ac_dir/$ac_word"
    29623164-   echo "$as_me:3044: found $ac_dir/$ac_word" >&5
    2963 +   echo "$as_me:3048: found $ac_dir/$ac_word" >&5
     3165+   echo "$as_me:3049: found $ac_dir/$ac_word" >&5
    29643166    break
    29653167 fi
    29663168 done
    2967 @@ -3052,16 +3056,16 @@
     3169@@ -3052,16 +3057,16 @@
    29683170 CXX=$ac_cv_path_CXX
    29693171 
    29703172 if test -n "$CXX"; then
    29713173-  echo "$as_me:3055: result: $CXX" >&5
    2972 +  echo "$as_me:3059: result: $CXX" >&5
     3174+  echo "$as_me:3060: result: $CXX" >&5
    29733175 echo "${ECHO_T}$CXX" >&6
    29743176 else
    29753177-  echo "$as_me:3058: result: no" >&5
    2976 +  echo "$as_me:3062: result: no" >&5
     3178+  echo "$as_me:3063: result: no" >&5
    29773179 echo "${ECHO_T}no" >&6
    29783180 fi
    … …  
    29813183        if test "$CXX" = "g++" ; then
    29823184-               { echo "$as_me:3064: WARNING: ignoring hardcoded g++" >&5
    2983 +               { echo "$as_me:3068: WARNING: ignoring hardcoded g++" >&5
     3185+               { echo "$as_me:3069: WARNING: ignoring hardcoded g++" >&5
    29843186 echo "$as_me: WARNING: ignoring hardcoded g++" >&2;}
    29853187                cf_with_cxx=no; CXX=""; GXX="";
    29863188        fi
    2987 @@ -3069,11 +3073,11 @@
     3189@@ -3069,11 +3074,11 @@
    29883190 
    29893191 GXX_VERSION=none
    29903192 if test "$GXX" = yes; then
    29913193-       echo "$as_me:3072: checking version of g++" >&5
    2992 +       echo "$as_me:3076: checking version of g++" >&5
     3194+       echo "$as_me:3077: checking version of g++" >&5
    29933195 echo $ECHO_N "checking version of g++... $ECHO_C" >&6
    29943196        GXX_VERSION="`${CXX-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
    29953197        test -z "$GXX_VERSION" && GXX_VERSION=unknown
    29963198-       echo "$as_me:3076: result: $GXX_VERSION" >&5
    2997 +       echo "$as_me:3080: result: $GXX_VERSION" >&5
     3199+       echo "$as_me:3081: result: $GXX_VERSION" >&5
    29983200 echo "${ECHO_T}$GXX_VERSION" >&6
    29993201 fi
    30003202 
    3001 @@ -3081,12 +3085,12 @@
     3203@@ -3081,12 +3086,12 @@
    30023204 1*|2.[0-6]*)
    30033205        # GXX=""; CXX=""; ac_cv_prog_gxx=no
    30043206        # cf_cxx_library=no
    30053207-       { echo "$as_me:3084: WARNING: templates do not work" >&5
    3006 +       { echo "$as_me:3088: WARNING: templates do not work" >&5
     3208+       { echo "$as_me:3089: WARNING: templates do not work" >&5
    30073209 echo "$as_me: WARNING: templates do not work" >&2;}
    30083210        ;;
    … …  
    30103212 
    30113213-echo "$as_me:3089: checking if you want to build C++ binding and demo" >&5
    3012 +echo "$as_me:3093: checking if you want to build C++ binding and demo" >&5
     3214+echo "$as_me:3094: checking if you want to build C++ binding and demo" >&5
    30133215 echo $ECHO_N "checking if you want to build C++ binding and demo... $ECHO_C" >&6
    30143216 
    30153217 # Check whether --with-cxx-binding or --without-cxx-binding was given.
    3016 @@ -3096,10 +3100,10 @@
     3218@@ -3096,10 +3101,10 @@
    30173219 else
    30183220   cf_with_cxx_binding=$cf_with_cxx
    30193221 fi;
    30203222-echo "$as_me:3099: result: $cf_with_cxx_binding" >&5
    3021 +echo "$as_me:3103: result: $cf_with_cxx_binding" >&5
     3223+echo "$as_me:3104: result: $cf_with_cxx_binding" >&5
    30223224 echo "${ECHO_T}$cf_with_cxx_binding" >&6
    30233225 
    30243226-echo "$as_me:3102: checking if you want to build with Ada95" >&5
    3025 +echo "$as_me:3106: checking if you want to build with Ada95" >&5
     3227+echo "$as_me:3107: checking if you want to build with Ada95" >&5
    30263228 echo $ECHO_N "checking if you want to build with Ada95... $ECHO_C" >&6
    30273229 
    30283230 # Check whether --with-ada or --without-ada was given.
    3029 @@ -3109,10 +3113,23 @@
     3231@@ -3109,10 +3114,23 @@
    30303232 else
    30313233   cf_with_ada=yes
    30323234 fi;
    30333235-echo "$as_me:3112: result: $cf_with_ada" >&5
    3034 +echo "$as_me:3116: result: $cf_with_ada" >&5
     3236+echo "$as_me:3117: result: $cf_with_ada" >&5
    30353237 echo "${ECHO_T}$cf_with_ada" >&6
    30363238 
    30373239-echo "$as_me:3115: checking if you want to build programs such as tic" >&5
    3038 +echo "$as_me:3119: checking if you want to install manpages" >&5
     3240+echo "$as_me:3120: checking if you want to install manpages" >&5
    30393241+echo $ECHO_N "checking if you want to install manpages... $ECHO_C" >&6
    30403242+
    … …  
    30463248+  cf_with_manpages=yes
    30473249+fi;
    3048 +echo "$as_me:3129: result: $cf_with_manpages" >&5
     3250+echo "$as_me:3130: result: $cf_with_manpages" >&5
    30493251+echo "${ECHO_T}$cf_with_manpages" >&6
    30503252+
    3051 +echo "$as_me:3132: checking if you want to build programs such as tic" >&5
     3253+echo "$as_me:3133: checking if you want to build programs such as tic" >&5
    30523254 echo $ECHO_N "checking if you want to build programs such as tic... $ECHO_C" >&6
    30533255 
    30543256 # Check whether --with-progs or --without-progs was given.
    3055 @@ -3122,10 +3139,10 @@
     3257@@ -3122,10 +3140,10 @@
    30563258 else
    30573259   cf_with_progs=yes
    30583260 fi;
    30593261-echo "$as_me:3125: result: $cf_with_progs" >&5
    3060 +echo "$as_me:3142: result: $cf_with_progs" >&5
     3262+echo "$as_me:3143: result: $cf_with_progs" >&5
    30613263 echo "${ECHO_T}$cf_with_progs" >&6
    30623264 
    30633265-echo "$as_me:3128: checking if you wish to install curses.h" >&5
    3064 +echo "$as_me:3145: checking if you wish to install curses.h" >&5
     3266+echo "$as_me:3146: checking if you wish to install curses.h" >&5
    30653267 echo $ECHO_N "checking if you wish to install curses.h... $ECHO_C" >&6
    30663268 
    30673269 # Check whether --with-curses-h or --without-curses-h was given.
    3068 @@ -3135,7 +3152,7 @@
     3270@@ -3135,7 +3153,7 @@
    30693271 else
    30703272   with_curses_h=yes
    30713273 fi;
    30723274-echo "$as_me:3138: result: $with_curses_h" >&5
    3073 +echo "$as_me:3155: result: $with_curses_h" >&5
     3275+echo "$as_me:3156: result: $with_curses_h" >&5
    30743276 echo "${ECHO_T}$with_curses_h" >&6
    30753277 
    30763278 modules_to_build="ncurses"
    3077 @@ -3161,7 +3178,7 @@
     3279@@ -3161,7 +3179,7 @@
    30783280 do
    30793281   # Extract the first word of "$ac_prog", so it can be a program name with args.
    30803282 set dummy $ac_prog; ac_word=$2
    30813283-echo "$as_me:3164: checking for $ac_word" >&5
    3082 +echo "$as_me:3181: checking for $ac_word" >&5
     3284+echo "$as_me:3182: checking for $ac_word" >&5
    30833285 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    30843286 if test "${ac_cv_prog_AWK+set}" = set; then
    30853287   echo $ECHO_N "(cached) $ECHO_C" >&6
    3086 @@ -3176,7 +3193,7 @@
     3288@@ -3176,7 +3194,7 @@
    30873289   test -z "$ac_dir" && ac_dir=.
    30883290   $as_executable_p "$ac_dir/$ac_word" || continue
    30893291 ac_cv_prog_AWK="$ac_prog"
    30903292-echo "$as_me:3179: found $ac_dir/$ac_word" >&5
    3091 +echo "$as_me:3196: found $ac_dir/$ac_word" >&5
     3293+echo "$as_me:3197: found $ac_dir/$ac_word" >&5
    30923294 break
    30933295 done
    30943296 
    3095 @@ -3184,21 +3201,21 @@
     3297@@ -3184,21 +3202,21 @@
    30963298 fi
    30973299 AWK=$ac_cv_prog_AWK
    30983300 if test -n "$AWK"; then
    30993301-  echo "$as_me:3187: result: $AWK" >&5
    3100 +  echo "$as_me:3204: result: $AWK" >&5
     3302+  echo "$as_me:3205: result: $AWK" >&5
    31013303 echo "${ECHO_T}$AWK" >&6
    31023304 else
    31033305-  echo "$as_me:3190: result: no" >&5
    3104 +  echo "$as_me:3207: result: no" >&5
     3306+  echo "$as_me:3208: result: no" >&5
    31053307 echo "${ECHO_T}no" >&6
    31063308 fi
    … …  
    31103312 
    31113313-test -z "$AWK" && { { echo "$as_me:3197: error: No awk program found" >&5
    3112 +test -z "$AWK" && { { echo "$as_me:3214: error: No awk program found" >&5
     3314+test -z "$AWK" && { { echo "$as_me:3215: error: No awk program found" >&5
    31133315 echo "$as_me: error: No awk program found" >&2;}
    31143316    { (exit 1); exit 1; }; }
    31153317 
    31163318-echo "$as_me:3201: checking for egrep" >&5
    3117 +echo "$as_me:3218: checking for egrep" >&5
     3319+echo "$as_me:3219: checking for egrep" >&5
    31183320 echo $ECHO_N "checking for egrep... $ECHO_C" >&6
    31193321 if test "${ac_cv_prog_egrep+set}" = set; then
    31203322   echo $ECHO_N "(cached) $ECHO_C" >&6
    3121 @@ -3208,11 +3225,11 @@
     3323@@ -3208,11 +3226,11 @@
    31223324     else ac_cv_prog_egrep='egrep'
    31233325     fi
    31243326 fi
    31253327-echo "$as_me:3211: result: $ac_cv_prog_egrep" >&5
    3126 +echo "$as_me:3228: result: $ac_cv_prog_egrep" >&5
     3328+echo "$as_me:3229: result: $ac_cv_prog_egrep" >&5
    31273329 echo "${ECHO_T}$ac_cv_prog_egrep" >&6
    31283330  EGREP=$ac_cv_prog_egrep
    31293331 
    31303332-test -z "$EGREP" && { { echo "$as_me:3215: error: No egrep program found" >&5
    3131 +test -z "$EGREP" && { { echo "$as_me:3232: error: No egrep program found" >&5
     3333+test -z "$EGREP" && { { echo "$as_me:3233: error: No egrep program found" >&5
    31323334 echo "$as_me: error: No egrep program found" >&2;}
    31333335    { (exit 1); exit 1; }; }
    31343336 
    3135 @@ -3228,7 +3245,7 @@
     3337@@ -3228,7 +3246,7 @@
    31363338 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
    31373339 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
    31383340 # ./install, which can be erroneously created by make from ./install.sh.
    31393341-echo "$as_me:3231: checking for a BSD compatible install" >&5
    3140 +echo "$as_me:3248: checking for a BSD compatible install" >&5
     3342+echo "$as_me:3249: checking for a BSD compatible install" >&5
    31413343 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
    31423344 if test -z "$INSTALL"; then
    31433345 if test "${ac_cv_path_install+set}" = set; then
    3144 @@ -3277,7 +3294,7 @@
     3346@@ -3277,7 +3295,7 @@
    31453347     INSTALL=$ac_install_sh
    31463348   fi
    31473349 fi
    31483350-echo "$as_me:3280: result: $INSTALL" >&5
    3149 +echo "$as_me:3297: result: $INSTALL" >&5
     3351+echo "$as_me:3298: result: $INSTALL" >&5
    31503352 echo "${ECHO_T}$INSTALL" >&6
    31513353 
    31523354 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
    3153 @@ -3302,7 +3319,7 @@
     3355@@ -3302,7 +3320,7 @@
    31543356 do
    31553357   # Extract the first word of "$ac_prog", so it can be a program name with args.
    31563358 set dummy $ac_prog; ac_word=$2
    31573359-echo "$as_me:3305: checking for $ac_word" >&5
    3158 +echo "$as_me:3322: checking for $ac_word" >&5
     3360+echo "$as_me:3323: checking for $ac_word" >&5
    31593361 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    31603362 if test "${ac_cv_prog_LINT+set}" = set; then
    31613363   echo $ECHO_N "(cached) $ECHO_C" >&6
    3162 @@ -3317,7 +3334,7 @@
     3364@@ -3317,7 +3335,7 @@
    31633365   test -z "$ac_dir" && ac_dir=.
    31643366   $as_executable_p "$ac_dir/$ac_word" || continue
    31653367 ac_cv_prog_LINT="$ac_prog"
    31663368-echo "$as_me:3320: found $ac_dir/$ac_word" >&5
    3167 +echo "$as_me:3337: found $ac_dir/$ac_word" >&5
     3369+echo "$as_me:3338: found $ac_dir/$ac_word" >&5
    31683370 break
    31693371 done
    31703372 
    3171 @@ -3325,28 +3342,28 @@
     3373@@ -3325,28 +3343,28 @@
    31723374 fi
    31733375 LINT=$ac_cv_prog_LINT
    31743376 if test -n "$LINT"; then
    31753377-  echo "$as_me:3328: result: $LINT" >&5
    3176 +  echo "$as_me:3345: result: $LINT" >&5
     3378+  echo "$as_me:3346: result: $LINT" >&5
    31773379 echo "${ECHO_T}$LINT" >&6
    31783380 else
    31793381-  echo "$as_me:3331: result: no" >&5
    3180 +  echo "$as_me:3348: result: no" >&5
     3382+  echo "$as_me:3349: result: no" >&5
    31813383 echo "${ECHO_T}no" >&6
    31823384 fi
    … …  
    31863388 
    31873389-echo "$as_me:3338: checking whether ln -s works" >&5
    3188 +echo "$as_me:3355: checking whether ln -s works" >&5
     3390+echo "$as_me:3356: checking whether ln -s works" >&5
    31893391 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
    31903392 LN_S=$as_ln_s
    31913393 if test "$LN_S" = "ln -s"; then
    31923394-  echo "$as_me:3342: result: yes" >&5
    3193 +  echo "$as_me:3359: result: yes" >&5
     3395+  echo "$as_me:3360: result: yes" >&5
    31943396 echo "${ECHO_T}yes" >&6
    31953397 else
    31963398-  echo "$as_me:3345: result: no, using $LN_S" >&5
    3197 +  echo "$as_me:3362: result: no, using $LN_S" >&5
     3399+  echo "$as_me:3363: result: no, using $LN_S" >&5
    31983400 echo "${ECHO_T}no, using $LN_S" >&6
    31993401 fi
    32003402 
    32013403-echo "$as_me:3349: checking for long file names" >&5
    3202 +echo "$as_me:3366: checking for long file names" >&5
     3404+echo "$as_me:3367: checking for long file names" >&5
    32033405 echo $ECHO_N "checking for long file names... $ECHO_C" >&6
    32043406 if test "${ac_cv_sys_long_file_names+set}" = set; then
    32053407   echo $ECHO_N "(cached) $ECHO_C" >&6
    3206 @@ -3385,7 +3402,7 @@
     3408@@ -3385,7 +3403,7 @@
    32073409   rm -rf $ac_xdir 2>/dev/null
    32083410 done
    32093411 fi
    32103412-echo "$as_me:3388: result: $ac_cv_sys_long_file_names" >&5
    3211 +echo "$as_me:3405: result: $ac_cv_sys_long_file_names" >&5
     3413+echo "$as_me:3406: result: $ac_cv_sys_long_file_names" >&5
    32123414 echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6
    32133415 if test $ac_cv_sys_long_file_names = yes; then
    32143416 
    3215 @@ -3395,7 +3412,136 @@
     3417@@ -3395,7 +3413,136 @@
    32163418 
    32173419 fi
    … …  
    32203422+# if we find pkg-config, check if we should install the ".pc" files.
    32213423+
    3222 +echo "$as_me:3417: checking if you want to use pkg-config" >&5
     3424+echo "$as_me:3418: checking if you want to use pkg-config" >&5
    32233425+echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6
    32243426+
    … …  
    32303432+  cf_pkg_config=yes
    32313433+fi;
    3232 +echo "$as_me:3427: result: $cf_pkg_config" >&5
     3434+echo "$as_me:3428: result: $cf_pkg_config" >&5
    32333435+echo "${ECHO_T}$cf_pkg_config" >&6
    32343436+
    … …  
    32403442+       # Extract the first word of "pkg-config", so it can be a program name with args.
    32413443+set dummy pkg-config; ac_word=$2
    3242 +echo "$as_me:3437: checking for $ac_word" >&5
     3444+echo "$as_me:3438: checking for $ac_word" >&5
    32433445+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    32443446+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
    … …  
    32573459+  if $as_executable_p "$ac_dir/$ac_word"; then
    32583460+   ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
    3259 +   echo "$as_me:3454: found $ac_dir/$ac_word" >&5
     3461+   echo "$as_me:3455: found $ac_dir/$ac_word" >&5
    32603462+   break
    32613463+fi
    … …  
    32693471+
    32703472+if test -n "$PKG_CONFIG"; then
    3271 +  echo "$as_me:3466: result: $PKG_CONFIG" >&5
     3473+  echo "$as_me:3467: result: $PKG_CONFIG" >&5
    32723474+echo "${ECHO_T}$PKG_CONFIG" >&6
    32733475+else
    3274 +  echo "$as_me:3469: result: no" >&5
     3476+  echo "$as_me:3470: result: no" >&5
    32753477+echo "${ECHO_T}no" >&6
    32763478+fi
    … …  
    33103512+  ;;
    33113513+*)
    3312 +  { { echo "$as_me:3507: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
     3514+  { { echo "$as_me:3508: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
    33133515+echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
    33143516+   { (exit 1); exit 1; }; }
    … …  
    33193521+
    33203522+if test "$PKG_CONFIG" != no ; then
    3321 +       echo "$as_me:3516: checking if we should install .pc files for $PKG_CONFIG" >&5
     3523+       echo "$as_me:3517: checking if we should install .pc files for $PKG_CONFIG" >&5
    33223524+echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6
    33233525+
    … …  
    33363538+  enable_pc_files=no
    33373539+fi;
    3338 +               echo "$as_me:3533: result: $enable_pc_files" >&5
     3540+               echo "$as_me:3534: result: $enable_pc_files" >&5
    33393541+echo "${ECHO_T}$enable_pc_files" >&6
    33403542+       else
    3341 +               echo "$as_me:3536: result: no" >&5
     3543+               echo "$as_me:3537: result: no" >&5
    33423544+echo "${ECHO_T}no" >&6
    3343 +               { echo "$as_me:3538: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&5
     3545+               { echo "$as_me:3539: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&5
    33443546+echo "$as_me: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&2;}
    33453547+               enable_pc_files=no
    … …  
    33473549+fi
    33483550+
    3349 +echo "$as_me:3544: checking if we should assume mixed-case filenames" >&5
     3551+echo "$as_me:3545: checking if we should assume mixed-case filenames" >&5
    33503552 echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6
    33513553 
    33523554 # Check whether --enable-mixed-case or --disable-mixed-case was given.
    3353 @@ -3405,11 +3551,11 @@
     3555@@ -3405,11 +3552,11 @@
    33543556 else
    33553557   enable_mixedcase=auto
    33563558 fi;
    33573559-echo "$as_me:3408: result: $enable_mixedcase" >&5
    3358 +echo "$as_me:3554: result: $enable_mixedcase" >&5
     3560+echo "$as_me:3555: result: $enable_mixedcase" >&5
    33593561 echo "${ECHO_T}$enable_mixedcase" >&6
    33603562 if test "$enable_mixedcase" = "auto" ; then
    33613563 
    33623564-echo "$as_me:3412: checking if filesystem supports mixed-case filenames" >&5
    3363 +echo "$as_me:3558: checking if filesystem supports mixed-case filenames" >&5
     3565+echo "$as_me:3559: checking if filesystem supports mixed-case filenames" >&5
    33643566 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
    33653567 if test "${cf_cv_mixedcase+set}" = set; then
    33663568   echo $ECHO_N "(cached) $ECHO_C" >&6
    3367 @@ -3436,7 +3582,7 @@
     3569@@ -3436,7 +3583,7 @@
    33683570 fi
    33693571 
    33703572 fi
    33713573-echo "$as_me:3439: result: $cf_cv_mixedcase" >&5
    3372 +echo "$as_me:3585: result: $cf_cv_mixedcase" >&5
     3574+echo "$as_me:3586: result: $cf_cv_mixedcase" >&5
    33733575 echo "${ECHO_T}$cf_cv_mixedcase" >&6
    33743576 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF
    33753577 #define MIXEDCASE_FILENAMES 1
    3376 @@ -3453,7 +3599,7 @@
     3578@@ -3453,7 +3600,7 @@
    33773579 fi
    33783580 
    33793581 # do this after mixed-case option (tags/TAGS is not as important as tic).
    33803582-echo "$as_me:3456: checking whether ${MAKE-make} sets \${MAKE}" >&5
    3381 +echo "$as_me:3602: checking whether ${MAKE-make} sets \${MAKE}" >&5
     3583+echo "$as_me:3603: checking whether ${MAKE-make} sets \${MAKE}" >&5
    33823584 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
    33833585 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
    33843586 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
    3385 @@ -3473,18 +3619,18 @@
     3587@@ -3473,18 +3620,18 @@
    33863588 rm -f conftest.make
    33873589 fi
    33883590 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
    33893591-  echo "$as_me:3476: result: yes" >&5
    3390 +  echo "$as_me:3622: result: yes" >&5
     3592+  echo "$as_me:3623: result: yes" >&5
    33913593 echo "${ECHO_T}yes" >&6
    33923594   SET_MAKE=
    33933595 else
    33943596-  echo "$as_me:3480: result: no" >&5
    3395 +  echo "$as_me:3626: result: no" >&5
     3597+  echo "$as_me:3627: result: no" >&5
    33963598 echo "${ECHO_T}no" >&6
    33973599   SET_MAKE="MAKE=${MAKE-make}"
    … …  
    34013603 set dummy ctags; ac_word=$2
    34023604-echo "$as_me:3487: checking for $ac_word" >&5
    3403 +echo "$as_me:3633: checking for $ac_word" >&5
     3605+echo "$as_me:3634: checking for $ac_word" >&5
    34043606 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    34053607 if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then
    34063608   echo $ECHO_N "(cached) $ECHO_C" >&6
    3407 @@ -3499,7 +3645,7 @@
     3609@@ -3499,7 +3646,7 @@
    34083610   test -z "$ac_dir" && ac_dir=.
    34093611   $as_executable_p "$ac_dir/$ac_word" || continue
    34103612 ac_cv_prog_MAKE_LOWER_TAGS="yes"
    34113613-echo "$as_me:3502: found $ac_dir/$ac_word" >&5
    3412 +echo "$as_me:3648: found $ac_dir/$ac_word" >&5
     3614+echo "$as_me:3649: found $ac_dir/$ac_word" >&5
    34133615 break
    34143616 done
    34153617 
    3416 @@ -3508,17 +3654,17 @@
     3618@@ -3508,17 +3655,17 @@
    34173619 fi
    34183620 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
    34193621 if test -n "$MAKE_LOWER_TAGS"; then
    34203622-  echo "$as_me:3511: result: $MAKE_LOWER_TAGS" >&5
    3421 +  echo "$as_me:3657: result: $MAKE_LOWER_TAGS" >&5
     3623+  echo "$as_me:3658: result: $MAKE_LOWER_TAGS" >&5
    34223624 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
    34233625 else
    34243626-  echo "$as_me:3514: result: no" >&5
    3425 +  echo "$as_me:3660: result: no" >&5
     3627+  echo "$as_me:3661: result: no" >&5
    34263628 echo "${ECHO_T}no" >&6
    34273629 fi
    … …  
    34313633 set dummy etags; ac_word=$2
    34323634-echo "$as_me:3521: checking for $ac_word" >&5
    3433 +echo "$as_me:3667: checking for $ac_word" >&5
     3635+echo "$as_me:3668: checking for $ac_word" >&5
    34343636 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    34353637 if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then
    34363638   echo $ECHO_N "(cached) $ECHO_C" >&6
    3437 @@ -3533,7 +3679,7 @@
     3639@@ -3533,7 +3680,7 @@
    34383640   test -z "$ac_dir" && ac_dir=.
    34393641   $as_executable_p "$ac_dir/$ac_word" || continue
    34403642 ac_cv_prog_MAKE_UPPER_TAGS="yes"
    34413643-echo "$as_me:3536: found $ac_dir/$ac_word" >&5
    3442 +echo "$as_me:3682: found $ac_dir/$ac_word" >&5
     3644+echo "$as_me:3683: found $ac_dir/$ac_word" >&5
    34433645 break
    34443646 done
    34453647 
    3446 @@ -3542,10 +3688,10 @@
     3648@@ -3542,10 +3689,10 @@
    34473649 fi
    34483650 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
    34493651 if test -n "$MAKE_UPPER_TAGS"; then
    34503652-  echo "$as_me:3545: result: $MAKE_UPPER_TAGS" >&5
    3451 +  echo "$as_me:3691: result: $MAKE_UPPER_TAGS" >&5
     3653+  echo "$as_me:3692: result: $MAKE_UPPER_TAGS" >&5
    34523654 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
    34533655 else
    34543656-  echo "$as_me:3548: result: no" >&5
    3455 +  echo "$as_me:3694: result: no" >&5
     3657+  echo "$as_me:3695: result: no" >&5
    34563658 echo "${ECHO_T}no" >&6
    34573659 fi
    34583660 
    3459 @@ -3565,7 +3711,7 @@
     3661@@ -3565,7 +3712,7 @@
    34603662        MAKE_LOWER_TAGS="#"
    34613663 fi
    34623664 
    34633665-echo "$as_me:3568: checking for makeflags variable" >&5
    3464 +echo "$as_me:3714: checking for makeflags variable" >&5
     3666+echo "$as_me:3715: checking for makeflags variable" >&5
    34653667 echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6
    34663668 if test "${cf_cv_makeflags+set}" = set; then
    34673669   echo $ECHO_N "(cached) $ECHO_C" >&6
    3468 @@ -3599,13 +3745,13 @@
     3670@@ -3599,13 +3746,13 @@
    34693671        rm -f cf_makeflags.tmp
    34703672 
    34713673 fi
    34723674-echo "$as_me:3602: result: $cf_cv_makeflags" >&5
    3473 +echo "$as_me:3748: result: $cf_cv_makeflags" >&5
     3675+echo "$as_me:3749: result: $cf_cv_makeflags" >&5
    34743676 echo "${ECHO_T}$cf_cv_makeflags" >&6
    34753677 
    … …  
    34783680 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
    34793681-echo "$as_me:3608: checking for $ac_word" >&5
    3480 +echo "$as_me:3754: checking for $ac_word" >&5
     3682+echo "$as_me:3755: checking for $ac_word" >&5
    34813683 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    34823684 if test "${ac_cv_prog_RANLIB+set}" = set; then
    34833685   echo $ECHO_N "(cached) $ECHO_C" >&6
    3484 @@ -3620,7 +3766,7 @@
     3686@@ -3620,7 +3767,7 @@
    34853687   test -z "$ac_dir" && ac_dir=.
    34863688   $as_executable_p "$ac_dir/$ac_word" || continue
    34873689 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
    34883690-echo "$as_me:3623: found $ac_dir/$ac_word" >&5
    3489 +echo "$as_me:3769: found $ac_dir/$ac_word" >&5
     3691+echo "$as_me:3770: found $ac_dir/$ac_word" >&5
    34903692 break
    34913693 done
    34923694 
    3493 @@ -3628,10 +3774,10 @@
     3695@@ -3628,10 +3775,10 @@
    34943696 fi
    34953697 RANLIB=$ac_cv_prog_RANLIB
    34963698 if test -n "$RANLIB"; then
    34973699-  echo "$as_me:3631: result: $RANLIB" >&5
    3498 +  echo "$as_me:3777: result: $RANLIB" >&5
     3700+  echo "$as_me:3778: result: $RANLIB" >&5
    34993701 echo "${ECHO_T}$RANLIB" >&6
    35003702 else
    35013703-  echo "$as_me:3634: result: no" >&5
    3502 +  echo "$as_me:3780: result: no" >&5
     3704+  echo "$as_me:3781: result: no" >&5
    35033705 echo "${ECHO_T}no" >&6
    35043706 fi
    35053707 
    3506 @@ -3640,7 +3786,7 @@
     3708@@ -3640,7 +3787,7 @@
    35073709   ac_ct_RANLIB=$RANLIB
    35083710   # Extract the first word of "ranlib", so it can be a program name with args.
    35093711 set dummy ranlib; ac_word=$2
    35103712-echo "$as_me:3643: checking for $ac_word" >&5
    3511 +echo "$as_me:3789: checking for $ac_word" >&5
     3713+echo "$as_me:3790: checking for $ac_word" >&5
    35123714 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    35133715 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
    35143716   echo $ECHO_N "(cached) $ECHO_C" >&6
    3515 @@ -3655,7 +3801,7 @@
     3717@@ -3655,7 +3802,7 @@
    35163718   test -z "$ac_dir" && ac_dir=.
    35173719   $as_executable_p "$ac_dir/$ac_word" || continue
    35183720 ac_cv_prog_ac_ct_RANLIB="ranlib"
    35193721-echo "$as_me:3658: found $ac_dir/$ac_word" >&5
    3520 +echo "$as_me:3804: found $ac_dir/$ac_word" >&5
     3722+echo "$as_me:3805: found $ac_dir/$ac_word" >&5
    35213723 break
    35223724 done
    35233725 
    3524 @@ -3664,10 +3810,10 @@
     3726@@ -3664,10 +3811,10 @@
    35253727 fi
    35263728 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
    35273729 if test -n "$ac_ct_RANLIB"; then
    35283730-  echo "$as_me:3667: result: $ac_ct_RANLIB" >&5
    3529 +  echo "$as_me:3813: result: $ac_ct_RANLIB" >&5
     3731+  echo "$as_me:3814: result: $ac_ct_RANLIB" >&5
    35303732 echo "${ECHO_T}$ac_ct_RANLIB" >&6
    35313733 else
    35323734-  echo "$as_me:3670: result: no" >&5
    3533 +  echo "$as_me:3816: result: no" >&5
     3735+  echo "$as_me:3817: result: no" >&5
    35343736 echo "${ECHO_T}no" >&6
    35353737 fi
    35363738 
    3537 @@ -3679,7 +3825,7 @@
     3739@@ -3679,7 +3826,7 @@
    35383740 if test -n "$ac_tool_prefix"; then
    35393741   # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
    35403742 set dummy ${ac_tool_prefix}ld; ac_word=$2
    35413743-echo "$as_me:3682: checking for $ac_word" >&5
    3542 +echo "$as_me:3828: checking for $ac_word" >&5
     3744+echo "$as_me:3829: checking for $ac_word" >&5
    35433745 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    35443746 if test "${ac_cv_prog_LD+set}" = set; then
    35453747   echo $ECHO_N "(cached) $ECHO_C" >&6
    3546 @@ -3694,7 +3840,7 @@
     3748@@ -3694,7 +3841,7 @@
    35473749   test -z "$ac_dir" && ac_dir=.
    35483750   $as_executable_p "$ac_dir/$ac_word" || continue
    35493751 ac_cv_prog_LD="${ac_tool_prefix}ld"
    35503752-echo "$as_me:3697: found $ac_dir/$ac_word" >&5
    3551 +echo "$as_me:3843: found $ac_dir/$ac_word" >&5
     3753+echo "$as_me:3844: found $ac_dir/$ac_word" >&5
    35523754 break
    35533755 done
    35543756 
    3555 @@ -3702,10 +3848,10 @@
     3757@@ -3702,10 +3849,10 @@
    35563758 fi
    35573759 LD=$ac_cv_prog_LD
    35583760 if test -n "$LD"; then
    35593761-  echo "$as_me:3705: result: $LD" >&5
    3560 +  echo "$as_me:3851: result: $LD" >&5
     3762+  echo "$as_me:3852: result: $LD" >&5
    35613763 echo "${ECHO_T}$LD" >&6
    35623764 else
    35633765-  echo "$as_me:3708: result: no" >&5
    3564 +  echo "$as_me:3854: result: no" >&5
     3766+  echo "$as_me:3855: result: no" >&5
    35653767 echo "${ECHO_T}no" >&6
    35663768 fi
    35673769 
    3568 @@ -3714,7 +3860,7 @@
     3770@@ -3714,7 +3861,7 @@
    35693771   ac_ct_LD=$LD
    35703772   # Extract the first word of "ld", so it can be a program name with args.
    35713773 set dummy ld; ac_word=$2
    35723774-echo "$as_me:3717: checking for $ac_word" >&5
    3573 +echo "$as_me:3863: checking for $ac_word" >&5
     3775+echo "$as_me:3864: checking for $ac_word" >&5
    35743776 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    35753777 if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
    35763778   echo $ECHO_N "(cached) $ECHO_C" >&6
    3577 @@ -3729,7 +3875,7 @@
     3779@@ -3729,7 +3876,7 @@
    35783780   test -z "$ac_dir" && ac_dir=.
    35793781   $as_executable_p "$ac_dir/$ac_word" || continue
    35803782 ac_cv_prog_ac_ct_LD="ld"
    35813783-echo "$as_me:3732: found $ac_dir/$ac_word" >&5
    3582 +echo "$as_me:3878: found $ac_dir/$ac_word" >&5
     3784+echo "$as_me:3879: found $ac_dir/$ac_word" >&5
    35833785 break
    35843786 done
    35853787 
    3586 @@ -3738,10 +3884,10 @@
     3788@@ -3738,10 +3885,10 @@
    35873789 fi
    35883790 ac_ct_LD=$ac_cv_prog_ac_ct_LD
    35893791 if test -n "$ac_ct_LD"; then
    35903792-  echo "$as_me:3741: result: $ac_ct_LD" >&5
    3591 +  echo "$as_me:3887: result: $ac_ct_LD" >&5
     3793+  echo "$as_me:3888: result: $ac_ct_LD" >&5
    35923794 echo "${ECHO_T}$ac_ct_LD" >&6
    35933795 else
    35943796-  echo "$as_me:3744: result: no" >&5
    3595 +  echo "$as_me:3890: result: no" >&5
     3797+  echo "$as_me:3891: result: no" >&5
    35963798 echo "${ECHO_T}no" >&6
    35973799 fi
    35983800 
    3599 @@ -3753,7 +3899,7 @@
     3801@@ -3753,7 +3900,7 @@
    36003802 if test -n "$ac_tool_prefix"; then
    36013803   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
    36023804 set dummy ${ac_tool_prefix}ar; ac_word=$2
    36033805-echo "$as_me:3756: checking for $ac_word" >&5
    3604 +echo "$as_me:3902: checking for $ac_word" >&5
     3806+echo "$as_me:3903: checking for $ac_word" >&5
    36053807 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    36063808 if test "${ac_cv_prog_AR+set}" = set; then
    36073809   echo $ECHO_N "(cached) $ECHO_C" >&6
    3608 @@ -3768,7 +3914,7 @@
     3810@@ -3768,7 +3915,7 @@
    36093811   test -z "$ac_dir" && ac_dir=.
    36103812   $as_executable_p "$ac_dir/$ac_word" || continue
    36113813 ac_cv_prog_AR="${ac_tool_prefix}ar"
    36123814-echo "$as_me:3771: found $ac_dir/$ac_word" >&5
    3613 +echo "$as_me:3917: found $ac_dir/$ac_word" >&5
     3815+echo "$as_me:3918: found $ac_dir/$ac_word" >&5
    36143816 break
    36153817 done
    36163818 
    3617 @@ -3776,10 +3922,10 @@
     3819@@ -3776,10 +3923,10 @@
    36183820 fi
    36193821 AR=$ac_cv_prog_AR
    36203822 if test -n "$AR"; then
    36213823-  echo "$as_me:3779: result: $AR" >&5
    3622 +  echo "$as_me:3925: result: $AR" >&5
     3824+  echo "$as_me:3926: result: $AR" >&5
    36233825 echo "${ECHO_T}$AR" >&6
    36243826 else
    36253827-  echo "$as_me:3782: result: no" >&5
    3626 +  echo "$as_me:3928: result: no" >&5
     3828+  echo "$as_me:3929: result: no" >&5
    36273829 echo "${ECHO_T}no" >&6
    36283830 fi
    36293831 
    3630 @@ -3788,7 +3934,7 @@
     3832@@ -3788,7 +3935,7 @@
    36313833   ac_ct_AR=$AR
    36323834   # Extract the first word of "ar", so it can be a program name with args.
    36333835 set dummy ar; ac_word=$2
    36343836-echo "$as_me:3791: checking for $ac_word" >&5
    3635 +echo "$as_me:3937: checking for $ac_word" >&5
     3837+echo "$as_me:3938: checking for $ac_word" >&5
    36363838 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    36373839 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
    36383840   echo $ECHO_N "(cached) $ECHO_C" >&6
    3639 @@ -3803,7 +3949,7 @@
     3841@@ -3803,7 +3950,7 @@
    36403842   test -z "$ac_dir" && ac_dir=.
    36413843   $as_executable_p "$ac_dir/$ac_word" || continue
    36423844 ac_cv_prog_ac_ct_AR="ar"
    36433845-echo "$as_me:3806: found $ac_dir/$ac_word" >&5
    3644 +echo "$as_me:3952: found $ac_dir/$ac_word" >&5
     3846+echo "$as_me:3953: found $ac_dir/$ac_word" >&5
    36453847 break
    36463848 done
    36473849 
    3648 @@ -3812,10 +3958,10 @@
     3850@@ -3812,10 +3959,10 @@
    36493851 fi
    36503852 ac_ct_AR=$ac_cv_prog_ac_ct_AR
    36513853 if test -n "$ac_ct_AR"; then
    36523854-  echo "$as_me:3815: result: $ac_ct_AR" >&5
    3653 +  echo "$as_me:3961: result: $ac_ct_AR" >&5
     3855+  echo "$as_me:3962: result: $ac_ct_AR" >&5
    36543856 echo "${ECHO_T}$ac_ct_AR" >&6
    36553857 else
    36563858-  echo "$as_me:3818: result: no" >&5
    3657 +  echo "$as_me:3964: result: no" >&5
     3859+  echo "$as_me:3965: result: no" >&5
    36583860 echo "${ECHO_T}no" >&6
    36593861 fi
    36603862 
    3661 @@ -3824,25 +3970,123 @@
     3863@@ -3824,25 +3971,123 @@
    36623864   AR="$ac_cv_prog_AR"
    36633865 fi
    … …  
    36673869+  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
    36683870+set dummy ${ac_tool_prefix}ar; ac_word=$2
    3669 +echo "$as_me:3976: checking for $ac_word" >&5
     3871+echo "$as_me:3977: checking for $ac_word" >&5
    36703872+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    36713873+if test "${ac_cv_prog_AR+set}" = set; then
    … …  
    36823884+  $as_executable_p "$ac_dir/$ac_word" || continue
    36833885+ac_cv_prog_AR="${ac_tool_prefix}ar"
    3684 +echo "$as_me:3991: found $ac_dir/$ac_word" >&5
     3886+echo "$as_me:3992: found $ac_dir/$ac_word" >&5
    36853887+break
    36863888+done
    … …  
    36923894+AR=$ac_cv_prog_AR
    36933895+if test -n "$AR"; then
    3694 +  echo "$as_me:3999: result: $AR" >&5
     3896+  echo "$as_me:4000: result: $AR" >&5
    36953897+echo "${ECHO_T}$AR" >&6
    36963898+else
    3697 +  echo "$as_me:4002: result: no" >&5
     3899+  echo "$as_me:4003: result: no" >&5
    36983900+echo "${ECHO_T}no" >&6
    36993901+fi
    … …  
    37063908+  # Extract the first word of "ar", so it can be a program name with args.
    37073909+set dummy ar; ac_word=$2
    3708 +echo "$as_me:4011: checking for $ac_word" >&5
     3910+echo "$as_me:4012: checking for $ac_word" >&5
    37093911+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    37103912+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
    … …  
    37213923+  $as_executable_p "$ac_dir/$ac_word" || continue
    37223924+ac_cv_prog_ac_ct_AR="ar"
    3723 +echo "$as_me:4026: found $ac_dir/$ac_word" >&5
     3925+echo "$as_me:4027: found $ac_dir/$ac_word" >&5
    37243926+break
    37253927+done
    … …  
    37303932+ac_ct_AR=$ac_cv_prog_ac_ct_AR
    37313933+if test -n "$ac_ct_AR"; then
    3732 +  echo "$as_me:4035: result: $ac_ct_AR" >&5
     3934+  echo "$as_me:4036: result: $ac_ct_AR" >&5
    37333935+echo "${ECHO_T}$ac_ct_AR" >&6
    37343936+else
    3735 +  echo "$as_me:4038: result: no" >&5
     3937+  echo "$as_me:4039: result: no" >&5
    37363938+echo "${ECHO_T}no" >&6
    37373939+fi
    … …  
    37423944+fi
    37433945+
    3744 +echo "$as_me:4047: checking for options to update archives" >&5
     3946+echo "$as_me:4048: checking for options to update archives" >&5
    37453947+echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6
    37463948+if test "${cf_cv_ar_flags+set}" = set; then
    37473949+  echo $ECHO_N "(cached) $ECHO_C" >&6
    37483950+else
    3749  
    3750 -cf_cv_subst_AR_OPTS=$AR_OPTS
    3751 -echo "$as_me:3840: result: $AR_OPTS" >&5
    3752 -echo "${ECHO_T}$AR_OPTS" >&6
     3951+
    37533952+       cf_cv_ar_flags=unknown
    37543953+       for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv
    … …  
    37563955+               rm -f conftest.$ac_cv_objext
    37573956+               rm -f conftest.a
    3758 +
     3957 
     3958-cf_cv_subst_AR_OPTS=$AR_OPTS
     3959-echo "$as_me:3840: result: $AR_OPTS" >&5
     3960-echo "${ECHO_T}$AR_OPTS" >&6
    37593961+               cat >conftest.$ac_ext <<EOF
    3760 +#line 4060 "configure"
     3962+#line 4061 "configure"
    37613963+int    testdata[3] = { 123, 456, 789 };
    37623964+EOF
    3763 +               if { (eval echo "$as_me:4063: \"$ac_compile\"") >&5
     3965+               if { (eval echo "$as_me:4064: \"$ac_compile\"") >&5
    37643966+  (eval $ac_compile) 2>&5
    37653967+  ac_status=$?
    3766 +  echo "$as_me:4066: \$? = $ac_status" >&5
     3968+  echo "$as_me:4067: \$? = $ac_status" >&5
    37673969+  (exit $ac_status); } ; then
    37683970+                       $AR $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null
    … …  
    37743976+                       test -n "$verbose" && echo "    cannot compile test-program" 1>&6
    37753977+
    3776 +echo "${as_me-configure}:4076: testing cannot compile test-program ..." 1>&5
     3978+echo "${as_me-configure}:4077: testing cannot compile test-program ..." 1>&5
    37773979+
    37783980+                       break
    … …  
    37823984 
    37833985 fi
    3784 +echo "$as_me:4084: result: $cf_cv_ar_flags" >&5
     3986+echo "$as_me:4085: result: $cf_cv_ar_flags" >&5
    37853987+echo "${ECHO_T}$cf_cv_ar_flags" >&6
    37863988+test -z "$ARFLAGS" && ARFLAGS=$cf_cv_ar_flags
    … …  
    37883990 
    37893991-echo "$as_me:3845: checking if you have specified an install-prefix" >&5
    3790 +echo "$as_me:4089: checking if you have specified an install-prefix" >&5
     3992+echo "$as_me:4090: checking if you have specified an install-prefix" >&5
    37913993 echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6
    37923994 
    37933995 # Check whether --with-install-prefix or --without-install-prefix was given.
    3794 @@ -3855,7 +4099,7 @@
     3996@@ -3855,7 +4100,7 @@
    37953997                ;;
    37963998        esac
    37973999 fi;
    37984000-echo "$as_me:3858: result: $DESTDIR" >&5
    3799 +echo "$as_me:4102: result: $DESTDIR" >&5
     4001+echo "$as_me:4103: result: $DESTDIR" >&5
    38004002 echo "${ECHO_T}$DESTDIR" >&6
    38014003 
    38024004 ###############################################################################
    3803 @@ -3883,7 +4127,7 @@
     4005@@ -3883,7 +4128,7 @@
    38044006 do
    38054007   # Extract the first word of "$ac_prog", so it can be a program name with args.
    38064008 set dummy $ac_prog; ac_word=$2
    38074009-echo "$as_me:3886: checking for $ac_word" >&5
    3808 +echo "$as_me:4130: checking for $ac_word" >&5
     4010+echo "$as_me:4131: checking for $ac_word" >&5
    38094011 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    38104012 if test "${ac_cv_prog_BUILD_CC+set}" = set; then
    38114013   echo $ECHO_N "(cached) $ECHO_C" >&6
    3812 @@ -3898,7 +4142,7 @@
     4014@@ -3898,7 +4143,7 @@
    38134015   test -z "$ac_dir" && ac_dir=.
    38144016   $as_executable_p "$ac_dir/$ac_word" || continue
    38154017 ac_cv_prog_BUILD_CC="$ac_prog"
    38164018-echo "$as_me:3901: found $ac_dir/$ac_word" >&5
    3817 +echo "$as_me:4145: found $ac_dir/$ac_word" >&5
     4019+echo "$as_me:4146: found $ac_dir/$ac_word" >&5
    38184020 break
    38194021 done
    38204022 
    3821 @@ -3906,10 +4150,10 @@
     4023@@ -3906,10 +4151,10 @@
    38224024 fi
    38234025 BUILD_CC=$ac_cv_prog_BUILD_CC
    38244026 if test -n "$BUILD_CC"; then
    38254027-  echo "$as_me:3909: result: $BUILD_CC" >&5
    3826 +  echo "$as_me:4153: result: $BUILD_CC" >&5
     4028+  echo "$as_me:4154: result: $BUILD_CC" >&5
    38274029 echo "${ECHO_T}$BUILD_CC" >&6
    38284030 else
    38294031-  echo "$as_me:3912: result: no" >&5
    3830 +  echo "$as_me:4156: result: no" >&5
     4032+  echo "$as_me:4157: result: no" >&5
    38314033 echo "${ECHO_T}no" >&6
    38324034 fi
    38334035 
    3834 @@ -3917,12 +4161,12 @@
     4036@@ -3917,12 +4162,12 @@
    38354037 done
    38364038 
    38374039 fi;
    38384040-       echo "$as_me:3920: checking for native build C compiler" >&5
    3839 +       echo "$as_me:4164: checking for native build C compiler" >&5
     4041+       echo "$as_me:4165: checking for native build C compiler" >&5
    38404042 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
    38414043-       echo "$as_me:3922: result: $BUILD_CC" >&5
    3842 +       echo "$as_me:4166: result: $BUILD_CC" >&5
     4044+       echo "$as_me:4167: result: $BUILD_CC" >&5
    38434045 echo "${ECHO_T}$BUILD_CC" >&6
    38444046 
    38454047-       echo "$as_me:3925: checking for native build C preprocessor" >&5
    3846 +       echo "$as_me:4169: checking for native build C preprocessor" >&5
     4048+       echo "$as_me:4170: checking for native build C preprocessor" >&5
    38474049 echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6
    38484050 
    38494051 # Check whether --with-build-cpp or --without-build-cpp was given.
    3850 @@ -3932,10 +4176,10 @@
     4052@@ -3932,10 +4177,10 @@
    38514053 else
    38524054   BUILD_CPP='${BUILD_CC} -E'
    38534055 fi;
    38544056-       echo "$as_me:3935: result: $BUILD_CPP" >&5
    3855 +       echo "$as_me:4179: result: $BUILD_CPP" >&5
     4057+       echo "$as_me:4180: result: $BUILD_CPP" >&5
    38564058 echo "${ECHO_T}$BUILD_CPP" >&6
    38574059 
    38584060-       echo "$as_me:3938: checking for native build C flags" >&5
    3859 +       echo "$as_me:4182: checking for native build C flags" >&5
     4061+       echo "$as_me:4183: checking for native build C flags" >&5
    38604062 echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6
    38614063 
    38624064 # Check whether --with-build-cflags or --without-build-cflags was given.
    3863 @@ -3943,10 +4187,10 @@
     4065@@ -3943,10 +4188,10 @@
    38644066   withval="$with_build_cflags"
    38654067   BUILD_CFLAGS="$withval"
    38664068 fi;
    38674069-       echo "$as_me:3946: result: $BUILD_CFLAGS" >&5
    3868 +       echo "$as_me:4190: result: $BUILD_CFLAGS" >&5
     4070+       echo "$as_me:4191: result: $BUILD_CFLAGS" >&5
    38694071 echo "${ECHO_T}$BUILD_CFLAGS" >&6
    38704072 
    38714073-       echo "$as_me:3949: checking for native build C preprocessor-flags" >&5
    3872 +       echo "$as_me:4193: checking for native build C preprocessor-flags" >&5
     4074+       echo "$as_me:4194: checking for native build C preprocessor-flags" >&5
    38734075 echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6
    38744076 
    38754077 # Check whether --with-build-cppflags or --without-build-cppflags was given.
    3876 @@ -3954,10 +4198,10 @@
     4078@@ -3954,10 +4199,10 @@
    38774079   withval="$with_build_cppflags"
    38784080   BUILD_CPPFLAGS="$withval"
    38794081 fi;
    38804082-       echo "$as_me:3957: result: $BUILD_CPPFLAGS" >&5
    3881 +       echo "$as_me:4201: result: $BUILD_CPPFLAGS" >&5
     4083+       echo "$as_me:4202: result: $BUILD_CPPFLAGS" >&5
    38824084 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
    38834085 
    38844086-       echo "$as_me:3960: checking for native build linker-flags" >&5
    3885 +       echo "$as_me:4204: checking for native build linker-flags" >&5
     4087+       echo "$as_me:4205: checking for native build linker-flags" >&5
    38864088 echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6
    38874089 
    38884090 # Check whether --with-build-ldflags or --without-build-ldflags was given.
    3889 @@ -3965,10 +4209,10 @@
     4091@@ -3965,10 +4210,10 @@
    38904092   withval="$with_build_ldflags"
    38914093   BUILD_LDFLAGS="$withval"
    38924094 fi;
    38934095-       echo "$as_me:3968: result: $BUILD_LDFLAGS" >&5
    3894 +       echo "$as_me:4212: result: $BUILD_LDFLAGS" >&5
     4096+       echo "$as_me:4213: result: $BUILD_LDFLAGS" >&5
    38954097 echo "${ECHO_T}$BUILD_LDFLAGS" >&6
    38964098 
    38974099-       echo "$as_me:3971: checking for native build linker-libraries" >&5
    3898 +       echo "$as_me:4215: checking for native build linker-libraries" >&5
     4100+       echo "$as_me:4216: checking for native build linker-libraries" >&5
    38994101 echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6
    39004102 
    39014103 # Check whether --with-build-libs or --without-build-libs was given.
    3902 @@ -3976,7 +4220,7 @@
     4104@@ -3976,7 +4221,7 @@
    39034105   withval="$with_build_libs"
    39044106   BUILD_LIBS="$withval"
    39054107 fi;
    39064108-       echo "$as_me:3979: result: $BUILD_LIBS" >&5
    3907 +       echo "$as_me:4223: result: $BUILD_LIBS" >&5
     4109+       echo "$as_me:4224: result: $BUILD_LIBS" >&5
    39084110 echo "${ECHO_T}$BUILD_LIBS" >&6
    39094111 
    39104112        # this assumes we're on Unix.
    3911 @@ -3986,7 +4230,7 @@
     4113@@ -3986,7 +4231,7 @@
    39124114        : ${BUILD_CC:='${CC}'}
    39134115 
    39144116        if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
    39154117-               { { echo "$as_me:3989: error: Cross-build requires two compilers.
    3916 +               { { echo "$as_me:4233: error: Cross-build requires two compilers.
     4118+               { { echo "$as_me:4234: error: Cross-build requires two compilers.
    39174119 Use --with-build-cc to specify the native compiler." >&5
    39184120 echo "$as_me: error: Cross-build requires two compilers.
    39194121 Use --with-build-cc to specify the native compiler." >&2;}
    3920 @@ -4027,7 +4271,7 @@
     4122@@ -4027,7 +4272,7 @@
    39214123 LIB_INSTALL=
    39224124 LIB_UNINSTALL=
    39234125 
    39244126-echo "$as_me:4030: checking if you want to build libraries with libtool" >&5
    3925 +echo "$as_me:4274: checking if you want to build libraries with libtool" >&5
     4127+echo "$as_me:4275: checking if you want to build libraries with libtool" >&5
    39264128 echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6
    39274129 
    39284130 # Check whether --with-libtool or --without-libtool was given.
    3929 @@ -4037,11 +4281,11 @@
     4131@@ -4037,11 +4282,11 @@
    39304132 else
    39314133   with_libtool=no
    39324134 fi;
    39334135-echo "$as_me:4040: result: $with_libtool" >&5
    3934 +echo "$as_me:4284: result: $with_libtool" >&5
     4136+echo "$as_me:4285: result: $with_libtool" >&5
    39354137 echo "${ECHO_T}$with_libtool" >&6
    39364138 if test "$with_libtool" != "no"; then
    … …  
    39414143 if test "x$prefix" != xNONE; then
    39424144   cf_path_syntax="$prefix"
    3943 @@ -4068,7 +4312,7 @@
     4145@@ -4068,7 +4313,7 @@
    39444146   with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%`
    39454147   ;;
    39464148 *)
    39474149-  { { echo "$as_me:4071: error: expected a pathname, not \"$with_libtool\"" >&5
    3948 +  { { echo "$as_me:4315: error: expected a pathname, not \"$with_libtool\"" >&5
     4150+  { { echo "$as_me:4316: error: expected a pathname, not \"$with_libtool\"" >&5
    39494151 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
    39504152    { (exit 1); exit 1; }; }
    39514153   ;;
    3952 @@ -4076,9 +4320,9 @@
     4154@@ -4076,9 +4321,9 @@
    39534155 
    39544156                LIBTOOL=$with_libtool
    … …  
    39584160 set dummy libtool; ac_word=$2
    39594161-echo "$as_me:4081: checking for $ac_word" >&5
    3960 +echo "$as_me:4325: checking for $ac_word" >&5
     4162+echo "$as_me:4326: checking for $ac_word" >&5
    39614163 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    39624164 if test "${ac_cv_path_LIBTOOL+set}" = set; then
    39634165   echo $ECHO_N "(cached) $ECHO_C" >&6
    3964 @@ -4095,7 +4339,7 @@
     4166@@ -4095,7 +4340,7 @@
    39654167   test -z "$ac_dir" && ac_dir=.
    39664168   if $as_executable_p "$ac_dir/$ac_word"; then
    39674169    ac_cv_path_LIBTOOL="$ac_dir/$ac_word"
    39684170-   echo "$as_me:4098: found $ac_dir/$ac_word" >&5
    3969 +   echo "$as_me:4342: found $ac_dir/$ac_word" >&5
     4171+   echo "$as_me:4343: found $ac_dir/$ac_word" >&5
    39704172    break
    39714173 fi
    39724174 done
    3973 @@ -4106,19 +4350,19 @@
     4175@@ -4106,20 +4351,20 @@
    39744176 LIBTOOL=$ac_cv_path_LIBTOOL
    39754177 
    39764178 if test -n "$LIBTOOL"; then
    39774179-  echo "$as_me:4109: result: $LIBTOOL" >&5
    3978 +  echo "$as_me:4353: result: $LIBTOOL" >&5
     4180+  echo "$as_me:4354: result: $LIBTOOL" >&5
    39794181 echo "${ECHO_T}$LIBTOOL" >&6
    39804182 else
    39814183-  echo "$as_me:4112: result: no" >&5
    3982 +  echo "$as_me:4356: result: no" >&5
     4184+  echo "$as_me:4357: result: no" >&5
    39834185 echo "${ECHO_T}no" >&6
    39844186 fi
    … …  
    39894191+       fi
    39904192+       if test -z "$LIBTOOL" ; then
    3991 +               { { echo "$as_me:4362: error: Cannot find libtool" >&5
     4193+               { { echo "$as_me:4363: error: Cannot find libtool" >&5
    39924194 echo "$as_me: error: Cannot find libtool" >&2;}
    39934195    { (exit 1); exit 1; }; }
    39944196-       fi
     4197-       LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} -o'
    39954198+       fi
    3996         LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} -o'
     4199+       LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} -o'
    39974200        LIB_OBJECT='${OBJECTS:.o=.lo}'
    39984201        LIB_SUFFIX=.la
    3999 @@ -4130,17 +4374,17 @@
     4202        LIB_CLEAN='${LIBTOOL} --mode=clean'
     4203@@ -4130,24 +4375,32 @@
    40004204        LIB_PREP=:
    40014205 
    40024206        # Show the version of libtool
    40034207-       echo "$as_me:4133: checking version of libtool" >&5
    4004 +       echo "$as_me:4377: checking version of libtool" >&5
     4208+       echo "$as_me:4378: checking version of libtool" >&5
    40054209 echo $ECHO_N "checking version of libtool... $ECHO_C" >&6
    40064210 
    40074211        # Save the version in a cache variable - this is not entirely a good
    40084212        # thing, but the version string from libtool is very ugly, and for
    4009         # bug reports it might be useful to have the original string.
     4213-       # bug reports it might be useful to have the original string.
     4214+       # bug reports it might be useful to have the original string. "("
    40104215        cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([^)]*)//g' -e 's/^[^1-9]*//' -e 's/[^0-9.].*//'`
    40114216-       echo "$as_me:4140: result: $cf_cv_libtool_version" >&5
    4012 +       echo "$as_me:4384: result: $cf_cv_libtool_version" >&5
     4217+       echo "$as_me:4385: result: $cf_cv_libtool_version" >&5
    40134218 echo "${ECHO_T}$cf_cv_libtool_version" >&6
    40144219        if test -z "$cf_cv_libtool_version" ; then
    40154220-               { { echo "$as_me:4143: error: This is not GNU libtool" >&5
    4016 +               { { echo "$as_me:4387: error: This is not GNU libtool" >&5
     4221+               { { echo "$as_me:4388: error: This is not GNU libtool" >&5
    40174222 echo "$as_me: error: This is not GNU libtool" >&2;}
    40184223    { (exit 1); exit 1; }; }
    40194224        fi
    4020 @@ -4168,7 +4412,7 @@
     4225 
     4226+       # special hack to add -no-undefined (which libtool should do for itself)
     4227+       LT_UNDEF=
     4228+       case "$cf_cv_system_name" in #(vi
     4229+       cygwin*|mingw32*|uwin*|aix[456]) #(vi
     4230+               LT_UNDEF=-no-undefined
     4231+               ;;
     4232+       esac
     4233+
     4234        # special hack to add --tag option for C++ compiler
     4235-       case $cf_cv_libtool_version in
     4236-       1.[5-9]*|[2-9]*)
     4237+       case $cf_cv_libtool_version in #(vi
     4238+       1.[5-9]*|[2-9].[0-9.a-z]*) #(vi
     4239                LIBTOOL_CXX="$LIBTOOL --tag=CXX"
     4240                LIBTOOL="$LIBTOOL --tag=CC"
     4241                ;;
     4242@@ -4168,7 +4421,7 @@
    40214243 
    40224244 else
    40234245 
    40244246-echo "$as_me:4171: checking if you want to build shared libraries" >&5
    4025 +echo "$as_me:4415: checking if you want to build shared libraries" >&5
     4247+echo "$as_me:4424: checking if you want to build shared libraries" >&5
    40264248 echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6
    40274249 
    40284250 # Check whether --with-shared or --without-shared was given.
    4029 @@ -4178,11 +4422,11 @@
     4251@@ -4178,11 +4431,11 @@
    40304252 else
    40314253   with_shared=no
    40324254 fi;
    40334255-echo "$as_me:4181: result: $with_shared" >&5
    4034 +echo "$as_me:4425: result: $with_shared" >&5
     4256+echo "$as_me:4434: result: $with_shared" >&5
    40354257 echo "${ECHO_T}$with_shared" >&6
    40364258 test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
    40374259 
    40384260-echo "$as_me:4185: checking if you want to build static libraries" >&5
    4039 +echo "$as_me:4429: checking if you want to build static libraries" >&5
     4261+echo "$as_me:4438: checking if you want to build static libraries" >&5
    40404262 echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6
    40414263 
    40424264 # Check whether --with-normal or --without-normal was given.
    4043 @@ -4192,11 +4436,11 @@
     4265@@ -4192,11 +4445,11 @@
    40444266 else
    40454267   with_normal=yes
    40464268 fi;
    40474269-echo "$as_me:4195: result: $with_normal" >&5
    4048 +echo "$as_me:4439: result: $with_normal" >&5
     4270+echo "$as_me:4448: result: $with_normal" >&5
    40494271 echo "${ECHO_T}$with_normal" >&6
    40504272 test "$with_normal" = "yes" && cf_list_models="$cf_list_models normal"
    40514273 
    40524274-echo "$as_me:4199: checking if you want to build debug libraries" >&5
    4053 +echo "$as_me:4443: checking if you want to build debug libraries" >&5
     4275+echo "$as_me:4452: checking if you want to build debug libraries" >&5
    40544276 echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6
    40554277 
    40564278 # Check whether --with-debug or --without-debug was given.
    4057 @@ -4206,11 +4450,11 @@
     4279@@ -4206,11 +4459,11 @@
    40584280 else
    40594281   with_debug=yes
    40604282 fi;
    40614283-echo "$as_me:4209: result: $with_debug" >&5
    4062 +echo "$as_me:4453: result: $with_debug" >&5
     4284+echo "$as_me:4462: result: $with_debug" >&5
    40634285 echo "${ECHO_T}$with_debug" >&6
    40644286 test "$with_debug" = "yes" && cf_list_models="$cf_list_models debug"
    40654287 
    40664288-echo "$as_me:4213: checking if you want to build profiling libraries" >&5
    4067 +echo "$as_me:4457: checking if you want to build profiling libraries" >&5
     4289+echo "$as_me:4466: checking if you want to build profiling libraries" >&5
    40684290 echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6
    40694291 
    40704292 # Check whether --with-profile or --without-profile was given.
    4071 @@ -4220,7 +4464,7 @@
     4293@@ -4220,7 +4473,7 @@
    40724294 else
    40734295   with_profile=no
    40744296 fi;
    40754297-echo "$as_me:4223: result: $with_profile" >&5
    4076 +echo "$as_me:4467: result: $with_profile" >&5
     4298+echo "$as_me:4476: result: $with_profile" >&5
    40774299 echo "${ECHO_T}$with_profile" >&6
    40784300 test "$with_profile" = "yes" && cf_list_models="$cf_list_models profile"
    40794301 
    4080 @@ -4228,19 +4472,19 @@
     4302@@ -4228,19 +4481,19 @@
    40814303 
    40824304 ###############################################################################
    40834305 
    40844306-echo "$as_me:4231: checking for specified models" >&5
    4085 +echo "$as_me:4475: checking for specified models" >&5
     4307+echo "$as_me:4484: checking for specified models" >&5
    40864308 echo $ECHO_N "checking for specified models... $ECHO_C" >&6
    40874309 test -z "$cf_list_models" && cf_list_models=normal
    40884310 test "$with_libtool" != "no" && cf_list_models=libtool
    40894311-echo "$as_me:4235: result: $cf_list_models" >&5
    4090 +echo "$as_me:4479: result: $cf_list_models" >&5
     4312+echo "$as_me:4488: result: $cf_list_models" >&5
    40914313 echo "${ECHO_T}$cf_list_models" >&6
    40924314 
    … …  
    40944316 ### up test-applications.
    40954317-echo "$as_me:4240: checking for default model" >&5
    4096 +echo "$as_me:4484: checking for default model" >&5
     4318+echo "$as_me:4493: checking for default model" >&5
    40974319 echo $ECHO_N "checking for default model... $ECHO_C" >&6
    40984320 DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'`
    40994321-echo "$as_me:4243: result: $DFT_LWR_MODEL" >&5
    4100 +echo "$as_me:4487: result: $DFT_LWR_MODEL" >&5
     4322+echo "$as_me:4496: result: $DFT_LWR_MODEL" >&5
    41014323 echo "${ECHO_T}$DFT_LWR_MODEL" >&6
    41024324 
    41034325 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
    4104 @@ -4269,7 +4513,7 @@
     4326@@ -4269,7 +4522,7 @@
    41054327 
    41064328 ###############################################################################
    41074329 
    41084330-echo "$as_me:4272: checking if you want to build a separate terminfo library" >&5
    4109 +echo "$as_me:4516: checking if you want to build a separate terminfo library" >&5
     4331+echo "$as_me:4525: checking if you want to build a separate terminfo library" >&5
    41104332 echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6
    41114333 
    41124334 # Check whether --with-termlib or --without-termlib was given.
    4113 @@ -4279,10 +4523,10 @@
     4335@@ -4279,10 +4532,10 @@
    41144336 else
    41154337   with_termlib=no
    41164338 fi;
    41174339-echo "$as_me:4282: result: $with_termlib" >&5
    4118 +echo "$as_me:4526: result: $with_termlib" >&5
     4340+echo "$as_me:4535: result: $with_termlib" >&5
    41194341 echo "${ECHO_T}$with_termlib" >&6
    41204342 
    41214343-echo "$as_me:4285: checking if you want to build a separate tic library" >&5
    4122 +echo "$as_me:4529: checking if you want to build a separate tic library" >&5
     4344+echo "$as_me:4538: checking if you want to build a separate tic library" >&5
    41234345 echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6
    41244346 
    41254347 # Check whether --with-ticlib or --without-ticlib was given.
    4126 @@ -4292,13 +4536,13 @@
     4348@@ -4292,13 +4545,13 @@
    41274349 else
    41284350   with_ticlib=no
    41294351 fi;
    41304352-echo "$as_me:4295: result: $with_ticlib" >&5
    4131 +echo "$as_me:4539: result: $with_ticlib" >&5
     4353+echo "$as_me:4548: result: $with_ticlib" >&5
    41324354 echo "${ECHO_T}$with_ticlib" >&6
    41334355 
    … …  
    41364358 
    41374359-echo "$as_me:4301: checking if you want to link with the GPM mouse library" >&5
    4138 +echo "$as_me:4545: checking if you want to link with the GPM mouse library" >&5
     4360+echo "$as_me:4554: checking if you want to link with the GPM mouse library" >&5
    41394361 echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6
    41404362 
    41414363 # Check whether --with-gpm or --without-gpm was given.
    4142 @@ -4308,27 +4552,27 @@
     4364@@ -4308,27 +4561,27 @@
    41434365 else
    41444366   with_gpm=maybe
    41454367 fi;
    41464368-echo "$as_me:4311: result: $with_gpm" >&5
    4147 +echo "$as_me:4555: result: $with_gpm" >&5
     4369+echo "$as_me:4564: result: $with_gpm" >&5
    41484370 echo "${ECHO_T}$with_gpm" >&6
    41494371 
    41504372 if test "$with_gpm" != no ; then
    41514373-       echo "$as_me:4315: checking for gpm.h" >&5
    4152 +       echo "$as_me:4559: checking for gpm.h" >&5
     4374+       echo "$as_me:4568: checking for gpm.h" >&5
    41534375 echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6
    41544376 if test "${ac_cv_header_gpm_h+set}" = set; then
    … …  
    41574379   cat >conftest.$ac_ext <<_ACEOF
    41584380-#line 4321 "configure"
    4159 +#line 4565 "configure"
     4381+#line 4574 "configure"
    41604382 #include "confdefs.h"
    41614383 #include <gpm.h>
    41624384 _ACEOF
    41634385-if { (eval echo "$as_me:4325: \"$ac_cpp conftest.$ac_ext\"") >&5
    4164 +if { (eval echo "$as_me:4569: \"$ac_cpp conftest.$ac_ext\"") >&5
     4386+if { (eval echo "$as_me:4578: \"$ac_cpp conftest.$ac_ext\"") >&5
    41654387   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    41664388   ac_status=$?
    … …  
    41694391   cat conftest.err >&5
    41704392-  echo "$as_me:4331: \$? = $ac_status" >&5
    4171 +  echo "$as_me:4575: \$? = $ac_status" >&5
     4393+  echo "$as_me:4584: \$? = $ac_status" >&5
    41724394   (exit $ac_status); } >/dev/null; then
    41734395   if test -s conftest.err; then
    41744396     ac_cpp_err=$ac_c_preproc_warn_flag
    4175 @@ -4347,7 +4591,7 @@
     4397@@ -4347,7 +4600,7 @@
    41764398 fi
    41774399 rm -f conftest.err conftest.$ac_ext
    41784400 fi
    41794401-echo "$as_me:4350: result: $ac_cv_header_gpm_h" >&5
    4180 +echo "$as_me:4594: result: $ac_cv_header_gpm_h" >&5
     4402+echo "$as_me:4603: result: $ac_cv_header_gpm_h" >&5
    41814403 echo "${ECHO_T}$ac_cv_header_gpm_h" >&6
    41824404 if test $ac_cv_header_gpm_h = yes; then
    41834405 
    4184 @@ -4358,14 +4602,14 @@
     4406@@ -4358,14 +4611,14 @@
    41854407                if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then
    41864408                        test -n "$verbose" && echo "    assuming we really have GPM library" 1>&6
    41874409 
    41884410-echo "${as_me-configure}:4361: testing assuming we really have GPM library ..." 1>&5
    4189 +echo "${as_me-configure}:4605: testing assuming we really have GPM library ..." 1>&5
     4411+echo "${as_me-configure}:4614: testing assuming we really have GPM library ..." 1>&5
    41904412 
    41914413                        cat >>confdefs.h <<\EOF
    … …  
    41954417                else
    41964418-                       echo "$as_me:4368: checking for Gpm_Open in -lgpm" >&5
    4197 +                       echo "$as_me:4612: checking for Gpm_Open in -lgpm" >&5
     4419+                       echo "$as_me:4621: checking for Gpm_Open in -lgpm" >&5
    41984420 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
    41994421 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
    42004422   echo $ECHO_N "(cached) $ECHO_C" >&6
    4201 @@ -4373,7 +4617,7 @@
     4423@@ -4373,7 +4626,7 @@
    42024424   ac_check_lib_save_LIBS=$LIBS
    42034425 LIBS="-lgpm  $LIBS"
    42044426 cat >conftest.$ac_ext <<_ACEOF
    42054427-#line 4376 "configure"
    4206 +#line 4620 "configure"
     4428+#line 4629 "configure"
    42074429 #include "confdefs.h"
    42084430 
    42094431 /* Override any gcc2 internal prototype to avoid an error.  */
    4210 @@ -4392,16 +4636,16 @@
     4432@@ -4392,16 +4645,16 @@
    42114433 }
    42124434 _ACEOF
    42134435 rm -f conftest.$ac_objext conftest$ac_exeext
    42144436-if { (eval echo "$as_me:4395: \"$ac_link\"") >&5
    4215 +if { (eval echo "$as_me:4639: \"$ac_link\"") >&5
     4437+if { (eval echo "$as_me:4648: \"$ac_link\"") >&5
    42164438   (eval $ac_link) 2>&5
    42174439   ac_status=$?
    42184440-  echo "$as_me:4398: \$? = $ac_status" >&5
    4219 +  echo "$as_me:4642: \$? = $ac_status" >&5
     4441+  echo "$as_me:4651: \$? = $ac_status" >&5
    42204442   (exit $ac_status); } &&
    42214443          { ac_try='test -s conftest$ac_exeext'
    42224444-  { (eval echo "$as_me:4401: \"$ac_try\"") >&5
    4223 +  { (eval echo "$as_me:4645: \"$ac_try\"") >&5
     4445+  { (eval echo "$as_me:4654: \"$ac_try\"") >&5
    42244446   (eval $ac_try) 2>&5
    42254447   ac_status=$?
    42264448-  echo "$as_me:4404: \$? = $ac_status" >&5
    4227 +  echo "$as_me:4648: \$? = $ac_status" >&5
     4449+  echo "$as_me:4657: \$? = $ac_status" >&5
    42284450   (exit $ac_status); }; }; then
    42294451   ac_cv_lib_gpm_Gpm_Open=yes
    42304452 else
    4231 @@ -4412,13 +4656,13 @@
     4453@@ -4412,13 +4665,13 @@
    42324454 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    42334455 LIBS=$ac_check_lib_save_LIBS
    42344456 fi
    42354457-echo "$as_me:4415: result: $ac_cv_lib_gpm_Gpm_Open" >&5
    4236 +echo "$as_me:4659: result: $ac_cv_lib_gpm_Gpm_Open" >&5
     4458+echo "$as_me:4668: result: $ac_cv_lib_gpm_Gpm_Open" >&5
    42374459 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
    42384460 if test $ac_cv_lib_gpm_Gpm_Open = yes; then
    … …  
    42414463 
    42424464-                               { { echo "$as_me:4421: error: Cannot link with GPM library" >&5
    4243 +                               { { echo "$as_me:4665: error: Cannot link with GPM library" >&5
     4465+                               { { echo "$as_me:4674: error: Cannot link with GPM library" >&5
    42444466 echo "$as_me: error: Cannot link with GPM library" >&2;}
    42454467    { (exit 1); exit 1; }; }
    42464468                fi
    4247 @@ -4428,7 +4672,7 @@
     4469@@ -4428,7 +4681,7 @@
    42484470 
    42494471 else
    42504472 
    42514473-               test "$with_gpm" != maybe && { echo "$as_me:4431: WARNING: Cannot find GPM header" >&5
    4252 +               test "$with_gpm" != maybe && { echo "$as_me:4675: WARNING: Cannot find GPM header" >&5
     4474+               test "$with_gpm" != maybe && { echo "$as_me:4684: WARNING: Cannot find GPM header" >&5
    42534475 echo "$as_me: WARNING: Cannot find GPM header" >&2;}
    42544476                with_gpm=no
    42554477 
    4256 @@ -4437,7 +4681,7 @@
     4478@@ -4437,7 +4690,7 @@
    42574479 fi
    42584480 
    42594481 if test "$with_gpm" != no ; then
    42604482-       echo "$as_me:4440: checking if you want to load GPM dynamically" >&5
    4261 +       echo "$as_me:4684: checking if you want to load GPM dynamically" >&5
     4483+       echo "$as_me:4693: checking if you want to load GPM dynamically" >&5
    42624484 echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6
    42634485 
    42644486 # Check whether --with-dlsym or --without-dlsym was given.
    4265 @@ -4447,18 +4691,18 @@
     4487@@ -4447,18 +4700,18 @@
    42664488 else
    42674489   with_dlsym=yes
    42684490 fi;
    42694491-       echo "$as_me:4450: result: $with_dlsym" >&5
    4270 +       echo "$as_me:4694: result: $with_dlsym" >&5
     4492+       echo "$as_me:4703: result: $with_dlsym" >&5
    42714493 echo "${ECHO_T}$with_dlsym" >&6
    42724494        if test "$with_dlsym" = yes ; then
    … …  
    42744496 cf_have_dlsym=no
    42754497-echo "$as_me:4455: checking for dlsym" >&5
    4276 +echo "$as_me:4699: checking for dlsym" >&5
     4498+echo "$as_me:4708: checking for dlsym" >&5
    42774499 echo $ECHO_N "checking for dlsym... $ECHO_C" >&6
    42784500 if test "${ac_cv_func_dlsym+set}" = set; then
    … …  
    42814503   cat >conftest.$ac_ext <<_ACEOF
    42824504-#line 4461 "configure"
    4283 +#line 4705 "configure"
     4505+#line 4714 "configure"
    42844506 #include "confdefs.h"
    42854507 /* System header to define __stub macros and hopefully few prototypes,
    42864508     which can conflict with char dlsym (); below.  */
    4287 @@ -4489,16 +4733,16 @@
     4509@@ -4489,16 +4742,16 @@
    42884510 }
    42894511 _ACEOF
    42904512 rm -f conftest.$ac_objext conftest$ac_exeext
    42914513-if { (eval echo "$as_me:4492: \"$ac_link\"") >&5
    4292 +if { (eval echo "$as_me:4736: \"$ac_link\"") >&5
     4514+if { (eval echo "$as_me:4745: \"$ac_link\"") >&5
    42934515   (eval $ac_link) 2>&5
    42944516   ac_status=$?
    42954517-  echo "$as_me:4495: \$? = $ac_status" >&5
    4296 +  echo "$as_me:4739: \$? = $ac_status" >&5
     4518+  echo "$as_me:4748: \$? = $ac_status" >&5
    42974519   (exit $ac_status); } &&
    42984520          { ac_try='test -s conftest$ac_exeext'
    42994521-  { (eval echo "$as_me:4498: \"$ac_try\"") >&5
    4300 +  { (eval echo "$as_me:4742: \"$ac_try\"") >&5
     4522+  { (eval echo "$as_me:4751: \"$ac_try\"") >&5
    43014523   (eval $ac_try) 2>&5
    43024524   ac_status=$?
    43034525-  echo "$as_me:4501: \$? = $ac_status" >&5
    4304 +  echo "$as_me:4745: \$? = $ac_status" >&5
     4526+  echo "$as_me:4754: \$? = $ac_status" >&5
    43054527   (exit $ac_status); }; }; then
    43064528   ac_cv_func_dlsym=yes
    43074529 else
    4308 @@ -4508,14 +4752,14 @@
     4530@@ -4508,14 +4761,14 @@
    43094531 fi
    43104532 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    43114533 fi
    43124534-echo "$as_me:4511: result: $ac_cv_func_dlsym" >&5
    4313 +echo "$as_me:4755: result: $ac_cv_func_dlsym" >&5
     4535+echo "$as_me:4764: result: $ac_cv_func_dlsym" >&5
    43144536 echo "${ECHO_T}$ac_cv_func_dlsym" >&6
    43154537 if test $ac_cv_func_dlsym = yes; then
    … …  
    43194541 cf_have_libdl=no
    43204542-echo "$as_me:4518: checking for dlsym in -ldl" >&5
    4321 +echo "$as_me:4762: checking for dlsym in -ldl" >&5
     4543+echo "$as_me:4771: checking for dlsym in -ldl" >&5
    43224544 echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6
    43234545 if test "${ac_cv_lib_dl_dlsym+set}" = set; then
    43244546   echo $ECHO_N "(cached) $ECHO_C" >&6
    4325 @@ -4523,7 +4767,7 @@
     4547@@ -4523,7 +4776,7 @@
    43264548   ac_check_lib_save_LIBS=$LIBS
    43274549 LIBS="-ldl  $LIBS"
    43284550 cat >conftest.$ac_ext <<_ACEOF
    43294551-#line 4526 "configure"
    4330 +#line 4770 "configure"
     4552+#line 4779 "configure"
    43314553 #include "confdefs.h"
    43324554 
    43334555 /* Override any gcc2 internal prototype to avoid an error.  */
    4334 @@ -4542,16 +4786,16 @@
     4556@@ -4542,16 +4795,16 @@
    43354557 }
    43364558 _ACEOF
    43374559 rm -f conftest.$ac_objext conftest$ac_exeext
    43384560-if { (eval echo "$as_me:4545: \"$ac_link\"") >&5
    4339 +if { (eval echo "$as_me:4789: \"$ac_link\"") >&5
     4561+if { (eval echo "$as_me:4798: \"$ac_link\"") >&5
    43404562   (eval $ac_link) 2>&5
    43414563   ac_status=$?
    43424564-  echo "$as_me:4548: \$? = $ac_status" >&5
    4343 +  echo "$as_me:4792: \$? = $ac_status" >&5
     4565+  echo "$as_me:4801: \$? = $ac_status" >&5
    43444566   (exit $ac_status); } &&
    43454567          { ac_try='test -s conftest$ac_exeext'
    43464568-  { (eval echo "$as_me:4551: \"$ac_try\"") >&5
    4347 +  { (eval echo "$as_me:4795: \"$ac_try\"") >&5
     4569+  { (eval echo "$as_me:4804: \"$ac_try\"") >&5
    43484570   (eval $ac_try) 2>&5
    43494571   ac_status=$?
    43504572-  echo "$as_me:4554: \$? = $ac_status" >&5
    4351 +  echo "$as_me:4798: \$? = $ac_status" >&5
     4573+  echo "$as_me:4807: \$? = $ac_status" >&5
    43524574   (exit $ac_status); }; }; then
    43534575   ac_cv_lib_dl_dlsym=yes
    43544576 else
    4355 @@ -4562,7 +4806,7 @@
     4577@@ -4562,7 +4815,7 @@
    43564578 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    43574579 LIBS=$ac_check_lib_save_LIBS
    43584580 fi
    43594581-echo "$as_me:4565: result: $ac_cv_lib_dl_dlsym" >&5
    4360 +echo "$as_me:4809: result: $ac_cv_lib_dl_dlsym" >&5
     4582+echo "$as_me:4818: result: $ac_cv_lib_dl_dlsym" >&5
    43614583 echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6
    43624584 if test $ac_cv_lib_dl_dlsym = yes; then
    43634585 
    4364 @@ -4575,10 +4819,10 @@
     4586@@ -4575,10 +4828,10 @@
    43654587 if test "$cf_have_dlsym" = yes ; then
    43664588        test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS"
    43674589 
    43684590-       echo "$as_me:4578: checking whether able to link to dl*() functions" >&5
    4369 +       echo "$as_me:4822: checking whether able to link to dl*() functions" >&5
     4591+       echo "$as_me:4831: checking whether able to link to dl*() functions" >&5
    43704592 echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6
    43714593        cat >conftest.$ac_ext <<_ACEOF
    43724594-#line 4581 "configure"
    4373 +#line 4825 "configure"
     4595+#line 4834 "configure"
    43744596 #include "confdefs.h"
    43754597 #include <dlfcn.h>
    43764598 int
    4377 @@ -4596,16 +4840,16 @@
     4599@@ -4596,16 +4849,16 @@
    43784600 }
    43794601 _ACEOF
    43804602 rm -f conftest.$ac_objext conftest$ac_exeext
    43814603-if { (eval echo "$as_me:4599: \"$ac_link\"") >&5
    4382 +if { (eval echo "$as_me:4843: \"$ac_link\"") >&5
     4604+if { (eval echo "$as_me:4852: \"$ac_link\"") >&5
    43834605   (eval $ac_link) 2>&5
    43844606   ac_status=$?
    43854607-  echo "$as_me:4602: \$? = $ac_status" >&5
    4386 +  echo "$as_me:4846: \$? = $ac_status" >&5
     4608+  echo "$as_me:4855: \$? = $ac_status" >&5
    43874609   (exit $ac_status); } &&
    43884610          { ac_try='test -s conftest$ac_exeext'
    43894611-  { (eval echo "$as_me:4605: \"$ac_try\"") >&5
    4390 +  { (eval echo "$as_me:4849: \"$ac_try\"") >&5
     4612+  { (eval echo "$as_me:4858: \"$ac_try\"") >&5
    43914613   (eval $ac_try) 2>&5
    43924614   ac_status=$?
    43934615-  echo "$as_me:4608: \$? = $ac_status" >&5
    4394 +  echo "$as_me:4852: \$? = $ac_status" >&5
     4616+  echo "$as_me:4861: \$? = $ac_status" >&5
    43954617   (exit $ac_status); }; }; then
    43964618 
    43974619                cat >>confdefs.h <<\EOF
    4398 @@ -4616,15 +4860,15 @@
     4620@@ -4616,15 +4869,15 @@
    43994621   echo "$as_me: failed program was:" >&5
    44004622 cat conftest.$ac_ext >&5
    44014623 
    44024624-               { { echo "$as_me:4619: error: Cannot link test program for libdl" >&5
    4403 +               { { echo "$as_me:4863: error: Cannot link test program for libdl" >&5
     4625+               { { echo "$as_me:4872: error: Cannot link test program for libdl" >&5
    44044626 echo "$as_me: error: Cannot link test program for libdl" >&2;}
    44054627    { (exit 1); exit 1; }; }
    … …  
    44074629 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    44084630-       echo "$as_me:4624: result: ok" >&5
    4409 +       echo "$as_me:4868: result: ok" >&5
     4631+       echo "$as_me:4877: result: ok" >&5
    44104632 echo "${ECHO_T}ok" >&6
    44114633 else
    44124634-       { { echo "$as_me:4627: error: Cannot find dlsym function" >&5
    4413 +       { { echo "$as_me:4871: error: Cannot find dlsym function" >&5
     4635+       { { echo "$as_me:4880: error: Cannot find dlsym function" >&5
    44144636 echo "$as_me: error: Cannot find dlsym function" >&2;}
    44154637    { (exit 1); exit 1; }; }
    44164638 fi
    4417 @@ -4632,12 +4876,12 @@
     4639@@ -4632,12 +4885,12 @@
    44184640                if test "$with_gpm" != yes ; then
    44194641                        test -n "$verbose" && echo "    assuming soname for gpm is $with_gpm" 1>&6
    44204642 
    44214643-echo "${as_me-configure}:4635: testing assuming soname for gpm is $with_gpm ..." 1>&5
    4422 +echo "${as_me-configure}:4879: testing assuming soname for gpm is $with_gpm ..." 1>&5
     4644+echo "${as_me-configure}:4888: testing assuming soname for gpm is $with_gpm ..." 1>&5
    44234645 
    44244646                        cf_cv_gpm_soname="$with_gpm"
    … …  
    44264648 
    44274649-echo "$as_me:4640: checking for soname of gpm library" >&5
    4428 +echo "$as_me:4884: checking for soname of gpm library" >&5
     4650+echo "$as_me:4893: checking for soname of gpm library" >&5
    44294651 echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6
    44304652 if test "${cf_cv_gpm_soname+set}" = set; then
    44314653   echo $ECHO_N "(cached) $ECHO_C" >&6
    4432 @@ -4655,15 +4899,15 @@
     4654@@ -4655,15 +4908,15 @@
    44334655 CF_EOF
    44344656 cf_save_LIBS="$LIBS"
    44354657        LIBS="-lgpm $LIBS"
    44364658-       if { (eval echo "$as_me:4658: \"$ac_compile\"") >&5
    4437 +       if { (eval echo "$as_me:4902: \"$ac_compile\"") >&5
     4659+       if { (eval echo "$as_me:4911: \"$ac_compile\"") >&5
    44384660   (eval $ac_compile) 2>&5
    44394661   ac_status=$?
    44404662-  echo "$as_me:4661: \$? = $ac_status" >&5
    4441 +  echo "$as_me:4905: \$? = $ac_status" >&5
     4663+  echo "$as_me:4914: \$? = $ac_status" >&5
    44424664   (exit $ac_status); } ; then
    44434665-               if { (eval echo "$as_me:4663: \"$ac_link\"") >&5
    4444 +               if { (eval echo "$as_me:4907: \"$ac_link\"") >&5
     4666+               if { (eval echo "$as_me:4916: \"$ac_link\"") >&5
    44454667   (eval $ac_link) 2>&5
    44464668   ac_status=$?
    44474669-  echo "$as_me:4666: \$? = $ac_status" >&5
    4448 +  echo "$as_me:4910: \$? = $ac_status" >&5
     4670+  echo "$as_me:4919: \$? = $ac_status" >&5
    44494671   (exit $ac_status); } ; then
    44504672                        cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.`
    44514673                        test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
    4452 @@ -4674,7 +4918,7 @@
     4674@@ -4674,7 +4927,7 @@
    44534675 fi
    44544676 
    44554677 fi
    44564678-echo "$as_me:4677: result: $cf_cv_gpm_soname" >&5
    4457 +echo "$as_me:4921: result: $cf_cv_gpm_soname" >&5
     4679+echo "$as_me:4930: result: $cf_cv_gpm_soname" >&5
    44584680 echo "${ECHO_T}$cf_cv_gpm_soname" >&6
    44594681 
    44604682                fi
    4461 @@ -4690,7 +4934,7 @@
     4683@@ -4690,7 +4943,7 @@
    44624684 #define HAVE_LIBGPM 1
    44634685 EOF
    44644686 
    44654687-echo "$as_me:4693: checking for Gpm_Wgetch in -lgpm" >&5
    4466 +echo "$as_me:4937: checking for Gpm_Wgetch in -lgpm" >&5
     4688+echo "$as_me:4946: checking for Gpm_Wgetch in -lgpm" >&5
    44674689 echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6
    44684690 if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then
    44694691   echo $ECHO_N "(cached) $ECHO_C" >&6
    4470 @@ -4698,7 +4942,7 @@
     4692@@ -4698,7 +4951,7 @@
    44714693   ac_check_lib_save_LIBS=$LIBS
    44724694 LIBS="-lgpm  $LIBS"
    44734695 cat >conftest.$ac_ext <<_ACEOF
    44744696-#line 4701 "configure"
    4475 +#line 4945 "configure"
     4697+#line 4954 "configure"
    44764698 #include "confdefs.h"
    44774699 
    44784700 /* Override any gcc2 internal prototype to avoid an error.  */
    4479 @@ -4717,16 +4961,16 @@
     4701@@ -4717,16 +4970,16 @@
    44804702 }
    44814703 _ACEOF
    44824704 rm -f conftest.$ac_objext conftest$ac_exeext
    44834705-if { (eval echo "$as_me:4720: \"$ac_link\"") >&5
    4484 +if { (eval echo "$as_me:4964: \"$ac_link\"") >&5
     4706+if { (eval echo "$as_me:4973: \"$ac_link\"") >&5
    44854707   (eval $ac_link) 2>&5
    44864708   ac_status=$?
    44874709-  echo "$as_me:4723: \$? = $ac_status" >&5
    4488 +  echo "$as_me:4967: \$? = $ac_status" >&5
     4710+  echo "$as_me:4976: \$? = $ac_status" >&5
    44894711   (exit $ac_status); } &&
    44904712          { ac_try='test -s conftest$ac_exeext'
    44914713-  { (eval echo "$as_me:4726: \"$ac_try\"") >&5
    4492 +  { (eval echo "$as_me:4970: \"$ac_try\"") >&5
     4714+  { (eval echo "$as_me:4979: \"$ac_try\"") >&5
    44934715   (eval $ac_try) 2>&5
    44944716   ac_status=$?
    44954717-  echo "$as_me:4729: \$? = $ac_status" >&5
    4496 +  echo "$as_me:4973: \$? = $ac_status" >&5
     4718+  echo "$as_me:4982: \$? = $ac_status" >&5
    44974719   (exit $ac_status); }; }; then
    44984720   ac_cv_lib_gpm_Gpm_Wgetch=yes
    44994721 else
    4500 @@ -4737,11 +4981,11 @@
     4722@@ -4737,11 +4990,11 @@
    45014723 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    45024724 LIBS=$ac_check_lib_save_LIBS
    45034725 fi
    45044726-echo "$as_me:4740: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
    4505 +echo "$as_me:4984: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
     4727+echo "$as_me:4993: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
    45064728 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6
    45074729 if test $ac_cv_lib_gpm_Gpm_Wgetch = yes; then
    45084730 
    45094731-echo "$as_me:4744: checking if GPM is weakly bound to curses library" >&5
    4510 +echo "$as_me:4988: checking if GPM is weakly bound to curses library" >&5
     4732+echo "$as_me:4997: checking if GPM is weakly bound to curses library" >&5
    45114733 echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6
    45124734 if test "${cf_cv_check_gpm_wgetch+set}" = set; then
    45134735   echo $ECHO_N "(cached) $ECHO_C" >&6
    4514 @@ -4765,15 +5009,15 @@
     4736@@ -4765,15 +5018,15 @@
    45154737        # to rely on the static library, noting that some packagers may not
    45164738        # include it.
    45174739        LIBS="-static -lgpm -dynamic $LIBS"
    45184740-       if { (eval echo "$as_me:4768: \"$ac_compile\"") >&5
    4519 +       if { (eval echo "$as_me:5012: \"$ac_compile\"") >&5
     4741+       if { (eval echo "$as_me:5021: \"$ac_compile\"") >&5
    45204742   (eval $ac_compile) 2>&5
    45214743   ac_status=$?
    45224744-  echo "$as_me:4771: \$? = $ac_status" >&5
    4523 +  echo "$as_me:5015: \$? = $ac_status" >&5
     4745+  echo "$as_me:5024: \$? = $ac_status" >&5
    45244746   (exit $ac_status); } ; then
    45254747-               if { (eval echo "$as_me:4773: \"$ac_link\"") >&5
    4526 +               if { (eval echo "$as_me:5017: \"$ac_link\"") >&5
     4748+               if { (eval echo "$as_me:5026: \"$ac_link\"") >&5
    45274749   (eval $ac_link) 2>&5
    45284750   ac_status=$?
    45294751-  echo "$as_me:4776: \$? = $ac_status" >&5
    4530 +  echo "$as_me:5020: \$? = $ac_status" >&5
     4752+  echo "$as_me:5029: \$? = $ac_status" >&5
    45314753   (exit $ac_status); } ; then
    45324754                        cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\<wgetch\>' | egrep '\<[vVwW]\>'`
    45334755                        test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
    4534 @@ -4785,11 +5029,11 @@
     4756@@ -4785,11 +5038,11 @@
    45354757 fi
    45364758 
    45374759 fi
    45384760-echo "$as_me:4788: result: $cf_cv_check_gpm_wgetch" >&5
    4539 +echo "$as_me:5032: result: $cf_cv_check_gpm_wgetch" >&5
     4761+echo "$as_me:5041: result: $cf_cv_check_gpm_wgetch" >&5
    45404762 echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6
    45414763 
    45424764 if test "$cf_cv_check_gpm_wgetch" != yes ; then
    45434765-       { echo "$as_me:4792: WARNING: GPM library is already linked with curses - read the FAQ" >&5
    4544 +       { echo "$as_me:5036: WARNING: GPM library is already linked with curses - read the FAQ" >&5
     4766+       { echo "$as_me:5045: WARNING: GPM library is already linked with curses - read the FAQ" >&5
    45454767 echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;}
    45464768 fi
    45474769 
    4548 @@ -4799,7 +5043,7 @@
     4770@@ -4799,7 +5052,7 @@
    45494771 
    45504772 # not everyone has "test -c"
    45514773 if test -c /dev/sysmouse 2>/dev/null ; then
    45524774-echo "$as_me:4802: checking if you want to use sysmouse" >&5
    4553 +echo "$as_me:5046: checking if you want to use sysmouse" >&5
     4775+echo "$as_me:5055: checking if you want to use sysmouse" >&5
    45544776 echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6
    45554777 
    45564778 # Check whether --with-sysmouse or --without-sysmouse was given.
    4557 @@ -4811,7 +5055,7 @@
     4779@@ -4811,7 +5064,7 @@
    45584780 fi;
    45594781        if test "$cf_with_sysmouse" != no ; then
    45604782        cat >conftest.$ac_ext <<_ACEOF
    45614783-#line 4814 "configure"
    4562 +#line 5058 "configure"
     4784+#line 5067 "configure"
    45634785 #include "confdefs.h"
    45644786 
    45654787 #include <osreldate.h>
    4566 @@ -4834,16 +5078,16 @@
     4788@@ -4834,16 +5087,16 @@
    45674789 }
    45684790 _ACEOF
    45694791 rm -f conftest.$ac_objext
    45704792-if { (eval echo "$as_me:4837: \"$ac_compile\"") >&5
    4571 +if { (eval echo "$as_me:5081: \"$ac_compile\"") >&5
     4793+if { (eval echo "$as_me:5090: \"$ac_compile\"") >&5
    45724794   (eval $ac_compile) 2>&5
    45734795   ac_status=$?
    45744796-  echo "$as_me:4840: \$? = $ac_status" >&5
    4575 +  echo "$as_me:5084: \$? = $ac_status" >&5
     4797+  echo "$as_me:5093: \$? = $ac_status" >&5
    45764798   (exit $ac_status); } &&
    45774799          { ac_try='test -s conftest.$ac_objext'
    45784800-  { (eval echo "$as_me:4843: \"$ac_try\"") >&5
    4579 +  { (eval echo "$as_me:5087: \"$ac_try\"") >&5
     4801+  { (eval echo "$as_me:5096: \"$ac_try\"") >&5
    45804802   (eval $ac_try) 2>&5
    45814803   ac_status=$?
    45824804-  echo "$as_me:4846: \$? = $ac_status" >&5
    4583 +  echo "$as_me:5090: \$? = $ac_status" >&5
     4805+  echo "$as_me:5099: \$? = $ac_status" >&5
    45844806   (exit $ac_status); }; }; then
    45854807   cf_with_sysmouse=yes
    45864808 else
    4587 @@ -4853,7 +5097,7 @@
     4809@@ -4853,7 +5106,7 @@
    45884810 fi
    45894811 rm -f conftest.$ac_objext conftest.$ac_ext
    45904812        fi
    45914813-echo "$as_me:4856: result: $cf_with_sysmouse" >&5
    4592 +echo "$as_me:5100: result: $cf_with_sysmouse" >&5
     4814+echo "$as_me:5109: result: $cf_with_sysmouse" >&5
    45934815 echo "${ECHO_T}$cf_with_sysmouse" >&6
    45944816 test "$cf_with_sysmouse" = yes && cat >>confdefs.h <<\EOF
    45954817 #define USE_SYSMOUSE 1
    4596 @@ -4871,7 +5115,7 @@
     4818@@ -4871,7 +5124,7 @@
    45974819        test -n "$GXX" && test "${ac_cv_prog_cxx_g}" != yes && CXX_G_OPT=''
    45984820 fi
    45994821 
    46004822-echo "$as_me:4874: checking for default loader flags" >&5
    4601 +echo "$as_me:5118: checking for default loader flags" >&5
     4823+echo "$as_me:5127: checking for default loader flags" >&5
    46024824 echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
    46034825 case $DFT_LWR_MODEL in
    46044826 libtool) LD_MODEL=''   ;;
    4605 @@ -4880,13 +5124,13 @@
     4827@@ -4880,13 +5133,13 @@
    46064828 profile) LD_MODEL='-pg';;
    46074829 shared)  LD_MODEL=''   ;;
    46084830 esac
    46094831-echo "$as_me:4883: result: $LD_MODEL" >&5
    4610 +echo "$as_me:5127: result: $LD_MODEL" >&5
     4832+echo "$as_me:5136: result: $LD_MODEL" >&5
    46114833 echo "${ECHO_T}$LD_MODEL" >&6
    46124834 
    … …  
    46154837 
    46164838-echo "$as_me:4889: checking if rpath option should be used" >&5
    4617 +echo "$as_me:5133: checking if rpath option should be used" >&5
     4839+echo "$as_me:5142: checking if rpath option should be used" >&5
    46184840 echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6
    46194841 
    46204842 # Check whether --enable-rpath or --disable-rpath was given.
    4621 @@ -4896,10 +5140,10 @@
     4843@@ -4896,10 +5149,10 @@
    46224844 else
    46234845   cf_cv_ld_rpath=no
    46244846 fi;
    46254847-echo "$as_me:4899: result: $cf_cv_ld_rpath" >&5
    4626 +echo "$as_me:5143: result: $cf_cv_ld_rpath" >&5
     4848+echo "$as_me:5152: result: $cf_cv_ld_rpath" >&5
    46274849 echo "${ECHO_T}$cf_cv_ld_rpath" >&6
    46284850 
    46294851-echo "$as_me:4902: checking if shared libraries should be relinked during install" >&5
    4630 +echo "$as_me:5146: checking if shared libraries should be relinked during install" >&5
     4852+echo "$as_me:5155: checking if shared libraries should be relinked during install" >&5
    46314853 echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6
    46324854 
    46334855 # Check whether --enable-relink or --disable-relink was given.
    4634 @@ -4909,19 +5153,20 @@
     4856@@ -4909,19 +5162,20 @@
    46354857 else
    46364858   cf_cv_do_relink=yes
    46374859 fi;
    46384860-echo "$as_me:4912: result: $cf_cv_do_relink" >&5
    4639 +echo "$as_me:5156: result: $cf_cv_do_relink" >&5
     4861+echo "$as_me:5165: result: $cf_cv_do_relink" >&5
    46404862 echo "${ECHO_T}$cf_cv_do_relink" >&6
    46414863        ;;
    … …  
    46514873 
    46524874-       echo "$as_me:4924: checking if release/abi version should be used for shared libs" >&5
    4653 +       echo "$as_me:5169: checking if release/abi version should be used for shared libs" >&5
     4875+       echo "$as_me:5178: checking if release/abi version should be used for shared libs" >&5
    46544876 echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6
    46554877 
    46564878 # Check whether --with-shlib-version or --without-shlib-version was given.
    4657 @@ -4936,7 +5181,7 @@
     4879@@ -4936,7 +5190,7 @@
    46584880                cf_cv_shlib_version=$withval
    46594881                ;;
    46604882        *)
    46614883-               { { echo "$as_me:4939: error: option value must be one of: rel, abi, auto or no" >&5
    4662 +               { { echo "$as_me:5184: error: option value must be one of: rel, abi, auto or no" >&5
     4884+               { { echo "$as_me:5193: error: option value must be one of: rel, abi, auto or no" >&5
    46634885 echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;}
    46644886    { (exit 1); exit 1; }; }
    46654887                ;;
    4666 @@ -4945,7 +5190,7 @@
     4888@@ -4945,7 +5199,7 @@
    46674889 else
    46684890   cf_cv_shlib_version=auto
    46694891 fi;
    46704892-       echo "$as_me:4948: result: $cf_cv_shlib_version" >&5
    4671 +       echo "$as_me:5193: result: $cf_cv_shlib_version" >&5
     4893+       echo "$as_me:5202: result: $cf_cv_shlib_version" >&5
    46724894 echo "${ECHO_T}$cf_cv_shlib_version" >&6
    46734895 
    46744896        cf_cv_rm_so_locs=no
    4675 @@ -4954,14 +5199,14 @@
     4897@@ -4954,14 +5208,14 @@
    46764898        CC_SHARED_OPTS=
    46774899        if test "$GCC" = yes
    46784900        then
    46794901-               echo "$as_me:4957: checking which $CC option to use" >&5
    4680 +               echo "$as_me:5202: checking which $CC option to use" >&5
     4902+               echo "$as_me:5211: checking which $CC option to use" >&5
    46814903 echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
    46824904                cf_save_CFLAGS="$CFLAGS"
    … …  
    46864908                        cat >conftest.$ac_ext <<_ACEOF
    46874909-#line 4964 "configure"
    4688 +#line 5209 "configure"
     4910+#line 5218 "configure"
    46894911 #include "confdefs.h"
    46904912 #include <stdio.h>
    46914913 int
    4692 @@ -4973,16 +5218,16 @@
     4914@@ -4973,16 +5227,16 @@
    46934915 }
    46944916 _ACEOF
    46954917 rm -f conftest.$ac_objext
    46964918-if { (eval echo "$as_me:4976: \"$ac_compile\"") >&5
    4697 +if { (eval echo "$as_me:5221: \"$ac_compile\"") >&5
     4919+if { (eval echo "$as_me:5230: \"$ac_compile\"") >&5
    46984920   (eval $ac_compile) 2>&5
    46994921   ac_status=$?
    47004922-  echo "$as_me:4979: \$? = $ac_status" >&5
    4701 +  echo "$as_me:5224: \$? = $ac_status" >&5
     4923+  echo "$as_me:5233: \$? = $ac_status" >&5
    47024924   (exit $ac_status); } &&
    47034925          { ac_try='test -s conftest.$ac_objext'
    47044926-  { (eval echo "$as_me:4982: \"$ac_try\"") >&5
    4705 +  { (eval echo "$as_me:5227: \"$ac_try\"") >&5
     4927+  { (eval echo "$as_me:5236: \"$ac_try\"") >&5
    47064928   (eval $ac_try) 2>&5
    47074929   ac_status=$?
    47084930-  echo "$as_me:4985: \$? = $ac_status" >&5
    4709 +  echo "$as_me:5230: \$? = $ac_status" >&5
     4931+  echo "$as_me:5239: \$? = $ac_status" >&5
    47104932   (exit $ac_status); }; }; then
    47114933   break
    47124934 else
    4713 @@ -4991,7 +5236,7 @@
     4935@@ -4991,7 +5245,7 @@
    47144936 fi
    47154937 rm -f conftest.$ac_objext conftest.$ac_ext
    47164938                done
    47174939-               echo "$as_me:4994: result: $CC_SHARED_OPTS" >&5
    4718 +               echo "$as_me:5239: result: $CC_SHARED_OPTS" >&5
     4940+               echo "$as_me:5248: result: $CC_SHARED_OPTS" >&5
    47194941 echo "${ECHO_T}$CC_SHARED_OPTS" >&6
    47204942                CFLAGS="$cf_save_CFLAGS"
    47214943        fi
    4722 @@ -4999,6 +5244,12 @@
     4944@@ -4999,6 +5253,12 @@
    47234945        cf_cv_shlib_version_infix=no
    47244946 
    … …  
    47334955                MK_SHARED_LIB='${CC} ${CFLAGS} -o $@ -Xlinker -soname=`basename $@` -nostart -e 0'
    47344956                ;;
    4735 @@ -5027,7 +5278,7 @@
     4957@@ -5027,7 +5287,7 @@
    47364958                MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
    47374959                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
    47384960                cf_cv_shlib_version_infix=yes
    47394961-               echo "$as_me:5030: checking if ld -search_paths_first works" >&5
    4740 +               echo "$as_me:5281: checking if ld -search_paths_first works" >&5
     4962+               echo "$as_me:5290: checking if ld -search_paths_first works" >&5
    47414963 echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6
    47424964 if test "${cf_cv_ldflags_search_paths_first+set}" = set; then
    47434965   echo $ECHO_N "(cached) $ECHO_C" >&6
    4744 @@ -5036,7 +5287,7 @@
     4966@@ -5036,7 +5296,7 @@
    47454967                        cf_save_LDFLAGS=$LDFLAGS
    47464968                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
    47474969                        cat >conftest.$ac_ext <<_ACEOF
    47484970-#line 5039 "configure"
    4749 +#line 5290 "configure"
     4971+#line 5299 "configure"
    47504972 #include "confdefs.h"
    47514973 
    47524974 int
    4753 @@ -5048,16 +5299,16 @@
     4975@@ -5048,16 +5308,16 @@
    47544976 }
    47554977 _ACEOF
    47564978 rm -f conftest.$ac_objext conftest$ac_exeext
    47574979-if { (eval echo "$as_me:5051: \"$ac_link\"") >&5
    4758 +if { (eval echo "$as_me:5302: \"$ac_link\"") >&5
     4980+if { (eval echo "$as_me:5311: \"$ac_link\"") >&5
    47594981   (eval $ac_link) 2>&5
    47604982   ac_status=$?
    47614983-  echo "$as_me:5054: \$? = $ac_status" >&5
    4762 +  echo "$as_me:5305: \$? = $ac_status" >&5
     4984+  echo "$as_me:5314: \$? = $ac_status" >&5
    47634985   (exit $ac_status); } &&
    47644986          { ac_try='test -s conftest$ac_exeext'
    47654987-  { (eval echo "$as_me:5057: \"$ac_try\"") >&5
    4766 +  { (eval echo "$as_me:5308: \"$ac_try\"") >&5
     4988+  { (eval echo "$as_me:5317: \"$ac_try\"") >&5
    47674989   (eval $ac_try) 2>&5
    47684990   ac_status=$?
    47694991-  echo "$as_me:5060: \$? = $ac_status" >&5
    4770 +  echo "$as_me:5311: \$? = $ac_status" >&5
     4992+  echo "$as_me:5320: \$? = $ac_status" >&5
    47714993   (exit $ac_status); }; }; then
    47724994   cf_cv_ldflags_search_paths_first=yes
    47734995 else
    4774 @@ -5068,7 +5319,7 @@
     4996@@ -5068,7 +5328,7 @@
    47754997 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    47764998                                LDFLAGS=$cf_save_LDFLAGS
    47774999 fi
    47785000-echo "$as_me:5071: result: $cf_cv_ldflags_search_paths_first" >&5
    4779 +echo "$as_me:5322: result: $cf_cv_ldflags_search_paths_first" >&5
     5001+echo "$as_me:5331: result: $cf_cv_ldflags_search_paths_first" >&5
    47805002 echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
    47815003                if test $cf_cv_ldflags_search_paths_first = yes; then
    47825004                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
    4783 @@ -5090,10 +5341,10 @@
     5005@@ -5090,10 +5350,10 @@
    47845006        irix*)
    47855007                if test "$cf_cv_ld_rpath" = yes ; then
    … …  
    47945016                        fi
    47955017                fi
    4796 @@ -5112,7 +5363,7 @@
     5018@@ -5112,7 +5372,7 @@
    47975019                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
    47985020                fi
    … …  
    48035025                fi
    48045026 
    4805 @@ -5131,7 +5382,7 @@
     5027@@ -5131,7 +5391,7 @@
    48065028                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
    48075029                fi
    … …  
    48125034                fi
    48135035                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
    4814 @@ -5143,7 +5394,7 @@
     5036@@ -5143,7 +5403,7 @@
    48155037                cf_cv_shared_soname='`basename $@`'
    48165038        fi
    … …  
    48215043        nto-qnx*|openbsd*|freebsd[12].*)
    48225044                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
    4823 @@ -5155,7 +5406,7 @@
     5045@@ -5155,7 +5415,7 @@
    48245046                if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_ld_rpath" = yes ; then
    48255047                        LOCAL_LDFLAGS="-rpath \$(LOCAL_LIBDIR)"
    … …  
    48305052                fi
    48315053 
    4832 @@ -5166,11 +5417,11 @@
     5054@@ -5166,11 +5426,11 @@
    48335055                cf_cv_shared_soname='`basename $@`'
    48345056        fi
    … …  
    48445066                        LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)"
    48455067                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
    4846 @@ -5192,7 +5443,7 @@
     5068@@ -5192,7 +5452,7 @@
    48475069 
    48485070                        MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $@'
    … …  
    48535075                ;;
    48545076        osf*|mls+*)
    4855 @@ -5211,7 +5462,7 @@
     5077@@ -5211,7 +5471,7 @@
    48565078                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
    48575079                fi
    … …  
    48625084                fi
    48635085                cf_cv_rm_so_locs=yes
    4864 @@ -5246,7 +5497,7 @@
     5086@@ -5246,7 +5506,7 @@
    48655087                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
    48665088                fi
    … …  
    48715093                fi
    48725094 
    4873 @@ -5258,7 +5509,43 @@
     5095@@ -5258,7 +5518,43 @@
    48745096        fi
    48755097 
    … …  
    48815103+                               CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
    48825104+                               cat >conftest.$ac_ext <<_ACEOF
    4883 +#line 5517 "configure"
     5105+#line 5526 "configure"
    48845106+#include "confdefs.h"
    48855107+#include <stdio.h>
    … …  
    48935115+_ACEOF
    48945116+rm -f conftest.$ac_objext
    4895 +if { (eval echo "$as_me:5529: \"$ac_compile\"") >&5
     5117+if { (eval echo "$as_me:5538: \"$ac_compile\"") >&5
    48965118+  (eval $ac_compile) 2>&5
    48975119+  ac_status=$?
    4898 +  echo "$as_me:5532: \$? = $ac_status" >&5
     5120+  echo "$as_me:5541: \$? = $ac_status" >&5
    48995121+  (exit $ac_status); } &&
    49005122+         { ac_try='test -s conftest.$ac_objext'
    4901 +  { (eval echo "$as_me:5535: \"$ac_try\"") >&5
     5123+  { (eval echo "$as_me:5544: \"$ac_try\"") >&5
    49025124+  (eval $ac_try) 2>&5
    49035125+  ac_status=$?
    4904 +  echo "$as_me:5538: \$? = $ac_status" >&5
     5126+  echo "$as_me:5547: \$? = $ac_status" >&5
    49055127+  (exit $ac_status); }; }; then
    49065128+  break
    … …  
    49165138                else
    49175139                        MK_SHARED_LIB='${CC} -shared -dy -G -h '$cf_cv_shared_soname' -o $@'
    4918 @@ -5285,20 +5572,20 @@
     5140@@ -5285,20 +5581,20 @@
    49195141                        test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
    49205142                        ;;
    49215143                *)
    49225144-                       { echo "$as_me:5288: WARNING: ignored --with-shlib-version" >&5
    4923 +                       { echo "$as_me:5575: WARNING: ignored --with-shlib-version" >&5
     5145+                       { echo "$as_me:5584: WARNING: ignored --with-shlib-version" >&5
    49245146 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
    49255147                        ;;
    … …  
    49315153-               echo "$as_me:5296: checking if we need a space after rpath option" >&5
    49325154+       if test -n "$LD_RPATH_OPT" ; then
    4933 +               echo "$as_me:5583: checking if we need a space after rpath option" >&5
     5155+               echo "$as_me:5592: checking if we need a space after rpath option" >&5
    49345156 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
    49355157                cf_save_LIBS="$LIBS"
    … …  
    49385160                cat >conftest.$ac_ext <<_ACEOF
    49395161-#line 5301 "configure"
    4940 +#line 5588 "configure"
     5162+#line 5597 "configure"
    49415163 #include "confdefs.h"
    49425164 
    49435165 int
    4944 @@ -5310,16 +5597,16 @@
     5166@@ -5310,16 +5606,16 @@
    49455167 }
    49465168 _ACEOF
    49475169 rm -f conftest.$ac_objext conftest$ac_exeext
    49485170-if { (eval echo "$as_me:5313: \"$ac_link\"") >&5
    4949 +if { (eval echo "$as_me:5600: \"$ac_link\"") >&5
     5171+if { (eval echo "$as_me:5609: \"$ac_link\"") >&5
    49505172   (eval $ac_link) 2>&5
    49515173   ac_status=$?
    49525174-  echo "$as_me:5316: \$? = $ac_status" >&5
    4953 +  echo "$as_me:5603: \$? = $ac_status" >&5
     5175+  echo "$as_me:5612: \$? = $ac_status" >&5
    49545176   (exit $ac_status); } &&
    49555177          { ac_try='test -s conftest$ac_exeext'
    49565178-  { (eval echo "$as_me:5319: \"$ac_try\"") >&5
    4957 +  { (eval echo "$as_me:5606: \"$ac_try\"") >&5
     5179+  { (eval echo "$as_me:5615: \"$ac_try\"") >&5
    49585180   (eval $ac_try) 2>&5
    49595181   ac_status=$?
    49605182-  echo "$as_me:5322: \$? = $ac_status" >&5
    4961 +  echo "$as_me:5609: \$? = $ac_status" >&5
     5183+  echo "$as_me:5618: \$? = $ac_status" >&5
    49625184   (exit $ac_status); }; }; then
    49635185   cf_rpath_space=no
    49645186 else
    4965 @@ -5329,16 +5616,16 @@
     5187@@ -5329,16 +5625,16 @@
    49665188 fi
    49675189 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    49685190                LIBS="$cf_save_LIBS"
    49695191-               echo "$as_me:5332: result: $cf_rpath_space" >&5
    4970 +               echo "$as_me:5619: result: $cf_rpath_space" >&5
     5192+               echo "$as_me:5628: result: $cf_rpath_space" >&5
    49715193 echo "${ECHO_T}$cf_rpath_space" >&6
    49725194-               test "$cf_rpath_space" = yes && cf_ld_rpath_opt="$cf_ld_rpath_opt "
    … …  
    49805202                if test "$model" = "shared"; then
    49815203-                       { { echo "$as_me:5341: error: Shared libraries are not supported in this version" >&5
    4982 +                       { { echo "$as_me:5628: error: Shared libraries are not supported in this version" >&5
     5204+                       { { echo "$as_me:5637: error: Shared libraries are not supported in this version" >&5
    49835205 echo "$as_me: error: Shared libraries are not supported in this version" >&2;}
    49845206    { (exit 1); exit 1; }; }
    49855207                fi
    4986 @@ -5348,7 +5635,7 @@
     5208@@ -5348,7 +5644,7 @@
    49875209 ###############################################################################
    49885210 
    49895211 ###    use option --disable-overwrite to leave out the link to -lcurses
    49905212-echo "$as_me:5351: checking if you wish to install ncurses overwriting curses" >&5
    4991 +echo "$as_me:5638: checking if you wish to install ncurses overwriting curses" >&5
     5213+echo "$as_me:5647: checking if you wish to install ncurses overwriting curses" >&5
    49925214 echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6
    49935215 
    49945216 # Check whether --enable-overwrite or --disable-overwrite was given.
    4995 @@ -5358,10 +5645,10 @@
     5217@@ -5358,10 +5654,10 @@
    49965218 else
    49975219   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
    49985220 fi;
    49995221-echo "$as_me:5361: result: $with_overwrite" >&5
    5000 +echo "$as_me:5648: result: $with_overwrite" >&5
     5222+echo "$as_me:5657: result: $with_overwrite" >&5
    50015223 echo "${ECHO_T}$with_overwrite" >&6
    50025224 
    50035225-echo "$as_me:5364: checking if external terminfo-database is used" >&5
    5004 +echo "$as_me:5651: checking if external terminfo-database is used" >&5
     5226+echo "$as_me:5660: checking if external terminfo-database is used" >&5
    50055227 echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6
    50065228 
    50075229 # Check whether --enable-database or --disable-database was given.
    5008 @@ -5371,7 +5658,7 @@
     5230@@ -5371,7 +5667,7 @@
    50095231 else
    50105232   use_database=yes
    50115233 fi;
    50125234-echo "$as_me:5374: result: $use_database" >&5
    5013 +echo "$as_me:5661: result: $use_database" >&5
     5235+echo "$as_me:5670: result: $use_database" >&5
    50145236 echo "${ECHO_T}$use_database" >&6
    50155237 
    50165238 case $host_os in #(vi
    5017 @@ -5384,8 +5671,8 @@
     5239@@ -5384,8 +5680,8 @@
    50185240 esac
    50195241 
    … …  
    50265248 
    50275249 if test "$use_database" != no ; then
    5028 @@ -5393,7 +5680,7 @@
     5250@@ -5393,7 +5689,7 @@
    50295251 #define USE_DATABASE 1
    50305252 EOF
    50315253 
    50325254-       echo "$as_me:5396: checking which terminfo source-file will be installed" >&5
    5033 +       echo "$as_me:5683: checking which terminfo source-file will be installed" >&5
     5255+       echo "$as_me:5692: checking which terminfo source-file will be installed" >&5
    50345256 echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6
    50355257 
    50365258 # Check whether --enable-database or --disable-database was given.
    5037 @@ -5401,10 +5688,10 @@
     5259@@ -5401,10 +5697,10 @@
    50385260   enableval="$enable_database"
    50395261   TERMINFO_SRC=$withval
    50405262 fi;
    50415263-       echo "$as_me:5404: result: $TERMINFO_SRC" >&5
    5042 +       echo "$as_me:5691: result: $TERMINFO_SRC" >&5
     5264+       echo "$as_me:5700: result: $TERMINFO_SRC" >&5
    50435265 echo "${ECHO_T}$TERMINFO_SRC" >&6
    50445266 
    50455267-       echo "$as_me:5407: checking whether to use hashed database instead of directory/tree" >&5
    5046 +       echo "$as_me:5694: checking whether to use hashed database instead of directory/tree" >&5
     5268+       echo "$as_me:5703: checking whether to use hashed database instead of directory/tree" >&5
    50475269 echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6
    50485270 
    50495271 # Check whether --with-hashed-db or --without-hashed-db was given.
    5050 @@ -5414,13 +5701,13 @@
     5272@@ -5414,13 +5710,13 @@
    50515273 else
    50525274   with_hashed_db=no
    50535275 fi;
    50545276-       echo "$as_me:5417: result: $with_hashed_db" >&5
    5055 +       echo "$as_me:5704: result: $with_hashed_db" >&5
     5277+       echo "$as_me:5713: result: $with_hashed_db" >&5
    50565278 echo "${ECHO_T}$with_hashed_db" >&6
    50575279 else
    … …  
    50605282 
    50615283-echo "$as_me:5423: checking for list of fallback descriptions" >&5
    5062 +echo "$as_me:5710: checking for list of fallback descriptions" >&5
     5284+echo "$as_me:5719: checking for list of fallback descriptions" >&5
    50635285 echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6
    50645286 
    50655287 # Check whether --with-fallbacks or --without-fallbacks was given.
    5066 @@ -5430,11 +5717,11 @@
     5288@@ -5430,11 +5726,11 @@
    50675289 else
    50685290   with_fallback=
    50695291 fi;
    50705292-echo "$as_me:5433: result: $with_fallback" >&5
    5071 +echo "$as_me:5720: result: $with_fallback" >&5
     5293+echo "$as_me:5729: result: $with_fallback" >&5
    50725294 echo "${ECHO_T}$with_fallback" >&6
    50735295 FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'`
    50745296 
    50755297-echo "$as_me:5437: checking if you want modern xterm or antique" >&5
    5076 +echo "$as_me:5724: checking if you want modern xterm or antique" >&5
     5298+echo "$as_me:5733: checking if you want modern xterm or antique" >&5
    50775299 echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6
    50785300 
    50795301 # Check whether --with-xterm-new or --without-xterm-new was given.
    5080 @@ -5448,7 +5735,7 @@
     5302@@ -5448,7 +5744,7 @@
    50815303 no)    with_xterm_new=xterm-old;;
    50825304 *)     with_xterm_new=xterm-new;;
    50835305 esac
    50845306-echo "$as_me:5451: result: $with_xterm_new" >&5
    5085 +echo "$as_me:5738: result: $with_xterm_new" >&5
     5307+echo "$as_me:5747: result: $with_xterm_new" >&5
    50865308 echo "${ECHO_T}$with_xterm_new" >&6
    50875309 WHICH_XTERM=$with_xterm_new
    50885310 
    5089 @@ -5458,7 +5745,7 @@
     5311@@ -5458,7 +5754,7 @@
    50905312        MAKE_TERMINFO="#"
    50915313 else
    50925314 
    50935315-echo "$as_me:5461: checking for list of terminfo directories" >&5
    5094 +echo "$as_me:5748: checking for list of terminfo directories" >&5
     5316+echo "$as_me:5757: checking for list of terminfo directories" >&5
    50955317 echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6
    50965318 
    50975319 # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given.
    5098 @@ -5468,7 +5755,7 @@
     5320@@ -5468,7 +5764,7 @@
    50995321 else
    51005322   withval=${TERMINFO_DIRS-${datadir}/terminfo}
    … …  
    51055327 for cf_src_path in $withval
    51065328 do
    5107 @@ -5498,7 +5785,7 @@
     5329@@ -5498,7 +5794,7 @@
    51085330   cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
    51095331   ;;
    51105332 *)
    51115333-  { { echo "$as_me:5501: error: expected a pathname, not \"$cf_src_path\"" >&5
    5112 +  { { echo "$as_me:5788: error: expected a pathname, not \"$cf_src_path\"" >&5
     5334+  { { echo "$as_me:5797: error: expected a pathname, not \"$cf_src_path\"" >&5
    51135335 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
    51145336    { (exit 1); exit 1; }; }
    51155337   ;;
    5116 @@ -5511,13 +5798,13 @@
     5338@@ -5511,13 +5807,13 @@
    51175339 
    51185340 eval 'TERMINFO_DIRS="$cf_dst_path"'
    51195341 
    51205342-echo "$as_me:5514: result: $TERMINFO_DIRS" >&5
    5121 +echo "$as_me:5801: result: $TERMINFO_DIRS" >&5
     5343+echo "$as_me:5810: result: $TERMINFO_DIRS" >&5
    51225344 echo "${ECHO_T}$TERMINFO_DIRS" >&6
    51235345 test -n "$TERMINFO_DIRS" && cat >>confdefs.h <<EOF
    … …  
    51265348 
    51275349-echo "$as_me:5520: checking for default terminfo directory" >&5
    5128 +echo "$as_me:5807: checking for default terminfo directory" >&5
     5350+echo "$as_me:5816: checking for default terminfo directory" >&5
    51295351 echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6
    51305352 
    51315353 # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given.
    5132 @@ -5553,7 +5840,7 @@
     5354@@ -5553,7 +5849,7 @@
    51335355   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
    51345356   ;;
    51355357 *)
    51365358-  { { echo "$as_me:5556: error: expected a pathname, not \"$withval\"" >&5
    5137 +  { { echo "$as_me:5843: error: expected a pathname, not \"$withval\"" >&5
     5359+  { { echo "$as_me:5852: error: expected a pathname, not \"$withval\"" >&5
    51385360 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    51395361    { (exit 1); exit 1; }; }
    51405362   ;;
    5141 @@ -5562,7 +5849,7 @@
     5363@@ -5562,7 +5858,7 @@
    51425364 fi
    51435365 TERMINFO="$withval"
    51445366 
    51455367-echo "$as_me:5565: result: $TERMINFO" >&5
    5146 +echo "$as_me:5852: result: $TERMINFO" >&5
     5368+echo "$as_me:5861: result: $TERMINFO" >&5
    51475369 echo "${ECHO_T}$TERMINFO" >&6
    51485370 cat >>confdefs.h <<EOF
    51495371 #define TERMINFO "$TERMINFO"
    5150 @@ -5572,7 +5859,7 @@
     5372@@ -5572,7 +5868,7 @@
    51515373 
    51525374 ###    use option --disable-big-core to make tic run on small machines
    51535375 ###    We need 4Mb, check if we can allocate 50% more than that.
    51545376-echo "$as_me:5575: checking if big-core option selected" >&5
    5155 +echo "$as_me:5862: checking if big-core option selected" >&5
     5377+echo "$as_me:5871: checking if big-core option selected" >&5
    51565378 echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6
    51575379 
    51585380 # Check whether --enable-big-core or --disable-big-core was given.
    5159 @@ -5584,7 +5871,7 @@
     5381@@ -5584,7 +5880,7 @@
    51605382   with_big_core=no
    51615383 else
    51625384   cat >conftest.$ac_ext <<_ACEOF
    51635385-#line 5587 "configure"
    5164 +#line 5874 "configure"
     5386+#line 5883 "configure"
    51655387 #include "confdefs.h"
    51665388 
    51675389 #include <stdlib.h>
    5168 @@ -5598,15 +5885,15 @@
     5390@@ -5598,15 +5894,15 @@
    51695391 }
    51705392 _ACEOF
    51715393 rm -f conftest$ac_exeext
    51725394-if { (eval echo "$as_me:5601: \"$ac_link\"") >&5
    5173 +if { (eval echo "$as_me:5888: \"$ac_link\"") >&5
     5395+if { (eval echo "$as_me:5897: \"$ac_link\"") >&5
    51745396   (eval $ac_link) 2>&5
    51755397   ac_status=$?
    51765398-  echo "$as_me:5604: \$? = $ac_status" >&5
    5177 +  echo "$as_me:5891: \$? = $ac_status" >&5
     5399+  echo "$as_me:5900: \$? = $ac_status" >&5
    51785400   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    51795401-  { (eval echo "$as_me:5606: \"$ac_try\"") >&5
    5180 +  { (eval echo "$as_me:5893: \"$ac_try\"") >&5
     5402+  { (eval echo "$as_me:5902: \"$ac_try\"") >&5
    51815403   (eval $ac_try) 2>&5
    51825404   ac_status=$?
    51835405-  echo "$as_me:5609: \$? = $ac_status" >&5
    5184 +  echo "$as_me:5896: \$? = $ac_status" >&5
     5406+  echo "$as_me:5905: \$? = $ac_status" >&5
    51855407   (exit $ac_status); }; }; then
    51865408   with_big_core=yes
    51875409 else
    5188 @@ -5618,7 +5905,7 @@
     5410@@ -5618,7 +5914,7 @@
    51895411 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
    51905412 fi
    51915413 fi;
    51925414-echo "$as_me:5621: result: $with_big_core" >&5
    5193 +echo "$as_me:5908: result: $with_big_core" >&5
     5415+echo "$as_me:5917: result: $with_big_core" >&5
    51945416 echo "${ECHO_T}$with_big_core" >&6
    51955417 test "$with_big_core" = "yes" && cat >>confdefs.h <<\EOF
    51965418 #define HAVE_BIG_CORE 1
    5197 @@ -5627,7 +5914,7 @@
     5419@@ -5627,7 +5923,7 @@
    51985420 ### ISO C only guarantees 512-char strings, we have tables which load faster
    51995421 ### when constructed using "big" strings.  More than the C compiler, the awk
    52005422 ### program is a limit on most vendor UNIX systems.  Check that we can build.
    52015423-echo "$as_me:5630: checking if big-strings option selected" >&5
    5202 +echo "$as_me:5917: checking if big-strings option selected" >&5
     5424+echo "$as_me:5926: checking if big-strings option selected" >&5
    52035425 echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6
    52045426 
    52055427 # Check whether --enable-big-strings or --disable-big-strings was given.
    5206 @@ -5636,29 +5923,29 @@
     5428@@ -5636,29 +5932,29 @@
    52075429   with_big_strings=$enableval
    52085430 else
    … …  
    52375459 fi;
    52385460-echo "$as_me:5654: result: $with_big_strings" >&5
    5239 +echo "$as_me:5941: result: $with_big_strings" >&5
     5461+echo "$as_me:5950: result: $with_big_strings" >&5
    52405462 echo "${ECHO_T}$with_big_strings" >&6
    52415463 
    … …  
    52455467 ###    use option --enable-termcap to compile in the termcap fallback support
    52465468-echo "$as_me:5661: checking if you want termcap-fallback support" >&5
    5247 +echo "$as_me:5948: checking if you want termcap-fallback support" >&5
     5469+echo "$as_me:5957: checking if you want termcap-fallback support" >&5
    52485470 echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6
    52495471 
    52505472 # Check whether --enable-termcap or --disable-termcap was given.
    5251 @@ -5668,13 +5955,13 @@
     5473@@ -5668,13 +5964,13 @@
    52525474 else
    52535475   with_termcap=no
    52545476 fi;
    52555477-echo "$as_me:5671: result: $with_termcap" >&5
    5256 +echo "$as_me:5958: result: $with_termcap" >&5
     5478+echo "$as_me:5967: result: $with_termcap" >&5
    52575479 echo "${ECHO_T}$with_termcap" >&6
    52585480 
    … …  
    52615483                if test -z "$with_fallback" ; then
    52625484-                       { { echo "$as_me:5677: error: You have disabled the database w/o specifying fallbacks" >&5
    5263 +                       { { echo "$as_me:5964: error: You have disabled the database w/o specifying fallbacks" >&5
     5485+                       { { echo "$as_me:5973: error: You have disabled the database w/o specifying fallbacks" >&5
    52645486 echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;}
    52655487    { (exit 1); exit 1; }; }
    52665488                fi
    5267 @@ -5686,7 +5973,7 @@
     5489@@ -5686,7 +5982,7 @@
    52685490 else
    52695491 
    52705492 if test "$with_ticlib" != no ; then
    52715493-       { { echo "$as_me:5689: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
    5272 +       { { echo "$as_me:5976: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
     5494+       { { echo "$as_me:5985: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
    52735495 echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;}
    52745496    { (exit 1); exit 1; }; }
    52755497 fi
    5276 @@ -5695,7 +5982,7 @@
     5498@@ -5695,7 +5991,7 @@
    52775499 #define USE_TERMCAP 1
    52785500 EOF
    52795501 
    52805502-echo "$as_me:5698: checking for list of termcap files" >&5
    5281 +echo "$as_me:5985: checking for list of termcap files" >&5
     5503+echo "$as_me:5994: checking for list of termcap files" >&5
    52825504 echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6
    52835505 
    52845506 # Check whether --with-termpath or --without-termpath was given.
    5285 @@ -5705,7 +5992,7 @@
     5507@@ -5705,7 +6001,7 @@
    52865508 else
    52875509   withval=${TERMPATH-/etc/termcap:/usr/share/misc/termcap}
    … …  
    52925514 for cf_src_path in $withval
    52935515 do
    5294 @@ -5735,7 +6022,7 @@
     5516@@ -5735,7 +6031,7 @@
    52955517   cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
    52965518   ;;
    52975519 *)
    52985520-  { { echo "$as_me:5738: error: expected a pathname, not \"$cf_src_path\"" >&5
    5299 +  { { echo "$as_me:6025: error: expected a pathname, not \"$cf_src_path\"" >&5
     5521+  { { echo "$as_me:6034: error: expected a pathname, not \"$cf_src_path\"" >&5
    53005522 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
    53015523    { (exit 1); exit 1; }; }
    53025524   ;;
    5303 @@ -5748,14 +6035,14 @@
     5525@@ -5748,14 +6044,14 @@
    53045526 
    53055527 eval 'TERMPATH="$cf_dst_path"'
    53065528 
    53075529-echo "$as_me:5751: result: $TERMPATH" >&5
    5308 +echo "$as_me:6038: result: $TERMPATH" >&5
     5530+echo "$as_me:6047: result: $TERMPATH" >&5
    53095531 echo "${ECHO_T}$TERMPATH" >&6
    53105532 test -n "$TERMPATH" && cat >>confdefs.h <<EOF
    … …  
    53145536 ###    use option --enable-getcap to use a hacked getcap for reading termcaps
    53155537-echo "$as_me:5758: checking if fast termcap-loader is needed" >&5
    5316 +echo "$as_me:6045: checking if fast termcap-loader is needed" >&5
     5538+echo "$as_me:6054: checking if fast termcap-loader is needed" >&5
    53175539 echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6
    53185540 
    53195541 # Check whether --enable-getcap or --disable-getcap was given.
    5320 @@ -5765,13 +6052,13 @@
     5542@@ -5765,13 +6061,13 @@
    53215543 else
    53225544   with_getcap=no
    53235545 fi;
    53245546-echo "$as_me:5768: result: $with_getcap" >&5
    5325 +echo "$as_me:6055: result: $with_getcap" >&5
     5547+echo "$as_me:6064: result: $with_getcap" >&5
    53265548 echo "${ECHO_T}$with_getcap" >&6
    53275549 test "$with_getcap" = "yes" && cat >>confdefs.h <<\EOF
    … …  
    53305552 
    53315553-echo "$as_me:5774: checking if translated termcaps will be cached in ~/.terminfo" >&5
    5332 +echo "$as_me:6061: checking if translated termcaps will be cached in ~/.terminfo" >&5
     5554+echo "$as_me:6070: checking if translated termcaps will be cached in ~/.terminfo" >&5
    53335555 echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6
    53345556 
    53355557 # Check whether --enable-getcap-cache or --disable-getcap-cache was given.
    5336 @@ -5781,7 +6068,7 @@
     5558@@ -5781,7 +6077,7 @@
    53375559 else
    53385560   with_getcap_cache=no
    53395561 fi;
    53405562-echo "$as_me:5784: result: $with_getcap_cache" >&5
    5341 +echo "$as_me:6071: result: $with_getcap_cache" >&5
     5563+echo "$as_me:6080: result: $with_getcap_cache" >&5
    53425564 echo "${ECHO_T}$with_getcap_cache" >&6
    53435565 test "$with_getcap_cache" = "yes" && cat >>confdefs.h <<\EOF
    53445566 #define USE_GETCAP_CACHE 1
    5345 @@ -5790,7 +6077,7 @@
     5567@@ -5790,7 +6086,7 @@
    53465568 fi
    53475569 
    53485570 ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
    53495571-echo "$as_me:5793: checking if ~/.terminfo is wanted" >&5
    5350 +echo "$as_me:6080: checking if ~/.terminfo is wanted" >&5
     5572+echo "$as_me:6089: checking if ~/.terminfo is wanted" >&5
    53515573 echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6
    53525574 
    53535575 # Check whether --enable-home-terminfo or --disable-home-terminfo was given.
    5354 @@ -5800,13 +6087,13 @@
     5576@@ -5800,13 +6096,13 @@
    53555577 else
    53565578   with_home_terminfo=yes
    53575579 fi;
    53585580-echo "$as_me:5803: result: $with_home_terminfo" >&5
    5359 +echo "$as_me:6090: result: $with_home_terminfo" >&5
     5581+echo "$as_me:6099: result: $with_home_terminfo" >&5
    53605582 echo "${ECHO_T}$with_home_terminfo" >&6
    53615583 test "$with_home_terminfo" = "yes" && cat >>confdefs.h <<\EOF
    … …  
    53645586 
    53655587-echo "$as_me:5809: checking if you want to use restricted environment when running as root" >&5
    5366 +echo "$as_me:6096: checking if you want to use restricted environment when running as root" >&5
     5588+echo "$as_me:6105: checking if you want to use restricted environment when running as root" >&5
    53675589 echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6
    53685590 
    53695591 # Check whether --enable-root-environ or --disable-root-environ was given.
    5370 @@ -5816,7 +6103,7 @@
     5592@@ -5816,7 +6112,7 @@
    53715593 else
    53725594   with_root_environ=yes
    53735595 fi;
    53745596-echo "$as_me:5819: result: $with_root_environ" >&5
    5375 +echo "$as_me:6106: result: $with_root_environ" >&5
     5597+echo "$as_me:6115: result: $with_root_environ" >&5
    53765598 echo "${ECHO_T}$with_root_environ" >&6
    53775599 test "$with_root_environ" = yes && cat >>confdefs.h <<\EOF
    53785600 #define USE_ROOT_ENVIRON 1
    5379 @@ -5830,13 +6117,13 @@
     5601@@ -5830,13 +6126,13 @@
    53805602        unlink
    53815603 do
    53825604 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
    53835605-echo "$as_me:5833: checking for $ac_func" >&5
    5384 +echo "$as_me:6120: checking for $ac_func" >&5
     5606+echo "$as_me:6129: checking for $ac_func" >&5
    53855607 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
    53865608 if eval "test \"\${$as_ac_var+set}\" = set"; then
    … …  
    53895611   cat >conftest.$ac_ext <<_ACEOF
    53905612-#line 5839 "configure"
    5391 +#line 6126 "configure"
     5613+#line 6135 "configure"
    53925614 #include "confdefs.h"
    53935615 /* System header to define __stub macros and hopefully few prototypes,
    53945616     which can conflict with char $ac_func (); below.  */
    5395 @@ -5867,16 +6154,16 @@
     5617@@ -5867,16 +6163,16 @@
    53965618 }
    53975619 _ACEOF
    53985620 rm -f conftest.$ac_objext conftest$ac_exeext
    53995621-if { (eval echo "$as_me:5870: \"$ac_link\"") >&5
    5400 +if { (eval echo "$as_me:6157: \"$ac_link\"") >&5
     5622+if { (eval echo "$as_me:6166: \"$ac_link\"") >&5
    54015623   (eval $ac_link) 2>&5
    54025624   ac_status=$?
    54035625-  echo "$as_me:5873: \$? = $ac_status" >&5
    5404 +  echo "$as_me:6160: \$? = $ac_status" >&5
     5626+  echo "$as_me:6169: \$? = $ac_status" >&5
    54055627   (exit $ac_status); } &&
    54065628          { ac_try='test -s conftest$ac_exeext'
    54075629-  { (eval echo "$as_me:5876: \"$ac_try\"") >&5
    5408 +  { (eval echo "$as_me:6163: \"$ac_try\"") >&5
     5630+  { (eval echo "$as_me:6172: \"$ac_try\"") >&5
    54095631   (eval $ac_try) 2>&5
    54105632   ac_status=$?
    54115633-  echo "$as_me:5879: \$? = $ac_status" >&5
    5412 +  echo "$as_me:6166: \$? = $ac_status" >&5
     5634+  echo "$as_me:6175: \$? = $ac_status" >&5
    54135635   (exit $ac_status); }; }; then
    54145636   eval "$as_ac_var=yes"
    54155637 else
    5416 @@ -5886,7 +6173,7 @@
     5638@@ -5886,7 +6182,7 @@
    54175639 fi
    54185640 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    54195641 fi
    54205642-echo "$as_me:5889: result: `eval echo '${'$as_ac_var'}'`" >&5
    5421 +echo "$as_me:6176: result: `eval echo '${'$as_ac_var'}'`" >&5
     5643+echo "$as_me:6185: result: `eval echo '${'$as_ac_var'}'`" >&5
    54225644 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
    54235645 if test `eval echo '${'$as_ac_var'}'` = yes; then
    54245646   cat >>confdefs.h <<EOF
    5425 @@ -5903,13 +6190,13 @@
     5647@@ -5903,13 +6199,13 @@
    54265648                symlink
    54275649 do
    54285650 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
    54295651-echo "$as_me:5906: checking for $ac_func" >&5
    5430 +echo "$as_me:6193: checking for $ac_func" >&5
     5652+echo "$as_me:6202: checking for $ac_func" >&5
    54315653 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
    54325654 if eval "test \"\${$as_ac_var+set}\" = set"; then
    … …  
    54355657   cat >conftest.$ac_ext <<_ACEOF
    54365658-#line 5912 "configure"
    5437 +#line 6199 "configure"
     5659+#line 6208 "configure"
    54385660 #include "confdefs.h"
    54395661 /* System header to define __stub macros and hopefully few prototypes,
    54405662     which can conflict with char $ac_func (); below.  */
    5441 @@ -5940,16 +6227,16 @@
     5663@@ -5940,16 +6236,16 @@
    54425664 }
    54435665 _ACEOF
    54445666 rm -f conftest.$ac_objext conftest$ac_exeext
    54455667-if { (eval echo "$as_me:5943: \"$ac_link\"") >&5
    5446 +if { (eval echo "$as_me:6230: \"$ac_link\"") >&5
     5668+if { (eval echo "$as_me:6239: \"$ac_link\"") >&5
    54475669   (eval $ac_link) 2>&5
    54485670   ac_status=$?
    54495671-  echo "$as_me:5946: \$? = $ac_status" >&5
    5450 +  echo "$as_me:6233: \$? = $ac_status" >&5
     5672+  echo "$as_me:6242: \$? = $ac_status" >&5
    54515673   (exit $ac_status); } &&
    54525674          { ac_try='test -s conftest$ac_exeext'
    54535675-  { (eval echo "$as_me:5949: \"$ac_try\"") >&5
    5454 +  { (eval echo "$as_me:6236: \"$ac_try\"") >&5
     5676+  { (eval echo "$as_me:6245: \"$ac_try\"") >&5
    54555677   (eval $ac_try) 2>&5
    54565678   ac_status=$?
    54575679-  echo "$as_me:5952: \$? = $ac_status" >&5
    5458 +  echo "$as_me:6239: \$? = $ac_status" >&5
     5680+  echo "$as_me:6248: \$? = $ac_status" >&5
    54595681   (exit $ac_status); }; }; then
    54605682   eval "$as_ac_var=yes"
    54615683 else
    5462 @@ -5959,7 +6246,7 @@
     5684@@ -5959,7 +6255,7 @@
    54635685 fi
    54645686 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    54655687 fi
    54665688-echo "$as_me:5962: result: `eval echo '${'$as_ac_var'}'`" >&5
    5467 +echo "$as_me:6249: result: `eval echo '${'$as_ac_var'}'`" >&5
     5689+echo "$as_me:6258: result: `eval echo '${'$as_ac_var'}'`" >&5
    54685690 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
    54695691 if test `eval echo '${'$as_ac_var'}'` = yes; then
    54705692   cat >>confdefs.h <<EOF
    5471 @@ -5970,7 +6257,7 @@
     5693@@ -5970,7 +6266,7 @@
    54725694 done
    54735695 
    54745696 else
    54755697-       echo "$as_me:5973: checking if link/symlink functions work" >&5
    5476 +       echo "$as_me:6260: checking if link/symlink functions work" >&5
     5698+       echo "$as_me:6269: checking if link/symlink functions work" >&5
    54775699 echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6
    54785700 if test "${cf_cv_link_funcs+set}" = set; then
    54795701   echo $ECHO_N "(cached) $ECHO_C" >&6
    5480 @@ -5983,7 +6270,7 @@
     5702@@ -5983,7 +6279,7 @@
    54815703                        eval 'ac_cv_func_'$cf_func'=error'
    54825704 else
    54835705   cat >conftest.$ac_ext <<_ACEOF
    54845706-#line 5986 "configure"
    5485 +#line 6273 "configure"
     5707+#line 6282 "configure"
    54865708 #include "confdefs.h"
    54875709 
    54885710 #include <sys/types.h>
    5489 @@ -6013,15 +6300,15 @@
     5711@@ -6013,15 +6309,15 @@
    54905712 
    54915713 _ACEOF
    54925714 rm -f conftest$ac_exeext
    54935715-if { (eval echo "$as_me:6016: \"$ac_link\"") >&5
    5494 +if { (eval echo "$as_me:6303: \"$ac_link\"") >&5
     5716+if { (eval echo "$as_me:6312: \"$ac_link\"") >&5
    54955717   (eval $ac_link) 2>&5
    54965718   ac_status=$?
    54975719-  echo "$as_me:6019: \$? = $ac_status" >&5
    5498 +  echo "$as_me:6306: \$? = $ac_status" >&5
     5720+  echo "$as_me:6315: \$? = $ac_status" >&5
    54995721   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    55005722-  { (eval echo "$as_me:6021: \"$ac_try\"") >&5
    5501 +  { (eval echo "$as_me:6308: \"$ac_try\"") >&5
     5723+  { (eval echo "$as_me:6317: \"$ac_try\"") >&5
    55025724   (eval $ac_try) 2>&5
    55035725   ac_status=$?
    55045726-  echo "$as_me:6024: \$? = $ac_status" >&5
    5505 +  echo "$as_me:6311: \$? = $ac_status" >&5
     5727+  echo "$as_me:6320: \$? = $ac_status" >&5
    55065728   (exit $ac_status); }; }; then
    55075729 
    55085730                        cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
    5509 @@ -6039,7 +6326,7 @@
     5731@@ -6039,7 +6335,7 @@
    55105732                test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
    55115733 
    55125734 fi
    55135735-echo "$as_me:6042: result: $cf_cv_link_funcs" >&5
    5514 +echo "$as_me:6329: result: $cf_cv_link_funcs" >&5
     5736+echo "$as_me:6338: result: $cf_cv_link_funcs" >&5
    55155737 echo "${ECHO_T}$cf_cv_link_funcs" >&6
    55165738        test "$ac_cv_func_link"    = yes && cat >>confdefs.h <<\EOF
    55175739 #define HAVE_LINK 1
    5518 @@ -6057,7 +6344,7 @@
     5740@@ -6057,7 +6353,7 @@
    55195741 # soft links (symbolic links) are useful for some systems where hard links do
    55205742 # not work, or to make it simpler to copy terminfo trees around.
    55215743 if test "$ac_cv_func_symlink" = yes ; then
    55225744-    echo "$as_me:6060: checking if tic should use symbolic links" >&5
    5523 +    echo "$as_me:6347: checking if tic should use symbolic links" >&5
     5745+    echo "$as_me:6356: checking if tic should use symbolic links" >&5
    55245746 echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6
    55255747 
    55265748 # Check whether --enable-symlinks or --disable-symlinks was given.
    5527 @@ -6067,21 +6354,21 @@
     5749@@ -6067,21 +6363,21 @@
    55285750 else
    55295751   with_symlinks=no
    55305752 fi;
    55315753-    echo "$as_me:6070: result: $with_symlinks" >&5
    5532 +    echo "$as_me:6357: result: $with_symlinks" >&5
     5754+    echo "$as_me:6366: result: $with_symlinks" >&5
    55335755 echo "${ECHO_T}$with_symlinks" >&6
    55345756 fi
    … …  
    55385760 if test "$with_symlinks" = no ; then
    55395761-    echo "$as_me:6077: checking if tic should use hard links" >&5
    5540 +    echo "$as_me:6364: checking if tic should use hard links" >&5
     5762+    echo "$as_me:6373: checking if tic should use hard links" >&5
    55415763 echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6
    55425764     if test "$ac_cv_func_link" = yes ; then
    … …  
    55465768     fi
    55475769-    echo "$as_me:6084: result: $with_links" >&5
    5548 +    echo "$as_me:6371: result: $with_links" >&5
     5770+    echo "$as_me:6380: result: $with_links" >&5
    55495771 echo "${ECHO_T}$with_links" >&6
    55505772 fi
    55515773 
    5552 @@ -6094,7 +6381,7 @@
     5774@@ -6094,7 +6390,7 @@
    55535775 EOF
    55545776 
    55555777 ###   use option --enable-broken-linker to force on use of broken-linker support
    55565778-echo "$as_me:6097: checking if you want broken-linker support code" >&5
    5557 +echo "$as_me:6384: checking if you want broken-linker support code" >&5
     5779+echo "$as_me:6393: checking if you want broken-linker support code" >&5
    55585780 echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6
    55595781 
    55605782 # Check whether --enable-broken_linker or --disable-broken_linker was given.
    5561 @@ -6104,7 +6391,7 @@
     5783@@ -6104,7 +6400,7 @@
    55625784 else
    55635785   with_broken_linker=${BROKEN_LINKER-no}
    55645786 fi;
    55655787-echo "$as_me:6107: result: $with_broken_linker" >&5
    5566 +echo "$as_me:6394: result: $with_broken_linker" >&5
     5788+echo "$as_me:6403: result: $with_broken_linker" >&5
    55675789 echo "${ECHO_T}$with_broken_linker" >&6
    55685790 
    55695791 BROKEN_LINKER=0
    5570 @@ -6124,14 +6411,14 @@
     5792@@ -6124,14 +6420,14 @@
    55715793                BROKEN_LINKER=1
    55725794                test -n "$verbose" && echo "    cygwin linker is broken anyway" 1>&6
    55735795 
    55745796-echo "${as_me-configure}:6127: testing cygwin linker is broken anyway ..." 1>&5
    5575 +echo "${as_me-configure}:6414: testing cygwin linker is broken anyway ..." 1>&5
     5797+echo "${as_me-configure}:6423: testing cygwin linker is broken anyway ..." 1>&5
    55765798 
    55775799                ;;
    … …  
    55815803 ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
    55825804-echo "$as_me:6134: checking if tputs should process BSD-style prefix padding" >&5
    5583 +echo "$as_me:6421: checking if tputs should process BSD-style prefix padding" >&5
     5805+echo "$as_me:6430: checking if tputs should process BSD-style prefix padding" >&5
    55845806 echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6
    55855807 
    55865808 # Check whether --enable-bsdpad or --disable-bsdpad was given.
    5587 @@ -6141,7 +6428,7 @@
     5809@@ -6141,7 +6437,7 @@
    55885810 else
    55895811   with_bsdpad=no
    55905812 fi;
    55915813-echo "$as_me:6144: result: $with_bsdpad" >&5
    5592 +echo "$as_me:6431: result: $with_bsdpad" >&5
     5814+echo "$as_me:6440: result: $with_bsdpad" >&5
    55935815 echo "${ECHO_T}$with_bsdpad" >&6
    55945816 test "$with_bsdpad" = yes && cat >>confdefs.h <<\EOF
    55955817 #define BSD_TPUTS 1
    5596 @@ -6158,7 +6445,7 @@
     5818@@ -6158,7 +6454,7 @@
    55975819 
    55985820 # Check to define _XOPEN_SOURCE "automatically"
    55995821 
    56005822-echo "$as_me:6161: checking if $CC -U and -D options work together" >&5
    5601 +echo "$as_me:6448: checking if $CC -U and -D options work together" >&5
     5823+echo "$as_me:6457: checking if $CC -U and -D options work together" >&5
    56025824 echo $ECHO_N "checking if $CC -U and -D options work together... $ECHO_C" >&6
    56035825 if test "${cf_cv_cc_u_d_options+set}" = set; then
    56045826   echo $ECHO_N "(cached) $ECHO_C" >&6
    5605 @@ -6167,7 +6454,7 @@
     5827@@ -6167,7 +6463,7 @@
    56065828        cf_save_CPPFLAGS="$CPPFLAGS"
    56075829        CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS"
    56085830        cat >conftest.$ac_ext <<_ACEOF
    56095831-#line 6170 "configure"
    5610 +#line 6457 "configure"
     5832+#line 6466 "configure"
    56115833 #include "confdefs.h"
    56125834 
    56135835 int
    5614 @@ -6186,16 +6473,16 @@
     5836@@ -6186,16 +6482,16 @@
    56155837 }
    56165838 _ACEOF
    56175839 rm -f conftest.$ac_objext
    56185840-if { (eval echo "$as_me:6189: \"$ac_compile\"") >&5
    5619 +if { (eval echo "$as_me:6476: \"$ac_compile\"") >&5
     5841+if { (eval echo "$as_me:6485: \"$ac_compile\"") >&5
    56205842   (eval $ac_compile) 2>&5
    56215843   ac_status=$?
    56225844-  echo "$as_me:6192: \$? = $ac_status" >&5
    5623 +  echo "$as_me:6479: \$? = $ac_status" >&5
     5845+  echo "$as_me:6488: \$? = $ac_status" >&5
    56245846   (exit $ac_status); } &&
    56255847          { ac_try='test -s conftest.$ac_objext'
    56265848-  { (eval echo "$as_me:6195: \"$ac_try\"") >&5
    5627 +  { (eval echo "$as_me:6482: \"$ac_try\"") >&5
     5849+  { (eval echo "$as_me:6491: \"$ac_try\"") >&5
    56285850   (eval $ac_try) 2>&5
    56295851   ac_status=$?
    56305852-  echo "$as_me:6198: \$? = $ac_status" >&5
    5631 +  echo "$as_me:6485: \$? = $ac_status" >&5
     5853+  echo "$as_me:6494: \$? = $ac_status" >&5
    56325854   (exit $ac_status); }; }; then
    56335855 
    56345856        cf_cv_cc_u_d_options=yes
    5635 @@ -6209,14 +6496,14 @@
     5857@@ -6209,14 +6505,14 @@
    56365858        CPPFLAGS="$cf_save_CPPFLAGS"
    56375859 
    56385860 fi
    56395861-echo "$as_me:6212: result: $cf_cv_cc_u_d_options" >&5
    5640 +echo "$as_me:6499: result: $cf_cv_cc_u_d_options" >&5
     5862+echo "$as_me:6508: result: $cf_cv_cc_u_d_options" >&5
    56415863 echo "${ECHO_T}$cf_cv_cc_u_d_options" >&6
    56425864 
    … …  
    56505872        ;;
    56515873 freebsd*|dragonfly*) #(vi
    5652 @@ -6233,16 +6520,16 @@
     5874@@ -6233,16 +6529,16 @@
    56535875 irix[56].*) #(vi
    56545876        CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
    … …  
    56585880 
    56595881-echo "$as_me:6238: checking if we must define _GNU_SOURCE" >&5
    5660 +echo "$as_me:6525: checking if we must define _GNU_SOURCE" >&5
     5882+echo "$as_me:6534: checking if we must define _GNU_SOURCE" >&5
    56615883 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
    56625884 if test "${cf_cv_gnu_source+set}" = set; then
    … …  
    56665888 cat >conftest.$ac_ext <<_ACEOF
    56675889-#line 6245 "configure"
    5668 +#line 6532 "configure"
     5890+#line 6541 "configure"
    56695891 #include "confdefs.h"
    56705892 #include <sys/types.h>
    56715893 int
    5672 @@ -6257,16 +6544,16 @@
     5894@@ -6257,16 +6553,16 @@
    56735895 }
    56745896 _ACEOF
    56755897 rm -f conftest.$ac_objext
    56765898-if { (eval echo "$as_me:6260: \"$ac_compile\"") >&5
    5677 +if { (eval echo "$as_me:6547: \"$ac_compile\"") >&5
     5899+if { (eval echo "$as_me:6556: \"$ac_compile\"") >&5
    56785900   (eval $ac_compile) 2>&5
    56795901   ac_status=$?
    56805902-  echo "$as_me:6263: \$? = $ac_status" >&5
    5681 +  echo "$as_me:6550: \$? = $ac_status" >&5
     5903+  echo "$as_me:6559: \$? = $ac_status" >&5
    56825904   (exit $ac_status); } &&
    56835905          { ac_try='test -s conftest.$ac_objext'
    56845906-  { (eval echo "$as_me:6266: \"$ac_try\"") >&5
    5685 +  { (eval echo "$as_me:6553: \"$ac_try\"") >&5
     5907+  { (eval echo "$as_me:6562: \"$ac_try\"") >&5
    56865908   (eval $ac_try) 2>&5
    56875909   ac_status=$?
    56885910-  echo "$as_me:6269: \$? = $ac_status" >&5
    5689 +  echo "$as_me:6556: \$? = $ac_status" >&5
     5911+  echo "$as_me:6565: \$? = $ac_status" >&5
    56905912   (exit $ac_status); }; }; then
    56915913   cf_cv_gnu_source=no
    56925914 else
    5693 @@ -6275,7 +6562,7 @@
     5915@@ -6275,7 +6571,7 @@
    56945916 cf_save="$CPPFLAGS"
    56955917         CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
    56965918         cat >conftest.$ac_ext <<_ACEOF
    56975919-#line 6278 "configure"
    5698 +#line 6565 "configure"
     5920+#line 6574 "configure"
    56995921 #include "confdefs.h"
    57005922 #include <sys/types.h>
    57015923 int
    5702 @@ -6290,16 +6577,16 @@
     5924@@ -6290,16 +6586,16 @@
    57035925 }
    57045926 _ACEOF
    57055927 rm -f conftest.$ac_objext
    57065928-if { (eval echo "$as_me:6293: \"$ac_compile\"") >&5
    5707 +if { (eval echo "$as_me:6580: \"$ac_compile\"") >&5
     5929+if { (eval echo "$as_me:6589: \"$ac_compile\"") >&5
    57085930   (eval $ac_compile) 2>&5
    57095931   ac_status=$?
    57105932-  echo "$as_me:6296: \$? = $ac_status" >&5
    5711 +  echo "$as_me:6583: \$? = $ac_status" >&5
     5933+  echo "$as_me:6592: \$? = $ac_status" >&5
    57125934   (exit $ac_status); } &&
    57135935          { ac_try='test -s conftest.$ac_objext'
    57145936-  { (eval echo "$as_me:6299: \"$ac_try\"") >&5
    5715 +  { (eval echo "$as_me:6586: \"$ac_try\"") >&5
     5937+  { (eval echo "$as_me:6595: \"$ac_try\"") >&5
    57165938   (eval $ac_try) 2>&5
    57175939   ac_status=$?
    57185940-  echo "$as_me:6302: \$? = $ac_status" >&5
    5719 +  echo "$as_me:6589: \$? = $ac_status" >&5
     5941+  echo "$as_me:6598: \$? = $ac_status" >&5
    57205942   (exit $ac_status); }; }; then
    57215943   cf_cv_gnu_source=no
    57225944 else
    5723 @@ -6314,7 +6601,7 @@
     5945@@ -6314,7 +6610,7 @@
    57245946 rm -f conftest.$ac_objext conftest.$ac_ext
    57255947 
    57265948 fi
    57275949-echo "$as_me:6317: result: $cf_cv_gnu_source" >&5
    5728 +echo "$as_me:6604: result: $cf_cv_gnu_source" >&5
     5950+echo "$as_me:6613: result: $cf_cv_gnu_source" >&5
    57295951 echo "${ECHO_T}$cf_cv_gnu_source" >&6
    57305952 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
    57315953 
    5732 @@ -6341,14 +6628,14 @@
     5954@@ -6341,14 +6637,14 @@
    57335955        CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__"
    57345956        ;;
    57355957 *)
    57365958-       echo "$as_me:6344: checking if we should define _XOPEN_SOURCE" >&5
    5737 +       echo "$as_me:6631: checking if we should define _XOPEN_SOURCE" >&5
     5959+       echo "$as_me:6640: checking if we should define _XOPEN_SOURCE" >&5
    57385960 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
    57395961 if test "${cf_cv_xopen_source+set}" = set; then
    … …  
    57435965        cat >conftest.$ac_ext <<_ACEOF
    57445966-#line 6351 "configure"
    5745 +#line 6638 "configure"
     5967+#line 6647 "configure"
    57465968 #include "confdefs.h"
    57475969 #include <sys/types.h>
    57485970 int
    5749 @@ -6363,16 +6650,16 @@
     5971@@ -6363,16 +6659,16 @@
    57505972 }
    57515973 _ACEOF
    57525974 rm -f conftest.$ac_objext
    57535975-if { (eval echo "$as_me:6366: \"$ac_compile\"") >&5
    5754 +if { (eval echo "$as_me:6653: \"$ac_compile\"") >&5
     5976+if { (eval echo "$as_me:6662: \"$ac_compile\"") >&5
    57555977   (eval $ac_compile) 2>&5
    57565978   ac_status=$?
    57575979-  echo "$as_me:6369: \$? = $ac_status" >&5
    5758 +  echo "$as_me:6656: \$? = $ac_status" >&5
     5980+  echo "$as_me:6665: \$? = $ac_status" >&5
    57595981   (exit $ac_status); } &&
    57605982          { ac_try='test -s conftest.$ac_objext'
    57615983-  { (eval echo "$as_me:6372: \"$ac_try\"") >&5
    5762 +  { (eval echo "$as_me:6659: \"$ac_try\"") >&5
     5984+  { (eval echo "$as_me:6668: \"$ac_try\"") >&5
    57635985   (eval $ac_try) 2>&5
    57645986   ac_status=$?
    57655987-  echo "$as_me:6375: \$? = $ac_status" >&5
    5766 +  echo "$as_me:6662: \$? = $ac_status" >&5
     5988+  echo "$as_me:6671: \$? = $ac_status" >&5
    57675989   (exit $ac_status); }; }; then
    57685990   cf_cv_xopen_source=no
    57695991 else
    5770 @@ -6381,7 +6668,7 @@
     5992@@ -6381,7 +6677,7 @@
    57715993 cf_save="$CPPFLAGS"
    57725994         CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
    57735995         cat >conftest.$ac_ext <<_ACEOF
    57745996-#line 6384 "configure"
    5775 +#line 6671 "configure"
     5997+#line 6680 "configure"
    57765998 #include "confdefs.h"
    57775999 #include <sys/types.h>
    57786000 int
    5779 @@ -6396,16 +6683,16 @@
     6001@@ -6396,16 +6692,16 @@