From 51eb1b8fa89ca7c3837f48b842fb3150a24bd759 Mon Sep 17 00:00:00 2001 From: Zach van Rijn Date: Tue, 19 Apr 2022 13:57:05 -0500 Subject: system/ncurses: bump { 20220129 --> 20220416 }. add maintenance script. fixes #531. --- system/ncurses/APKBUILD | 62 +- system/ncurses/maintain | 64 + system/ncurses/ncurses-6.3-20211026.patch | 23250 ++++++++++++++++++++ system/ncurses/ncurses-6.3-20211030.patch | 8846 ++++++++ system/ncurses/ncurses-6.3-20211106.patch | 404 + system/ncurses/ncurses-6.3-20211113.patch | 23164 ++++++++++++++++++++ system/ncurses/ncurses-6.3-20211115.patch | 225 + system/ncurses/ncurses-6.3-20211120.patch | 23868 +++++++++++++++++++++ system/ncurses/ncurses-6.3-20211127.patch | 3202 +++ system/ncurses/ncurses-6.3-20211204.patch | 5913 +++++ system/ncurses/ncurses-6.3-20211211.patch | 544 + system/ncurses/ncurses-6.3-20211219.patch | 784 + system/ncurses/ncurses-6.3-20211225.patch | 27027 +++++++++++++++++++++++ system/ncurses/ncurses-6.3-20220101.patch | 1076 + system/ncurses/ncurses-6.3-20220115.patch | 32107 ++++++++++++++++++++++++++++ system/ncurses/ncurses-6.3-20220122.patch | 20217 ++++++++++++++++++ system/ncurses/ncurses-6.3-20220129.patch | 23405 ++++++++++++++++++++ system/ncurses/ncurses-6.3-20220205.patch | 9177 ++++++++ system/ncurses/ncurses-6.3-20220212.patch | 8924 ++++++++ system/ncurses/ncurses-6.3-20220219.patch | 691 + system/ncurses/ncurses-6.3-20220226.patch | 566 + system/ncurses/ncurses-6.3-20220305.patch | 377 + system/ncurses/ncurses-6.3-20220312.patch | 300 + system/ncurses/ncurses-6.3-20220319.patch | 327 + system/ncurses/ncurses-6.3-20220326.patch | 337 + system/ncurses/ncurses-6.3-20220402.patch | 915 + system/ncurses/ncurses-6.3-20220409.patch | 3596 ++++ system/ncurses/ncurses-6.3-20220416.patch | 12968 +++++++++++ 28 files changed, 232332 insertions(+), 4 deletions(-) create mode 100755 system/ncurses/maintain create mode 100644 system/ncurses/ncurses-6.3-20211026.patch create mode 100644 system/ncurses/ncurses-6.3-20211030.patch create mode 100644 system/ncurses/ncurses-6.3-20211106.patch create mode 100644 system/ncurses/ncurses-6.3-20211113.patch create mode 100644 system/ncurses/ncurses-6.3-20211115.patch create mode 100644 system/ncurses/ncurses-6.3-20211120.patch create mode 100644 system/ncurses/ncurses-6.3-20211127.patch create mode 100644 system/ncurses/ncurses-6.3-20211204.patch create mode 100644 system/ncurses/ncurses-6.3-20211211.patch create mode 100644 system/ncurses/ncurses-6.3-20211219.patch create mode 100644 system/ncurses/ncurses-6.3-20211225.patch create mode 100644 system/ncurses/ncurses-6.3-20220101.patch create mode 100644 system/ncurses/ncurses-6.3-20220115.patch create mode 100644 system/ncurses/ncurses-6.3-20220122.patch create mode 100644 system/ncurses/ncurses-6.3-20220129.patch create mode 100644 system/ncurses/ncurses-6.3-20220205.patch create mode 100644 system/ncurses/ncurses-6.3-20220212.patch create mode 100644 system/ncurses/ncurses-6.3-20220219.patch create mode 100644 system/ncurses/ncurses-6.3-20220226.patch create mode 100644 system/ncurses/ncurses-6.3-20220305.patch create mode 100644 system/ncurses/ncurses-6.3-20220312.patch create mode 100644 system/ncurses/ncurses-6.3-20220319.patch create mode 100644 system/ncurses/ncurses-6.3-20220326.patch create mode 100644 system/ncurses/ncurses-6.3-20220402.patch create mode 100644 system/ncurses/ncurses-6.3-20220409.patch create mode 100644 system/ncurses/ncurses-6.3-20220416.patch (limited to 'system/ncurses') diff --git a/system/ncurses/APKBUILD b/system/ncurses/APKBUILD index 160491dab..a61c9415c 100644 --- a/system/ncurses/APKBUILD +++ b/system/ncurses/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Síle Ekaterin Liszka pkgname=ncurses pkgver=6.3 -_ver=${pkgver}-20220129 +_ver=20220416 pkgrel=0 pkgdesc="Console display library" url="https://invisible-island.net/ncurses/ncurses.html" @@ -11,9 +11,35 @@ license="MIT" depends="" subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs $pkgname-terminfo-base:base:noarch $pkgname-terminfo:terminfo:noarch" -source="http://invisible-mirror.net/archives/ncurses/current/$pkgname-$_ver.tgz +# ATTENTION MAINTAINERS: This is generated by the 'maintain' script. +source="https://invisible-mirror.net/archives/ncurses/ncurses-6.3.tar.gz + ncurses-6.3-20211026.patch + ncurses-6.3-20211030.patch + ncurses-6.3-20211106.patch + ncurses-6.3-20211113.patch + ncurses-6.3-20211115.patch + ncurses-6.3-20211120.patch + ncurses-6.3-20211127.patch + ncurses-6.3-20211204.patch + ncurses-6.3-20211211.patch + ncurses-6.3-20211219.patch + ncurses-6.3-20211225.patch + ncurses-6.3-20220101.patch + ncurses-6.3-20220115.patch + ncurses-6.3-20220122.patch + ncurses-6.3-20220129.patch + ncurses-6.3-20220205.patch + ncurses-6.3-20220212.patch + ncurses-6.3-20220219.patch + ncurses-6.3-20220226.patch + ncurses-6.3-20220305.patch + ncurses-6.3-20220312.patch + ncurses-6.3-20220319.patch + ncurses-6.3-20220326.patch + ncurses-6.3-20220402.patch + ncurses-6.3-20220409.patch + ncurses-6.3-20220416.patch " -builddir="$srcdir/$pkgname-$_ver" # secfixes: # 6.3-r0: @@ -111,4 +137,32 @@ static() { mv "$pkgdir"/lib/*.a "$subpkgdir"/lib/ } -sha512sums="8ce8806c31aa18b6eb386540fa2cb1038cc763e87b1dcb489de238e993d66b0234e7ab3fb81a0ec70d38f4800f68811aa8a9da71e5ac2ef5a721c9d1c308f6bd ncurses-6.3-20220129.tgz" +# ATTENTION MAINTAINERS: This is generated by the 'maintain' script. +sha512sums=" +683fee64baa744e24385dd015939d1bbc0dd5a22aad4d7e25e19b480c0b41e60fd995f9f992fa195249b4e2d84d400d4bda8cd17d4fc3028ac9827f594003835 ncurses-6.3-20211026.patch +1ad21b25aa4fe101842ce15ebab34ad65a18cf01c6cf43ea29ab6f93320a00a2d41ea9de865f04f975646bda42d5a0aa998f64b7824d00e30edd8cc34b9ce257 ncurses-6.3-20211030.patch +64cf460c3b4f15df270ae4fe4759a6ce893026dc78427c319a93d0941e40b50663c01f0a5b6e27850cfba7f640177aa32f48ea1752516623187b9caec1b2ad5a ncurses-6.3-20211106.patch +8dc3b61122f571f610a90a079ccab08ae344c6870cab98967fe0b21b07bae961ee93c7f7899efda5f044d0a614fbae3bfef30921b4cc7e31de9f818103206273 ncurses-6.3-20211113.patch +7c22c11778f122f947e5cb67920e40960f595418eb1c6d4fde5e0531f15232e096c589883b28d1f2440c2b202b897f7b4b96a16564de0ffdd9d162182e1e89b5 ncurses-6.3-20211115.patch +0aa1085f776c17dc9b4cddd408e7b8ea98d8aacb8d7f87f291b16a6817e29cb2842163084c541375fc98fdb73b832a3c31aea4b9ae933e2302e01bb091c26a9a ncurses-6.3-20211120.patch +6f3121497ba2dde290ed8ba3e737057897ce802a8055a7354a7b26555cf53d2906a4e57f291fb196cbde0800fa80a31d5e716eb77eaf3c3c525f92497775fade ncurses-6.3-20211127.patch +e51184184e11983523ec212f208ef0df228b2592ec98e8a2eb7687bcfcc6bc84b68089cde5934fe57bd1f85b23d6d15a7f166b12de9d694bff95a014ed1369d0 ncurses-6.3-20211204.patch +d89013c9b9695c33ece934595e0e598ec4f33f365ba49352cbe6937224a5a6d7d93110465bfdde7193695690302b904151e3c87262552b49cc53ae55a4e99149 ncurses-6.3-20211211.patch +e7d8da585eaf716cec4657653956d0ea4152b403c123a8b1076d0bf4ab7a9791e500e4c57d2ff0b99243b969e9fa21ce7d5cd226c98a881bedc049ba6e19297a ncurses-6.3-20211219.patch +645dd8f967b2779069fe9c085685a60585bffd5ad326a3fe7b94e0783ddbb5df73a9cfe345da4a1a6bf67a613ebb58df92dbb9edb4cabc0527f6a95d264f98cc ncurses-6.3-20211225.patch +1f7e48d33980baa1a23c61e871805f4c8b556a3607eb826fc1a8a14c24139a7574db56344395addc3e62fb4792c8e1795316be1213c72f16805074ff3836586b ncurses-6.3-20220101.patch +100ed324dc07b328ffb0b30e454aa13eb04a1ee585649bb4528c4afab2d6be551d473d09e6de04a3b92403c25fee4102773d294eff613d36e70fdfcbfd716bbc ncurses-6.3-20220115.patch +c54cd26d2950adf521be0f343a4911f8b84106d99fe8be9a56cf9a9d776aea63b96e2a415818219d1adbf06e42990409ec9af759ce0aee6db14160640b2b84cc ncurses-6.3-20220122.patch +bb7778d055fd7ae54121782b02fab9df6901a53c6cb3b6f2b4d02f1deef13a5adbb991b0cf73fb59d122dc4f2e5b949ea3292f4a60fe8fc3e5e968e9d52cbbf8 ncurses-6.3-20220129.patch +b6109602f96990d6ea7dc71c20e9b46df8d49dd4fb134c9188886af66c0e5a5790ef3989a9f0d11d4ee66f891b81a640b86e7e4cf24471d370804c70c2fbf8ec ncurses-6.3-20220205.patch +9ac6c8f4403a882fd900c7ff6027674ffe48707c1121762b31f88bc6af2a77fdc1d3e7abe26f185ea60d153f39fc6dad22983bd3a75fa6b3c93456b47be4f113 ncurses-6.3-20220212.patch +e99142ee904c326d027f1aca16d00ed12027c6ec1e2d078d43b8a6d4a319de1797b84ea54408b2ab2c10de1b6f54b530d804e27c188e3ce2b0fa6f010e570fb5 ncurses-6.3-20220219.patch +e7c4e75dd36637b0a812396a7a379e8f03e16a6ed98129a5c82ace7b9e1c053ded045074e528a61f50377b05b7674ca542d14a7d49175d7c204440af9796eec0 ncurses-6.3-20220226.patch +f629f40f42f187df2d2bd958f7aa8cbfc58a12f37a3aa905540c07c0c0afaa6315863616451ed43a3d6da33ff9a28b79a2dd863eeda029f892ec1c2f2716ebc9 ncurses-6.3-20220305.patch +9012cdb6ee73776fe04098b5677fa423dce324ba9307500b01488c4a9bf0d73c669d2bfa9b655633778dda041db92f5db7023a404883be99287724a1cc340a2d ncurses-6.3-20220312.patch +a77e2b9555a8eb863ad2c6706787c1fdc5f27df964ab5136e0db947f9ec299e94323342bb162a2eaee9231c3282f38f460692fb82664aea079b342db184fd858 ncurses-6.3-20220319.patch +a4945607917f59442de8ef08f4e7347a63b349e5686228c6f5fda4fcb7017362d51afe2a590ebe2a0743a7cccf905c79d06f5937f853fbfda4d3d3f0054a0f6b ncurses-6.3-20220326.patch +a8daa9c031a937caefaab41d2b9555e76b72c58aad385a6cbb79e5fc7860302c487ed09ae31f4857a849366c0ab65c36647a7d2be0fa791b3099479917f2a857 ncurses-6.3-20220402.patch +dd418aa115ef5cd0f5441bcc230bfdcb479bf4469de8c0e91133d09371c029b48a2ae9cde21c76464b9a02aba136b496647eaabf4f960ccc564f8534898f9adb ncurses-6.3-20220409.patch +f244cc8a241e85fb595b784e628ea43dd015124674e8e61dd35044d47664b620a04d35c73b2f4adea798f9843629c9d61cbfe52f8de49ead8e0159086f192931 ncurses-6.3-20220416.patch +5373f228cba6b7869210384a607a2d7faecfcbfef6dbfcd7c513f4e84fbd8bcad53ac7db2e7e84b95582248c1039dcfc7c4db205a618f7da22a166db482f0105 ncurses-6.3.tar.gz" diff --git a/system/ncurses/maintain b/system/ncurses/maintain new file mode 100755 index 000000000..3112cf87a --- /dev/null +++ b/system/ncurses/maintain @@ -0,0 +1,64 @@ +#!/bin/sh -e + +## +# This script downloads the "base" ncurses tarball and all patches (if any) +# up to and including the version specified in '_ver', to a temporary dir. +# +# It prints a first pass at 'sources=' and the corresponding checksums. You +# need to copy/paste these into the APKBUILD yourself. Ensure tabs!!! +# + +## +# Only run from this directory. +# +test -f APKBUILD || exit 1; +. ./APKBUILD + +## +# Mirror (note: not invisible-island, related). +# +m=https://invisible-mirror.net/archives/ncurses + +## +# Parse the HTML from directory index to determine available patches. +# +p=$(curl -s ${m}/${pkgver}/ \ + | grep -oE '[0-9]{8}\.patch' `# 8-digit date` \ + | sort \ + | uniq \ + | awk "\$1 <= ${_ver} + 1" `# exclude newly-available patches` \ + | awk "{print \"${m}/${pkgver}/${pkgname}-${pkgver}-\"\$1\".gz\"}" +); + +d=$(mktemp -d); +cd ${d}; + +## +# Download "base" tarball. +# +s=${m}/${pkgname}-${pkgver}.tar.gz; +curl -sq -O ${s}; + +## +# Generate 'source=', extracting patches along the way. +# +printf "source=\"%s\n" "${s}"; +for k in ${p}; do + curl -sq -O ${k}; + gzip -d ${k##*/}; + _k=${k##*/}; + printf "\t%s\n" "${_k%.*}"; +done +printf "\t\"\n"; + +## +# Checksums. +# +sha512sum $(find . -type f -print | cut -d/ -f2- | sort); +rm "${s##*/}"; + +## +# Cleanup. +# +printf "\n"; +printf "YOU MUST COPY THE PATCHES FROM '%s' (and delete that dir after)!\n" "${d}"; diff --git a/system/ncurses/ncurses-6.3-20211026.patch b/system/ncurses/ncurses-6.3-20211026.patch new file mode 100644 index 000000000..cc4bf0d6a --- /dev/null +++ b/system/ncurses/ncurses-6.3-20211026.patch @@ -0,0 +1,23250 @@ +# ncurses 6.3 - patch 20211026 - Thomas E. Dickey +# +# ------------------------------------------------------------------------------ +# +# Ncurses 6.3 is at +# ftp.gnu.org:/pub/gnu +# +# Patches for ncurses 6.3 can be found at +# ftp://ftp.invisible-island.net/ncurses/6.3 +# http://invisible-mirror.net/archives/ncurses/6.3 +# +# ------------------------------------------------------------------------------ +# ftp://ftp.invisible-island.net/ncurses/6.3/ncurses-6.3-20211026.patch.gz +# patch by Thomas E. Dickey +# created Tue Oct 26 23:55:34 UTC 2021 +# ------------------------------------------------------------------------------ +# Ada95/aclocal.m4 | 91 +# Ada95/configure | 2447 ++++++++++---------- +# INSTALL | 13 +# NEWS | 8 +# VERSION | 2 +# aclocal.m4 | 95 +# configure | 4321 ++++++++++++++++++------------------- +# dist.mk | 4 +# package/debian-mingw/changelog | 4 +# package/debian-mingw64/changelog | 4 +# package/debian/changelog | 4 +# package/mingw-ncurses.nsi | 4 +# package/mingw-ncurses.spec | 2 +# package/ncurses.spec | 2 +# package/ncursest.spec | 2 +# 15 files changed, 3496 insertions(+), 3507 deletions(-) +# ------------------------------------------------------------------------------ +Index: Ada95/aclocal.m4 +Prereq: 1.185 +--- ncurses-6.3-20211021+/Ada95/aclocal.m4 2021-10-17 15:16:03.000000000 +0000 ++++ ncurses-6.3-20211026/Ada95/aclocal.m4 2021-10-26 20:50:11.000000000 +0000 +@@ -29,7 +29,7 @@ + dnl + dnl Author: Thomas E. Dickey + dnl +-dnl $Id: aclocal.m4,v 1.185 2021/10/17 15:16:03 tom Exp $ ++dnl $Id: aclocal.m4,v 1.187 2021/10/26 20:50:11 tom Exp $ + dnl Macros used in NCURSES Ada95 auto-configuration script. + dnl + dnl These macros are maintained separately from NCURSES. The copyright on +@@ -4771,7 +4771,7 @@ + AC_SUBST($3)dnl + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_WITH_PKG_CONFIG_LIBDIR version: 13 updated: 2021/10/17 11:12:47 ++dnl CF_WITH_PKG_CONFIG_LIBDIR version: 16 updated: 2021/10/26 16:50:11 + dnl ------------------------- + dnl Allow the choice of the pkg-config library directory to be overridden. + dnl +@@ -4808,62 +4808,28 @@ + CF_VERBOSE(auto...) + # Look for the library directory using the same prefix as the executable + AC_MSG_CHECKING(for search-list) +- if test "x$PKG_CONFIG" = xnone ++ if test "x$PKG_CONFIG" != xnone + then +- cf_path=$prefix +- else +- cf_path=`echo "$PKG_CONFIG" | sed -e 's,/[[^/]]*/[[^/]]*$,,'` ++ # works for pkg-config since version 0.24 (2009) ++ cf_pkg_program=`echo "$PKG_CONFIG" | sed -e 's,^.*/,,'` ++ cf_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null | tr : ' '` ++ ++ # works for pkgconf since version 0.8.3 (2012) ++ test -z "$cf_search_path" && \ ++ cf_search_path=`pkgconf --variable=pc_path pkgconf 2>/dev/null | tr : ' '` ++ ++ # works for pkg-config since import in 2005 of original 2001 HP code. ++ test -z "$cf_search_path" && \ + cf_search_path=` +- "$PKG_CONFIG" --debug --exists no-such-package 2>&1 | awk "\ +-/^Scanning directory #[1-9][0-9]* '.*'$/{ \ ++ "$PKG_CONFIG" --debug --exists no-such-package 2>&1 | $AWK "\ ++/^Scanning directory (#[1-9][0-9]* )?'.*'$/{ \ + sub(\"^[[^']]*'\",\"\"); \ + sub(\"'.*\",\"\"); \ + printf \" %s\", \\[$]0; } \ +-/trying path:/{ +- sub(\"^.* trying path: \",\"\"); +- sub(\" for no-such-package.*$\",\"\"); +- printf \" %s\", \\[$]0; +-} + { next; } \ + "` + fi + +- if test -z "$cf_search_path" +- then +- # If you don't like using the default architecture, you have to specify +- # the intended library directory and corresponding compiler/linker +- # options. +- # +- # This case allows for Debian's 2014-flavor of multiarch, along with +- # the most common variations before that point. Some other variants +- # spell the directory differently, e.g., "pkg-config", and put it in +- # unusual places. +- # +- # pkg-config has always been poorly standardized, which is ironic... +- case x`(arch) 2>/dev/null` in +- (*64) +- cf_test_path="\ +- $cf_path/lib/*64-linux-gnu \ +- $cf_path/share \ +- $cf_path/lib64 \ +- $cf_path/lib32 \ +- $cf_path/lib" +- ;; +- (*) +- cf_test_path="\ +- $cf_path/lib/*-linux-gnu \ +- $cf_path/share \ +- $cf_path/lib32 \ +- $cf_path/lib \ +- $cf_path/libdata" +- ;; +- esac +- for cf_config in $cf_test_path +- do +- test -d "$cf_config/pkgconfig" && cf_search_path="$cf_search_path $cf_config/pkgconfig" +- done +- fi +- + AC_MSG_RESULT($cf_search_path) + + ;; +@@ -4888,6 +4854,33 @@ + PKG_CONFIG_LIBDIR="$cf_pkg_config_path" + fi + ++if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path" ++then ++ AC_MSG_CHECKING(for workaround) ++ if test "$prefix" = "NONE" ; then ++ cf_prefix="$ac_default_prefix" ++ else ++ cf_prefix="$prefix" ++ fi ++ eval cf_libdir=$libdir ++ cf_libdir=`echo "$cf_libdir" | sed -e "s,^NONE,$cf_prefix,"` ++ cf_backup= ++ for cf_config in $cf_search_path ++ do ++ case $cf_config in ++ $cf_libdir/pkgconfig) ++ PKG_CONFIG_LIBDIR=$cf_libdir/pkgconfig ++ break ++ ;; ++ *) ++ test -z "$cf_backup" && cf_backup=$cf_config ++ ;; ++ esac ++ done ++ test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup ++ AC_MSG_RESULT($PKG_CONFIG_LIBDIR) ++fi ++ + AC_SUBST(PKG_CONFIG_LIBDIR) + ])dnl + dnl --------------------------------------------------------------------------- +Index: Ada95/configure +--- ncurses-6.3-20211021+/Ada95/configure 2021-10-17 15:16:26.000000000 +0000 ++++ ncurses-6.3-20211026/Ada95/configure 2021-10-26 20:50:11.000000000 +0000 +@@ -3301,63 +3301,29 @@ + # Look for the library directory using the same prefix as the executable + echo "$as_me:3302: checking for search-list" >&5 + echo $ECHO_N "checking for search-list... $ECHO_C" >&6 +- if test "x$PKG_CONFIG" = xnone ++ if test "x$PKG_CONFIG" != xnone + then +- cf_path=$prefix +- else +- cf_path=`echo "$PKG_CONFIG" | sed -e 's,/[^/]*/[^/]*$,,'` ++ # works for pkg-config since version 0.24 (2009) ++ cf_pkg_program=`echo "$PKG_CONFIG" | sed -e 's,^.*/,,'` ++ cf_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null | tr : ' '` ++ ++ # works for pkgconf since version 0.8.3 (2012) ++ test -z "$cf_search_path" && \ ++ cf_search_path=`pkgconf --variable=pc_path pkgconf 2>/dev/null | tr : ' '` ++ ++ # works for pkg-config since import in 2005 of original 2001 HP code. ++ test -z "$cf_search_path" && \ + cf_search_path=` +- "$PKG_CONFIG" --debug --exists no-such-package 2>&1 | awk "\ +-/^Scanning directory #[1-9][0-9]* '.*'$/{ \ ++ "$PKG_CONFIG" --debug --exists no-such-package 2>&1 | $AWK "\ ++/^Scanning directory (#[1-9][0-9]* )?'.*'$/{ \ + sub(\"^[^']*'\",\"\"); \ + sub(\"'.*\",\"\"); \ + printf \" %s\", \\$0; } \ +-/trying path:/{ +- sub(\"^.* trying path: \",\"\"); +- sub(\" for no-such-package.*$\",\"\"); +- printf \" %s\", \\$0; +-} + { next; } \ + "` + fi + +- if test -z "$cf_search_path" +- then +- # If you don't like using the default architecture, you have to specify +- # the intended library directory and corresponding compiler/linker +- # options. +- # +- # This case allows for Debian's 2014-flavor of multiarch, along with +- # the most common variations before that point. Some other variants +- # spell the directory differently, e.g., "pkg-config", and put it in +- # unusual places. +- # +- # pkg-config has always been poorly standardized, which is ironic... +- case x`(arch) 2>/dev/null` in +- (*64) +- cf_test_path="\ +- $cf_path/lib/*64-linux-gnu \ +- $cf_path/share \ +- $cf_path/lib64 \ +- $cf_path/lib32 \ +- $cf_path/lib" +- ;; +- (*) +- cf_test_path="\ +- $cf_path/lib/*-linux-gnu \ +- $cf_path/share \ +- $cf_path/lib32 \ +- $cf_path/lib \ +- $cf_path/libdata" +- ;; +- esac +- for cf_config in $cf_test_path +- do +- test -d "$cf_config/pkgconfig" && cf_search_path="$cf_search_path $cf_config/pkgconfig" +- done +- fi +- +- echo "$as_me:3360: result: $cf_search_path" >&5 ++ echo "$as_me:3326: result: $cf_search_path" >&5 + echo "${ECHO_T}$cf_search_path" >&6 + + ;; +@@ -3365,7 +3331,7 @@ + ;; + esac + +-echo "$as_me:3368: checking for first directory" >&5 ++echo "$as_me:3334: checking for first directory" >&5 + echo $ECHO_N "checking for first directory... $ECHO_C" >&6 + cf_pkg_config_path=none + for cf_config in $cf_search_path +@@ -3376,7 +3342,7 @@ + break + fi + done +-echo "$as_me:3379: result: $cf_pkg_config_path" >&5 ++echo "$as_me:3345: result: $cf_pkg_config_path" >&5 + echo "${ECHO_T}$cf_pkg_config_path" >&6 + + if test "x$cf_pkg_config_path" != xnone ; then +@@ -3384,7 +3350,36 @@ + PKG_CONFIG_LIBDIR="$cf_pkg_config_path" + fi + +-echo "$as_me:3387: checking if you want to build test-programs" >&5 ++if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path" ++then ++ echo "$as_me:3355: checking for workaround" >&5 ++echo $ECHO_N "checking for workaround... $ECHO_C" >&6 ++ if test "$prefix" = "NONE" ; then ++ cf_prefix="$ac_default_prefix" ++ else ++ cf_prefix="$prefix" ++ fi ++ eval cf_libdir=$libdir ++ cf_libdir=`echo "$cf_libdir" | sed -e "s,^NONE,$cf_prefix,"` ++ cf_backup= ++ for cf_config in $cf_search_path ++ do ++ case $cf_config in ++ $cf_libdir/pkgconfig) ++ PKG_CONFIG_LIBDIR=$cf_libdir/pkgconfig ++ break ++ ;; ++ *) ++ test -z "$cf_backup" && cf_backup=$cf_config ++ ;; ++ esac ++ done ++ test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup ++ echo "$as_me:3378: result: $PKG_CONFIG_LIBDIR" >&5 ++echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 ++fi ++ ++echo "$as_me:3382: checking if you want to build test-programs" >&5 + echo $ECHO_N "checking if you want to build test-programs... $ECHO_C" >&6 + + # Check whether --with-tests or --without-tests was given. +@@ -3394,10 +3389,10 @@ + else + cf_with_tests=yes + fi; +-echo "$as_me:3397: result: $cf_with_tests" >&5 ++echo "$as_me:3392: result: $cf_with_tests" >&5 + echo "${ECHO_T}$cf_with_tests" >&6 + +-echo "$as_me:3400: checking if we should assume mixed-case filenames" >&5 ++echo "$as_me:3395: checking if we should assume mixed-case filenames" >&5 + echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6 + + # Check whether --enable-mixed-case or --disable-mixed-case was given. +@@ -3407,11 +3402,11 @@ + else + enable_mixedcase=auto + fi; +-echo "$as_me:3410: result: $enable_mixedcase" >&5 ++echo "$as_me:3405: result: $enable_mixedcase" >&5 + echo "${ECHO_T}$enable_mixedcase" >&6 + if test "$enable_mixedcase" = "auto" ; then + +-echo "$as_me:3414: checking if filesystem supports mixed-case filenames" >&5 ++echo "$as_me:3409: checking if filesystem supports mixed-case filenames" >&5 + echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6 + if test "${cf_cv_mixedcase+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3438,7 +3433,7 @@ + fi + + fi +-echo "$as_me:3441: result: $cf_cv_mixedcase" >&5 ++echo "$as_me:3436: result: $cf_cv_mixedcase" >&5 + echo "${ECHO_T}$cf_cv_mixedcase" >&6 + test "$cf_cv_mixedcase" = yes && + cat >>confdefs.h <<\EOF +@@ -3456,7 +3451,7 @@ + fi + + # do this after mixed-case option (tags/TAGS is not as important as tic). +-echo "$as_me:3459: checking whether ${MAKE-make} sets \${MAKE}" >&5 ++echo "$as_me:3454: checking whether ${MAKE-make} sets \${MAKE}" >&5 + echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 + set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` + if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then +@@ -3476,16 +3471,16 @@ + rm -f conftest.make + fi + if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then +- echo "$as_me:3479: result: yes" >&5 ++ echo "$as_me:3474: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + SET_MAKE= + else +- echo "$as_me:3483: result: no" >&5 ++ echo "$as_me:3478: result: no" >&5 + echo "${ECHO_T}no" >&6 + SET_MAKE="MAKE=${MAKE-make}" + fi + +-echo "$as_me:3488: checking for \".PHONY\" make-support" >&5 ++echo "$as_me:3483: checking for \".PHONY\" make-support" >&5 + echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6 + if test "${cf_cv_make_PHONY+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3540,7 +3535,7 @@ + rm -rf conftest* + + fi +-echo "$as_me:3543: result: $cf_cv_make_PHONY" >&5 ++echo "$as_me:3538: result: $cf_cv_make_PHONY" >&5 + echo "${ECHO_T}$cf_cv_make_PHONY" >&6 + MAKE_NO_PHONY="#" + MAKE_PHONY="#" +@@ -3551,7 +3546,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:3554: checking for $ac_word" >&5 ++echo "$as_me:3549: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_CTAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3566,7 +3561,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_CTAGS="$ac_prog" +-echo "$as_me:3569: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3564: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3574,10 +3569,10 @@ + fi + CTAGS=$ac_cv_prog_CTAGS + if test -n "$CTAGS"; then +- echo "$as_me:3577: result: $CTAGS" >&5 ++ echo "$as_me:3572: result: $CTAGS" >&5 + echo "${ECHO_T}$CTAGS" >&6 + else +- echo "$as_me:3580: result: no" >&5 ++ echo "$as_me:3575: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3588,7 +3583,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:3591: checking for $ac_word" >&5 ++echo "$as_me:3586: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ETAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3603,7 +3598,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ETAGS="$ac_prog" +-echo "$as_me:3606: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3601: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3611,10 +3606,10 @@ + fi + ETAGS=$ac_cv_prog_ETAGS + if test -n "$ETAGS"; then +- echo "$as_me:3614: result: $ETAGS" >&5 ++ echo "$as_me:3609: result: $ETAGS" >&5 + echo "${ECHO_T}$ETAGS" >&6 + else +- echo "$as_me:3617: result: no" >&5 ++ echo "$as_me:3612: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3623,7 +3618,7 @@ + + # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args. + set dummy ${CTAGS:-ctags}; ac_word=$2 +-echo "$as_me:3626: checking for $ac_word" >&5 ++echo "$as_me:3621: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3638,7 +3633,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_MAKE_LOWER_TAGS="yes" +-echo "$as_me:3641: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3636: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3647,17 +3642,17 @@ + fi + MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS + if test -n "$MAKE_LOWER_TAGS"; then +- echo "$as_me:3650: result: $MAKE_LOWER_TAGS" >&5 ++ echo "$as_me:3645: result: $MAKE_LOWER_TAGS" >&5 + echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 + else +- echo "$as_me:3653: result: no" >&5 ++ echo "$as_me:3648: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + if test "$cf_cv_mixedcase" = yes ; then + # Extract the first word of "${ETAGS:-etags}", so it can be a program name with args. + set dummy ${ETAGS:-etags}; ac_word=$2 +-echo "$as_me:3660: checking for $ac_word" >&5 ++echo "$as_me:3655: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3672,7 +3667,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_MAKE_UPPER_TAGS="yes" +-echo "$as_me:3675: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3670: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3681,10 +3676,10 @@ + fi + MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS + if test -n "$MAKE_UPPER_TAGS"; then +- echo "$as_me:3684: result: $MAKE_UPPER_TAGS" >&5 ++ echo "$as_me:3679: result: $MAKE_UPPER_TAGS" >&5 + echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 + else +- echo "$as_me:3687: result: no" >&5 ++ echo "$as_me:3682: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3704,7 +3699,7 @@ + MAKE_LOWER_TAGS="#" + fi + +-echo "$as_me:3707: checking for makeflags variable" >&5 ++echo "$as_me:3702: checking for makeflags variable" >&5 + echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6 + if test "${cf_cv_makeflags+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3734,7 +3729,7 @@ + ;; + (*) + +-echo "${as_me:-configure}:3737: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 ++echo "${as_me:-configure}:3732: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 + + ;; + esac +@@ -3742,13 +3737,13 @@ + rm -f cf_makeflags.tmp + + fi +-echo "$as_me:3745: result: $cf_cv_makeflags" >&5 ++echo "$as_me:3740: result: $cf_cv_makeflags" >&5 + echo "${ECHO_T}$cf_cv_makeflags" >&6 + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. + set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +-echo "$as_me:3751: checking for $ac_word" >&5 ++echo "$as_me:3746: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3763,7 +3758,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" +-echo "$as_me:3766: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3761: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3771,10 +3766,10 @@ + fi + RANLIB=$ac_cv_prog_RANLIB + if test -n "$RANLIB"; then +- echo "$as_me:3774: result: $RANLIB" >&5 ++ echo "$as_me:3769: result: $RANLIB" >&5 + echo "${ECHO_T}$RANLIB" >&6 + else +- echo "$as_me:3777: result: no" >&5 ++ echo "$as_me:3772: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3783,7 +3778,7 @@ + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. + set dummy ranlib; ac_word=$2 +-echo "$as_me:3786: checking for $ac_word" >&5 ++echo "$as_me:3781: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3798,7 +3793,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_RANLIB="ranlib" +-echo "$as_me:3801: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3796: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3807,10 +3802,10 @@ + fi + ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB + if test -n "$ac_ct_RANLIB"; then +- echo "$as_me:3810: result: $ac_ct_RANLIB" >&5 ++ echo "$as_me:3805: result: $ac_ct_RANLIB" >&5 + echo "${ECHO_T}$ac_ct_RANLIB" >&6 + else +- echo "$as_me:3813: result: no" >&5 ++ echo "$as_me:3808: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3822,7 +3817,7 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. + set dummy ${ac_tool_prefix}ld; ac_word=$2 +-echo "$as_me:3825: checking for $ac_word" >&5 ++echo "$as_me:3820: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3837,7 +3832,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_LD="${ac_tool_prefix}ld" +-echo "$as_me:3840: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3835: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3845,10 +3840,10 @@ + fi + LD=$ac_cv_prog_LD + if test -n "$LD"; then +- echo "$as_me:3848: result: $LD" >&5 ++ echo "$as_me:3843: result: $LD" >&5 + echo "${ECHO_T}$LD" >&6 + else +- echo "$as_me:3851: result: no" >&5 ++ echo "$as_me:3846: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3857,7 +3852,7 @@ + ac_ct_LD=$LD + # Extract the first word of "ld", so it can be a program name with args. + set dummy ld; ac_word=$2 +-echo "$as_me:3860: checking for $ac_word" >&5 ++echo "$as_me:3855: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3872,7 +3867,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_LD="ld" +-echo "$as_me:3875: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3870: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3881,10 +3876,10 @@ + fi + ac_ct_LD=$ac_cv_prog_ac_ct_LD + if test -n "$ac_ct_LD"; then +- echo "$as_me:3884: result: $ac_ct_LD" >&5 ++ echo "$as_me:3879: result: $ac_ct_LD" >&5 + echo "${ECHO_T}$ac_ct_LD" >&6 + else +- echo "$as_me:3887: result: no" >&5 ++ echo "$as_me:3882: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3896,7 +3891,7 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. + set dummy ${ac_tool_prefix}ar; ac_word=$2 +-echo "$as_me:3899: checking for $ac_word" >&5 ++echo "$as_me:3894: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3911,7 +3906,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_AR="${ac_tool_prefix}ar" +-echo "$as_me:3914: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3909: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3919,10 +3914,10 @@ + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +- echo "$as_me:3922: result: $AR" >&5 ++ echo "$as_me:3917: result: $AR" >&5 + echo "${ECHO_T}$AR" >&6 + else +- echo "$as_me:3925: result: no" >&5 ++ echo "$as_me:3920: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3931,7 +3926,7 @@ + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. + set dummy ar; ac_word=$2 +-echo "$as_me:3934: checking for $ac_word" >&5 ++echo "$as_me:3929: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3946,7 +3941,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_AR="ar" +-echo "$as_me:3949: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3944: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3955,10 +3950,10 @@ + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +- echo "$as_me:3958: result: $ac_ct_AR" >&5 ++ echo "$as_me:3953: result: $ac_ct_AR" >&5 + echo "${ECHO_T}$ac_ct_AR" >&6 + else +- echo "$as_me:3961: result: no" >&5 ++ echo "$as_me:3956: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3970,7 +3965,7 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. + set dummy ${ac_tool_prefix}ar; ac_word=$2 +-echo "$as_me:3973: checking for $ac_word" >&5 ++echo "$as_me:3968: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3985,7 +3980,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_AR="${ac_tool_prefix}ar" +-echo "$as_me:3988: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3983: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3993,10 +3988,10 @@ + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +- echo "$as_me:3996: result: $AR" >&5 ++ echo "$as_me:3991: result: $AR" >&5 + echo "${ECHO_T}$AR" >&6 + else +- echo "$as_me:3999: result: no" >&5 ++ echo "$as_me:3994: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4005,7 +4000,7 @@ + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. + set dummy ar; ac_word=$2 +-echo "$as_me:4008: checking for $ac_word" >&5 ++echo "$as_me:4003: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4020,7 +4015,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_AR="ar" +-echo "$as_me:4023: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4018: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4029,10 +4024,10 @@ + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +- echo "$as_me:4032: result: $ac_ct_AR" >&5 ++ echo "$as_me:4027: result: $ac_ct_AR" >&5 + echo "${ECHO_T}$ac_ct_AR" >&6 + else +- echo "$as_me:4035: result: no" >&5 ++ echo "$as_me:4030: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4041,7 +4036,7 @@ + AR="$ac_cv_prog_AR" + fi + +-echo "$as_me:4044: checking for options to update archives" >&5 ++echo "$as_me:4039: checking for options to update archives" >&5 + echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6 + if test "${cf_cv_ar_flags+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4078,13 +4073,13 @@ + rm -f conftest.a + + cat >"conftest.$ac_ext" <&5 ++ if { (eval echo "$as_me:4079: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4087: \$? = $ac_status" >&5 ++ echo "$as_me:4082: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then + echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5 + $AR $ARFLAGS "$cf_ar_flags" conftest.a "conftest.$ac_cv_objext" 2>&5 1>/dev/null +@@ -4095,7 +4090,7 @@ + else + test -n "$verbose" && echo " cannot compile test-program" 1>&6 + +-echo "${as_me:-configure}:4098: testing cannot compile test-program ..." 1>&5 ++echo "${as_me:-configure}:4093: testing cannot compile test-program ..." 1>&5 + + break + fi +@@ -4105,7 +4100,7 @@ + esac + + fi +-echo "$as_me:4108: result: $cf_cv_ar_flags" >&5 ++echo "$as_me:4103: result: $cf_cv_ar_flags" >&5 + echo "${ECHO_T}$cf_cv_ar_flags" >&6 + + if test -n "$ARFLAGS" ; then +@@ -4116,17 +4111,17 @@ + ARFLAGS=$cf_cv_ar_flags + fi + +- echo "$as_me:4119: checking for PATH separator" >&5 ++ echo "$as_me:4114: checking for PATH separator" >&5 + echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6 + case "$cf_cv_system_name" in + (os2*) PATH_SEPARATOR=';' ;; + (*) ${PATH_SEPARATOR:=':'} ;; + esac + +- echo "$as_me:4126: result: $PATH_SEPARATOR" >&5 ++ echo "$as_me:4121: result: $PATH_SEPARATOR" >&5 + echo "${ECHO_T}$PATH_SEPARATOR" >&6 + +-echo "$as_me:4129: checking if you have specified an install-prefix" >&5 ++echo "$as_me:4124: checking if you have specified an install-prefix" >&5 + echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6 + + # Check whether --with-install-prefix or --without-install-prefix was given. +@@ -4139,7 +4134,7 @@ + ;; + esac + fi; +-echo "$as_me:4142: result: $DESTDIR" >&5 ++echo "$as_me:4137: result: $DESTDIR" >&5 + echo "${ECHO_T}$DESTDIR" >&6 + + ############################################################################### +@@ -4167,7 +4162,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:4170: checking for $ac_word" >&5 ++echo "$as_me:4165: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_BUILD_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4182,7 +4177,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_BUILD_CC="$ac_prog" +-echo "$as_me:4185: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4180: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4190,10 +4185,10 @@ + fi + BUILD_CC=$ac_cv_prog_BUILD_CC + if test -n "$BUILD_CC"; then +- echo "$as_me:4193: result: $BUILD_CC" >&5 ++ echo "$as_me:4188: result: $BUILD_CC" >&5 + echo "${ECHO_T}$BUILD_CC" >&6 + else +- echo "$as_me:4196: result: no" >&5 ++ echo "$as_me:4191: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4202,12 +4197,12 @@ + test -n "$BUILD_CC" || BUILD_CC="none" + + fi; +- echo "$as_me:4205: checking for native build C compiler" >&5 ++ echo "$as_me:4200: checking for native build C compiler" >&5 + echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6 +- echo "$as_me:4207: result: $BUILD_CC" >&5 ++ echo "$as_me:4202: result: $BUILD_CC" >&5 + echo "${ECHO_T}$BUILD_CC" >&6 + +- echo "$as_me:4210: checking for native build C preprocessor" >&5 ++ echo "$as_me:4205: checking for native build C preprocessor" >&5 + echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6 + + # Check whether --with-build-cpp or --without-build-cpp was given. +@@ -4217,10 +4212,10 @@ + else + BUILD_CPP='${BUILD_CC} -E' + fi; +- echo "$as_me:4220: result: $BUILD_CPP" >&5 ++ echo "$as_me:4215: result: $BUILD_CPP" >&5 + echo "${ECHO_T}$BUILD_CPP" >&6 + +- echo "$as_me:4223: checking for native build C flags" >&5 ++ echo "$as_me:4218: checking for native build C flags" >&5 + echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6 + + # Check whether --with-build-cflags or --without-build-cflags was given. +@@ -4228,10 +4223,10 @@ + withval="$with_build_cflags" + BUILD_CFLAGS="$withval" + fi; +- echo "$as_me:4231: result: $BUILD_CFLAGS" >&5 ++ echo "$as_me:4226: result: $BUILD_CFLAGS" >&5 + echo "${ECHO_T}$BUILD_CFLAGS" >&6 + +- echo "$as_me:4234: checking for native build C preprocessor-flags" >&5 ++ echo "$as_me:4229: checking for native build C preprocessor-flags" >&5 + echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6 + + # Check whether --with-build-cppflags or --without-build-cppflags was given. +@@ -4239,10 +4234,10 @@ + withval="$with_build_cppflags" + BUILD_CPPFLAGS="$withval" + fi; +- echo "$as_me:4242: result: $BUILD_CPPFLAGS" >&5 ++ echo "$as_me:4237: result: $BUILD_CPPFLAGS" >&5 + echo "${ECHO_T}$BUILD_CPPFLAGS" >&6 + +- echo "$as_me:4245: checking for native build linker-flags" >&5 ++ echo "$as_me:4240: checking for native build linker-flags" >&5 + echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6 + + # Check whether --with-build-ldflags or --without-build-ldflags was given. +@@ -4250,10 +4245,10 @@ + withval="$with_build_ldflags" + BUILD_LDFLAGS="$withval" + fi; +- echo "$as_me:4253: result: $BUILD_LDFLAGS" >&5 ++ echo "$as_me:4248: result: $BUILD_LDFLAGS" >&5 + echo "${ECHO_T}$BUILD_LDFLAGS" >&6 + +- echo "$as_me:4256: checking for native build linker-libraries" >&5 ++ echo "$as_me:4251: checking for native build linker-libraries" >&5 + echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6 + + # Check whether --with-build-libs or --without-build-libs was given. +@@ -4261,7 +4256,7 @@ + withval="$with_build_libs" + BUILD_LIBS="$withval" + fi; +- echo "$as_me:4264: result: $BUILD_LIBS" >&5 ++ echo "$as_me:4259: result: $BUILD_LIBS" >&5 + echo "${ECHO_T}$BUILD_LIBS" >&6 + + # this assumes we're on Unix. +@@ -4271,7 +4266,7 @@ + : ${BUILD_CC:='${CC}'} + + if { test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}'; } ; then +- { { echo "$as_me:4274: error: Cross-build requires two compilers. ++ { { echo "$as_me:4269: error: Cross-build requires two compilers. + Use --with-build-cc to specify the native compiler." >&5 + echo "$as_me: error: Cross-build requires two compilers. + Use --with-build-cc to specify the native compiler." >&2;} +@@ -4296,7 +4291,7 @@ + ### shared, for example. + cf_list_models="" + +-echo "$as_me:4299: checking if you want to build shared C-objects" >&5 ++echo "$as_me:4294: checking if you want to build shared C-objects" >&5 + echo $ECHO_N "checking if you want to build shared C-objects... $ECHO_C" >&6 + + # Check whether --with-shared or --without-shared was given. +@@ -4306,27 +4301,27 @@ + else + with_shared=no + fi; +-echo "$as_me:4309: result: $with_shared" >&5 ++echo "$as_me:4304: result: $with_shared" >&5 + echo "${ECHO_T}$with_shared" >&6 + test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared" + +-echo "$as_me:4313: checking for specified models" >&5 ++echo "$as_me:4308: checking for specified models" >&5 + echo $ECHO_N "checking for specified models... $ECHO_C" >&6 + test -z "$cf_list_models" && cf_list_models=normal +-echo "$as_me:4316: result: $cf_list_models" >&5 ++echo "$as_me:4311: result: $cf_list_models" >&5 + echo "${ECHO_T}$cf_list_models" >&6 + + ### Use the first model as the default, and save its suffix for use in building + ### up test-applications. +-echo "$as_me:4321: checking for default model" >&5 ++echo "$as_me:4316: checking for default model" >&5 + echo $ECHO_N "checking for default model... $ECHO_C" >&6 + DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'` +-echo "$as_me:4324: result: $DFT_LWR_MODEL" >&5 ++echo "$as_me:4319: result: $DFT_LWR_MODEL" >&5 + echo "${ECHO_T}$DFT_LWR_MODEL" >&6 + + DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + +-echo "$as_me:4329: checking for specific curses-directory" >&5 ++echo "$as_me:4324: checking for specific curses-directory" >&5 + echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6 + + # Check whether --with-curses-dir or --without-curses-dir was given. +@@ -4336,7 +4331,7 @@ + else + cf_cv_curses_dir=no + fi; +-echo "$as_me:4339: result: $cf_cv_curses_dir" >&5 ++echo "$as_me:4334: result: $cf_cv_curses_dir" >&5 + echo "${ECHO_T}$cf_cv_curses_dir" >&6 + + if test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" +@@ -4367,7 +4362,7 @@ + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:4370: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:4365: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -4403,7 +4398,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 4406 "configure" ++#line 4401 "configure" + #include "confdefs.h" + #include + int +@@ -4415,16 +4410,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:4418: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4413: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4421: \$? = $ac_status" >&5 ++ echo "$as_me:4416: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:4424: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4419: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4427: \$? = $ac_status" >&5 ++ echo "$as_me:4422: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -4441,7 +4436,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:4444: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:4439: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -4477,7 +4472,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me:-configure}:4480: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:4475: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -4492,13 +4487,13 @@ + cf_have_ncuconfig=no + + if test "x${PKG_CONFIG:=none}" != xnone; then +- echo "$as_me:4495: checking pkg-config for $cf_ncuconfig_root" >&5 ++ echo "$as_me:4490: checking pkg-config for $cf_ncuconfig_root" >&5 + echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6 + if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then +- echo "$as_me:4498: result: yes" >&5 ++ echo "$as_me:4493: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + +- echo "$as_me:4501: checking if the $cf_ncuconfig_root package files work" >&5 ++ echo "$as_me:4496: checking if the $cf_ncuconfig_root package files work" >&5 + echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 + cf_have_ncuconfig=unknown + +@@ -4631,7 +4626,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 4634 "configure" ++#line 4629 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -4643,37 +4638,37 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:4646: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:4641: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:4649: \$? = $ac_status" >&5 ++ echo "$as_me:4644: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:4652: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4647: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4655: \$? = $ac_status" >&5 ++ echo "$as_me:4650: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + if test "$cross_compiling" = yes; then + cf_test_ncuconfig=maybe + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 4661 "configure" ++#line 4656 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int main(void) + { const char *xx = curses_version(); return (xx == 0); } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:4668: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:4663: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:4671: \$? = $ac_status" >&5 ++ echo "$as_me:4666: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:4673: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4668: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4676: \$? = $ac_status" >&5 ++ echo "$as_me:4671: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_test_ncuconfig=yes + else +@@ -4847,7 +4842,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 4850 "configure" ++#line 4845 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -4859,37 +4854,37 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:4862: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:4857: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:4865: \$? = $ac_status" >&5 ++ echo "$as_me:4860: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:4868: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4863: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4871: \$? = $ac_status" >&5 ++ echo "$as_me:4866: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + if test "$cross_compiling" = yes; then + cf_have_ncuconfig=maybe + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 4877 "configure" ++#line 4872 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int main(void) + { const char *xx = curses_version(); return (xx == 0); } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:4884: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:4879: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:4887: \$? = $ac_status" >&5 ++ echo "$as_me:4882: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:4889: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4884: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4892: \$? = $ac_status" >&5 ++ echo "$as_me:4887: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_have_ncuconfig=yes + else +@@ -4906,7 +4901,7 @@ + cf_have_ncuconfig=no + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +- echo "$as_me:4909: result: $cf_have_ncuconfig" >&5 ++ echo "$as_me:4904: result: $cf_have_ncuconfig" >&5 + echo "${ECHO_T}$cf_have_ncuconfig" >&6 + test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes + if test "$cf_have_ncuconfig" != "yes" +@@ -4922,7 +4917,7 @@ + + NCURSES_CONFIG_PKG=$cf_ncuconfig_root + +-echo "$as_me:4925: checking for terminfo header" >&5 ++echo "$as_me:4920: checking for terminfo header" >&5 + echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 + if test "${cf_cv_term_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4940,7 +4935,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 4943 "configure" ++#line 4938 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -4955,16 +4950,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:4958: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4953: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4961: \$? = $ac_status" >&5 ++ echo "$as_me:4956: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:4964: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4959: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4967: \$? = $ac_status" >&5 ++ echo "$as_me:4962: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_term_header="$cf_test" +@@ -4980,7 +4975,7 @@ + done + + fi +-echo "$as_me:4983: result: $cf_cv_term_header" >&5 ++echo "$as_me:4978: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -5015,7 +5010,7 @@ + fi + + else +- echo "$as_me:5018: result: no" >&5 ++ echo "$as_me:5013: result: no" >&5 + echo "${ECHO_T}no" >&6 + NCURSES_CONFIG_PKG=none + fi +@@ -5031,7 +5026,7 @@ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-echo "$as_me:5034: checking for $ac_word" >&5 ++echo "$as_me:5029: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5046,7 +5041,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" +-echo "$as_me:5049: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5044: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5054,10 +5049,10 @@ + fi + NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG + if test -n "$NCURSES_CONFIG"; then +- echo "$as_me:5057: result: $NCURSES_CONFIG" >&5 ++ echo "$as_me:5052: result: $NCURSES_CONFIG" >&5 + echo "${ECHO_T}$NCURSES_CONFIG" >&6 + else +- echo "$as_me:5060: result: no" >&5 ++ echo "$as_me:5055: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5070,7 +5065,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:5073: checking for $ac_word" >&5 ++echo "$as_me:5068: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5085,7 +5080,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" +-echo "$as_me:5088: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5083: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5093,10 +5088,10 @@ + fi + ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG + if test -n "$ac_ct_NCURSES_CONFIG"; then +- echo "$as_me:5096: result: $ac_ct_NCURSES_CONFIG" >&5 ++ echo "$as_me:5091: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 + else +- echo "$as_me:5099: result: no" >&5 ++ echo "$as_me:5094: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5253,7 +5248,7 @@ + + # even with config script, some packages use no-override for curses.h + +-echo "$as_me:5256: checking if we have identified curses headers" >&5 ++echo "$as_me:5251: checking if we have identified curses headers" >&5 + echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 + if test "${cf_cv_ncurses_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5265,7 +5260,7 @@ + curses.h ncurses/curses.h + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 5268 "configure" ++#line 5263 "configure" + #include "confdefs.h" + #include <${cf_header}> + int +@@ -5277,16 +5272,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:5280: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5275: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5283: \$? = $ac_status" >&5 ++ echo "$as_me:5278: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:5286: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5281: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5289: \$? = $ac_status" >&5 ++ echo "$as_me:5284: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_header=$cf_header; break + else +@@ -5297,11 +5292,11 @@ + done + + fi +-echo "$as_me:5300: result: $cf_cv_ncurses_header" >&5 ++echo "$as_me:5295: result: $cf_cv_ncurses_header" >&5 + echo "${ECHO_T}$cf_cv_ncurses_header" >&6 + + if test "$cf_cv_ncurses_header" = none ; then +- { { echo "$as_me:5304: error: No curses header-files found" >&5 ++ { { echo "$as_me:5299: error: No curses header-files found" >&5 + echo "$as_me: error: No curses header-files found" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -5311,23 +5306,23 @@ + for ac_header in $cf_cv_ncurses_header + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:5314: checking for $ac_header" >&5 ++echo "$as_me:5309: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 5320 "configure" ++#line 5315 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:5324: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:5319: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:5330: \$? = $ac_status" >&5 ++ echo "$as_me:5325: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -5346,7 +5341,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:5349: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:5344: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF +-#line 5405 "configure" ++#line 5400 "configure" + #include "confdefs.h" + #include + int +@@ -5414,16 +5409,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:5417: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5412: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5420: \$? = $ac_status" >&5 ++ echo "$as_me:5415: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:5423: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5418: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5426: \$? = $ac_status" >&5 ++ echo "$as_me:5421: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -5440,7 +5435,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:5443: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:5438: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -5459,7 +5454,7 @@ + + } + +-echo "$as_me:5462: checking for $cf_ncuhdr_root header in include-path" >&5 ++echo "$as_me:5457: checking for $cf_ncuhdr_root header in include-path" >&5 + echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 + if test "${cf_cv_ncurses_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5471,7 +5466,7 @@ + do + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 5474 "configure" ++#line 5469 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -5495,16 +5490,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:5498: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5493: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5501: \$? = $ac_status" >&5 ++ echo "$as_me:5496: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:5504: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5499: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5507: \$? = $ac_status" >&5 ++ echo "$as_me:5502: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_h=$cf_header + +@@ -5519,14 +5514,14 @@ + done + + fi +-echo "$as_me:5522: result: $cf_cv_ncurses_h" >&5 ++echo "$as_me:5517: result: $cf_cv_ncurses_h" >&5 + echo "${ECHO_T}$cf_cv_ncurses_h" >&6 + + if test "$cf_cv_ncurses_h" != no ; then + cf_cv_ncurses_header=$cf_cv_ncurses_h + else + +-echo "$as_me:5529: checking for $cf_ncuhdr_root include-path" >&5 ++echo "$as_me:5524: checking for $cf_ncuhdr_root include-path" >&5 + echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 + if test "${cf_cv_ncurses_h2+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5647,7 +5642,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 5650 "configure" ++#line 5645 "configure" + #include "confdefs.h" + #include + int +@@ -5659,16 +5654,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:5662: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5657: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5665: \$? = $ac_status" >&5 ++ echo "$as_me:5660: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:5668: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5663: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5671: \$? = $ac_status" >&5 ++ echo "$as_me:5666: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -5685,7 +5680,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:5688: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:5683: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -5708,7 +5703,7 @@ + do + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 5711 "configure" ++#line 5706 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -5732,16 +5727,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:5735: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5730: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5738: \$? = $ac_status" >&5 ++ echo "$as_me:5733: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:5741: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5736: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5744: \$? = $ac_status" >&5 ++ echo "$as_me:5739: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_h2=$cf_header + +@@ -5762,12 +5757,12 @@ + CPPFLAGS="$cf_save2_CPPFLAGS" + test "$cf_cv_ncurses_h2" != no && break + done +- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5765: error: not found" >&5 ++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5760: error: not found" >&5 + echo "$as_me: error: not found" >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:5770: result: $cf_cv_ncurses_h2" >&5 ++echo "$as_me:5765: result: $cf_cv_ncurses_h2" >&5 + echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 + + cf_1st_incdir=`echo "$cf_cv_ncurses_h2" | sed -e 's%/[^/]*$%%'` +@@ -5803,7 +5798,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 5806 "configure" ++#line 5801 "configure" + #include "confdefs.h" + #include + int +@@ -5815,16 +5810,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:5818: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5813: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5821: \$? = $ac_status" >&5 ++ echo "$as_me:5816: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:5824: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5819: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5827: \$? = $ac_status" >&5 ++ echo "$as_me:5822: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -5841,7 +5836,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:5844: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:5839: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -5889,7 +5884,7 @@ + ;; + esac + +-echo "$as_me:5892: checking for terminfo header" >&5 ++echo "$as_me:5887: checking for terminfo header" >&5 + echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 + if test "${cf_cv_term_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5907,7 +5902,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 5910 "configure" ++#line 5905 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -5922,16 +5917,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:5925: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5920: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5928: \$? = $ac_status" >&5 ++ echo "$as_me:5923: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:5931: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5926: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5934: \$? = $ac_status" >&5 ++ echo "$as_me:5929: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_term_header="$cf_test" +@@ -5947,7 +5942,7 @@ + done + + fi +-echo "$as_me:5950: result: $cf_cv_term_header" >&5 ++echo "$as_me:5945: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -5985,7 +5980,7 @@ + #define NCURSES 1 + EOF + +-echo "$as_me:5988: checking for ncurses version" >&5 ++echo "$as_me:5983: checking for ncurses version" >&5 + echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 + if test "${cf_cv_ncurses_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6011,10 +6006,10 @@ + #endif + EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" +- { (eval echo "$as_me:6014: \"$cf_try\"") >&5 ++ { (eval echo "$as_me:6009: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? +- echo "$as_me:6017: \$? = $ac_status" >&5 ++ echo "$as_me:6012: \$? = $ac_status" >&5 + (exit "$ac_status"); } + if test -f conftest.out ; then + cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` +@@ -6024,7 +6019,7 @@ + + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6027 "configure" ++#line 6022 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -6049,15 +6044,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:6052: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6047: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6055: \$? = $ac_status" >&5 ++ echo "$as_me:6050: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:6057: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6052: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6060: \$? = $ac_status" >&5 ++ echo "$as_me:6055: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_ncurses_version=`cat $cf_tempfile` +@@ -6071,7 +6066,7 @@ + rm -f "$cf_tempfile" + + fi +-echo "$as_me:6074: result: $cf_cv_ncurses_version" >&5 ++echo "$as_me:6069: result: $cf_cv_ncurses_version" >&5 + echo "${ECHO_T}$cf_cv_ncurses_version" >&6 + test "$cf_cv_ncurses_version" = no || + cat >>confdefs.h <<\EOF +@@ -6084,7 +6079,7 @@ + # to link gpm. + cf_ncurses_LIBS="" + cf_ncurses_SAVE="$LIBS" +-echo "$as_me:6087: checking for Gpm_Open in -lgpm" >&5 ++echo "$as_me:6082: checking for Gpm_Open in -lgpm" >&5 + echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 + if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6092,7 +6087,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6095 "configure" ++#line 6090 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -6111,16 +6106,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6114: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6109: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6117: \$? = $ac_status" >&5 ++ echo "$as_me:6112: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6120: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6115: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6123: \$? = $ac_status" >&5 ++ echo "$as_me:6118: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gpm_Gpm_Open=yes + else +@@ -6131,10 +6126,10 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:6134: result: $ac_cv_lib_gpm_Gpm_Open" >&5 ++echo "$as_me:6129: result: $ac_cv_lib_gpm_Gpm_Open" >&5 + echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 + if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then +- echo "$as_me:6137: checking for initscr in -lgpm" >&5 ++ echo "$as_me:6132: checking for initscr in -lgpm" >&5 + echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 + if test "${ac_cv_lib_gpm_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6142,7 +6137,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6145 "configure" ++#line 6140 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -6161,16 +6156,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6164: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6159: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6167: \$? = $ac_status" >&5 ++ echo "$as_me:6162: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6170: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6165: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6173: \$? = $ac_status" >&5 ++ echo "$as_me:6168: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gpm_initscr=yes + else +@@ -6181,7 +6176,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:6184: result: $ac_cv_lib_gpm_initscr" >&5 ++echo "$as_me:6179: result: $ac_cv_lib_gpm_initscr" >&5 + echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 + if test "$ac_cv_lib_gpm_initscr" = yes; then + LIBS="$cf_ncurses_SAVE" +@@ -6196,7 +6191,7 @@ + # This is only necessary if you are linking against an obsolete + # version of ncurses (but it should do no harm, since it is static). + if test "$cf_nculib_root" = ncurses ; then +- echo "$as_me:6199: checking for tgoto in -lmytinfo" >&5 ++ echo "$as_me:6194: checking for tgoto in -lmytinfo" >&5 + echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 + if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6204,7 +6199,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmytinfo $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6207 "configure" ++#line 6202 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -6223,16 +6218,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6226: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6221: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6229: \$? = $ac_status" >&5 ++ echo "$as_me:6224: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6232: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6227: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6235: \$? = $ac_status" >&5 ++ echo "$as_me:6230: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_mytinfo_tgoto=yes + else +@@ -6243,7 +6238,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:6246: result: $ac_cv_lib_mytinfo_tgoto" >&5 ++echo "$as_me:6241: result: $ac_cv_lib_mytinfo_tgoto" >&5 + echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 + if test "$ac_cv_lib_mytinfo_tgoto" = yes; then + cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" +@@ -6292,13 +6287,13 @@ + + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' + cf_libdir="" +- echo "$as_me:6295: checking for initscr" >&5 ++ echo "$as_me:6290: checking for initscr" >&5 + echo $ECHO_N "checking for initscr... $ECHO_C" >&6 + if test "${ac_cv_func_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6301 "configure" ++#line 6296 "configure" + #include "confdefs.h" + #define initscr autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -6329,16 +6324,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6332: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6327: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6335: \$? = $ac_status" >&5 ++ echo "$as_me:6330: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6338: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6333: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6341: \$? = $ac_status" >&5 ++ echo "$as_me:6336: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_initscr=yes + else +@@ -6348,18 +6343,18 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:6351: result: $ac_cv_func_initscr" >&5 ++echo "$as_me:6346: result: $ac_cv_func_initscr" >&5 + echo "${ECHO_T}$ac_cv_func_initscr" >&6 + if test "$ac_cv_func_initscr" = yes; then + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' + else + + cf_save_LIBS="$LIBS" +- echo "$as_me:6358: checking for initscr in -l$cf_nculib_root" >&5 ++ echo "$as_me:6353: checking for initscr in -l$cf_nculib_root" >&5 + echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 + LIBS="-l$cf_nculib_root $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6362 "configure" ++#line 6357 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -6371,25 +6366,25 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6374: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6369: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6377: \$? = $ac_status" >&5 ++ echo "$as_me:6372: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6380: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6375: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6383: \$? = $ac_status" >&5 ++ echo "$as_me:6378: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then +- echo "$as_me:6385: result: yes" >&5 ++ echo "$as_me:6380: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' + + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 +-echo "$as_me:6392: result: no" >&5 ++echo "$as_me:6387: result: no" >&5 + echo "${ECHO_T}no" >&6 + + cf_search= +@@ -6457,11 +6452,11 @@ + + for cf_libdir in $cf_search + do +- echo "$as_me:6460: checking for -l$cf_nculib_root in $cf_libdir" >&5 ++ echo "$as_me:6455: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 + LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6464 "configure" ++#line 6459 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -6473,25 +6468,25 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6476: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6471: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6479: \$? = $ac_status" >&5 ++ echo "$as_me:6474: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6482: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6477: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6485: \$? = $ac_status" >&5 ++ echo "$as_me:6480: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then +- echo "$as_me:6487: result: yes" >&5 ++ echo "$as_me:6482: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' + break + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 +-echo "$as_me:6494: result: no" >&5 ++echo "$as_me:6489: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_save_LIBS" + fi +@@ -6506,7 +6501,7 @@ + eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" + + if test "$cf_found_library" = no ; then +- { { echo "$as_me:6509: error: Cannot link $cf_nculib_root library" >&5 ++ { { echo "$as_me:6504: error: Cannot link $cf_nculib_root library" >&5 + echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -6514,7 +6509,7 @@ + fi + + if test -n "$cf_ncurses_LIBS" ; then +- echo "$as_me:6517: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 ++ echo "$as_me:6512: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 + cf_ncurses_SAVE="$LIBS" + for p in $cf_ncurses_LIBS ; do +@@ -6524,7 +6519,7 @@ + fi + done + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6527 "configure" ++#line 6522 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -6536,23 +6531,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6539: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6534: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6542: \$? = $ac_status" >&5 ++ echo "$as_me:6537: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6545: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6540: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6548: \$? = $ac_status" >&5 ++ echo "$as_me:6543: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then +- echo "$as_me:6550: result: yes" >&5 ++ echo "$as_me:6545: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 +-echo "$as_me:6555: result: no" >&5 ++echo "$as_me:6550: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_ncurses_SAVE" + fi +@@ -6570,7 +6565,7 @@ + NCURSES_CONFIG=none + fi + +-echo "$as_me:6573: checking if you want wide-character code" >&5 ++echo "$as_me:6568: checking if you want wide-character code" >&5 + echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6 + + # Check whether --enable-widec or --disable-widec was given. +@@ -6580,30 +6575,30 @@ + else + with_widec=no + fi; +-echo "$as_me:6583: result: $with_widec" >&5 ++echo "$as_me:6578: result: $with_widec" >&5 + echo "${ECHO_T}$with_widec" >&6 + if test "$with_widec" = yes ; then + + for ac_header in wchar.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:6590: checking for $ac_header" >&5 ++echo "$as_me:6585: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6596 "configure" ++#line 6591 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:6600: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:6595: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:6606: \$? = $ac_status" >&5 ++ echo "$as_me:6601: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -6622,7 +6617,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:6625: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:6620: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:6630: checking for multibyte character support" >&5 + echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6 + if test "${cf_cv_utf8_lib+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6640,7 +6635,7 @@ + + cf_save_LIBS="$LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6643 "configure" ++#line 6638 "configure" + #include "confdefs.h" + + #include +@@ -6658,16 +6653,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6661: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6656: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6664: \$? = $ac_status" >&5 ++ echo "$as_me:6659: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6667: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6662: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6670: \$? = $ac_status" >&5 ++ echo "$as_me:6665: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_utf8_lib=yes + else +@@ -6679,12 +6674,12 @@ + cf_cv_header_path_utf8= + cf_cv_library_path_utf8= + +-echo "${as_me:-configure}:6682: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:6677: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6687 "configure" ++#line 6682 "configure" + #include "confdefs.h" + + #include +@@ -6697,16 +6692,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6700: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6695: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6703: \$? = $ac_status" >&5 ++ echo "$as_me:6698: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6706: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6701: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6709: \$? = $ac_status" >&5 ++ echo "$as_me:6704: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_find_linkage_utf8=yes +@@ -6720,7 +6715,7 @@ + LIBS="-lutf8 $cf_save_LIBS" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6723 "configure" ++#line 6718 "configure" + #include "confdefs.h" + + #include +@@ -6733,16 +6728,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6736: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6731: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6739: \$? = $ac_status" >&5 ++ echo "$as_me:6734: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6742: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6737: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6745: \$? = $ac_status" >&5 ++ echo "$as_me:6740: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_find_linkage_utf8=yes +@@ -6759,9 +6754,9 @@ + + test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 + +-echo "${as_me:-configure}:6762: testing find linkage for utf8 library ..." 1>&5 ++echo "${as_me:-configure}:6757: testing find linkage for utf8 library ..." 1>&5 + +-echo "${as_me:-configure}:6764: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:6759: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_CPPFLAGS="$CPPFLAGS" + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -6852,7 +6847,7 @@ + if test -d "$cf_cv_header_path_utf8" ; then + test -n "$verbose" && echo " ... testing $cf_cv_header_path_utf8" 1>&6 + +-echo "${as_me:-configure}:6855: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:6850: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 + + CPPFLAGS="$cf_save_CPPFLAGS" + +@@ -6860,7 +6855,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6863 "configure" ++#line 6858 "configure" + #include "confdefs.h" + + #include +@@ -6873,21 +6868,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:6876: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6871: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6879: \$? = $ac_status" >&5 ++ echo "$as_me:6874: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:6882: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6877: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6885: \$? = $ac_status" >&5 ++ echo "$as_me:6880: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + test -n "$verbose" && echo " ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6 + +-echo "${as_me:-configure}:6890: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:6885: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 + + cf_cv_find_linkage_utf8=maybe + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -6905,7 +6900,7 @@ + + if test "$cf_cv_find_linkage_utf8" = maybe ; then + +-echo "${as_me:-configure}:6908: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:6903: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + cf_save_LDFLAGS="$LDFLAGS" +@@ -6980,13 +6975,13 @@ + if test -d "$cf_cv_library_path_utf8" ; then + test -n "$verbose" && echo " ... testing $cf_cv_library_path_utf8" 1>&6 + +-echo "${as_me:-configure}:6983: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:6978: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 + + CPPFLAGS="$cf_test_CPPFLAGS" + LIBS="-lutf8 $cf_save_LIBS" + LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6989 "configure" ++#line 6984 "configure" + #include "confdefs.h" + + #include +@@ -6999,21 +6994,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7002: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6997: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7005: \$? = $ac_status" >&5 ++ echo "$as_me:7000: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7008: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7003: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7011: \$? = $ac_status" >&5 ++ echo "$as_me:7006: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + test -n "$verbose" && echo " ... found utf8 library in $cf_cv_library_path_utf8" 1>&6 + +-echo "${as_me:-configure}:7016: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:7011: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 + + cf_cv_find_linkage_utf8=yes + cf_cv_library_file_utf8="-lutf8" +@@ -7055,7 +7050,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:7058: result: $cf_cv_utf8_lib" >&5 ++echo "$as_me:7053: result: $cf_cv_utf8_lib" >&5 + echo "${ECHO_T}$cf_cv_utf8_lib" >&6 + + # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between +@@ -7093,7 +7088,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7096 "configure" ++#line 7091 "configure" + #include "confdefs.h" + #include + int +@@ -7105,16 +7100,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:7108: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:7103: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7111: \$? = $ac_status" >&5 ++ echo "$as_me:7106: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:7114: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7109: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7117: \$? = $ac_status" >&5 ++ echo "$as_me:7112: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -7131,7 +7126,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:7134: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:7129: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -7167,7 +7162,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me:-configure}:7170: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:7165: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -7197,13 +7192,13 @@ + cf_have_ncuconfig=no + + if test "x${PKG_CONFIG:=none}" != xnone; then +- echo "$as_me:7200: checking pkg-config for $cf_ncuconfig_root" >&5 ++ echo "$as_me:7195: checking pkg-config for $cf_ncuconfig_root" >&5 + echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6 + if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then +- echo "$as_me:7203: result: yes" >&5 ++ echo "$as_me:7198: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + +- echo "$as_me:7206: checking if the $cf_ncuconfig_root package files work" >&5 ++ echo "$as_me:7201: checking if the $cf_ncuconfig_root package files work" >&5 + echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 + cf_have_ncuconfig=unknown + +@@ -7336,7 +7331,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7339 "configure" ++#line 7334 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -7348,37 +7343,37 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7351: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7346: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7354: \$? = $ac_status" >&5 ++ echo "$as_me:7349: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7357: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7352: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7360: \$? = $ac_status" >&5 ++ echo "$as_me:7355: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + if test "$cross_compiling" = yes; then + cf_test_ncuconfig=maybe + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7366 "configure" ++#line 7361 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int main(void) + { const char *xx = curses_version(); return (xx == 0); } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:7373: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7368: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7376: \$? = $ac_status" >&5 ++ echo "$as_me:7371: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:7378: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7373: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7381: \$? = $ac_status" >&5 ++ echo "$as_me:7376: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_test_ncuconfig=yes + else +@@ -7552,7 +7547,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7555 "configure" ++#line 7550 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -7564,37 +7559,37 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7567: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7562: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7570: \$? = $ac_status" >&5 ++ echo "$as_me:7565: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7573: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7568: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7576: \$? = $ac_status" >&5 ++ echo "$as_me:7571: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + if test "$cross_compiling" = yes; then + cf_have_ncuconfig=maybe + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7582 "configure" ++#line 7577 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int main(void) + { const char *xx = curses_version(); return (xx == 0); } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:7589: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7584: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7592: \$? = $ac_status" >&5 ++ echo "$as_me:7587: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:7594: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7589: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7597: \$? = $ac_status" >&5 ++ echo "$as_me:7592: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_have_ncuconfig=yes + else +@@ -7611,7 +7606,7 @@ + cf_have_ncuconfig=no + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +- echo "$as_me:7614: result: $cf_have_ncuconfig" >&5 ++ echo "$as_me:7609: result: $cf_have_ncuconfig" >&5 + echo "${ECHO_T}$cf_have_ncuconfig" >&6 + test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes + if test "$cf_have_ncuconfig" != "yes" +@@ -7627,7 +7622,7 @@ + + NCURSES_CONFIG_PKG=$cf_ncuconfig_root + +-echo "$as_me:7630: checking for terminfo header" >&5 ++echo "$as_me:7625: checking for terminfo header" >&5 + echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 + if test "${cf_cv_term_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7645,7 +7640,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7648 "configure" ++#line 7643 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -7660,16 +7655,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:7663: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:7658: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7666: \$? = $ac_status" >&5 ++ echo "$as_me:7661: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:7669: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7664: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7672: \$? = $ac_status" >&5 ++ echo "$as_me:7667: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_term_header="$cf_test" +@@ -7685,7 +7680,7 @@ + done + + fi +-echo "$as_me:7688: result: $cf_cv_term_header" >&5 ++echo "$as_me:7683: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -7720,7 +7715,7 @@ + fi + + else +- echo "$as_me:7723: result: no" >&5 ++ echo "$as_me:7718: result: no" >&5 + echo "${ECHO_T}no" >&6 + NCURSES_CONFIG_PKG=none + fi +@@ -7736,7 +7731,7 @@ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-echo "$as_me:7739: checking for $ac_word" >&5 ++echo "$as_me:7734: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7751,7 +7746,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" +-echo "$as_me:7754: found $ac_dir/$ac_word" >&5 ++echo "$as_me:7749: found $ac_dir/$ac_word" >&5 + break + done + +@@ -7759,10 +7754,10 @@ + fi + NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG + if test -n "$NCURSES_CONFIG"; then +- echo "$as_me:7762: result: $NCURSES_CONFIG" >&5 ++ echo "$as_me:7757: result: $NCURSES_CONFIG" >&5 + echo "${ECHO_T}$NCURSES_CONFIG" >&6 + else +- echo "$as_me:7765: result: no" >&5 ++ echo "$as_me:7760: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -7775,7 +7770,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:7778: checking for $ac_word" >&5 ++echo "$as_me:7773: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7790,7 +7785,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" +-echo "$as_me:7793: found $ac_dir/$ac_word" >&5 ++echo "$as_me:7788: found $ac_dir/$ac_word" >&5 + break + done + +@@ -7798,10 +7793,10 @@ + fi + ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG + if test -n "$ac_ct_NCURSES_CONFIG"; then +- echo "$as_me:7801: result: $ac_ct_NCURSES_CONFIG" >&5 ++ echo "$as_me:7796: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 + else +- echo "$as_me:7804: result: no" >&5 ++ echo "$as_me:7799: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -7958,7 +7953,7 @@ + + # even with config script, some packages use no-override for curses.h + +-echo "$as_me:7961: checking if we have identified curses headers" >&5 ++echo "$as_me:7956: checking if we have identified curses headers" >&5 + echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 + if test "${cf_cv_ncurses_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7970,7 +7965,7 @@ + curses.h ncursesw/curses.h + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7973 "configure" ++#line 7968 "configure" + #include "confdefs.h" + #include <${cf_header}> + int +@@ -7982,16 +7977,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:7985: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:7980: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7988: \$? = $ac_status" >&5 ++ echo "$as_me:7983: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:7991: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7986: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7994: \$? = $ac_status" >&5 ++ echo "$as_me:7989: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_header=$cf_header; break + else +@@ -8002,11 +7997,11 @@ + done + + fi +-echo "$as_me:8005: result: $cf_cv_ncurses_header" >&5 ++echo "$as_me:8000: result: $cf_cv_ncurses_header" >&5 + echo "${ECHO_T}$cf_cv_ncurses_header" >&6 + + if test "$cf_cv_ncurses_header" = none ; then +- { { echo "$as_me:8009: error: No curses header-files found" >&5 ++ { { echo "$as_me:8004: error: No curses header-files found" >&5 + echo "$as_me: error: No curses header-files found" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -8016,23 +8011,23 @@ + for ac_header in $cf_cv_ncurses_header + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:8019: checking for $ac_header" >&5 ++echo "$as_me:8014: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8025 "configure" ++#line 8020 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:8029: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:8024: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:8035: \$? = $ac_status" >&5 ++ echo "$as_me:8030: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -8051,7 +8046,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:8054: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:8049: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF +-#line 8110 "configure" ++#line 8105 "configure" + #include "confdefs.h" + #include + int +@@ -8119,16 +8114,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:8122: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8117: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8125: \$? = $ac_status" >&5 ++ echo "$as_me:8120: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:8128: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8123: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8131: \$? = $ac_status" >&5 ++ echo "$as_me:8126: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -8145,7 +8140,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:8148: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:8143: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -8164,7 +8159,7 @@ + + } + +-echo "$as_me:8167: checking for $cf_ncuhdr_root header in include-path" >&5 ++echo "$as_me:8162: checking for $cf_ncuhdr_root header in include-path" >&5 + echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 + if test "${cf_cv_ncurses_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8176,7 +8171,7 @@ + do + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8179 "configure" ++#line 8174 "configure" + #include "confdefs.h" + + #define _XOPEN_SOURCE_EXTENDED +@@ -8208,16 +8203,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:8211: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8206: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8214: \$? = $ac_status" >&5 ++ echo "$as_me:8209: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:8217: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8212: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8220: \$? = $ac_status" >&5 ++ echo "$as_me:8215: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_h=$cf_header + +@@ -8232,14 +8227,14 @@ + done + + fi +-echo "$as_me:8235: result: $cf_cv_ncurses_h" >&5 ++echo "$as_me:8230: result: $cf_cv_ncurses_h" >&5 + echo "${ECHO_T}$cf_cv_ncurses_h" >&6 + + if test "$cf_cv_ncurses_h" != no ; then + cf_cv_ncurses_header=$cf_cv_ncurses_h + else + +-echo "$as_me:8242: checking for $cf_ncuhdr_root include-path" >&5 ++echo "$as_me:8237: checking for $cf_ncuhdr_root include-path" >&5 + echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 + if test "${cf_cv_ncurses_h2+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8360,7 +8355,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8363 "configure" ++#line 8358 "configure" + #include "confdefs.h" + #include + int +@@ -8372,16 +8367,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:8375: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8370: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8378: \$? = $ac_status" >&5 ++ echo "$as_me:8373: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:8381: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8376: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8384: \$? = $ac_status" >&5 ++ echo "$as_me:8379: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -8398,7 +8393,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:8401: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:8396: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -8421,7 +8416,7 @@ + do + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8424 "configure" ++#line 8419 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -8445,16 +8440,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:8448: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8443: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8451: \$? = $ac_status" >&5 ++ echo "$as_me:8446: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:8454: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8449: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8457: \$? = $ac_status" >&5 ++ echo "$as_me:8452: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_h2=$cf_header + +@@ -8475,12 +8470,12 @@ + CPPFLAGS="$cf_save2_CPPFLAGS" + test "$cf_cv_ncurses_h2" != no && break + done +- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8478: error: not found" >&5 ++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8473: error: not found" >&5 + echo "$as_me: error: not found" >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:8483: result: $cf_cv_ncurses_h2" >&5 ++echo "$as_me:8478: result: $cf_cv_ncurses_h2" >&5 + echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 + + cf_1st_incdir=`echo "$cf_cv_ncurses_h2" | sed -e 's%/[^/]*$%%'` +@@ -8516,7 +8511,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8519 "configure" ++#line 8514 "configure" + #include "confdefs.h" + #include + int +@@ -8528,16 +8523,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:8531: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8526: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8534: \$? = $ac_status" >&5 ++ echo "$as_me:8529: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:8537: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8532: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8540: \$? = $ac_status" >&5 ++ echo "$as_me:8535: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -8554,7 +8549,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:8557: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:8552: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -8602,7 +8597,7 @@ + ;; + esac + +-echo "$as_me:8605: checking for terminfo header" >&5 ++echo "$as_me:8600: checking for terminfo header" >&5 + echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 + if test "${cf_cv_term_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8620,7 +8615,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8623 "configure" ++#line 8618 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -8635,16 +8630,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:8638: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8633: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8641: \$? = $ac_status" >&5 ++ echo "$as_me:8636: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:8644: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8639: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8647: \$? = $ac_status" >&5 ++ echo "$as_me:8642: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_term_header="$cf_test" +@@ -8660,7 +8655,7 @@ + done + + fi +-echo "$as_me:8663: result: $cf_cv_term_header" >&5 ++echo "$as_me:8658: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -8698,7 +8693,7 @@ + #define NCURSES 1 + EOF + +-echo "$as_me:8701: checking for ncurses version" >&5 ++echo "$as_me:8696: checking for ncurses version" >&5 + echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 + if test "${cf_cv_ncurses_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8724,10 +8719,10 @@ + #endif + EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" +- { (eval echo "$as_me:8727: \"$cf_try\"") >&5 ++ { (eval echo "$as_me:8722: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? +- echo "$as_me:8730: \$? = $ac_status" >&5 ++ echo "$as_me:8725: \$? = $ac_status" >&5 + (exit "$ac_status"); } + if test -f conftest.out ; then + cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` +@@ -8737,7 +8732,7 @@ + + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8740 "configure" ++#line 8735 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -8762,15 +8757,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:8765: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8760: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8768: \$? = $ac_status" >&5 ++ echo "$as_me:8763: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:8770: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8765: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8773: \$? = $ac_status" >&5 ++ echo "$as_me:8768: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_ncurses_version=`cat $cf_tempfile` +@@ -8784,7 +8779,7 @@ + rm -f "$cf_tempfile" + + fi +-echo "$as_me:8787: result: $cf_cv_ncurses_version" >&5 ++echo "$as_me:8782: result: $cf_cv_ncurses_version" >&5 + echo "${ECHO_T}$cf_cv_ncurses_version" >&6 + test "$cf_cv_ncurses_version" = no || + cat >>confdefs.h <<\EOF +@@ -8797,7 +8792,7 @@ + # to link gpm. + cf_ncurses_LIBS="" + cf_ncurses_SAVE="$LIBS" +-echo "$as_me:8800: checking for Gpm_Open in -lgpm" >&5 ++echo "$as_me:8795: checking for Gpm_Open in -lgpm" >&5 + echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 + if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8805,7 +8800,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8808 "configure" ++#line 8803 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -8824,16 +8819,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:8827: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8822: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8830: \$? = $ac_status" >&5 ++ echo "$as_me:8825: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:8833: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8828: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8836: \$? = $ac_status" >&5 ++ echo "$as_me:8831: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gpm_Gpm_Open=yes + else +@@ -8844,10 +8839,10 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:8847: result: $ac_cv_lib_gpm_Gpm_Open" >&5 ++echo "$as_me:8842: result: $ac_cv_lib_gpm_Gpm_Open" >&5 + echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 + if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then +- echo "$as_me:8850: checking for initscr in -lgpm" >&5 ++ echo "$as_me:8845: checking for initscr in -lgpm" >&5 + echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 + if test "${ac_cv_lib_gpm_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8855,7 +8850,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8858 "configure" ++#line 8853 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -8874,16 +8869,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:8877: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8872: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8880: \$? = $ac_status" >&5 ++ echo "$as_me:8875: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:8883: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8878: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8886: \$? = $ac_status" >&5 ++ echo "$as_me:8881: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gpm_initscr=yes + else +@@ -8894,7 +8889,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:8897: result: $ac_cv_lib_gpm_initscr" >&5 ++echo "$as_me:8892: result: $ac_cv_lib_gpm_initscr" >&5 + echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 + if test "$ac_cv_lib_gpm_initscr" = yes; then + LIBS="$cf_ncurses_SAVE" +@@ -8909,7 +8904,7 @@ + # This is only necessary if you are linking against an obsolete + # version of ncurses (but it should do no harm, since it is static). + if test "$cf_nculib_root" = ncurses ; then +- echo "$as_me:8912: checking for tgoto in -lmytinfo" >&5 ++ echo "$as_me:8907: checking for tgoto in -lmytinfo" >&5 + echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 + if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8917,7 +8912,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmytinfo $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8920 "configure" ++#line 8915 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -8936,16 +8931,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:8939: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8934: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8942: \$? = $ac_status" >&5 ++ echo "$as_me:8937: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:8945: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8940: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8948: \$? = $ac_status" >&5 ++ echo "$as_me:8943: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_mytinfo_tgoto=yes + else +@@ -8956,7 +8951,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:8959: result: $ac_cv_lib_mytinfo_tgoto" >&5 ++echo "$as_me:8954: result: $ac_cv_lib_mytinfo_tgoto" >&5 + echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 + if test "$ac_cv_lib_mytinfo_tgoto" = yes; then + cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" +@@ -9005,13 +9000,13 @@ + + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' + cf_libdir="" +- echo "$as_me:9008: checking for initscr" >&5 ++ echo "$as_me:9003: checking for initscr" >&5 + echo $ECHO_N "checking for initscr... $ECHO_C" >&6 + if test "${ac_cv_func_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9014 "configure" ++#line 9009 "configure" + #include "confdefs.h" + #define initscr autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -9042,16 +9037,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:9045: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9040: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9048: \$? = $ac_status" >&5 ++ echo "$as_me:9043: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:9051: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9046: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9054: \$? = $ac_status" >&5 ++ echo "$as_me:9049: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_initscr=yes + else +@@ -9061,18 +9056,18 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:9064: result: $ac_cv_func_initscr" >&5 ++echo "$as_me:9059: result: $ac_cv_func_initscr" >&5 + echo "${ECHO_T}$ac_cv_func_initscr" >&6 + if test "$ac_cv_func_initscr" = yes; then + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' + else + + cf_save_LIBS="$LIBS" +- echo "$as_me:9071: checking for initscr in -l$cf_nculib_root" >&5 ++ echo "$as_me:9066: checking for initscr in -l$cf_nculib_root" >&5 + echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 + LIBS="-l$cf_nculib_root $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9075 "configure" ++#line 9070 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -9084,25 +9079,25 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:9087: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9082: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9090: \$? = $ac_status" >&5 ++ echo "$as_me:9085: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:9093: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9088: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9096: \$? = $ac_status" >&5 ++ echo "$as_me:9091: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then +- echo "$as_me:9098: result: yes" >&5 ++ echo "$as_me:9093: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' + + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 +-echo "$as_me:9105: result: no" >&5 ++echo "$as_me:9100: result: no" >&5 + echo "${ECHO_T}no" >&6 + + cf_search= +@@ -9170,11 +9165,11 @@ + + for cf_libdir in $cf_search + do +- echo "$as_me:9173: checking for -l$cf_nculib_root in $cf_libdir" >&5 ++ echo "$as_me:9168: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 + LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9177 "configure" ++#line 9172 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -9186,25 +9181,25 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:9189: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9184: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9192: \$? = $ac_status" >&5 ++ echo "$as_me:9187: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:9195: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9190: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9198: \$? = $ac_status" >&5 ++ echo "$as_me:9193: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then +- echo "$as_me:9200: result: yes" >&5 ++ echo "$as_me:9195: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' + break + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 +-echo "$as_me:9207: result: no" >&5 ++echo "$as_me:9202: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_save_LIBS" + fi +@@ -9219,7 +9214,7 @@ + eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" + + if test "$cf_found_library" = no ; then +- { { echo "$as_me:9222: error: Cannot link $cf_nculib_root library" >&5 ++ { { echo "$as_me:9217: error: Cannot link $cf_nculib_root library" >&5 + echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -9227,7 +9222,7 @@ + fi + + if test -n "$cf_ncurses_LIBS" ; then +- echo "$as_me:9230: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 ++ echo "$as_me:9225: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 + cf_ncurses_SAVE="$LIBS" + for p in $cf_ncurses_LIBS ; do +@@ -9237,7 +9232,7 @@ + fi + done + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9240 "configure" ++#line 9235 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -9249,23 +9244,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:9252: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9247: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9255: \$? = $ac_status" >&5 ++ echo "$as_me:9250: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:9258: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9253: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9261: \$? = $ac_status" >&5 ++ echo "$as_me:9256: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then +- echo "$as_me:9263: result: yes" >&5 ++ echo "$as_me:9258: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 +-echo "$as_me:9268: result: no" >&5 ++echo "$as_me:9263: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_ncurses_SAVE" + fi +@@ -9289,13 +9284,13 @@ + cf_have_ncuconfig=no + + if test "x${PKG_CONFIG:=none}" != xnone; then +- echo "$as_me:9292: checking pkg-config for $cf_ncuconfig_root" >&5 ++ echo "$as_me:9287: checking pkg-config for $cf_ncuconfig_root" >&5 + echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6 + if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then +- echo "$as_me:9295: result: yes" >&5 ++ echo "$as_me:9290: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + +- echo "$as_me:9298: checking if the $cf_ncuconfig_root package files work" >&5 ++ echo "$as_me:9293: checking if the $cf_ncuconfig_root package files work" >&5 + echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 + cf_have_ncuconfig=unknown + +@@ -9428,7 +9423,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9431 "configure" ++#line 9426 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -9440,37 +9435,37 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:9443: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9438: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9446: \$? = $ac_status" >&5 ++ echo "$as_me:9441: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:9449: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9444: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9452: \$? = $ac_status" >&5 ++ echo "$as_me:9447: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + if test "$cross_compiling" = yes; then + cf_test_ncuconfig=maybe + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9458 "configure" ++#line 9453 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int main(void) + { const char *xx = curses_version(); return (xx == 0); } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:9465: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9460: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9468: \$? = $ac_status" >&5 ++ echo "$as_me:9463: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:9470: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9465: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9473: \$? = $ac_status" >&5 ++ echo "$as_me:9468: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_test_ncuconfig=yes + else +@@ -9644,7 +9639,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9647 "configure" ++#line 9642 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -9656,37 +9651,37 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:9659: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9654: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9662: \$? = $ac_status" >&5 ++ echo "$as_me:9657: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:9665: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9660: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9668: \$? = $ac_status" >&5 ++ echo "$as_me:9663: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + if test "$cross_compiling" = yes; then + cf_have_ncuconfig=maybe + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9674 "configure" ++#line 9669 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int main(void) + { const char *xx = curses_version(); return (xx == 0); } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:9681: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9676: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9684: \$? = $ac_status" >&5 ++ echo "$as_me:9679: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:9686: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9681: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9689: \$? = $ac_status" >&5 ++ echo "$as_me:9684: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_have_ncuconfig=yes + else +@@ -9703,7 +9698,7 @@ + cf_have_ncuconfig=no + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +- echo "$as_me:9706: result: $cf_have_ncuconfig" >&5 ++ echo "$as_me:9701: result: $cf_have_ncuconfig" >&5 + echo "${ECHO_T}$cf_have_ncuconfig" >&6 + test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes + if test "$cf_have_ncuconfig" != "yes" +@@ -9719,7 +9714,7 @@ + + NCURSES_CONFIG_PKG=$cf_ncuconfig_root + +-echo "$as_me:9722: checking for terminfo header" >&5 ++echo "$as_me:9717: checking for terminfo header" >&5 + echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 + if test "${cf_cv_term_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -9737,7 +9732,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9740 "configure" ++#line 9735 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -9752,16 +9747,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:9755: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9750: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9758: \$? = $ac_status" >&5 ++ echo "$as_me:9753: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:9761: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9756: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9764: \$? = $ac_status" >&5 ++ echo "$as_me:9759: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_term_header="$cf_test" +@@ -9777,7 +9772,7 @@ + done + + fi +-echo "$as_me:9780: result: $cf_cv_term_header" >&5 ++echo "$as_me:9775: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -9812,7 +9807,7 @@ + fi + + else +- echo "$as_me:9815: result: no" >&5 ++ echo "$as_me:9810: result: no" >&5 + echo "${ECHO_T}no" >&6 + NCURSES_CONFIG_PKG=none + fi +@@ -9828,7 +9823,7 @@ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-echo "$as_me:9831: checking for $ac_word" >&5 ++echo "$as_me:9826: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -9843,7 +9838,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" +-echo "$as_me:9846: found $ac_dir/$ac_word" >&5 ++echo "$as_me:9841: found $ac_dir/$ac_word" >&5 + break + done + +@@ -9851,10 +9846,10 @@ + fi + NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG + if test -n "$NCURSES_CONFIG"; then +- echo "$as_me:9854: result: $NCURSES_CONFIG" >&5 ++ echo "$as_me:9849: result: $NCURSES_CONFIG" >&5 + echo "${ECHO_T}$NCURSES_CONFIG" >&6 + else +- echo "$as_me:9857: result: no" >&5 ++ echo "$as_me:9852: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -9867,7 +9862,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:9870: checking for $ac_word" >&5 ++echo "$as_me:9865: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -9882,7 +9877,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" +-echo "$as_me:9885: found $ac_dir/$ac_word" >&5 ++echo "$as_me:9880: found $ac_dir/$ac_word" >&5 + break + done + +@@ -9890,10 +9885,10 @@ + fi + ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG + if test -n "$ac_ct_NCURSES_CONFIG"; then +- echo "$as_me:9893: result: $ac_ct_NCURSES_CONFIG" >&5 ++ echo "$as_me:9888: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 + else +- echo "$as_me:9896: result: no" >&5 ++ echo "$as_me:9891: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -10050,7 +10045,7 @@ + + # even with config script, some packages use no-override for curses.h + +-echo "$as_me:10053: checking if we have identified curses headers" >&5 ++echo "$as_me:10048: checking if we have identified curses headers" >&5 + echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 + if test "${cf_cv_ncurses_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10062,7 +10057,7 @@ + curses.h ncurses/curses.h + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10065 "configure" ++#line 10060 "configure" + #include "confdefs.h" + #include <${cf_header}> + int +@@ -10074,16 +10069,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10077: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10072: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10080: \$? = $ac_status" >&5 ++ echo "$as_me:10075: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10083: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10078: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10086: \$? = $ac_status" >&5 ++ echo "$as_me:10081: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_header=$cf_header; break + else +@@ -10094,11 +10089,11 @@ + done + + fi +-echo "$as_me:10097: result: $cf_cv_ncurses_header" >&5 ++echo "$as_me:10092: result: $cf_cv_ncurses_header" >&5 + echo "${ECHO_T}$cf_cv_ncurses_header" >&6 + + if test "$cf_cv_ncurses_header" = none ; then +- { { echo "$as_me:10101: error: No curses header-files found" >&5 ++ { { echo "$as_me:10096: error: No curses header-files found" >&5 + echo "$as_me: error: No curses header-files found" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -10108,23 +10103,23 @@ + for ac_header in $cf_cv_ncurses_header + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:10111: checking for $ac_header" >&5 ++echo "$as_me:10106: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10117 "configure" ++#line 10112 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:10121: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:10116: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:10127: \$? = $ac_status" >&5 ++ echo "$as_me:10122: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -10143,7 +10138,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:10146: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:10141: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF +-#line 10202 "configure" ++#line 10197 "configure" + #include "confdefs.h" + #include + int +@@ -10211,16 +10206,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10214: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10209: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10217: \$? = $ac_status" >&5 ++ echo "$as_me:10212: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10220: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10215: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10223: \$? = $ac_status" >&5 ++ echo "$as_me:10218: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -10237,7 +10232,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:10240: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:10235: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -10256,7 +10251,7 @@ + + } + +-echo "$as_me:10259: checking for $cf_ncuhdr_root header in include-path" >&5 ++echo "$as_me:10254: checking for $cf_ncuhdr_root header in include-path" >&5 + echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 + if test "${cf_cv_ncurses_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10268,7 +10263,7 @@ + do + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10271 "configure" ++#line 10266 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -10292,16 +10287,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10295: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10290: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10298: \$? = $ac_status" >&5 ++ echo "$as_me:10293: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10301: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10296: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10304: \$? = $ac_status" >&5 ++ echo "$as_me:10299: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_h=$cf_header + +@@ -10316,14 +10311,14 @@ + done + + fi +-echo "$as_me:10319: result: $cf_cv_ncurses_h" >&5 ++echo "$as_me:10314: result: $cf_cv_ncurses_h" >&5 + echo "${ECHO_T}$cf_cv_ncurses_h" >&6 + + if test "$cf_cv_ncurses_h" != no ; then + cf_cv_ncurses_header=$cf_cv_ncurses_h + else + +-echo "$as_me:10326: checking for $cf_ncuhdr_root include-path" >&5 ++echo "$as_me:10321: checking for $cf_ncuhdr_root include-path" >&5 + echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 + if test "${cf_cv_ncurses_h2+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10444,7 +10439,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10447 "configure" ++#line 10442 "configure" + #include "confdefs.h" + #include + int +@@ -10456,16 +10451,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10459: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10454: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10462: \$? = $ac_status" >&5 ++ echo "$as_me:10457: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10465: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10460: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10468: \$? = $ac_status" >&5 ++ echo "$as_me:10463: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -10482,7 +10477,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:10485: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:10480: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -10505,7 +10500,7 @@ + do + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10508 "configure" ++#line 10503 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -10529,16 +10524,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10532: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10527: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10535: \$? = $ac_status" >&5 ++ echo "$as_me:10530: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10538: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10533: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10541: \$? = $ac_status" >&5 ++ echo "$as_me:10536: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_h2=$cf_header + +@@ -10559,12 +10554,12 @@ + CPPFLAGS="$cf_save2_CPPFLAGS" + test "$cf_cv_ncurses_h2" != no && break + done +- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10562: error: not found" >&5 ++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10557: error: not found" >&5 + echo "$as_me: error: not found" >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:10567: result: $cf_cv_ncurses_h2" >&5 ++echo "$as_me:10562: result: $cf_cv_ncurses_h2" >&5 + echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 + + cf_1st_incdir=`echo "$cf_cv_ncurses_h2" | sed -e 's%/[^/]*$%%'` +@@ -10600,7 +10595,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10603 "configure" ++#line 10598 "configure" + #include "confdefs.h" + #include + int +@@ -10612,16 +10607,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10615: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10610: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10618: \$? = $ac_status" >&5 ++ echo "$as_me:10613: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10621: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10616: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10624: \$? = $ac_status" >&5 ++ echo "$as_me:10619: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -10638,7 +10633,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:10641: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:10636: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -10686,7 +10681,7 @@ + ;; + esac + +-echo "$as_me:10689: checking for terminfo header" >&5 ++echo "$as_me:10684: checking for terminfo header" >&5 + echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 + if test "${cf_cv_term_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10704,7 +10699,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10707 "configure" ++#line 10702 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -10719,16 +10714,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10722: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10717: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10725: \$? = $ac_status" >&5 ++ echo "$as_me:10720: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10728: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10723: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10731: \$? = $ac_status" >&5 ++ echo "$as_me:10726: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_term_header="$cf_test" +@@ -10744,7 +10739,7 @@ + done + + fi +-echo "$as_me:10747: result: $cf_cv_term_header" >&5 ++echo "$as_me:10742: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -10782,7 +10777,7 @@ + #define NCURSES 1 + EOF + +-echo "$as_me:10785: checking for ncurses version" >&5 ++echo "$as_me:10780: checking for ncurses version" >&5 + echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 + if test "${cf_cv_ncurses_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10808,10 +10803,10 @@ + #endif + EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" +- { (eval echo "$as_me:10811: \"$cf_try\"") >&5 ++ { (eval echo "$as_me:10806: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? +- echo "$as_me:10814: \$? = $ac_status" >&5 ++ echo "$as_me:10809: \$? = $ac_status" >&5 + (exit "$ac_status"); } + if test -f conftest.out ; then + cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` +@@ -10821,7 +10816,7 @@ + + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10824 "configure" ++#line 10819 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -10846,15 +10841,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:10849: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10844: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10852: \$? = $ac_status" >&5 ++ echo "$as_me:10847: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:10854: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10849: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10857: \$? = $ac_status" >&5 ++ echo "$as_me:10852: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_ncurses_version=`cat $cf_tempfile` +@@ -10868,7 +10863,7 @@ + rm -f "$cf_tempfile" + + fi +-echo "$as_me:10871: result: $cf_cv_ncurses_version" >&5 ++echo "$as_me:10866: result: $cf_cv_ncurses_version" >&5 + echo "${ECHO_T}$cf_cv_ncurses_version" >&6 + test "$cf_cv_ncurses_version" = no || + cat >>confdefs.h <<\EOF +@@ -10881,7 +10876,7 @@ + # to link gpm. + cf_ncurses_LIBS="" + cf_ncurses_SAVE="$LIBS" +-echo "$as_me:10884: checking for Gpm_Open in -lgpm" >&5 ++echo "$as_me:10879: checking for Gpm_Open in -lgpm" >&5 + echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 + if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10889,7 +10884,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10892 "configure" ++#line 10887 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -10908,16 +10903,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:10911: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10906: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10914: \$? = $ac_status" >&5 ++ echo "$as_me:10909: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:10917: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10912: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10920: \$? = $ac_status" >&5 ++ echo "$as_me:10915: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gpm_Gpm_Open=yes + else +@@ -10928,10 +10923,10 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:10931: result: $ac_cv_lib_gpm_Gpm_Open" >&5 ++echo "$as_me:10926: result: $ac_cv_lib_gpm_Gpm_Open" >&5 + echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 + if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then +- echo "$as_me:10934: checking for initscr in -lgpm" >&5 ++ echo "$as_me:10929: checking for initscr in -lgpm" >&5 + echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 + if test "${ac_cv_lib_gpm_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10939,7 +10934,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10942 "configure" ++#line 10937 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -10958,16 +10953,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:10961: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10956: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10964: \$? = $ac_status" >&5 ++ echo "$as_me:10959: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:10967: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10962: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10970: \$? = $ac_status" >&5 ++ echo "$as_me:10965: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gpm_initscr=yes + else +@@ -10978,7 +10973,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:10981: result: $ac_cv_lib_gpm_initscr" >&5 ++echo "$as_me:10976: result: $ac_cv_lib_gpm_initscr" >&5 + echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 + if test "$ac_cv_lib_gpm_initscr" = yes; then + LIBS="$cf_ncurses_SAVE" +@@ -10993,7 +10988,7 @@ + # This is only necessary if you are linking against an obsolete + # version of ncurses (but it should do no harm, since it is static). + if test "$cf_nculib_root" = ncurses ; then +- echo "$as_me:10996: checking for tgoto in -lmytinfo" >&5 ++ echo "$as_me:10991: checking for tgoto in -lmytinfo" >&5 + echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 + if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -11001,7 +10996,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmytinfo $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11004 "configure" ++#line 10999 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -11020,16 +11015,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:11023: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11018: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11026: \$? = $ac_status" >&5 ++ echo "$as_me:11021: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:11029: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11024: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11032: \$? = $ac_status" >&5 ++ echo "$as_me:11027: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_mytinfo_tgoto=yes + else +@@ -11040,7 +11035,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:11043: result: $ac_cv_lib_mytinfo_tgoto" >&5 ++echo "$as_me:11038: result: $ac_cv_lib_mytinfo_tgoto" >&5 + echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 + if test "$ac_cv_lib_mytinfo_tgoto" = yes; then + cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" +@@ -11089,13 +11084,13 @@ + + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' + cf_libdir="" +- echo "$as_me:11092: checking for initscr" >&5 ++ echo "$as_me:11087: checking for initscr" >&5 + echo $ECHO_N "checking for initscr... $ECHO_C" >&6 + if test "${ac_cv_func_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11098 "configure" ++#line 11093 "configure" + #include "confdefs.h" + #define initscr autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -11126,16 +11121,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:11129: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11124: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11132: \$? = $ac_status" >&5 ++ echo "$as_me:11127: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:11135: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11130: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11138: \$? = $ac_status" >&5 ++ echo "$as_me:11133: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_initscr=yes + else +@@ -11145,18 +11140,18 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:11148: result: $ac_cv_func_initscr" >&5 ++echo "$as_me:11143: result: $ac_cv_func_initscr" >&5 + echo "${ECHO_T}$ac_cv_func_initscr" >&6 + if test "$ac_cv_func_initscr" = yes; then + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' + else + + cf_save_LIBS="$LIBS" +- echo "$as_me:11155: checking for initscr in -l$cf_nculib_root" >&5 ++ echo "$as_me:11150: checking for initscr in -l$cf_nculib_root" >&5 + echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 + LIBS="-l$cf_nculib_root $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11159 "configure" ++#line 11154 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -11168,25 +11163,25 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:11171: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11166: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11174: \$? = $ac_status" >&5 ++ echo "$as_me:11169: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:11177: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11172: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11180: \$? = $ac_status" >&5 ++ echo "$as_me:11175: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then +- echo "$as_me:11182: result: yes" >&5 ++ echo "$as_me:11177: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' + + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 +-echo "$as_me:11189: result: no" >&5 ++echo "$as_me:11184: result: no" >&5 + echo "${ECHO_T}no" >&6 + + cf_search= +@@ -11254,11 +11249,11 @@ + + for cf_libdir in $cf_search + do +- echo "$as_me:11257: checking for -l$cf_nculib_root in $cf_libdir" >&5 ++ echo "$as_me:11252: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 + LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11261 "configure" ++#line 11256 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -11270,25 +11265,25 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:11273: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11268: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11276: \$? = $ac_status" >&5 ++ echo "$as_me:11271: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:11279: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11274: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11282: \$? = $ac_status" >&5 ++ echo "$as_me:11277: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then +- echo "$as_me:11284: result: yes" >&5 ++ echo "$as_me:11279: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' + break + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 +-echo "$as_me:11291: result: no" >&5 ++echo "$as_me:11286: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_save_LIBS" + fi +@@ -11303,7 +11298,7 @@ + eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" + + if test "$cf_found_library" = no ; then +- { { echo "$as_me:11306: error: Cannot link $cf_nculib_root library" >&5 ++ { { echo "$as_me:11301: error: Cannot link $cf_nculib_root library" >&5 + echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -11311,7 +11306,7 @@ + fi + + if test -n "$cf_ncurses_LIBS" ; then +- echo "$as_me:11314: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 ++ echo "$as_me:11309: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 + cf_ncurses_SAVE="$LIBS" + for p in $cf_ncurses_LIBS ; do +@@ -11321,7 +11316,7 @@ + fi + done + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11324 "configure" ++#line 11319 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -11333,23 +11328,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:11336: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11331: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11339: \$? = $ac_status" >&5 ++ echo "$as_me:11334: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:11342: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11337: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11345: \$? = $ac_status" >&5 ++ echo "$as_me:11340: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then +- echo "$as_me:11347: result: yes" >&5 ++ echo "$as_me:11342: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 +-echo "$as_me:11352: result: no" >&5 ++echo "$as_me:11347: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_ncurses_SAVE" + fi +@@ -11402,10 +11397,10 @@ + AUTOCONF_$cf_name NCURSES_VERSION_$cf_name + CF_EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | fgrep AUTOCONF_$cf_name >conftest.out" +- { (eval echo "$as_me:11405: \"$cf_try\"") >&5 ++ { (eval echo "$as_me:11400: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? +- echo "$as_me:11408: \$? = $ac_status" >&5 ++ echo "$as_me:11403: \$? = $ac_status" >&5 + (exit "$ac_status"); } + if test -f conftest.out ; then + cf_result=`sed -e "s/^.*AUTOCONF_${cf_name}[ ][ ]*//" conftest.out` +@@ -11423,10 +11418,10 @@ + + cf_cv_timestamp=`date` + +-echo "$as_me:11426: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 ++echo "$as_me:11421: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 + echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6 + +-echo "$as_me:11429: checking if you want to have a library-prefix" >&5 ++echo "$as_me:11424: checking if you want to have a library-prefix" >&5 + echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6 + + # Check whether --with-lib-prefix or --without-lib-prefix was given. +@@ -11436,7 +11431,7 @@ + else + with_lib_prefix=auto + fi; +-echo "$as_me:11439: result: $with_lib_prefix" >&5 ++echo "$as_me:11434: result: $with_lib_prefix" >&5 + echo "${ECHO_T}$with_lib_prefix" >&6 + + if test "$with_lib_prefix" = auto +@@ -11474,7 +11469,7 @@ + test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT='' + fi + +-echo "$as_me:11477: checking for default loader flags" >&5 ++echo "$as_me:11472: checking for default loader flags" >&5 + echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6 + case $DFT_LWR_MODEL in + (normal) LD_MODEL='' ;; +@@ -11482,13 +11477,13 @@ + (profile) LD_MODEL='-pg';; + (shared) LD_MODEL='' ;; + esac +-echo "$as_me:11485: result: $LD_MODEL" >&5 ++echo "$as_me:11480: result: $LD_MODEL" >&5 + echo "${ECHO_T}$LD_MODEL" >&6 + + LD_RPATH_OPT= + if test "x$cf_cv_enable_rpath" != xno + then +- echo "$as_me:11491: checking for an rpath option" >&5 ++ echo "$as_me:11486: checking for an rpath option" >&5 + echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 + case "$cf_cv_system_name" in + (irix*) +@@ -11519,12 +11514,12 @@ + (*) + ;; + esac +- echo "$as_me:11522: result: $LD_RPATH_OPT" >&5 ++ echo "$as_me:11517: result: $LD_RPATH_OPT" >&5 + echo "${ECHO_T}$LD_RPATH_OPT" >&6 + + case "x$LD_RPATH_OPT" in + (x-R*) +- echo "$as_me:11527: checking if we need a space after rpath option" >&5 ++ echo "$as_me:11522: checking if we need a space after rpath option" >&5 + echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6 + cf_save_LIBS="$LIBS" + +@@ -11545,7 +11540,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11548 "configure" ++#line 11543 "configure" + #include "confdefs.h" + + int +@@ -11557,16 +11552,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:11560: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11555: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11563: \$? = $ac_status" >&5 ++ echo "$as_me:11558: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:11566: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11561: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11569: \$? = $ac_status" >&5 ++ echo "$as_me:11564: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_rpath_space=no + else +@@ -11576,7 +11571,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS="$cf_save_LIBS" +- echo "$as_me:11579: result: $cf_rpath_space" >&5 ++ echo "$as_me:11574: result: $cf_rpath_space" >&5 + echo "${ECHO_T}$cf_rpath_space" >&6 + test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " + ;; +@@ -11598,7 +11593,7 @@ + cf_ld_rpath_opt= + test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT" + +- echo "$as_me:11601: checking if release/abi version should be used for shared libs" >&5 ++ echo "$as_me:11596: checking if release/abi version should be used for shared libs" >&5 + echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6 + + # Check whether --with-shlib-version or --without-shlib-version was given. +@@ -11613,9 +11608,9 @@ + cf_cv_shlib_version=$withval + ;; + (*) +- echo "$as_me:11616: result: $withval" >&5 ++ echo "$as_me:11611: result: $withval" >&5 + echo "${ECHO_T}$withval" >&6 +- { { echo "$as_me:11618: error: option value must be one of: rel, abi, or auto" >&5 ++ { { echo "$as_me:11613: error: option value must be one of: rel, abi, or auto" >&5 + echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -11624,7 +11619,7 @@ + else + cf_cv_shlib_version=auto + fi; +- echo "$as_me:11627: result: $cf_cv_shlib_version" >&5 ++ echo "$as_me:11622: result: $cf_cv_shlib_version" >&5 + echo "${ECHO_T}$cf_cv_shlib_version" >&6 + + cf_cv_rm_so_locs=no +@@ -11647,14 +11642,14 @@ + + if test "$cf_try_fPIC" = yes + then +- echo "$as_me:11650: checking which $CC option to use" >&5 ++ echo "$as_me:11645: checking which $CC option to use" >&5 + echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6 + cf_save_CFLAGS="$CFLAGS" + for CC_SHARED_OPTS in -fPIC -fpic '' + do + CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11657 "configure" ++#line 11652 "configure" + #include "confdefs.h" + #include + int +@@ -11666,16 +11661,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11669: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11664: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11672: \$? = $ac_status" >&5 ++ echo "$as_me:11667: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11675: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11670: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11678: \$? = $ac_status" >&5 ++ echo "$as_me:11673: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -11684,7 +11679,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + done +- echo "$as_me:11687: result: $CC_SHARED_OPTS" >&5 ++ echo "$as_me:11682: result: $CC_SHARED_OPTS" >&5 + echo "${ECHO_T}$CC_SHARED_OPTS" >&6 + CFLAGS="$cf_save_CFLAGS" + fi +@@ -11755,7 +11750,7 @@ + MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@' + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi + cf_cv_shlib_version_infix=yes +- echo "$as_me:11758: checking if ld -search_paths_first works" >&5 ++ echo "$as_me:11753: checking if ld -search_paths_first works" >&5 + echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6 + if test "${cf_cv_ldflags_search_paths_first+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -11764,7 +11759,7 @@ + cf_save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -Wl,-search_paths_first" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11767 "configure" ++#line 11762 "configure" + #include "confdefs.h" + + int +@@ -11776,16 +11771,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:11779: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11774: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11782: \$? = $ac_status" >&5 ++ echo "$as_me:11777: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:11785: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11780: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11788: \$? = $ac_status" >&5 ++ echo "$as_me:11783: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ldflags_search_paths_first=yes + else +@@ -11796,7 +11791,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LDFLAGS=$cf_save_LDFLAGS + fi +-echo "$as_me:11799: result: $cf_cv_ldflags_search_paths_first" >&5 ++echo "$as_me:11794: result: $cf_cv_ldflags_search_paths_first" >&5 + echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 + if test "$cf_cv_ldflags_search_paths_first" = yes; then + LDFLAGS="$LDFLAGS -Wl,-search_paths_first" +@@ -12146,7 +12141,7 @@ + do + CFLAGS="$cf_shared_opts $cf_save_CFLAGS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12149 "configure" ++#line 12144 "configure" + #include "confdefs.h" + #include + int +@@ -12158,16 +12153,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12161: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12156: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12164: \$? = $ac_status" >&5 ++ echo "$as_me:12159: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12167: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12162: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12170: \$? = $ac_status" >&5 ++ echo "$as_me:12165: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -12204,7 +12199,7 @@ + test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes + ;; + (*) +- { echo "$as_me:12207: WARNING: ignored --with-shlib-version" >&5 ++ { echo "$as_me:12202: WARNING: ignored --with-shlib-version" >&5 + echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} + ;; + esac +@@ -12214,7 +12209,7 @@ + if test -n "$cf_try_cflags" + then + cat > conftest.$ac_ext < + int main(int argc, char *argv[]) + { +@@ -12226,18 +12221,18 @@ + for cf_opt in $cf_try_cflags + do + CFLAGS="$cf_save_CFLAGS -$cf_opt" +- echo "$as_me:12229: checking if CFLAGS option -$cf_opt works" >&5 ++ echo "$as_me:12224: checking if CFLAGS option -$cf_opt works" >&5 + echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6 +- if { (eval echo "$as_me:12231: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:12226: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12234: \$? = $ac_status" >&5 ++ echo "$as_me:12229: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- echo "$as_me:12236: result: yes" >&5 ++ echo "$as_me:12231: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + cf_save_CFLAGS="$CFLAGS" + else +- echo "$as_me:12240: result: no" >&5 ++ echo "$as_me:12235: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + done +@@ -12252,17 +12247,17 @@ + + test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6 + +-echo "${as_me:-configure}:12255: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 ++echo "${as_me:-configure}:12250: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 + + test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 + +-echo "${as_me:-configure}:12259: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 ++echo "${as_me:-configure}:12254: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 + + # The test/sample programs in the original tree link using rpath option. + # Make it optional for packagers. + if test -n "$LOCAL_LDFLAGS" + then +- echo "$as_me:12265: checking if you want to link sample programs with rpath option" >&5 ++ echo "$as_me:12260: checking if you want to link sample programs with rpath option" >&5 + echo $ECHO_N "checking if you want to link sample programs with rpath option... $ECHO_C" >&6 + + # Check whether --enable-rpath-link or --disable-rpath-link was given. +@@ -12272,7 +12267,7 @@ + else + with_rpath_link=yes + fi; +- echo "$as_me:12275: result: $with_rpath_link" >&5 ++ echo "$as_me:12270: result: $with_rpath_link" >&5 + echo "${ECHO_T}$with_rpath_link" >&6 + if test "$with_rpath_link" = no + then +@@ -12285,7 +12280,7 @@ + + ### use option --enable-broken-linker to force on use of broken-linker support + +-echo "$as_me:12288: checking if you want broken-linker support code" >&5 ++echo "$as_me:12283: checking if you want broken-linker support code" >&5 + echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6 + + # Check whether --enable-broken_linker or --disable-broken_linker was given. +@@ -12295,7 +12290,7 @@ + else + with_broken_linker=no + fi; +-echo "$as_me:12298: result: $with_broken_linker" >&5 ++echo "$as_me:12293: result: $with_broken_linker" >&5 + echo "${ECHO_T}$with_broken_linker" >&6 + + : "${BROKEN_LINKER:=0}" +@@ -12310,14 +12305,14 @@ + + # Check to define _XOPEN_SOURCE "automatically" + +-echo "$as_me:12313: checking if the POSIX test-macros are already defined" >&5 ++echo "$as_me:12308: checking if the POSIX test-macros are already defined" >&5 + echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6 + if test "${cf_cv_posix_visible+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12320 "configure" ++#line 12315 "configure" + #include "confdefs.h" + #include + int +@@ -12336,16 +12331,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12339: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12334: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12342: \$? = $ac_status" >&5 ++ echo "$as_me:12337: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12345: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12340: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12348: \$? = $ac_status" >&5 ++ echo "$as_me:12343: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_posix_visible=no + else +@@ -12356,7 +12351,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:12359: result: $cf_cv_posix_visible" >&5 ++echo "$as_me:12354: result: $cf_cv_posix_visible" >&5 + echo "${ECHO_T}$cf_cv_posix_visible" >&6 + + if test "$cf_cv_posix_visible" = no; then +@@ -12401,14 +12396,14 @@ + + cf_gnu_xopen_source=$cf_XOPEN_SOURCE + +-echo "$as_me:12404: checking if this is the GNU C library" >&5 ++echo "$as_me:12399: checking if this is the GNU C library" >&5 + echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6 + if test "${cf_cv_gnu_library+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12411 "configure" ++#line 12406 "configure" + #include "confdefs.h" + #include + int +@@ -12427,16 +12422,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12430: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12425: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12433: \$? = $ac_status" >&5 ++ echo "$as_me:12428: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12436: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12431: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12439: \$? = $ac_status" >&5 ++ echo "$as_me:12434: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_library=yes + else +@@ -12447,7 +12442,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:12450: result: $cf_cv_gnu_library" >&5 ++echo "$as_me:12445: result: $cf_cv_gnu_library" >&5 + echo "${ECHO_T}$cf_cv_gnu_library" >&6 + + if test x$cf_cv_gnu_library = xyes; then +@@ -12455,7 +12450,7 @@ + # With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE + # was changed to help a little. newlib incorporated the change about 4 + # years later. +- echo "$as_me:12458: checking if _DEFAULT_SOURCE can be used as a basis" >&5 ++ echo "$as_me:12453: checking if _DEFAULT_SOURCE can be used as a basis" >&5 + echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6 + if test "${cf_cv_gnu_library_219+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -12467,7 +12462,7 @@ + CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12470 "configure" ++#line 12465 "configure" + #include "confdefs.h" + #include + int +@@ -12486,16 +12481,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12489: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12484: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12492: \$? = $ac_status" >&5 ++ echo "$as_me:12487: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12495: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12490: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12498: \$? = $ac_status" >&5 ++ echo "$as_me:12493: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_library_219=yes + else +@@ -12507,12 +12502,12 @@ + CPPFLAGS="$cf_save" + + fi +-echo "$as_me:12510: result: $cf_cv_gnu_library_219" >&5 ++echo "$as_me:12505: result: $cf_cv_gnu_library_219" >&5 + echo "${ECHO_T}$cf_cv_gnu_library_219" >&6 + + if test "x$cf_cv_gnu_library_219" = xyes; then + cf_save="$CPPFLAGS" +- echo "$as_me:12515: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 ++ echo "$as_me:12510: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 + echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_gnu_dftsrc_219+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -12617,7 +12612,7 @@ + fi + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12620 "configure" ++#line 12615 "configure" + #include "confdefs.h" + + #include +@@ -12637,16 +12632,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12640: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12635: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12643: \$? = $ac_status" >&5 ++ echo "$as_me:12638: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12646: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12641: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12649: \$? = $ac_status" >&5 ++ echo "$as_me:12644: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_dftsrc_219=yes + else +@@ -12657,7 +12652,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:12660: result: $cf_cv_gnu_dftsrc_219" >&5 ++echo "$as_me:12655: result: $cf_cv_gnu_dftsrc_219" >&5 + echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6 + test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save" + else +@@ -12666,14 +12661,14 @@ + + if test "x$cf_cv_gnu_dftsrc_219" != xyes; then + +- echo "$as_me:12669: checking if we must define _GNU_SOURCE" >&5 ++ echo "$as_me:12664: checking if we must define _GNU_SOURCE" >&5 + echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_gnu_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12676 "configure" ++#line 12671 "configure" + #include "confdefs.h" + #include + int +@@ -12688,16 +12683,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12691: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12686: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12694: \$? = $ac_status" >&5 ++ echo "$as_me:12689: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12697: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12692: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12700: \$? = $ac_status" >&5 ++ echo "$as_me:12695: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_source=no + else +@@ -12804,7 +12799,7 @@ + fi + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12807 "configure" ++#line 12802 "configure" + #include "confdefs.h" + #include + int +@@ -12819,16 +12814,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12822: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12817: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12825: \$? = $ac_status" >&5 ++ echo "$as_me:12820: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12828: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12823: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12831: \$? = $ac_status" >&5 ++ echo "$as_me:12826: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_source=no + else +@@ -12843,12 +12838,12 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:12846: result: $cf_cv_gnu_source" >&5 ++echo "$as_me:12841: result: $cf_cv_gnu_source" >&5 + echo "${ECHO_T}$cf_cv_gnu_source" >&6 + + if test "$cf_cv_gnu_source" = yes + then +- echo "$as_me:12851: checking if we should also define _DEFAULT_SOURCE" >&5 ++ echo "$as_me:12846: checking if we should also define _DEFAULT_SOURCE" >&5 + echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_default_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -12858,7 +12853,7 @@ + CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12861 "configure" ++#line 12856 "configure" + #include "confdefs.h" + #include + int +@@ -12873,16 +12868,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12876: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12871: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12879: \$? = $ac_status" >&5 ++ echo "$as_me:12874: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12882: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12877: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12885: \$? = $ac_status" >&5 ++ echo "$as_me:12880: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_default_source=no + else +@@ -12893,7 +12888,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:12896: result: $cf_cv_default_source" >&5 ++echo "$as_me:12891: result: $cf_cv_default_source" >&5 + echo "${ECHO_T}$cf_cv_default_source" >&6 + if test "$cf_cv_default_source" = yes + then +@@ -12930,16 +12925,16 @@ + sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` + +-echo "$as_me:12933: checking if we should define _POSIX_C_SOURCE" >&5 ++echo "$as_me:12928: checking if we should define _POSIX_C_SOURCE" >&5 + echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_posix_c_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + +-echo "${as_me:-configure}:12939: testing if the symbol is already defined go no further ..." 1>&5 ++echo "${as_me:-configure}:12934: testing if the symbol is already defined go no further ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12942 "configure" ++#line 12937 "configure" + #include "confdefs.h" + #include + int +@@ -12954,16 +12949,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12957: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12952: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12960: \$? = $ac_status" >&5 ++ echo "$as_me:12955: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12963: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12958: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12966: \$? = $ac_status" >&5 ++ echo "$as_me:12961: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_posix_c_source=no + else +@@ -12984,7 +12979,7 @@ + esac + if test "$cf_want_posix_source" = yes ; then + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12987 "configure" ++#line 12982 "configure" + #include "confdefs.h" + #include + int +@@ -12999,16 +12994,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13002: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12997: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13005: \$? = $ac_status" >&5 ++ echo "$as_me:13000: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13008: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13003: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13011: \$? = $ac_status" >&5 ++ echo "$as_me:13006: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -13019,7 +13014,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi + +-echo "${as_me:-configure}:13022: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 ++echo "${as_me:-configure}:13017: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 + + CFLAGS="$cf_trim_CFLAGS" + CPPFLAGS="$cf_trim_CPPFLAGS" +@@ -13027,10 +13022,10 @@ + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" + +-echo "${as_me:-configure}:13030: testing if the second compile does not leave our definition intact error ..." 1>&5 ++echo "${as_me:-configure}:13025: testing if the second compile does not leave our definition intact error ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13033 "configure" ++#line 13028 "configure" + #include "confdefs.h" + #include + int +@@ -13045,16 +13040,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13048: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13043: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13051: \$? = $ac_status" >&5 ++ echo "$as_me:13046: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13054: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13049: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13057: \$? = $ac_status" >&5 ++ echo "$as_me:13052: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -13070,7 +13065,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:13073: result: $cf_cv_posix_c_source" >&5 ++echo "$as_me:13068: result: $cf_cv_posix_c_source" >&5 + echo "${ECHO_T}$cf_cv_posix_c_source" >&6 + + if test "$cf_cv_posix_c_source" != no ; then +@@ -13187,7 +13182,7 @@ + # OpenBSD 6.x has broken locale support, both compile-time and runtime. + # see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html + # Abusing the conformance level is a workaround. +- { echo "$as_me:13190: WARNING: this system does not provide usable locale support" >&5 ++ { echo "$as_me:13185: WARNING: this system does not provide usable locale support" >&5 + echo "$as_me: WARNING: this system does not provide usable locale support" >&2;} + cf_xopen_source="-D_BSD_SOURCE" + cf_XOPEN_SOURCE=700 +@@ -13219,14 +13214,14 @@ + ;; + (*) + +-echo "$as_me:13222: checking if we should define _XOPEN_SOURCE" >&5 ++echo "$as_me:13217: checking if we should define _XOPEN_SOURCE" >&5 + echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_xopen_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13229 "configure" ++#line 13224 "configure" + #include "confdefs.h" + + #include +@@ -13245,16 +13240,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13248: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13243: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13251: \$? = $ac_status" >&5 ++ echo "$as_me:13246: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13254: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13249: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13257: \$? = $ac_status" >&5 ++ echo "$as_me:13252: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_xopen_source=no + else +@@ -13266,7 +13261,7 @@ + CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13269 "configure" ++#line 13264 "configure" + #include "confdefs.h" + + #include +@@ -13285,16 +13280,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13288: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13283: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13291: \$? = $ac_status" >&5 ++ echo "$as_me:13286: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13294: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13289: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13297: \$? = $ac_status" >&5 ++ echo "$as_me:13292: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_xopen_source=no + else +@@ -13309,7 +13304,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:13312: result: $cf_cv_xopen_source" >&5 ++echo "$as_me:13307: result: $cf_cv_xopen_source" >&5 + echo "${ECHO_T}$cf_cv_xopen_source" >&6 + + if test "$cf_cv_xopen_source" != no ; then +@@ -13467,16 +13462,16 @@ + sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` + +-echo "$as_me:13470: checking if we should define _POSIX_C_SOURCE" >&5 ++echo "$as_me:13465: checking if we should define _POSIX_C_SOURCE" >&5 + echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_posix_c_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + +-echo "${as_me:-configure}:13476: testing if the symbol is already defined go no further ..." 1>&5 ++echo "${as_me:-configure}:13471: testing if the symbol is already defined go no further ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13479 "configure" ++#line 13474 "configure" + #include "confdefs.h" + #include + int +@@ -13491,16 +13486,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13494: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13489: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13497: \$? = $ac_status" >&5 ++ echo "$as_me:13492: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13500: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13495: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13503: \$? = $ac_status" >&5 ++ echo "$as_me:13498: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_posix_c_source=no + else +@@ -13521,7 +13516,7 @@ + esac + if test "$cf_want_posix_source" = yes ; then + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13524 "configure" ++#line 13519 "configure" + #include "confdefs.h" + #include + int +@@ -13536,16 +13531,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13539: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13534: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13542: \$? = $ac_status" >&5 ++ echo "$as_me:13537: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13545: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13540: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13548: \$? = $ac_status" >&5 ++ echo "$as_me:13543: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -13556,7 +13551,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi + +-echo "${as_me:-configure}:13559: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 ++echo "${as_me:-configure}:13554: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 + + CFLAGS="$cf_trim_CFLAGS" + CPPFLAGS="$cf_trim_CPPFLAGS" +@@ -13564,10 +13559,10 @@ + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" + +-echo "${as_me:-configure}:13567: testing if the second compile does not leave our definition intact error ..." 1>&5 ++echo "${as_me:-configure}:13562: testing if the second compile does not leave our definition intact error ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13570 "configure" ++#line 13565 "configure" + #include "confdefs.h" + #include + int +@@ -13582,16 +13577,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13585: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13580: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13588: \$? = $ac_status" >&5 ++ echo "$as_me:13583: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13591: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13586: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13594: \$? = $ac_status" >&5 ++ echo "$as_me:13589: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -13607,7 +13602,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:13610: result: $cf_cv_posix_c_source" >&5 ++echo "$as_me:13605: result: $cf_cv_posix_c_source" >&5 + echo "${ECHO_T}$cf_cv_posix_c_source" >&6 + + if test "$cf_cv_posix_c_source" != no ; then +@@ -13733,7 +13728,7 @@ + test "$CFLAGS" != "$cf_old_cflag" || break + test -n "$verbose" && echo " removing old option $cf_add_cflags from CFLAGS" 1>&6 + +-echo "${as_me:-configure}:13736: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:13731: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5 + + CFLAGS="$cf_old_cflag" + done +@@ -13745,7 +13740,7 @@ + test "$CPPFLAGS" != "$cf_old_cflag" || break + test -n "$verbose" && echo " removing old option $cf_add_cflags from CPPFLAGS" 1>&6 + +-echo "${as_me:-configure}:13748: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5 ++echo "${as_me:-configure}:13743: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5 + + CPPFLAGS="$cf_old_cflag" + done +@@ -13833,7 +13828,7 @@ + if test -n "$cf_new_cflags" ; then + test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 + +-echo "${as_me:-configure}:13836: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 ++echo "${as_me:-configure}:13831: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" +@@ -13843,7 +13838,7 @@ + if test -n "$cf_new_cppflags" ; then + test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 + +-echo "${as_me:-configure}:13846: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 ++echo "${as_me:-configure}:13841: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" +@@ -13853,7 +13848,7 @@ + if test -n "$cf_new_extra_cppflags" ; then + test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 + +-echo "${as_me:-configure}:13856: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 ++echo "${as_me:-configure}:13851: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 + + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" +@@ -13865,10 +13860,10 @@ + fi + + if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then +- echo "$as_me:13868: checking if _XOPEN_SOURCE really is set" >&5 ++ echo "$as_me:13863: checking if _XOPEN_SOURCE really is set" >&5 + echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13871 "configure" ++#line 13866 "configure" + #include "confdefs.h" + #include + int +@@ -13883,16 +13878,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13886: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13881: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13889: \$? = $ac_status" >&5 ++ echo "$as_me:13884: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13892: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13887: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13895: \$? = $ac_status" >&5 ++ echo "$as_me:13890: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_XOPEN_SOURCE_set=yes + else +@@ -13901,12 +13896,12 @@ + cf_XOPEN_SOURCE_set=no + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +- echo "$as_me:13904: result: $cf_XOPEN_SOURCE_set" >&5 ++ echo "$as_me:13899: result: $cf_XOPEN_SOURCE_set" >&5 + echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6 + if test "$cf_XOPEN_SOURCE_set" = yes + then + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13909 "configure" ++#line 13904 "configure" + #include "confdefs.h" + #include + int +@@ -13921,16 +13916,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13924: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13919: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13927: \$? = $ac_status" >&5 ++ echo "$as_me:13922: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13930: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13925: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13933: \$? = $ac_status" >&5 ++ echo "$as_me:13928: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_XOPEN_SOURCE_set_ok=yes + else +@@ -13941,19 +13936,19 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + if test "$cf_XOPEN_SOURCE_set_ok" = no + then +- { echo "$as_me:13944: WARNING: _XOPEN_SOURCE is lower than requested" >&5 ++ { echo "$as_me:13939: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} + fi + else + +-echo "$as_me:13949: checking if we should define _XOPEN_SOURCE" >&5 ++echo "$as_me:13944: checking if we should define _XOPEN_SOURCE" >&5 + echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_xopen_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13956 "configure" ++#line 13951 "configure" + #include "confdefs.h" + + #include +@@ -13972,16 +13967,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13975: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13970: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13978: \$? = $ac_status" >&5 ++ echo "$as_me:13973: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13981: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13976: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13984: \$? = $ac_status" >&5 ++ echo "$as_me:13979: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_xopen_source=no + else +@@ -13993,7 +13988,7 @@ + CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13996 "configure" ++#line 13991 "configure" + #include "confdefs.h" + + #include +@@ -14012,16 +14007,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14015: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14010: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14018: \$? = $ac_status" >&5 ++ echo "$as_me:14013: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14021: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14016: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14024: \$? = $ac_status" >&5 ++ echo "$as_me:14019: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_xopen_source=no + else +@@ -14036,7 +14031,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:14039: result: $cf_cv_xopen_source" >&5 ++echo "$as_me:14034: result: $cf_cv_xopen_source" >&5 + echo "${ECHO_T}$cf_cv_xopen_source" >&6 + + if test "$cf_cv_xopen_source" != no ; then +@@ -14190,7 +14185,7 @@ + fi; + if test "$enable_largefile" != no; then + +- echo "$as_me:14193: checking for special C compiler options needed for large files" >&5 ++ echo "$as_me:14188: checking for special C compiler options needed for large files" >&5 + echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 + if test "${ac_cv_sys_largefile_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -14202,7 +14197,7 @@ + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14205 "configure" ++#line 14200 "configure" + #include "confdefs.h" + #include + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -14222,16 +14217,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14225: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14220: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14228: \$? = $ac_status" >&5 ++ echo "$as_me:14223: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14231: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14226: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14234: \$? = $ac_status" >&5 ++ echo "$as_me:14229: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -14241,16 +14236,16 @@ + rm -f "conftest.$ac_objext" + CC="$CC -n32" + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14244: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14239: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14247: \$? = $ac_status" >&5 ++ echo "$as_me:14242: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14250: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14245: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14253: \$? = $ac_status" >&5 ++ echo "$as_me:14248: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sys_largefile_CC=' -n32'; break + else +@@ -14264,13 +14259,13 @@ + rm -f "conftest.$ac_ext" + fi + fi +-echo "$as_me:14267: result: $ac_cv_sys_largefile_CC" >&5 ++echo "$as_me:14262: result: $ac_cv_sys_largefile_CC" >&5 + echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 + if test "$ac_cv_sys_largefile_CC" != no; then + CC=$CC$ac_cv_sys_largefile_CC + fi + +- echo "$as_me:14273: checking for _FILE_OFFSET_BITS value needed for large files" >&5 ++ echo "$as_me:14268: checking for _FILE_OFFSET_BITS value needed for large files" >&5 + echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 + if test "${ac_cv_sys_file_offset_bits+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -14278,7 +14273,7 @@ + while :; do + ac_cv_sys_file_offset_bits=no + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14281 "configure" ++#line 14276 "configure" + #include "confdefs.h" + #include + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -14298,16 +14293,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14301: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14296: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14304: \$? = $ac_status" >&5 ++ echo "$as_me:14299: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14307: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14302: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14310: \$? = $ac_status" >&5 ++ echo "$as_me:14305: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -14316,7 +14311,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14319 "configure" ++#line 14314 "configure" + #include "confdefs.h" + #define _FILE_OFFSET_BITS 64 + #include +@@ -14337,16 +14332,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14340: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14335: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14343: \$? = $ac_status" >&5 ++ echo "$as_me:14338: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14346: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14341: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14349: \$? = $ac_status" >&5 ++ echo "$as_me:14344: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sys_file_offset_bits=64; break + else +@@ -14357,7 +14352,7 @@ + break + done + fi +-echo "$as_me:14360: result: $ac_cv_sys_file_offset_bits" >&5 ++echo "$as_me:14355: result: $ac_cv_sys_file_offset_bits" >&5 + echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 + if test "$ac_cv_sys_file_offset_bits" != no; then + +@@ -14367,7 +14362,7 @@ + + fi + rm -rf conftest* +- echo "$as_me:14370: checking for _LARGE_FILES value needed for large files" >&5 ++ echo "$as_me:14365: checking for _LARGE_FILES value needed for large files" >&5 + echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 + if test "${ac_cv_sys_large_files+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -14375,7 +14370,7 @@ + while :; do + ac_cv_sys_large_files=no + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14378 "configure" ++#line 14373 "configure" + #include "confdefs.h" + #include + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -14395,16 +14390,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14398: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14393: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14401: \$? = $ac_status" >&5 ++ echo "$as_me:14396: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14404: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14399: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14407: \$? = $ac_status" >&5 ++ echo "$as_me:14402: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -14413,7 +14408,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14416 "configure" ++#line 14411 "configure" + #include "confdefs.h" + #define _LARGE_FILES 1 + #include +@@ -14434,16 +14429,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14437: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14432: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14440: \$? = $ac_status" >&5 ++ echo "$as_me:14435: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14443: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14438: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14446: \$? = $ac_status" >&5 ++ echo "$as_me:14441: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sys_large_files=1; break + else +@@ -14454,7 +14449,7 @@ + break + done + fi +-echo "$as_me:14457: result: $ac_cv_sys_large_files" >&5 ++echo "$as_me:14452: result: $ac_cv_sys_large_files" >&5 + echo "${ECHO_T}$ac_cv_sys_large_files" >&6 + if test "$ac_cv_sys_large_files" != no; then + +@@ -14467,7 +14462,7 @@ + fi + + if test "$enable_largefile" != no ; then +- echo "$as_me:14470: checking for _LARGEFILE_SOURCE value needed for large files" >&5 ++ echo "$as_me:14465: checking for _LARGEFILE_SOURCE value needed for large files" >&5 + echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6 + if test "${ac_cv_sys_largefile_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -14475,7 +14470,7 @@ + while :; do + ac_cv_sys_largefile_source=no + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14478 "configure" ++#line 14473 "configure" + #include "confdefs.h" + #include + int +@@ -14487,16 +14482,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14490: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14485: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14493: \$? = $ac_status" >&5 ++ echo "$as_me:14488: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14496: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14491: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14499: \$? = $ac_status" >&5 ++ echo "$as_me:14494: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -14505,7 +14500,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14508 "configure" ++#line 14503 "configure" + #include "confdefs.h" + #define _LARGEFILE_SOURCE 1 + #include +@@ -14518,16 +14513,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14521: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14516: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14524: \$? = $ac_status" >&5 ++ echo "$as_me:14519: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14527: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14522: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14530: \$? = $ac_status" >&5 ++ echo "$as_me:14525: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sys_largefile_source=1; break + else +@@ -14538,7 +14533,7 @@ + break + done + fi +-echo "$as_me:14541: result: $ac_cv_sys_largefile_source" >&5 ++echo "$as_me:14536: result: $ac_cv_sys_largefile_source" >&5 + echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6 + if test "$ac_cv_sys_largefile_source" != no; then + +@@ -14552,13 +14547,13 @@ + # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug + # in glibc 2.1.3, but that breaks too many other things. + # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. +-echo "$as_me:14555: checking for fseeko" >&5 ++echo "$as_me:14550: checking for fseeko" >&5 + echo $ECHO_N "checking for fseeko... $ECHO_C" >&6 + if test "${ac_cv_func_fseeko+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14561 "configure" ++#line 14556 "configure" + #include "confdefs.h" + #include + int +@@ -14570,16 +14565,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:14573: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14568: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14576: \$? = $ac_status" >&5 ++ echo "$as_me:14571: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:14579: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14574: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14582: \$? = $ac_status" >&5 ++ echo "$as_me:14577: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_fseeko=yes + else +@@ -14589,7 +14584,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:14592: result: $ac_cv_func_fseeko" >&5 ++echo "$as_me:14587: result: $ac_cv_func_fseeko" >&5 + echo "${ECHO_T}$ac_cv_func_fseeko" >&6 + if test $ac_cv_func_fseeko = yes; then + +@@ -14628,14 +14623,14 @@ + + fi + +- echo "$as_me:14631: checking whether to use struct dirent64" >&5 ++ echo "$as_me:14626: checking whether to use struct dirent64" >&5 + echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6 + if test "${cf_cv_struct_dirent64+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14638 "configure" ++#line 14633 "configure" + #include "confdefs.h" + + #pragma GCC diagnostic error "-Wincompatible-pointer-types" +@@ -14658,16 +14653,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14661: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14656: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14664: \$? = $ac_status" >&5 ++ echo "$as_me:14659: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14667: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14662: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14670: \$? = $ac_status" >&5 ++ echo "$as_me:14665: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_struct_dirent64=yes + else +@@ -14678,7 +14673,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:14681: result: $cf_cv_struct_dirent64" >&5 ++echo "$as_me:14676: result: $cf_cv_struct_dirent64" >&5 + echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 + test "$cf_cv_struct_dirent64" = yes && + cat >>confdefs.h <<\EOF +@@ -14688,7 +14683,7 @@ + fi + + ### Enable compiling-in rcs id's +-echo "$as_me:14691: checking if RCS identifiers should be compiled-in" >&5 ++echo "$as_me:14686: checking if RCS identifiers should be compiled-in" >&5 + echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6 + + # Check whether --with-rcs-ids or --without-rcs-ids was given. +@@ -14698,7 +14693,7 @@ + else + with_rcs_ids=no + fi; +-echo "$as_me:14701: result: $with_rcs_ids" >&5 ++echo "$as_me:14696: result: $with_rcs_ids" >&5 + echo "${ECHO_T}$with_rcs_ids" >&6 + test "$with_rcs_ids" = yes && + cat >>confdefs.h <<\EOF +@@ -14708,7 +14703,7 @@ + ############################################################################### + + ### Note that some functions (such as const) are normally disabled anyway. +-echo "$as_me:14711: checking if you want to build with function extensions" >&5 ++echo "$as_me:14706: checking if you want to build with function extensions" >&5 + echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6 + + # Check whether --enable-ext-funcs or --disable-ext-funcs was given. +@@ -14718,7 +14713,7 @@ + else + with_ext_funcs=yes + fi; +-echo "$as_me:14721: result: $with_ext_funcs" >&5 ++echo "$as_me:14716: result: $with_ext_funcs" >&5 + echo "${ECHO_T}$with_ext_funcs" >&6 + if test "$with_ext_funcs" = yes ; then + NCURSES_EXT_FUNCS=1 +@@ -14736,7 +14731,7 @@ + fi + + ### use option --enable-const to turn on use of const beyond that in XSI. +-echo "$as_me:14739: checking for extended use of const keyword" >&5 ++echo "$as_me:14734: checking for extended use of const keyword" >&5 + echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6 + + # Check whether --enable-const or --disable-const was given. +@@ -14746,7 +14741,7 @@ + else + with_ext_const=no + fi; +-echo "$as_me:14749: result: $with_ext_const" >&5 ++echo "$as_me:14744: result: $with_ext_const" >&5 + echo "${ECHO_T}$with_ext_const" >&6 + NCURSES_CONST='/*nothing*/' + if test "$with_ext_const" = yes ; then +@@ -14756,7 +14751,7 @@ + ############################################################################### + # These options are relatively safe to experiment with. + +-echo "$as_me:14759: checking if you want all development code" >&5 ++echo "$as_me:14754: checking if you want all development code" >&5 + echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6 + + # Check whether --with-develop or --without-develop was given. +@@ -14766,7 +14761,7 @@ + else + with_develop=no + fi; +-echo "$as_me:14769: result: $with_develop" >&5 ++echo "$as_me:14764: result: $with_develop" >&5 + echo "${ECHO_T}$with_develop" >&6 + + ############################################################################### +@@ -14775,7 +14770,7 @@ + # This is still experimental (20080329), but should ultimately be moved to + # the script-block --with-normal, etc. + +-echo "$as_me:14778: checking if you want to link with the pthread library" >&5 ++echo "$as_me:14773: checking if you want to link with the pthread library" >&5 + echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6 + + # Check whether --with-pthread or --without-pthread was given. +@@ -14785,27 +14780,27 @@ + else + with_pthread=no + fi; +-echo "$as_me:14788: result: $with_pthread" >&5 ++echo "$as_me:14783: result: $with_pthread" >&5 + echo "${ECHO_T}$with_pthread" >&6 + + if test "$with_pthread" != no ; then +- echo "$as_me:14792: checking for pthread.h" >&5 ++ echo "$as_me:14787: checking for pthread.h" >&5 + echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 + if test "${ac_cv_header_pthread_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14798 "configure" ++#line 14793 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:14802: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:14797: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:14808: \$? = $ac_status" >&5 ++ echo "$as_me:14803: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -14824,7 +14819,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:14827: result: $ac_cv_header_pthread_h" >&5 ++echo "$as_me:14822: result: $ac_cv_header_pthread_h" >&5 + echo "${ECHO_T}$ac_cv_header_pthread_h" >&6 + if test "$ac_cv_header_pthread_h" = yes; then + +@@ -14834,7 +14829,7 @@ + + for cf_lib_pthread in pthread c_r + do +- echo "$as_me:14837: checking if we can link with the $cf_lib_pthread library" >&5 ++ echo "$as_me:14832: checking if we can link with the $cf_lib_pthread library" >&5 + echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6 + cf_save_LIBS="$LIBS" + +@@ -14855,7 +14850,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14858 "configure" ++#line 14853 "configure" + #include "confdefs.h" + + #include +@@ -14872,16 +14867,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:14875: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14870: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14878: \$? = $ac_status" >&5 ++ echo "$as_me:14873: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:14881: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14876: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14884: \$? = $ac_status" >&5 ++ echo "$as_me:14879: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + with_pthread=yes + else +@@ -14891,7 +14886,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS="$cf_save_LIBS" +- echo "$as_me:14894: result: $with_pthread" >&5 ++ echo "$as_me:14889: result: $with_pthread" >&5 + echo "${ECHO_T}$with_pthread" >&6 + test "$with_pthread" = yes && break + done +@@ -14919,7 +14914,7 @@ + EOF + + else +- { { echo "$as_me:14922: error: Cannot link with pthread library" >&5 ++ { { echo "$as_me:14917: error: Cannot link with pthread library" >&5 + echo "$as_me: error: Cannot link with pthread library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -14928,7 +14923,7 @@ + + fi + +-echo "$as_me:14931: checking if you want to use weak-symbols for pthreads" >&5 ++echo "$as_me:14926: checking if you want to use weak-symbols for pthreads" >&5 + echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6 + + # Check whether --enable-weak-symbols or --disable-weak-symbols was given. +@@ -14938,18 +14933,18 @@ + else + use_weak_symbols=no + fi; +-echo "$as_me:14941: result: $use_weak_symbols" >&5 ++echo "$as_me:14936: result: $use_weak_symbols" >&5 + echo "${ECHO_T}$use_weak_symbols" >&6 + if test "$use_weak_symbols" = yes ; then + +-echo "$as_me:14945: checking if $CC supports weak symbols" >&5 ++echo "$as_me:14940: checking if $CC supports weak symbols" >&5 + echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6 + if test "${cf_cv_weak_symbols+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14952 "configure" ++#line 14947 "configure" + #include "confdefs.h" + + #include +@@ -14975,16 +14970,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14978: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14973: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14981: \$? = $ac_status" >&5 ++ echo "$as_me:14976: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14984: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14979: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14987: \$? = $ac_status" >&5 ++ echo "$as_me:14982: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_weak_symbols=yes + else +@@ -14995,7 +14990,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:14998: result: $cf_cv_weak_symbols" >&5 ++echo "$as_me:14993: result: $cf_cv_weak_symbols" >&5 + echo "${ECHO_T}$cf_cv_weak_symbols" >&6 + + else +@@ -15024,13 +15019,13 @@ + fi + + # OpenSUSE is installing ncurses6, using reentrant option. +-echo "$as_me:15027: checking for _nc_TABSIZE" >&5 ++echo "$as_me:15022: checking for _nc_TABSIZE" >&5 + echo $ECHO_N "checking for _nc_TABSIZE... $ECHO_C" >&6 + if test "${ac_cv_func__nc_TABSIZE+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 15033 "configure" ++#line 15028 "configure" + #include "confdefs.h" + #define _nc_TABSIZE autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -15061,16 +15056,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:15064: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15059: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15067: \$? = $ac_status" >&5 ++ echo "$as_me:15062: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:15070: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15065: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15073: \$? = $ac_status" >&5 ++ echo "$as_me:15068: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func__nc_TABSIZE=yes + else +@@ -15080,7 +15075,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:15083: result: $ac_cv_func__nc_TABSIZE" >&5 ++echo "$as_me:15078: result: $ac_cv_func__nc_TABSIZE" >&5 + echo "${ECHO_T}$ac_cv_func__nc_TABSIZE" >&6 + if test "$ac_cv_func__nc_TABSIZE" = yes; then + assume_reentrant=yes +@@ -15092,7 +15087,7 @@ + # opaque outside of that, so there is no --enable-opaque option. We can use + # this option without --with-pthreads, but this will be always set for + # pthreads. +-echo "$as_me:15095: checking if you want experimental reentrant code" >&5 ++echo "$as_me:15090: checking if you want experimental reentrant code" >&5 + echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6 + + # Check whether --enable-reentrant or --disable-reentrant was given. +@@ -15102,7 +15097,7 @@ + else + with_reentrant=$assume_reentrant + fi; +-echo "$as_me:15105: result: $with_reentrant" >&5 ++echo "$as_me:15100: result: $with_reentrant" >&5 + echo "${ECHO_T}$with_reentrant" >&6 + if test "$with_reentrant" = yes ; then + cf_cv_enable_reentrant=1 +@@ -15125,7 +15120,7 @@ + + ### Allow using a different wrap-prefix + if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then +- echo "$as_me:15128: checking for prefix used to wrap public variables" >&5 ++ echo "$as_me:15123: checking for prefix used to wrap public variables" >&5 + echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6 + + # Check whether --with-wrap-prefix or --without-wrap-prefix was given. +@@ -15135,7 +15130,7 @@ + else + NCURSES_WRAP_PREFIX=_nc_ + fi; +- echo "$as_me:15138: result: $NCURSES_WRAP_PREFIX" >&5 ++ echo "$as_me:15133: result: $NCURSES_WRAP_PREFIX" >&5 + echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 + else + NCURSES_WRAP_PREFIX=_nc_ +@@ -15149,7 +15144,7 @@ + + ### use option --disable-echo to suppress full display compiling commands + +-echo "$as_me:15152: checking if you want to see long compiling messages" >&5 ++echo "$as_me:15147: checking if you want to see long compiling messages" >&5 + echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6 + + # Check whether --enable-echo or --disable-echo was given. +@@ -15183,10 +15178,10 @@ + ECHO_CC='' + + fi; +-echo "$as_me:15186: result: $enableval" >&5 ++echo "$as_me:15181: result: $enableval" >&5 + echo "${ECHO_T}$enableval" >&6 + +-echo "$as_me:15189: checking if you want to use C11 _Noreturn feature" >&5 ++echo "$as_me:15184: checking if you want to use C11 _Noreturn feature" >&5 + echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6 + + # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given. +@@ -15203,17 +15198,17 @@ + enable_stdnoreturn=no + + fi; +-echo "$as_me:15206: result: $enable_stdnoreturn" >&5 ++echo "$as_me:15201: result: $enable_stdnoreturn" >&5 + echo "${ECHO_T}$enable_stdnoreturn" >&6 + + if test $enable_stdnoreturn = yes; then +-echo "$as_me:15210: checking for C11 _Noreturn feature" >&5 ++echo "$as_me:15205: checking for C11 _Noreturn feature" >&5 + echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6 + if test "${cf_cv_c11_noreturn+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 15216 "configure" ++#line 15211 "configure" + #include "confdefs.h" + + #include +@@ -15230,16 +15225,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:15233: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15228: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15236: \$? = $ac_status" >&5 ++ echo "$as_me:15231: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:15239: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15234: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15242: \$? = $ac_status" >&5 ++ echo "$as_me:15237: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_c11_noreturn=yes + else +@@ -15250,7 +15245,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:15253: result: $cf_cv_c11_noreturn" >&5 ++echo "$as_me:15248: result: $cf_cv_c11_noreturn" >&5 + echo "${ECHO_T}$cf_cv_c11_noreturn" >&6 + else + cf_cv_c11_noreturn=no, +@@ -15280,7 +15275,7 @@ + (*-Werror=*) + test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 + +-echo "${as_me:-configure}:15283: testing repairing CFLAGS: $CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:15278: testing repairing CFLAGS: $CFLAGS ..." 1>&5 + + cf_temp_flags= + for cf_temp_scan in $CFLAGS +@@ -15303,11 +15298,11 @@ + CFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 + +-echo "${as_me:-configure}:15306: testing ... fixed $CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:15301: testing ... fixed $CFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +-echo "${as_me:-configure}:15310: testing ... extra $EXTRA_CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:15305: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + ;; + esac +@@ -15319,7 +15314,7 @@ + (*-Werror=*) + test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 + +-echo "${as_me:-configure}:15322: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 ++echo "${as_me:-configure}:15317: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 + + cf_temp_flags= + for cf_temp_scan in $CPPFLAGS +@@ -15342,11 +15337,11 @@ + CPPFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 + +-echo "${as_me:-configure}:15345: testing ... fixed $CPPFLAGS ..." 1>&5 ++echo "${as_me:-configure}:15340: testing ... fixed $CPPFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +-echo "${as_me:-configure}:15349: testing ... extra $EXTRA_CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:15344: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + ;; + esac +@@ -15358,7 +15353,7 @@ + (*-Werror=*) + test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:15361: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:15356: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 + + cf_temp_flags= + for cf_temp_scan in $LDFLAGS +@@ -15381,17 +15376,17 @@ + LDFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:15384: testing ... fixed $LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:15379: testing ... fixed $LDFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +-echo "${as_me:-configure}:15388: testing ... extra $EXTRA_CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:15383: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + ;; + esac + fi + +-echo "$as_me:15394: checking if you want to turn on gcc warnings" >&5 ++echo "$as_me:15389: checking if you want to turn on gcc warnings" >&5 + echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6 + + # Check whether --enable-warnings or --disable-warnings was given. +@@ -15408,7 +15403,7 @@ + enable_warnings=no + + fi; +-echo "$as_me:15411: result: $enable_warnings" >&5 ++echo "$as_me:15406: result: $enable_warnings" >&5 + echo "${ECHO_T}$enable_warnings" >&6 + if test "$enable_warnings" = "yes" + then +@@ -15432,7 +15427,7 @@ + done + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 15435 "configure" ++#line 15430 "configure" + #include "confdefs.h" + + #include +@@ -15447,26 +15442,26 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:15450: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15445: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15453: \$? = $ac_status" >&5 ++ echo "$as_me:15448: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:15456: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15451: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15459: \$? = $ac_status" >&5 ++ echo "$as_me:15454: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + +-echo "$as_me:15462: checking for X11/Xt const-feature" >&5 ++echo "$as_me:15457: checking for X11/Xt const-feature" >&5 + echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6 + if test "${cf_cv_const_x_string+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 15469 "configure" ++#line 15464 "configure" + #include "confdefs.h" + + #define _CONST_X_STRING /* X11R7.8 (perhaps) */ +@@ -15483,16 +15478,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:15486: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15481: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15489: \$? = $ac_status" >&5 ++ echo "$as_me:15484: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:15492: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15487: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15495: \$? = $ac_status" >&5 ++ echo "$as_me:15490: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_const_x_string=no +@@ -15507,7 +15502,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:15510: result: $cf_cv_const_x_string" >&5 ++echo "$as_me:15505: result: $cf_cv_const_x_string" >&5 + echo "${ECHO_T}$cf_cv_const_x_string" >&6 + + LIBS="$cf_save_LIBS_CF_CONST_X_STRING" +@@ -15536,7 +15531,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi + cat > "conftest.$ac_ext" <&5 ++ { echo "$as_me:15550: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" +@@ -15568,12 +15563,12 @@ + wd981 + do + CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" +- if { (eval echo "$as_me:15571: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:15566: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15574: \$? = $ac_status" >&5 ++ echo "$as_me:15569: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- test -n "$verbose" && echo "$as_me:15576: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:15571: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" + fi +@@ -15581,7 +15576,7 @@ + CFLAGS="$cf_save_CFLAGS" + elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" + then +- { echo "$as_me:15584: checking for $CC warning options..." >&5 ++ { echo "$as_me:15579: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + cf_warn_CONST="" +@@ -15604,12 +15599,12 @@ + Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum + do + CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" +- if { (eval echo "$as_me:15607: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:15602: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15610: \$? = $ac_status" >&5 ++ echo "$as_me:15605: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- test -n "$verbose" && echo "$as_me:15612: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:15607: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + case "$cf_opt" in + (Winline) +@@ -15617,7 +15612,7 @@ + ([34].*) + test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 + +-echo "${as_me:-configure}:15620: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 ++echo "${as_me:-configure}:15615: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 + + continue;; + esac +@@ -15627,7 +15622,7 @@ + ([12].*) + test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 + +-echo "${as_me:-configure}:15630: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 ++echo "${as_me:-configure}:15625: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 + + continue;; + esac +@@ -15660,10 +15655,10 @@ + EOF + if test "$GCC" = yes + then +- { echo "$as_me:15663: checking for $CC __attribute__ directives..." >&5 ++ { echo "$as_me:15658: checking for $CC __attribute__ directives..." >&5 + echo "$as_me: checking for $CC __attribute__ directives..." >&6;} + cat > "conftest.$ac_ext" <&5 ++ if { (eval echo "$as_me:15710: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15718: \$? = $ac_status" >&5 ++ echo "$as_me:15713: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- test -n "$verbose" && echo "$as_me:15720: result: ... $cf_attribute" >&5 ++ test -n "$verbose" && echo "$as_me:15715: result: ... $cf_attribute" >&5 + echo "${ECHO_T}... $cf_attribute" >&6 + cat conftest.h >>confdefs.h + case "$cf_attribute" in +@@ -15785,7 +15780,7 @@ + fi + + ### use option --enable-assertions to turn on generation of assertion code +-echo "$as_me:15788: checking if you want to enable runtime assertions" >&5 ++echo "$as_me:15783: checking if you want to enable runtime assertions" >&5 + echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6 + + # Check whether --enable-assertions or --disable-assertions was given. +@@ -15795,7 +15790,7 @@ + else + with_assertions=no + fi; +-echo "$as_me:15798: result: $with_assertions" >&5 ++echo "$as_me:15793: result: $with_assertions" >&5 + echo "${ECHO_T}$with_assertions" >&6 + if test -n "$GCC" + then +@@ -15848,7 +15843,7 @@ + ;; + esac + +-echo "$as_me:15851: checking whether to add trace feature to all models" >&5 ++echo "$as_me:15846: checking whether to add trace feature to all models" >&5 + echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6 + + # Check whether --with-trace or --without-trace was given. +@@ -15858,7 +15853,7 @@ + else + cf_with_trace=$cf_all_traces + fi; +-echo "$as_me:15861: result: $cf_with_trace" >&5 ++echo "$as_me:15856: result: $cf_with_trace" >&5 + echo "${ECHO_T}$cf_with_trace" >&6 + + if test "$cf_with_trace" = yes ; then +@@ -15966,7 +15961,7 @@ + ADA_TRACE=FALSE + fi + +-echo "$as_me:15969: checking if we want to use GNAT projects" >&5 ++echo "$as_me:15964: checking if we want to use GNAT projects" >&5 + echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6 + + # Check whether --enable-gnat-projects or --disable-gnat-projects was given. +@@ -15983,7 +15978,7 @@ + enable_gnat_projects=yes + + fi; +-echo "$as_me:15986: result: $enable_gnat_projects" >&5 ++echo "$as_me:15981: result: $enable_gnat_projects" >&5 + echo "${ECHO_T}$enable_gnat_projects" >&6 + + ### Checks for libraries. +@@ -15991,13 +15986,13 @@ + (*mingw32*) + ;; + (*) +-echo "$as_me:15994: checking for gettimeofday" >&5 ++echo "$as_me:15989: checking for gettimeofday" >&5 + echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6 + if test "${ac_cv_func_gettimeofday+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16000 "configure" ++#line 15995 "configure" + #include "confdefs.h" + #define gettimeofday autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -16028,16 +16023,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:16031: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16026: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16034: \$? = $ac_status" >&5 ++ echo "$as_me:16029: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:16037: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16032: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16040: \$? = $ac_status" >&5 ++ echo "$as_me:16035: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_gettimeofday=yes + else +@@ -16047,7 +16042,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:16050: result: $ac_cv_func_gettimeofday" >&5 ++echo "$as_me:16045: result: $ac_cv_func_gettimeofday" >&5 + echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 + if test "$ac_cv_func_gettimeofday" = yes; then + cat >>confdefs.h <<\EOF +@@ -16056,7 +16051,7 @@ + + else + +-echo "$as_me:16059: checking for gettimeofday in -lbsd" >&5 ++echo "$as_me:16054: checking for gettimeofday in -lbsd" >&5 + echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6 + if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -16064,7 +16059,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16067 "configure" ++#line 16062 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -16083,16 +16078,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:16086: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16081: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16089: \$? = $ac_status" >&5 ++ echo "$as_me:16084: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:16092: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16087: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16095: \$? = $ac_status" >&5 ++ echo "$as_me:16090: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_bsd_gettimeofday=yes + else +@@ -16103,7 +16098,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:16106: result: $ac_cv_lib_bsd_gettimeofday" >&5 ++echo "$as_me:16101: result: $ac_cv_lib_bsd_gettimeofday" >&5 + echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6 + if test "$ac_cv_lib_bsd_gettimeofday" = yes; then + +@@ -16119,13 +16114,13 @@ + esac + + ### Checks for header files. +-echo "$as_me:16122: checking for ANSI C header files" >&5 ++echo "$as_me:16117: checking for ANSI C header files" >&5 + echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 + if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16128 "configure" ++#line 16123 "configure" + #include "confdefs.h" + #include + #include +@@ -16133,13 +16128,13 @@ + #include + + _ACEOF +-if { (eval echo "$as_me:16136: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:16131: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:16142: \$? = $ac_status" >&5 ++ echo "$as_me:16137: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -16161,7 +16156,7 @@ + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16164 "configure" ++#line 16159 "configure" + #include "confdefs.h" + #include + +@@ -16179,7 +16174,7 @@ + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16182 "configure" ++#line 16177 "configure" + #include "confdefs.h" + #include + +@@ -16200,7 +16195,7 @@ + : + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16203 "configure" ++#line 16198 "configure" + #include "confdefs.h" + #include + #if ((' ' & 0x0FF) == 0x020) +@@ -16226,15 +16221,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:16229: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16224: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16232: \$? = $ac_status" >&5 ++ echo "$as_me:16227: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:16234: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16229: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16237: \$? = $ac_status" >&5 ++ echo "$as_me:16232: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -16247,7 +16242,7 @@ + fi + fi + fi +-echo "$as_me:16250: result: $ac_cv_header_stdc" >&5 ++echo "$as_me:16245: result: $ac_cv_header_stdc" >&5 + echo "${ECHO_T}$ac_cv_header_stdc" >&6 + if test $ac_cv_header_stdc = yes; then + +@@ -16263,28 +16258,28 @@ + inttypes.h stdint.h unistd.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:16266: checking for $ac_header" >&5 ++echo "$as_me:16261: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16272 "configure" ++#line 16267 "configure" + #include "confdefs.h" + $ac_includes_default + #include <$ac_header> + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16278: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16273: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16281: \$? = $ac_status" >&5 ++ echo "$as_me:16276: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16284: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16279: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16287: \$? = $ac_status" >&5 ++ echo "$as_me:16282: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_Header=yes" + else +@@ -16294,7 +16289,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:16297: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:16292: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:16302: checking for signed char" >&5 + echo $ECHO_N "checking for signed char... $ECHO_C" >&6 + if test "${ac_cv_type_signed_char+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16313 "configure" ++#line 16308 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -16325,16 +16320,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16328: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16323: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16331: \$? = $ac_status" >&5 ++ echo "$as_me:16326: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16334: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16329: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16337: \$? = $ac_status" >&5 ++ echo "$as_me:16332: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_signed_char=yes + else +@@ -16344,10 +16339,10 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:16347: result: $ac_cv_type_signed_char" >&5 ++echo "$as_me:16342: result: $ac_cv_type_signed_char" >&5 + echo "${ECHO_T}$ac_cv_type_signed_char" >&6 + +-echo "$as_me:16350: checking size of signed char" >&5 ++echo "$as_me:16345: checking size of signed char" >&5 + echo $ECHO_N "checking size of signed char... $ECHO_C" >&6 + if test "${ac_cv_sizeof_signed_char+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -16356,7 +16351,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16359 "configure" ++#line 16354 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -16368,21 +16363,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16371: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16366: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16374: \$? = $ac_status" >&5 ++ echo "$as_me:16369: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16377: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16372: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16380: \$? = $ac_status" >&5 ++ echo "$as_me:16375: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16385 "configure" ++#line 16380 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -16394,16 +16389,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16397: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16392: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16400: \$? = $ac_status" >&5 ++ echo "$as_me:16395: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16403: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16398: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16406: \$? = $ac_status" >&5 ++ echo "$as_me:16401: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid; break + else +@@ -16419,7 +16414,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16422 "configure" ++#line 16417 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -16431,16 +16426,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16434: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16429: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16437: \$? = $ac_status" >&5 ++ echo "$as_me:16432: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16440: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16435: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16443: \$? = $ac_status" >&5 ++ echo "$as_me:16438: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=$ac_mid; break + else +@@ -16456,7 +16451,7 @@ + while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16459 "configure" ++#line 16454 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -16468,16 +16463,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16471: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16466: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16474: \$? = $ac_status" >&5 ++ echo "$as_me:16469: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16477: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16472: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16480: \$? = $ac_status" >&5 ++ echo "$as_me:16475: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid + else +@@ -16490,12 +16485,12 @@ + ac_cv_sizeof_signed_char=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:16493: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:16488: error: cannot run test program while cross compiling" >&5 + echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16498 "configure" ++#line 16493 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -16511,15 +16506,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:16514: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16509: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16517: \$? = $ac_status" >&5 ++ echo "$as_me:16512: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:16519: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16514: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16522: \$? = $ac_status" >&5 ++ echo "$as_me:16517: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sizeof_signed_char=`cat conftest.val` + else +@@ -16535,19 +16530,19 @@ + ac_cv_sizeof_signed_char=0 + fi + fi +-echo "$as_me:16538: result: $ac_cv_sizeof_signed_char" >&5 ++echo "$as_me:16533: result: $ac_cv_sizeof_signed_char" >&5 + echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 + cat >>confdefs.h <&5 ++echo "$as_me:16539: checking for ANSI C header files" >&5 + echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 + if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16550 "configure" ++#line 16545 "configure" + #include "confdefs.h" + #include + #include +@@ -16555,13 +16550,13 @@ + #include + + _ACEOF +-if { (eval echo "$as_me:16558: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:16553: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:16564: \$? = $ac_status" >&5 ++ echo "$as_me:16559: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -16583,7 +16578,7 @@ + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16586 "configure" ++#line 16581 "configure" + #include "confdefs.h" + #include + +@@ -16601,7 +16596,7 @@ + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16604 "configure" ++#line 16599 "configure" + #include "confdefs.h" + #include + +@@ -16622,7 +16617,7 @@ + : + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16625 "configure" ++#line 16620 "configure" + #include "confdefs.h" + #include + #if ((' ' & 0x0FF) == 0x020) +@@ -16648,15 +16643,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:16651: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16646: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16654: \$? = $ac_status" >&5 ++ echo "$as_me:16649: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:16656: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16651: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16659: \$? = $ac_status" >&5 ++ echo "$as_me:16654: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -16669,7 +16664,7 @@ + fi + fi + fi +-echo "$as_me:16672: result: $ac_cv_header_stdc" >&5 ++echo "$as_me:16667: result: $ac_cv_header_stdc" >&5 + echo "${ECHO_T}$ac_cv_header_stdc" >&6 + if test $ac_cv_header_stdc = yes; then + +@@ -16682,13 +16677,13 @@ + ac_header_dirent=no + for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do + as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` +-echo "$as_me:16685: checking for $ac_hdr that defines DIR" >&5 ++echo "$as_me:16680: checking for $ac_hdr that defines DIR" >&5 + echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16691 "configure" ++#line 16686 "configure" + #include "confdefs.h" + #include + #include <$ac_hdr> +@@ -16703,16 +16698,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16706: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16701: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16709: \$? = $ac_status" >&5 ++ echo "$as_me:16704: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16712: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16707: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16715: \$? = $ac_status" >&5 ++ echo "$as_me:16710: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_Header=yes" + else +@@ -16722,7 +16717,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:16725: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:16720: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++ echo "$as_me:16733: checking for opendir in -ldir" >&5 + echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 + if test "${ac_cv_lib_dir_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -16743,7 +16738,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldir $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16746 "configure" ++#line 16741 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -16762,16 +16757,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:16765: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16760: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16768: \$? = $ac_status" >&5 ++ echo "$as_me:16763: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:16771: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16766: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16774: \$? = $ac_status" >&5 ++ echo "$as_me:16769: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_dir_opendir=yes + else +@@ -16782,14 +16777,14 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:16785: result: $ac_cv_lib_dir_opendir" >&5 ++echo "$as_me:16780: result: $ac_cv_lib_dir_opendir" >&5 + echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 + if test "$ac_cv_lib_dir_opendir" = yes; then + LIBS="$LIBS -ldir" + fi + + else +- echo "$as_me:16792: checking for opendir in -lx" >&5 ++ echo "$as_me:16787: checking for opendir in -lx" >&5 + echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 + if test "${ac_cv_lib_x_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -16797,7 +16792,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lx $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16800 "configure" ++#line 16795 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -16816,16 +16811,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:16819: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16814: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16822: \$? = $ac_status" >&5 ++ echo "$as_me:16817: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:16825: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16820: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16828: \$? = $ac_status" >&5 ++ echo "$as_me:16823: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_x_opendir=yes + else +@@ -16836,7 +16831,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:16839: result: $ac_cv_lib_x_opendir" >&5 ++echo "$as_me:16834: result: $ac_cv_lib_x_opendir" >&5 + echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 + if test "$ac_cv_lib_x_opendir" = yes; then + LIBS="$LIBS -lx" +@@ -16844,13 +16839,13 @@ + + fi + +-echo "$as_me:16847: checking whether time.h and sys/time.h may both be included" >&5 ++echo "$as_me:16842: checking whether time.h and sys/time.h may both be included" >&5 + echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 + if test "${ac_cv_header_time+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16853 "configure" ++#line 16848 "configure" + #include "confdefs.h" + #include + #include +@@ -16866,16 +16861,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16869: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16864: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16872: \$? = $ac_status" >&5 ++ echo "$as_me:16867: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16875: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16870: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16878: \$? = $ac_status" >&5 ++ echo "$as_me:16873: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_header_time=yes + else +@@ -16885,7 +16880,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:16888: result: $ac_cv_header_time" >&5 ++echo "$as_me:16883: result: $ac_cv_header_time" >&5 + echo "${ECHO_T}$ac_cv_header_time" >&6 + if test $ac_cv_header_time = yes; then + +@@ -16903,13 +16898,13 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_main_return="return" + +-echo "$as_me:16906: checking for an ANSI C-conforming const" >&5 ++echo "$as_me:16901: checking for an ANSI C-conforming const" >&5 + echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 + if test "${ac_cv_c_const+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16912 "configure" ++#line 16907 "configure" + #include "confdefs.h" + + int +@@ -16967,16 +16962,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16970: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16965: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16973: \$? = $ac_status" >&5 ++ echo "$as_me:16968: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16976: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16971: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16979: \$? = $ac_status" >&5 ++ echo "$as_me:16974: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_c_const=yes + else +@@ -16986,7 +16981,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:16989: result: $ac_cv_c_const" >&5 ++echo "$as_me:16984: result: $ac_cv_c_const" >&5 + echo "${ECHO_T}$ac_cv_c_const" >&6 + if test $ac_cv_c_const = no; then + +@@ -16998,7 +16993,7 @@ + + ### Checks for external-data + +-echo "$as_me:17001: checking if data-only library module links" >&5 ++echo "$as_me:16996: checking if data-only library module links" >&5 + echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6 + if test "${cf_cv_link_dataonly+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17006,20 +17001,20 @@ + + rm -f conftest.a + cat >conftest.$ac_ext <&5 ++ if { (eval echo "$as_me:17007: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17015: \$? = $ac_status" >&5 ++ echo "$as_me:17010: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then + mv conftest.o data.o && \ + ( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null + fi + rm -f conftest.$ac_ext data.o + cat >conftest.$ac_ext <&5 ++ if { (eval echo "$as_me:17030: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17038: \$? = $ac_status" >&5 ++ echo "$as_me:17033: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then + mv conftest.o func.o && \ + ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null +@@ -17048,7 +17043,7 @@ + cf_cv_link_dataonly=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17051 "configure" ++#line 17046 "configure" + #include "confdefs.h" + + int main(void) +@@ -17059,15 +17054,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:17062: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17057: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17065: \$? = $ac_status" >&5 ++ echo "$as_me:17060: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:17067: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17062: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17070: \$? = $ac_status" >&5 ++ echo "$as_me:17065: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_link_dataonly=yes + else +@@ -17082,7 +17077,7 @@ + + fi + +-echo "$as_me:17085: result: $cf_cv_link_dataonly" >&5 ++echo "$as_me:17080: result: $cf_cv_link_dataonly" >&5 + echo "${ECHO_T}$cf_cv_link_dataonly" >&6 + + if test "$cf_cv_link_dataonly" = no ; then +@@ -17101,23 +17096,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:17104: checking for $ac_header" >&5 ++echo "$as_me:17099: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17110 "configure" ++#line 17105 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:17114: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:17109: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:17120: \$? = $ac_status" >&5 ++ echo "$as_me:17115: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -17136,7 +17131,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:17139: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:17134: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:17144: checking for working mkstemp" >&5 + echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 + if test "${cf_cv_func_mkstemp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17157,7 +17152,7 @@ + cf_cv_func_mkstemp=maybe + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17160 "configure" ++#line 17155 "configure" + #include "confdefs.h" + + #include +@@ -17198,15 +17193,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:17201: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17196: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17204: \$? = $ac_status" >&5 ++ echo "$as_me:17199: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:17206: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17201: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17209: \$? = $ac_status" >&5 ++ echo "$as_me:17204: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_mkstemp=yes + +@@ -17221,16 +17216,16 @@ + fi + + fi +-echo "$as_me:17224: result: $cf_cv_func_mkstemp" >&5 ++echo "$as_me:17219: result: $cf_cv_func_mkstemp" >&5 + echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 + if test "x$cf_cv_func_mkstemp" = xmaybe ; then +- echo "$as_me:17227: checking for mkstemp" >&5 ++ echo "$as_me:17222: checking for mkstemp" >&5 + echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 + if test "${ac_cv_func_mkstemp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17233 "configure" ++#line 17228 "configure" + #include "confdefs.h" + #define mkstemp autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -17261,16 +17256,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:17264: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17259: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17267: \$? = $ac_status" >&5 ++ echo "$as_me:17262: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:17270: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17265: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17273: \$? = $ac_status" >&5 ++ echo "$as_me:17268: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_mkstemp=yes + else +@@ -17280,7 +17275,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:17283: result: $ac_cv_func_mkstemp" >&5 ++echo "$as_me:17278: result: $ac_cv_func_mkstemp" >&5 + echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 + + fi +@@ -17309,7 +17304,7 @@ + unset cf_TEMP_gnat + # Extract the first word of "$cf_prog_gnat", so it can be a program name with args. + set dummy $cf_prog_gnat; ac_word=$2 +-echo "$as_me:17312: checking for $ac_word" >&5 ++echo "$as_me:17307: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17326,7 +17321,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word" +- echo "$as_me:17329: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:17324: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -17338,10 +17333,10 @@ + cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat + + if test -n "$cf_TEMP_gnat"; then +- echo "$as_me:17341: result: $cf_TEMP_gnat" >&5 ++ echo "$as_me:17336: result: $cf_TEMP_gnat" >&5 + echo "${ECHO_T}$cf_TEMP_gnat" >&6 + else +- echo "$as_me:17344: result: no" >&5 ++ echo "$as_me:17339: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -17351,7 +17346,7 @@ + unset cf_cv_gnat_version + unset cf_TEMP_gnat + +-echo "$as_me:17354: checking for $cf_prog_gnat version" >&5 ++echo "$as_me:17349: checking for $cf_prog_gnat version" >&5 + echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6 + if test "${cf_cv_gnat_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17362,7 +17357,7 @@ + sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` + + fi +-echo "$as_me:17365: result: $cf_cv_gnat_version" >&5 ++echo "$as_me:17360: result: $cf_cv_gnat_version" >&5 + echo "${ECHO_T}$cf_cv_gnat_version" >&6 + test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no + eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version +@@ -17391,7 +17386,7 @@ + cd conftest.src + for cf_gprconfig in Ada C + do +- echo "$as_me:17394: checking for gprconfig name for $cf_gprconfig" >&5 ++ echo "$as_me:17389: checking for gprconfig name for $cf_gprconfig" >&5 + echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6 + if test "$cf_gprconfig" = C + then +@@ -17410,10 +17405,10 @@ + if test -n "$cf_gprconfig_value" + then + eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value" +- echo "$as_me:17413: result: $cf_gprconfig_value" >&5 ++ echo "$as_me:17408: result: $cf_gprconfig_value" >&5 + echo "${ECHO_T}$cf_gprconfig_value" >&6 + else +- echo "$as_me:17416: result: missing" >&5 ++ echo "$as_me:17411: result: missing" >&5 + echo "${ECHO_T}missing" >&6 + cf_ada_config="#" + break +@@ -17426,7 +17421,7 @@ + if test "x$cf_ada_config" != "x#" + then + +-echo "$as_me:17429: checking for gnat version" >&5 ++echo "$as_me:17424: checking for gnat version" >&5 + echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 + if test "${cf_cv_gnat_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17437,7 +17432,7 @@ + sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` + + fi +-echo "$as_me:17440: result: $cf_cv_gnat_version" >&5 ++echo "$as_me:17435: result: $cf_cv_gnat_version" >&5 + echo "${ECHO_T}$cf_cv_gnat_version" >&6 + test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no + +@@ -17446,7 +17441,7 @@ + cf_cv_prog_gnat_correct=yes + ;; + (*) +- { echo "$as_me:17449: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 ++ { echo "$as_me:17444: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 + echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} + cf_cv_prog_gnat_correct=no + ;; +@@ -17454,7 +17449,7 @@ + + # Extract the first word of "m4", so it can be a program name with args. + set dummy m4; ac_word=$2 +-echo "$as_me:17457: checking for $ac_word" >&5 ++echo "$as_me:17452: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_M4_exists+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17469,7 +17464,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_M4_exists="yes" +-echo "$as_me:17472: found $ac_dir/$ac_word" >&5 ++echo "$as_me:17467: found $ac_dir/$ac_word" >&5 + break + done + +@@ -17478,20 +17473,20 @@ + fi + M4_exists=$ac_cv_prog_M4_exists + if test -n "$M4_exists"; then +- echo "$as_me:17481: result: $M4_exists" >&5 ++ echo "$as_me:17476: result: $M4_exists" >&5 + echo "${ECHO_T}$M4_exists" >&6 + else +- echo "$as_me:17484: result: no" >&5 ++ echo "$as_me:17479: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + if test "$ac_cv_prog_M4_exists" = no; then + cf_cv_prog_gnat_correct=no +- { echo "$as_me:17490: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 ++ { echo "$as_me:17485: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 + echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;} + fi + if test "$cf_cv_prog_gnat_correct" = yes; then +- echo "$as_me:17494: checking if GNAT works" >&5 ++ echo "$as_me:17489: checking if GNAT works" >&5 + echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 + + rm -rf ./conftest* ./*~conftest* +@@ -17519,7 +17514,7 @@ + fi + rm -rf ./conftest* ./*~conftest* + +- echo "$as_me:17522: result: $cf_cv_prog_gnat_correct" >&5 ++ echo "$as_me:17517: result: $cf_cv_prog_gnat_correct" >&5 + echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 + fi + else +@@ -17529,7 +17524,7 @@ + + if test "$cf_cv_prog_gnat_correct" = yes; then + +- echo "$as_me:17532: checking optimization options for ADAFLAGS" >&5 ++ echo "$as_me:17527: checking optimization options for ADAFLAGS" >&5 + echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 + case "$CFLAGS" in + (*-g*) +@@ -17546,10 +17541,10 @@ + + ;; + esac +- echo "$as_me:17549: result: $ADAFLAGS" >&5 ++ echo "$as_me:17544: result: $ADAFLAGS" >&5 + echo "${ECHO_T}$ADAFLAGS" >&6 + +-echo "$as_me:17552: checking if GNATPREP supports -T option" >&5 ++echo "$as_me:17547: checking if GNATPREP supports -T option" >&5 + echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6 + if test "${cf_cv_gnatprep_opt_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17559,11 +17554,11 @@ + gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes + + fi +-echo "$as_me:17562: result: $cf_cv_gnatprep_opt_t" >&5 ++echo "$as_me:17557: result: $cf_cv_gnatprep_opt_t" >&5 + echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6 + test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS" + +-echo "$as_me:17566: checking if GNAT supports generics" >&5 ++echo "$as_me:17561: checking if GNAT supports generics" >&5 + echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 + case "$cf_cv_gnat_version" in + (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9]) +@@ -17573,7 +17568,7 @@ + cf_gnat_generics=no + ;; + esac +-echo "$as_me:17576: result: $cf_gnat_generics" >&5 ++echo "$as_me:17571: result: $cf_gnat_generics" >&5 + echo "${ECHO_T}$cf_gnat_generics" >&6 + + if test "$cf_gnat_generics" = yes +@@ -17585,7 +17580,7 @@ + cf_generic_objects= + fi + +-echo "$as_me:17588: checking if GNAT supports SIGINT" >&5 ++echo "$as_me:17583: checking if GNAT supports SIGINT" >&5 + echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6 + if test "${cf_cv_gnat_sigint+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17633,7 +17628,7 @@ + rm -rf ./conftest* ./*~conftest* + + fi +-echo "$as_me:17636: result: $cf_cv_gnat_sigint" >&5 ++echo "$as_me:17631: result: $cf_cv_gnat_sigint" >&5 + echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 + + if test "$cf_cv_gnat_sigint" = yes ; then +@@ -17646,7 +17641,7 @@ + cf_gnat_projects=no + + if test "$enable_gnat_projects" != no ; then +-echo "$as_me:17649: checking if GNAT supports project files" >&5 ++echo "$as_me:17644: checking if GNAT supports project files" >&5 + echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 + case "$cf_cv_gnat_version" in + (3.[0-9]*) +@@ -17709,15 +17704,15 @@ + esac + ;; + esac +-echo "$as_me:17712: result: $cf_gnat_projects" >&5 ++echo "$as_me:17707: result: $cf_gnat_projects" >&5 + echo "${ECHO_T}$cf_gnat_projects" >&6 + fi # enable_gnat_projects + + if test "$cf_gnat_projects" = yes + then +- echo "$as_me:17718: checking if GNAT supports libraries" >&5 ++ echo "$as_me:17713: checking if GNAT supports libraries" >&5 + echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 +- echo "$as_me:17720: result: $cf_gnat_libraries" >&5 ++ echo "$as_me:17715: result: $cf_gnat_libraries" >&5 + echo "${ECHO_T}$cf_gnat_libraries" >&6 + fi + +@@ -17737,7 +17732,7 @@ + then + USE_GNAT_MAKE_GPR="" + else +- { echo "$as_me:17740: WARNING: use old makefile rules since tools are missing" >&5 ++ { echo "$as_me:17735: WARNING: use old makefile rules since tools are missing" >&5 + echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;} + fi + fi +@@ -17749,7 +17744,7 @@ + USE_GNAT_LIBRARIES="#" + fi + +-echo "$as_me:17752: checking for ada-compiler" >&5 ++echo "$as_me:17747: checking for ada-compiler" >&5 + echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6 + + # Check whether --with-ada-compiler or --without-ada-compiler was given. +@@ -17760,12 +17755,12 @@ + cf_ada_compiler=gnatmake + fi; + +-echo "$as_me:17763: result: $cf_ada_compiler" >&5 ++echo "$as_me:17758: result: $cf_ada_compiler" >&5 + echo "${ECHO_T}$cf_ada_compiler" >&6 + + cf_ada_package=terminal_interface + +-echo "$as_me:17768: checking for ada-include" >&5 ++echo "$as_me:17763: checking for ada-include" >&5 + echo $ECHO_N "checking for ada-include... $ECHO_C" >&6 + + # Check whether --with-ada-include or --without-ada-include was given. +@@ -17801,7 +17796,7 @@ + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:17804: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:17799: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -17810,10 +17805,10 @@ + fi + eval ADA_INCLUDE="$withval" + +-echo "$as_me:17813: result: $ADA_INCLUDE" >&5 ++echo "$as_me:17808: result: $ADA_INCLUDE" >&5 + echo "${ECHO_T}$ADA_INCLUDE" >&6 + +-echo "$as_me:17816: checking for ada-objects" >&5 ++echo "$as_me:17811: checking for ada-objects" >&5 + echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6 + + # Check whether --with-ada-objects or --without-ada-objects was given. +@@ -17849,7 +17844,7 @@ + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:17852: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:17847: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -17858,10 +17853,10 @@ + fi + eval ADA_OBJECTS="$withval" + +-echo "$as_me:17861: result: $ADA_OBJECTS" >&5 ++echo "$as_me:17856: result: $ADA_OBJECTS" >&5 + echo "${ECHO_T}$ADA_OBJECTS" >&6 + +-echo "$as_me:17864: checking if an Ada95 shared-library should be built" >&5 ++echo "$as_me:17859: checking if an Ada95 shared-library should be built" >&5 + echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6 + + # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given. +@@ -17871,14 +17866,14 @@ + else + with_ada_sharedlib=no + fi; +-echo "$as_me:17874: result: $with_ada_sharedlib" >&5 ++echo "$as_me:17869: result: $with_ada_sharedlib" >&5 + echo "${ECHO_T}$with_ada_sharedlib" >&6 + + if test "x$with_ada_sharedlib" != xno + then + if test "x$cf_gnat_projects" != xyes + then +- { echo "$as_me:17881: WARNING: disabling shared-library since GNAT projects are not supported" >&5 ++ { echo "$as_me:17876: WARNING: disabling shared-library since GNAT projects are not supported" >&5 + echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;} + with_ada_sharedlib=no + fi +@@ -17898,7 +17893,7 @@ + + # allow the Ada binding to be renamed + +-echo "$as_me:17901: checking for ada-libname" >&5 ++echo "$as_me:17896: checking for ada-libname" >&5 + echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6 + + # Check whether --with-ada-libname or --without-ada-libname was given. +@@ -17914,16 +17909,16 @@ + ;; + esac + +-echo "$as_me:17917: result: $ADA_LIBNAME" >&5 ++echo "$as_me:17912: result: $ADA_LIBNAME" >&5 + echo "${ECHO_T}$ADA_LIBNAME" >&6 + + else +- { { echo "$as_me:17921: error: No usable Ada compiler found" >&5 ++ { { echo "$as_me:17916: error: No usable Ada compiler found" >&5 + echo "$as_me: error: No usable Ada compiler found" >&2;} + { (exit 1); exit 1; }; } + fi + else +- { { echo "$as_me:17926: error: The Ada compiler is needed for this package" >&5 ++ { { echo "$as_me:17921: error: The Ada compiler is needed for this package" >&5 + echo "$as_me: error: The Ada compiler is needed for this package" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -17963,7 +17958,7 @@ + fi + + ### Build up pieces for makefile rules +-echo "$as_me:17966: checking default library suffix" >&5 ++echo "$as_me:17961: checking default library suffix" >&5 + echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -17974,10 +17969,10 @@ + (shared) DFT_ARG_SUFFIX='' ;; + esac + test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" +-echo "$as_me:17977: result: $DFT_ARG_SUFFIX" >&5 ++echo "$as_me:17972: result: $DFT_ARG_SUFFIX" >&5 + echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 + +-echo "$as_me:17980: checking default library-dependency suffix" >&5 ++echo "$as_me:17975: checking default library-dependency suffix" >&5 + echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 + + case X$DFT_LWR_MODEL in +@@ -18060,10 +18055,10 @@ + DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}" + DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}" + fi +-echo "$as_me:18063: result: $DFT_DEP_SUFFIX" >&5 ++echo "$as_me:18058: result: $DFT_DEP_SUFFIX" >&5 + echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 + +-echo "$as_me:18066: checking default object directory" >&5 ++echo "$as_me:18061: checking default object directory" >&5 + echo $ECHO_N "checking default object directory... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -18079,7 +18074,7 @@ + DFT_OBJ_SUBDIR='obj_s' ;; + esac + esac +-echo "$as_me:18082: result: $DFT_OBJ_SUBDIR" >&5 ++echo "$as_me:18077: result: $DFT_OBJ_SUBDIR" >&5 + echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 + + ### Set up low-level terminfo dependencies for makefiles. +@@ -18221,7 +18216,7 @@ + : "${CONFIG_STATUS=./config.status}" + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ echo "$as_me:18224: creating $CONFIG_STATUS" >&5 ++{ echo "$as_me:18219: creating $CONFIG_STATUS" >&5 + echo "$as_me: creating $CONFIG_STATUS" >&6;} + cat >"$CONFIG_STATUS" <<_ACEOF + #! $SHELL +@@ -18400,7 +18395,7 @@ + echo "$ac_cs_version"; exit 0 ;; + --he | --h) + # Conflict between --help and --header +- { { echo "$as_me:18403: error: ambiguous option: $1 ++ { { echo "$as_me:18398: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&5 + echo "$as_me: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&2;} +@@ -18419,7 +18414,7 @@ + ac_need_defaults=false;; + + # This is an error. +- -*) { { echo "$as_me:18422: error: unrecognized option: $1 ++ -*) { { echo "$as_me:18417: error: unrecognized option: $1 + Try \`$0 --help' for more information." >&5 + echo "$as_me: error: unrecognized option: $1 + Try \`$0 --help' for more information." >&2;} +@@ -18493,7 +18488,7 @@ + "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; + "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; +- *) { { echo "$as_me:18496: error: invalid argument: $ac_config_target" >&5 ++ *) { { echo "$as_me:18491: error: invalid argument: $ac_config_target" >&5 + echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +@@ -18853,7 +18848,7 @@ + esac + + if test x"$ac_file" != x-; then +- { echo "$as_me:18856: creating $ac_file" >&5 ++ { echo "$as_me:18851: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi +@@ -18871,7 +18866,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:18874: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:18869: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -18884,7 +18879,7 @@ + echo "$srcdir/$f" + else + # /dev/null tree +- { { echo "$as_me:18887: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:18882: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -18900,7 +18895,7 @@ + if test -n "$ac_seen"; then + ac_used=`grep '@datarootdir@' "$ac_item"` + if test -z "$ac_used"; then +- { echo "$as_me:18903: WARNING: datarootdir was used implicitly but not set: ++ { echo "$as_me:18898: WARNING: datarootdir was used implicitly but not set: + $ac_seen" >&5 + echo "$as_me: WARNING: datarootdir was used implicitly but not set: + $ac_seen" >&2;} +@@ -18909,7 +18904,7 @@ + fi + ac_seen=`grep '${datarootdir}' "$ac_item"` + if test -n "$ac_seen"; then +- { echo "$as_me:18912: WARNING: datarootdir was used explicitly but not set: ++ { echo "$as_me:18907: WARNING: datarootdir was used explicitly but not set: + $ac_seen" >&5 + echo "$as_me: WARNING: datarootdir was used explicitly but not set: + $ac_seen" >&2;} +@@ -18946,7 +18941,7 @@ + ac_init=`${EGREP-egrep} '[ ]*'$ac_name'[ ]*=' "$ac_file"` + if test -z "$ac_init"; then + ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` +- { echo "$as_me:18949: WARNING: Variable $ac_name is used but was not set: ++ { echo "$as_me:18944: WARNING: Variable $ac_name is used but was not set: + $ac_seen" >&5 + echo "$as_me: WARNING: Variable $ac_name is used but was not set: + $ac_seen" >&2;} +@@ -18957,7 +18952,7 @@ + ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out + if test -s $tmp/out; then + ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` +- { echo "$as_me:18960: WARNING: Some variables may not be substituted: ++ { echo "$as_me:18955: WARNING: Some variables may not be substituted: + $ac_seen" >&5 + echo "$as_me: WARNING: Some variables may not be substituted: + $ac_seen" >&2;} +@@ -19006,7 +19001,7 @@ + * ) ac_file_in=$ac_file.in ;; + esac + +- test x"$ac_file" != x- && { echo "$as_me:19009: creating $ac_file" >&5 ++ test x"$ac_file" != x- && { echo "$as_me:19004: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + + # First look for the input files in the build tree, otherwise in the +@@ -19017,7 +19012,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:19020: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:19015: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -19030,7 +19025,7 @@ + echo "$srcdir/$f" + else + # /dev/null tree +- { { echo "$as_me:19033: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:19028: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -19088,7 +19083,7 @@ + rm -f $tmp/in + if test x"$ac_file" != x-; then + if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then +- { echo "$as_me:19091: $ac_file is unchanged" >&5 ++ { echo "$as_me:19086: $ac_file is unchanged" >&5 + echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +Index: INSTALL +Prereq: 1.235 +--- ncurses-6.3-20211021+/INSTALL 2021-10-19 23:34:17.000000000 +0000 ++++ ncurses-6.3-20211026/INSTALL 2021-10-26 07:55:02.000000000 +0000 +@@ -26,7 +26,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: INSTALL,v 1.235 2021/10/19 23:34:17 tom Exp $ ++-- $Id: INSTALL,v 1.236 2021/10/26 07:55:02 tom Exp $ + --------------------------------------------------------------------- + How to install Ncurses/Terminfo on your system + --------------------------------------------------------------------- +@@ -1146,8 +1146,15 @@ + path. The configure script allows only a single directory, because + that is used as the directory in which to install ".pc" files. + +- The automatic check for the library path selects the first directory +- which currently exists. ++ The automatic check for the library path prefers the first directory ++ which currently exists. If none of the directories listed by ++ pkg-config exist, the check prefers a pkgconfig directory under the ++ "libdir" set by the configure script (which may not be the system ++ default), or if pkg-config lists nothing suitable, the first one which ++ is listed by pkg-config is used. ++ ++ Automatic selection is overridden by providing an option-value ++ beginning with "/". + + --with-profile + Generate profile-libraries These are named by adding "_p" to the root, +Index: NEWS +Prereq: 1.3732 +--- ncurses-6.3-20211021+/NEWS 2021-10-20 22:49:51.000000000 +0000 ++++ ncurses-6.3-20211026/NEWS 2021-10-26 08:34:43.000000000 +0000 +@@ -26,7 +26,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: NEWS,v 1.3732 2021/10/20 22:49:51 tom Exp $ ++-- $Id: NEWS,v 1.3735 2021/10/26 08:34:43 tom Exp $ + ------------------------------------------------------------------------------- + + This is a log of changes that ncurses has gone through since Zeyd started +@@ -46,6 +46,12 @@ + Changes through 1.9.9e did not credit all contributions; + it is not possible to add this information. + ++20211026 ++ + corrected regex needed for older pkg-config used in Solaris 10. ++ + amend configure option's auto-search to account for systems where ++ none of the directories known to pkg-config exist, adapted from ++ mailing-list comment (report by Milan P. Stanic). ++ + 20211021 6.3 release for upload to ftp.gnu.org + + update release notes + + add "ncu2openbsd" script, to illustrate how to update an OpenBSD +Index: VERSION +--- ncurses-6.3-20211021+/VERSION 2021-10-20 22:43:08.000000000 +0000 ++++ ncurses-6.3-20211026/VERSION 2021-10-26 07:49:17.000000000 +0000 +@@ -1 +1 @@ +-5:0:10 6.3 20211021 ++5:0:10 6.3 20211026 +Index: aclocal.m4 +Prereq: 1.981 +--- ncurses-6.3-20211021+/aclocal.m4 2021-10-17 15:14:04.000000000 +0000 ++++ ncurses-6.3-20211026/aclocal.m4 2021-10-26 20:50:11.000000000 +0000 +@@ -29,7 +29,7 @@ + dnl + dnl Author: Thomas E. Dickey 1995-on + dnl +-dnl $Id: aclocal.m4,v 1.981 2021/10/17 15:14:04 tom Exp $ ++dnl $Id: aclocal.m4,v 1.990 2021/10/26 20:50:11 tom Exp $ + dnl Macros used in NCURSES auto-configuration script. + dnl + dnl These macros are maintained separately from NCURSES. The copyright on +@@ -2041,7 +2041,7 @@ + AC_SUBST(BROKEN_LINKER) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_ENABLE_PC_FILES version: 14 updated: 2021/10/17 11:12:47 ++dnl CF_ENABLE_PC_FILES version: 15 updated: 2021/10/25 19:21:54 + dnl ------------------ + dnl This is the "--enable-pc-files" option, which is available if there is a + dnl pkg-config configuration on the local machine. +@@ -2066,7 +2066,7 @@ + then + MAKE_PC_FILES= + case "x$PKG_CONFIG_LIBDIR" in +- (xno|xnone|xyes) ++ (xno|xnone|xyes|x) + AC_MSG_WARN(no PKG_CONFIG_LIBDIR was found) + ;; + (*) +@@ -9206,7 +9206,7 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_WITH_PKG_CONFIG_LIBDIR version: 13 updated: 2021/10/17 11:12:47 ++dnl CF_WITH_PKG_CONFIG_LIBDIR version: 16 updated: 2021/10/26 16:50:11 + dnl ------------------------- + dnl Allow the choice of the pkg-config library directory to be overridden. + dnl +@@ -9243,62 +9243,28 @@ + CF_VERBOSE(auto...) + # Look for the library directory using the same prefix as the executable + AC_MSG_CHECKING(for search-list) +- if test "x$PKG_CONFIG" = xnone ++ if test "x$PKG_CONFIG" != xnone + then +- cf_path=$prefix +- else +- cf_path=`echo "$PKG_CONFIG" | sed -e 's,/[[^/]]*/[[^/]]*$,,'` ++ # works for pkg-config since version 0.24 (2009) ++ cf_pkg_program=`echo "$PKG_CONFIG" | sed -e 's,^.*/,,'` ++ cf_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null | tr : ' '` ++ ++ # works for pkgconf since version 0.8.3 (2012) ++ test -z "$cf_search_path" && \ ++ cf_search_path=`pkgconf --variable=pc_path pkgconf 2>/dev/null | tr : ' '` ++ ++ # works for pkg-config since import in 2005 of original 2001 HP code. ++ test -z "$cf_search_path" && \ + cf_search_path=` +- "$PKG_CONFIG" --debug --exists no-such-package 2>&1 | awk "\ +-/^Scanning directory #[1-9][0-9]* '.*'$/{ \ ++ "$PKG_CONFIG" --debug --exists no-such-package 2>&1 | $AWK "\ ++/^Scanning directory (#[1-9][0-9]* )?'.*'$/{ \ + sub(\"^[[^']]*'\",\"\"); \ + sub(\"'.*\",\"\"); \ + printf \" %s\", \\[$]0; } \ +-/trying path:/{ +- sub(\"^.* trying path: \",\"\"); +- sub(\" for no-such-package.*$\",\"\"); +- printf \" %s\", \\[$]0; +-} + { next; } \ + "` + fi + +- if test -z "$cf_search_path" +- then +- # If you don't like using the default architecture, you have to specify +- # the intended library directory and corresponding compiler/linker +- # options. +- # +- # This case allows for Debian's 2014-flavor of multiarch, along with +- # the most common variations before that point. Some other variants +- # spell the directory differently, e.g., "pkg-config", and put it in +- # unusual places. +- # +- # pkg-config has always been poorly standardized, which is ironic... +- case x`(arch) 2>/dev/null` in +- (*64) +- cf_test_path="\ +- $cf_path/lib/*64-linux-gnu \ +- $cf_path/share \ +- $cf_path/lib64 \ +- $cf_path/lib32 \ +- $cf_path/lib" +- ;; +- (*) +- cf_test_path="\ +- $cf_path/lib/*-linux-gnu \ +- $cf_path/share \ +- $cf_path/lib32 \ +- $cf_path/lib \ +- $cf_path/libdata" +- ;; +- esac +- for cf_config in $cf_test_path +- do +- test -d "$cf_config/pkgconfig" && cf_search_path="$cf_search_path $cf_config/pkgconfig" +- done +- fi +- + AC_MSG_RESULT($cf_search_path) + + ;; +@@ -9323,6 +9289,33 @@ + PKG_CONFIG_LIBDIR="$cf_pkg_config_path" + fi + ++if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path" ++then ++ AC_MSG_CHECKING(for workaround) ++ if test "$prefix" = "NONE" ; then ++ cf_prefix="$ac_default_prefix" ++ else ++ cf_prefix="$prefix" ++ fi ++ eval cf_libdir=$libdir ++ cf_libdir=`echo "$cf_libdir" | sed -e "s,^NONE,$cf_prefix,"` ++ cf_backup= ++ for cf_config in $cf_search_path ++ do ++ case $cf_config in ++ $cf_libdir/pkgconfig) ++ PKG_CONFIG_LIBDIR=$cf_libdir/pkgconfig ++ break ++ ;; ++ *) ++ test -z "$cf_backup" && cf_backup=$cf_config ++ ;; ++ esac ++ done ++ test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup ++ AC_MSG_RESULT($PKG_CONFIG_LIBDIR) ++fi ++ + AC_SUBST(PKG_CONFIG_LIBDIR) + ])dnl + dnl --------------------------------------------------------------------------- +Index: configure +--- ncurses-6.3-20211021+/configure 2021-10-17 15:12:23.000000000 +0000 ++++ ncurses-6.3-20211026/configure 2021-10-26 20:51:25.000000000 +0000 +@@ -4160,63 +4160,29 @@ + # Look for the library directory using the same prefix as the executable + echo "$as_me:4161: checking for search-list" >&5 + echo $ECHO_N "checking for search-list... $ECHO_C" >&6 +- if test "x$PKG_CONFIG" = xnone ++ if test "x$PKG_CONFIG" != xnone + then +- cf_path=$prefix +- else +- cf_path=`echo "$PKG_CONFIG" | sed -e 's,/[^/]*/[^/]*$,,'` ++ # works for pkg-config since version 0.24 (2009) ++ cf_pkg_program=`echo "$PKG_CONFIG" | sed -e 's,^.*/,,'` ++ cf_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null | tr : ' '` ++ ++ # works for pkgconf since version 0.8.3 (2012) ++ test -z "$cf_search_path" && \ ++ cf_search_path=`pkgconf --variable=pc_path pkgconf 2>/dev/null | tr : ' '` ++ ++ # works for pkg-config since import in 2005 of original 2001 HP code. ++ test -z "$cf_search_path" && \ + cf_search_path=` +- "$PKG_CONFIG" --debug --exists no-such-package 2>&1 | awk "\ +-/^Scanning directory #[1-9][0-9]* '.*'$/{ \ ++ "$PKG_CONFIG" --debug --exists no-such-package 2>&1 | $AWK "\ ++/^Scanning directory (#[1-9][0-9]* )?'.*'$/{ \ + sub(\"^[^']*'\",\"\"); \ + sub(\"'.*\",\"\"); \ + printf \" %s\", \\$0; } \ +-/trying path:/{ +- sub(\"^.* trying path: \",\"\"); +- sub(\" for no-such-package.*$\",\"\"); +- printf \" %s\", \\$0; +-} + { next; } \ + "` + fi + +- if test -z "$cf_search_path" +- then +- # If you don't like using the default architecture, you have to specify +- # the intended library directory and corresponding compiler/linker +- # options. +- # +- # This case allows for Debian's 2014-flavor of multiarch, along with +- # the most common variations before that point. Some other variants +- # spell the directory differently, e.g., "pkg-config", and put it in +- # unusual places. +- # +- # pkg-config has always been poorly standardized, which is ironic... +- case x`(arch) 2>/dev/null` in +- (*64) +- cf_test_path="\ +- $cf_path/lib/*64-linux-gnu \ +- $cf_path/share \ +- $cf_path/lib64 \ +- $cf_path/lib32 \ +- $cf_path/lib" +- ;; +- (*) +- cf_test_path="\ +- $cf_path/lib/*-linux-gnu \ +- $cf_path/share \ +- $cf_path/lib32 \ +- $cf_path/lib \ +- $cf_path/libdata" +- ;; +- esac +- for cf_config in $cf_test_path +- do +- test -d "$cf_config/pkgconfig" && cf_search_path="$cf_search_path $cf_config/pkgconfig" +- done +- fi +- +- echo "$as_me:4219: result: $cf_search_path" >&5 ++ echo "$as_me:4185: result: $cf_search_path" >&5 + echo "${ECHO_T}$cf_search_path" >&6 + + ;; +@@ -4224,7 +4190,7 @@ + ;; + esac + +-echo "$as_me:4227: checking for first directory" >&5 ++echo "$as_me:4193: checking for first directory" >&5 + echo $ECHO_N "checking for first directory... $ECHO_C" >&6 + cf_pkg_config_path=none + for cf_config in $cf_search_path +@@ -4235,7 +4201,7 @@ + break + fi + done +-echo "$as_me:4238: result: $cf_pkg_config_path" >&5 ++echo "$as_me:4204: result: $cf_pkg_config_path" >&5 + echo "${ECHO_T}$cf_pkg_config_path" >&6 + + if test "x$cf_pkg_config_path" != xnone ; then +@@ -4243,12 +4209,41 @@ + PKG_CONFIG_LIBDIR="$cf_pkg_config_path" + fi + ++if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path" ++then ++ echo "$as_me:4214: checking for workaround" >&5 ++echo $ECHO_N "checking for workaround... $ECHO_C" >&6 ++ if test "$prefix" = "NONE" ; then ++ cf_prefix="$ac_default_prefix" ++ else ++ cf_prefix="$prefix" ++ fi ++ eval cf_libdir=$libdir ++ cf_libdir=`echo "$cf_libdir" | sed -e "s,^NONE,$cf_prefix,"` ++ cf_backup= ++ for cf_config in $cf_search_path ++ do ++ case $cf_config in ++ $cf_libdir/pkgconfig) ++ PKG_CONFIG_LIBDIR=$cf_libdir/pkgconfig ++ break ++ ;; ++ *) ++ test -z "$cf_backup" && cf_backup=$cf_config ++ ;; ++ esac ++ done ++ test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup ++ echo "$as_me:4237: result: $PKG_CONFIG_LIBDIR" >&5 ++echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 ++fi ++ + if test "x$PKG_CONFIG" != xnone + then +- echo "$as_me:4248: checking if we should install .pc files for $PKG_CONFIG" >&5 ++ echo "$as_me:4243: checking if we should install .pc files for $PKG_CONFIG" >&5 + echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6 + else +- echo "$as_me:4251: checking if we should install .pc files" >&5 ++ echo "$as_me:4246: checking if we should install .pc files" >&5 + echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6 + fi + +@@ -4259,15 +4254,15 @@ + else + enable_pc_files=no + fi; +-echo "$as_me:4262: result: $enable_pc_files" >&5 ++echo "$as_me:4257: result: $enable_pc_files" >&5 + echo "${ECHO_T}$enable_pc_files" >&6 + + if test "x$enable_pc_files" != xno + then + MAKE_PC_FILES= + case "x$PKG_CONFIG_LIBDIR" in +- (xno|xnone|xyes) +- { echo "$as_me:4270: WARNING: no PKG_CONFIG_LIBDIR was found" >&5 ++ (xno|xnone|xyes|x) ++ { echo "$as_me:4265: WARNING: no PKG_CONFIG_LIBDIR was found" >&5 + echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;} + ;; + (*) +@@ -4297,7 +4292,7 @@ + PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:4300: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5 ++ { { echo "$as_me:4295: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5 + echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -4311,7 +4306,7 @@ + + if test -z "$MAKE_PC_FILES" + then +- echo "$as_me:4314: checking for suffix to add to pc-files" >&5 ++ echo "$as_me:4309: checking for suffix to add to pc-files" >&5 + echo $ECHO_N "checking for suffix to add to pc-files... $ECHO_C" >&6 + + # Check whether --with-pc-suffix or --without-pc-suffix was given. +@@ -4326,13 +4321,13 @@ + esac + fi; + test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none +- echo "$as_me:4329: result: $PC_MODULE_SUFFIX" >&5 ++ echo "$as_me:4324: result: $PC_MODULE_SUFFIX" >&5 + echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6 + test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX= + + fi + +-echo "$as_me:4335: checking if we should assume mixed-case filenames" >&5 ++echo "$as_me:4330: checking if we should assume mixed-case filenames" >&5 + echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6 + + # Check whether --enable-mixed-case or --disable-mixed-case was given. +@@ -4342,11 +4337,11 @@ + else + enable_mixedcase=auto + fi; +-echo "$as_me:4345: result: $enable_mixedcase" >&5 ++echo "$as_me:4340: result: $enable_mixedcase" >&5 + echo "${ECHO_T}$enable_mixedcase" >&6 + if test "$enable_mixedcase" = "auto" ; then + +-echo "$as_me:4349: checking if filesystem supports mixed-case filenames" >&5 ++echo "$as_me:4344: checking if filesystem supports mixed-case filenames" >&5 + echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6 + if test "${cf_cv_mixedcase+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4373,7 +4368,7 @@ + fi + + fi +-echo "$as_me:4376: result: $cf_cv_mixedcase" >&5 ++echo "$as_me:4371: result: $cf_cv_mixedcase" >&5 + echo "${ECHO_T}$cf_cv_mixedcase" >&6 + test "$cf_cv_mixedcase" = yes && + cat >>confdefs.h <<\EOF +@@ -4392,7 +4387,7 @@ + fi + + # do this after mixed-case option (tags/TAGS is not as important as tic). +-echo "$as_me:4395: checking whether ${MAKE-make} sets \${MAKE}" >&5 ++echo "$as_me:4390: checking whether ${MAKE-make} sets \${MAKE}" >&5 + echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 + set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` + if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then +@@ -4412,16 +4407,16 @@ + rm -f conftest.make + fi + if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then +- echo "$as_me:4415: result: yes" >&5 ++ echo "$as_me:4410: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + SET_MAKE= + else +- echo "$as_me:4419: result: no" >&5 ++ echo "$as_me:4414: result: no" >&5 + echo "${ECHO_T}no" >&6 + SET_MAKE="MAKE=${MAKE-make}" + fi + +-echo "$as_me:4424: checking for \".PHONY\" make-support" >&5 ++echo "$as_me:4419: checking for \".PHONY\" make-support" >&5 + echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6 + if test "${cf_cv_make_PHONY+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4476,7 +4471,7 @@ + rm -rf conftest* + + fi +-echo "$as_me:4479: result: $cf_cv_make_PHONY" >&5 ++echo "$as_me:4474: result: $cf_cv_make_PHONY" >&5 + echo "${ECHO_T}$cf_cv_make_PHONY" >&6 + MAKE_NO_PHONY="#" + MAKE_PHONY="#" +@@ -4487,7 +4482,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:4490: checking for $ac_word" >&5 ++echo "$as_me:4485: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_CTAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4502,7 +4497,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_CTAGS="$ac_prog" +-echo "$as_me:4505: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4500: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4510,10 +4505,10 @@ + fi + CTAGS=$ac_cv_prog_CTAGS + if test -n "$CTAGS"; then +- echo "$as_me:4513: result: $CTAGS" >&5 ++ echo "$as_me:4508: result: $CTAGS" >&5 + echo "${ECHO_T}$CTAGS" >&6 + else +- echo "$as_me:4516: result: no" >&5 ++ echo "$as_me:4511: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4524,7 +4519,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:4527: checking for $ac_word" >&5 ++echo "$as_me:4522: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ETAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4539,7 +4534,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ETAGS="$ac_prog" +-echo "$as_me:4542: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4537: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4547,10 +4542,10 @@ + fi + ETAGS=$ac_cv_prog_ETAGS + if test -n "$ETAGS"; then +- echo "$as_me:4550: result: $ETAGS" >&5 ++ echo "$as_me:4545: result: $ETAGS" >&5 + echo "${ECHO_T}$ETAGS" >&6 + else +- echo "$as_me:4553: result: no" >&5 ++ echo "$as_me:4548: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4559,7 +4554,7 @@ + + # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args. + set dummy ${CTAGS:-ctags}; ac_word=$2 +-echo "$as_me:4562: checking for $ac_word" >&5 ++echo "$as_me:4557: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4574,7 +4569,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_MAKE_LOWER_TAGS="yes" +-echo "$as_me:4577: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4572: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4583,17 +4578,17 @@ + fi + MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS + if test -n "$MAKE_LOWER_TAGS"; then +- echo "$as_me:4586: result: $MAKE_LOWER_TAGS" >&5 ++ echo "$as_me:4581: result: $MAKE_LOWER_TAGS" >&5 + echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 + else +- echo "$as_me:4589: result: no" >&5 ++ echo "$as_me:4584: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + if test "$cf_cv_mixedcase" = yes ; then + # Extract the first word of "${ETAGS:-etags}", so it can be a program name with args. + set dummy ${ETAGS:-etags}; ac_word=$2 +-echo "$as_me:4596: checking for $ac_word" >&5 ++echo "$as_me:4591: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4608,7 +4603,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_MAKE_UPPER_TAGS="yes" +-echo "$as_me:4611: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4606: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4617,10 +4612,10 @@ + fi + MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS + if test -n "$MAKE_UPPER_TAGS"; then +- echo "$as_me:4620: result: $MAKE_UPPER_TAGS" >&5 ++ echo "$as_me:4615: result: $MAKE_UPPER_TAGS" >&5 + echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 + else +- echo "$as_me:4623: result: no" >&5 ++ echo "$as_me:4618: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4640,7 +4635,7 @@ + MAKE_LOWER_TAGS="#" + fi + +-echo "$as_me:4643: checking for makeflags variable" >&5 ++echo "$as_me:4638: checking for makeflags variable" >&5 + echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6 + if test "${cf_cv_makeflags+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4670,7 +4665,7 @@ + ;; + (*) + +-echo "${as_me:-configure}:4673: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 ++echo "${as_me:-configure}:4668: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 + + ;; + esac +@@ -4678,13 +4673,13 @@ + rm -f cf_makeflags.tmp + + fi +-echo "$as_me:4681: result: $cf_cv_makeflags" >&5 ++echo "$as_me:4676: result: $cf_cv_makeflags" >&5 + echo "${ECHO_T}$cf_cv_makeflags" >&6 + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. + set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +-echo "$as_me:4687: checking for $ac_word" >&5 ++echo "$as_me:4682: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4699,7 +4694,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" +-echo "$as_me:4702: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4697: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4707,10 +4702,10 @@ + fi + RANLIB=$ac_cv_prog_RANLIB + if test -n "$RANLIB"; then +- echo "$as_me:4710: result: $RANLIB" >&5 ++ echo "$as_me:4705: result: $RANLIB" >&5 + echo "${ECHO_T}$RANLIB" >&6 + else +- echo "$as_me:4713: result: no" >&5 ++ echo "$as_me:4708: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4719,7 +4714,7 @@ + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. + set dummy ranlib; ac_word=$2 +-echo "$as_me:4722: checking for $ac_word" >&5 ++echo "$as_me:4717: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4734,7 +4729,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_RANLIB="ranlib" +-echo "$as_me:4737: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4732: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4743,10 +4738,10 @@ + fi + ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB + if test -n "$ac_ct_RANLIB"; then +- echo "$as_me:4746: result: $ac_ct_RANLIB" >&5 ++ echo "$as_me:4741: result: $ac_ct_RANLIB" >&5 + echo "${ECHO_T}$ac_ct_RANLIB" >&6 + else +- echo "$as_me:4749: result: no" >&5 ++ echo "$as_me:4744: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4758,7 +4753,7 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. + set dummy ${ac_tool_prefix}ld; ac_word=$2 +-echo "$as_me:4761: checking for $ac_word" >&5 ++echo "$as_me:4756: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4773,7 +4768,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_LD="${ac_tool_prefix}ld" +-echo "$as_me:4776: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4771: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4781,10 +4776,10 @@ + fi + LD=$ac_cv_prog_LD + if test -n "$LD"; then +- echo "$as_me:4784: result: $LD" >&5 ++ echo "$as_me:4779: result: $LD" >&5 + echo "${ECHO_T}$LD" >&6 + else +- echo "$as_me:4787: result: no" >&5 ++ echo "$as_me:4782: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4793,7 +4788,7 @@ + ac_ct_LD=$LD + # Extract the first word of "ld", so it can be a program name with args. + set dummy ld; ac_word=$2 +-echo "$as_me:4796: checking for $ac_word" >&5 ++echo "$as_me:4791: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4808,7 +4803,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_LD="ld" +-echo "$as_me:4811: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4806: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4817,10 +4812,10 @@ + fi + ac_ct_LD=$ac_cv_prog_ac_ct_LD + if test -n "$ac_ct_LD"; then +- echo "$as_me:4820: result: $ac_ct_LD" >&5 ++ echo "$as_me:4815: result: $ac_ct_LD" >&5 + echo "${ECHO_T}$ac_ct_LD" >&6 + else +- echo "$as_me:4823: result: no" >&5 ++ echo "$as_me:4818: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4832,7 +4827,7 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. + set dummy ${ac_tool_prefix}ar; ac_word=$2 +-echo "$as_me:4835: checking for $ac_word" >&5 ++echo "$as_me:4830: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4847,7 +4842,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_AR="${ac_tool_prefix}ar" +-echo "$as_me:4850: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4845: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4855,10 +4850,10 @@ + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +- echo "$as_me:4858: result: $AR" >&5 ++ echo "$as_me:4853: result: $AR" >&5 + echo "${ECHO_T}$AR" >&6 + else +- echo "$as_me:4861: result: no" >&5 ++ echo "$as_me:4856: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4867,7 +4862,7 @@ + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. + set dummy ar; ac_word=$2 +-echo "$as_me:4870: checking for $ac_word" >&5 ++echo "$as_me:4865: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4882,7 +4877,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_AR="ar" +-echo "$as_me:4885: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4880: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4891,10 +4886,10 @@ + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +- echo "$as_me:4894: result: $ac_ct_AR" >&5 ++ echo "$as_me:4889: result: $ac_ct_AR" >&5 + echo "${ECHO_T}$ac_ct_AR" >&6 + else +- echo "$as_me:4897: result: no" >&5 ++ echo "$as_me:4892: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4906,7 +4901,7 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args. + set dummy ${ac_tool_prefix}nm; ac_word=$2 +-echo "$as_me:4909: checking for $ac_word" >&5 ++echo "$as_me:4904: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_NM+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4921,7 +4916,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_NM="${ac_tool_prefix}nm" +-echo "$as_me:4924: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4919: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4929,10 +4924,10 @@ + fi + NM=$ac_cv_prog_NM + if test -n "$NM"; then +- echo "$as_me:4932: result: $NM" >&5 ++ echo "$as_me:4927: result: $NM" >&5 + echo "${ECHO_T}$NM" >&6 + else +- echo "$as_me:4935: result: no" >&5 ++ echo "$as_me:4930: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4941,7 +4936,7 @@ + ac_ct_NM=$NM + # Extract the first word of "nm", so it can be a program name with args. + set dummy nm; ac_word=$2 +-echo "$as_me:4944: checking for $ac_word" >&5 ++echo "$as_me:4939: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_NM+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4956,7 +4951,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_NM="nm" +-echo "$as_me:4959: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4954: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4965,10 +4960,10 @@ + fi + ac_ct_NM=$ac_cv_prog_ac_ct_NM + if test -n "$ac_ct_NM"; then +- echo "$as_me:4968: result: $ac_ct_NM" >&5 ++ echo "$as_me:4963: result: $ac_ct_NM" >&5 + echo "${ECHO_T}$ac_ct_NM" >&6 + else +- echo "$as_me:4971: result: no" >&5 ++ echo "$as_me:4966: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4980,7 +4975,7 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. + set dummy ${ac_tool_prefix}ar; ac_word=$2 +-echo "$as_me:4983: checking for $ac_word" >&5 ++echo "$as_me:4978: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4995,7 +4990,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_AR="${ac_tool_prefix}ar" +-echo "$as_me:4998: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4993: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5003,10 +4998,10 @@ + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +- echo "$as_me:5006: result: $AR" >&5 ++ echo "$as_me:5001: result: $AR" >&5 + echo "${ECHO_T}$AR" >&6 + else +- echo "$as_me:5009: result: no" >&5 ++ echo "$as_me:5004: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5015,7 +5010,7 @@ + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. + set dummy ar; ac_word=$2 +-echo "$as_me:5018: checking for $ac_word" >&5 ++echo "$as_me:5013: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5030,7 +5025,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_AR="ar" +-echo "$as_me:5033: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5028: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5039,10 +5034,10 @@ + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +- echo "$as_me:5042: result: $ac_ct_AR" >&5 ++ echo "$as_me:5037: result: $ac_ct_AR" >&5 + echo "${ECHO_T}$ac_ct_AR" >&6 + else +- echo "$as_me:5045: result: no" >&5 ++ echo "$as_me:5040: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5051,7 +5046,7 @@ + AR="$ac_cv_prog_AR" + fi + +-echo "$as_me:5054: checking for options to update archives" >&5 ++echo "$as_me:5049: checking for options to update archives" >&5 + echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6 + if test "${cf_cv_ar_flags+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5088,13 +5083,13 @@ + rm -f conftest.a + + cat >"conftest.$ac_ext" <&5 ++ if { (eval echo "$as_me:5089: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5097: \$? = $ac_status" >&5 ++ echo "$as_me:5092: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then + echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5 + $AR $ARFLAGS "$cf_ar_flags" conftest.a "conftest.$ac_cv_objext" 2>&5 1>/dev/null +@@ -5105,7 +5100,7 @@ + else + test -n "$verbose" && echo " cannot compile test-program" 1>&6 + +-echo "${as_me:-configure}:5108: testing cannot compile test-program ..." 1>&5 ++echo "${as_me:-configure}:5103: testing cannot compile test-program ..." 1>&5 + + break + fi +@@ -5115,7 +5110,7 @@ + esac + + fi +-echo "$as_me:5118: result: $cf_cv_ar_flags" >&5 ++echo "$as_me:5113: result: $cf_cv_ar_flags" >&5 + echo "${ECHO_T}$cf_cv_ar_flags" >&6 + + if test -n "$ARFLAGS" ; then +@@ -5126,7 +5121,7 @@ + ARFLAGS=$cf_cv_ar_flags + fi + +-echo "$as_me:5129: checking if you have specified an install-prefix" >&5 ++echo "$as_me:5124: checking if you have specified an install-prefix" >&5 + echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6 + + # Check whether --with-install-prefix or --without-install-prefix was given. +@@ -5139,7 +5134,7 @@ + ;; + esac + fi; +-echo "$as_me:5142: result: $DESTDIR" >&5 ++echo "$as_me:5137: result: $DESTDIR" >&5 + echo "${ECHO_T}$DESTDIR" >&6 + + ############################################################################### +@@ -5174,7 +5169,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:5177: checking for $ac_word" >&5 ++echo "$as_me:5172: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_BUILD_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5189,7 +5184,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_BUILD_CC="$ac_prog" +-echo "$as_me:5192: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5187: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5197,10 +5192,10 @@ + fi + BUILD_CC=$ac_cv_prog_BUILD_CC + if test -n "$BUILD_CC"; then +- echo "$as_me:5200: result: $BUILD_CC" >&5 ++ echo "$as_me:5195: result: $BUILD_CC" >&5 + echo "${ECHO_T}$BUILD_CC" >&6 + else +- echo "$as_me:5203: result: no" >&5 ++ echo "$as_me:5198: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5209,12 +5204,12 @@ + test -n "$BUILD_CC" || BUILD_CC="none" + + fi; +- echo "$as_me:5212: checking for native build C compiler" >&5 ++ echo "$as_me:5207: checking for native build C compiler" >&5 + echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6 +- echo "$as_me:5214: result: $BUILD_CC" >&5 ++ echo "$as_me:5209: result: $BUILD_CC" >&5 + echo "${ECHO_T}$BUILD_CC" >&6 + +- echo "$as_me:5217: checking for native build C preprocessor" >&5 ++ echo "$as_me:5212: checking for native build C preprocessor" >&5 + echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6 + + # Check whether --with-build-cpp or --without-build-cpp was given. +@@ -5224,10 +5219,10 @@ + else + BUILD_CPP='${BUILD_CC} -E' + fi; +- echo "$as_me:5227: result: $BUILD_CPP" >&5 ++ echo "$as_me:5222: result: $BUILD_CPP" >&5 + echo "${ECHO_T}$BUILD_CPP" >&6 + +- echo "$as_me:5230: checking for native build C flags" >&5 ++ echo "$as_me:5225: checking for native build C flags" >&5 + echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6 + + # Check whether --with-build-cflags or --without-build-cflags was given. +@@ -5235,10 +5230,10 @@ + withval="$with_build_cflags" + BUILD_CFLAGS="$withval" + fi; +- echo "$as_me:5238: result: $BUILD_CFLAGS" >&5 ++ echo "$as_me:5233: result: $BUILD_CFLAGS" >&5 + echo "${ECHO_T}$BUILD_CFLAGS" >&6 + +- echo "$as_me:5241: checking for native build C preprocessor-flags" >&5 ++ echo "$as_me:5236: checking for native build C preprocessor-flags" >&5 + echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6 + + # Check whether --with-build-cppflags or --without-build-cppflags was given. +@@ -5246,10 +5241,10 @@ + withval="$with_build_cppflags" + BUILD_CPPFLAGS="$withval" + fi; +- echo "$as_me:5249: result: $BUILD_CPPFLAGS" >&5 ++ echo "$as_me:5244: result: $BUILD_CPPFLAGS" >&5 + echo "${ECHO_T}$BUILD_CPPFLAGS" >&6 + +- echo "$as_me:5252: checking for native build linker-flags" >&5 ++ echo "$as_me:5247: checking for native build linker-flags" >&5 + echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6 + + # Check whether --with-build-ldflags or --without-build-ldflags was given. +@@ -5257,10 +5252,10 @@ + withval="$with_build_ldflags" + BUILD_LDFLAGS="$withval" + fi; +- echo "$as_me:5260: result: $BUILD_LDFLAGS" >&5 ++ echo "$as_me:5255: result: $BUILD_LDFLAGS" >&5 + echo "${ECHO_T}$BUILD_LDFLAGS" >&6 + +- echo "$as_me:5263: checking for native build linker-libraries" >&5 ++ echo "$as_me:5258: checking for native build linker-libraries" >&5 + echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6 + + # Check whether --with-build-libs or --without-build-libs was given. +@@ -5268,7 +5263,7 @@ + withval="$with_build_libs" + BUILD_LIBS="$withval" + fi; +- echo "$as_me:5271: result: $BUILD_LIBS" >&5 ++ echo "$as_me:5266: result: $BUILD_LIBS" >&5 + echo "${ECHO_T}$BUILD_LIBS" >&6 + + # this assumes we're on Unix. +@@ -5278,7 +5273,7 @@ + : ${BUILD_CC:='${CC}'} + + if { test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}'; } ; then +- { { echo "$as_me:5281: error: Cross-build requires two compilers. ++ { { echo "$as_me:5276: error: Cross-build requires two compilers. + Use --with-build-cc to specify the native compiler." >&5 + echo "$as_me: error: Cross-build requires two compilers. + Use --with-build-cc to specify the native compiler." >&2;} +@@ -5303,7 +5298,7 @@ + ### shared, for example. + cf_list_models="" + +-echo "$as_me:5306: checking if libtool -version-number should be used" >&5 ++echo "$as_me:5301: checking if libtool -version-number should be used" >&5 + echo $ECHO_N "checking if libtool -version-number should be used... $ECHO_C" >&6 + + # Check whether --enable-libtool-version or --disable-libtool-version was given. +@@ -5320,7 +5315,7 @@ + cf_libtool_version=yes + + fi; +-echo "$as_me:5323: result: $cf_libtool_version" >&5 ++echo "$as_me:5318: result: $cf_libtool_version" >&5 + echo "${ECHO_T}$cf_libtool_version" >&6 + + if test "$cf_libtool_version" = yes ; then +@@ -5329,25 +5324,25 @@ + LIBTOOL_VERSION="-version-info" + case "x$VERSION" in + (x) +- { echo "$as_me:5332: WARNING: VERSION was not set" >&5 ++ { echo "$as_me:5327: WARNING: VERSION was not set" >&5 + echo "$as_me: WARNING: VERSION was not set" >&2;} + ;; + (x*.*.*) + ABI_VERSION="$VERSION" + test -n "$verbose" && echo " ABI_VERSION: $ABI_VERSION" 1>&6 + +-echo "${as_me:-configure}:5339: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 ++echo "${as_me:-configure}:5334: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 + + ;; + (x*:*:*) + ABI_VERSION=`echo "$VERSION" | sed -e 's/:/./g'` + test -n "$verbose" && echo " ABI_VERSION: $ABI_VERSION" 1>&6 + +-echo "${as_me:-configure}:5346: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 ++echo "${as_me:-configure}:5341: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 + + ;; + (*) +- { echo "$as_me:5350: WARNING: unexpected VERSION value: $VERSION" >&5 ++ { echo "$as_me:5345: WARNING: unexpected VERSION value: $VERSION" >&5 + echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;} + ;; + esac +@@ -5369,7 +5364,7 @@ + LIB_INSTALL= + LIB_UNINSTALL= + +-echo "$as_me:5372: checking if you want to build libraries with libtool" >&5 ++echo "$as_me:5367: checking if you want to build libraries with libtool" >&5 + echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6 + + # Check whether --with-libtool or --without-libtool was given. +@@ -5379,7 +5374,7 @@ + else + with_libtool=no + fi; +-echo "$as_me:5382: result: $with_libtool" >&5 ++echo "$as_me:5377: result: $with_libtool" >&5 + echo "${ECHO_T}$with_libtool" >&6 + if test "$with_libtool" != "no"; then + +@@ -5410,7 +5405,7 @@ + with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:5413: error: expected a pathname, not \"$with_libtool\"" >&5 ++ { { echo "$as_me:5408: error: expected a pathname, not \"$with_libtool\"" >&5 + echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -5423,7 +5418,7 @@ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-echo "$as_me:5426: checking for $ac_word" >&5 ++echo "$as_me:5421: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_LIBTOOL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5438,7 +5433,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog" +-echo "$as_me:5441: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5436: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5446,10 +5441,10 @@ + fi + LIBTOOL=$ac_cv_prog_LIBTOOL + if test -n "$LIBTOOL"; then +- echo "$as_me:5449: result: $LIBTOOL" >&5 ++ echo "$as_me:5444: result: $LIBTOOL" >&5 + echo "${ECHO_T}$LIBTOOL" >&6 + else +- echo "$as_me:5452: result: no" >&5 ++ echo "$as_me:5447: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5462,7 +5457,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:5465: checking for $ac_word" >&5 ++echo "$as_me:5460: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5477,7 +5472,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_LIBTOOL="$ac_prog" +-echo "$as_me:5480: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5475: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5485,10 +5480,10 @@ + fi + ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL + if test -n "$ac_ct_LIBTOOL"; then +- echo "$as_me:5488: result: $ac_ct_LIBTOOL" >&5 ++ echo "$as_me:5483: result: $ac_ct_LIBTOOL" >&5 + echo "${ECHO_T}$ac_ct_LIBTOOL" >&6 + else +- echo "$as_me:5491: result: no" >&5 ++ echo "$as_me:5486: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5519,7 +5514,7 @@ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-echo "$as_me:5522: checking for $ac_word" >&5 ++echo "$as_me:5517: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_LIBTOOL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5534,7 +5529,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog" +-echo "$as_me:5537: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5532: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5542,10 +5537,10 @@ + fi + LIBTOOL=$ac_cv_prog_LIBTOOL + if test -n "$LIBTOOL"; then +- echo "$as_me:5545: result: $LIBTOOL" >&5 ++ echo "$as_me:5540: result: $LIBTOOL" >&5 + echo "${ECHO_T}$LIBTOOL" >&6 + else +- echo "$as_me:5548: result: no" >&5 ++ echo "$as_me:5543: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5558,7 +5553,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:5561: checking for $ac_word" >&5 ++echo "$as_me:5556: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5573,7 +5568,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_LIBTOOL="$ac_prog" +-echo "$as_me:5576: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5571: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5581,10 +5576,10 @@ + fi + ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL + if test -n "$ac_ct_LIBTOOL"; then +- echo "$as_me:5584: result: $ac_ct_LIBTOOL" >&5 ++ echo "$as_me:5579: result: $ac_ct_LIBTOOL" >&5 + echo "${ECHO_T}$ac_ct_LIBTOOL" >&6 + else +- echo "$as_me:5587: result: no" >&5 ++ echo "$as_me:5582: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5606,7 +5601,7 @@ + fi + fi + if test -z "$LIBTOOL" ; then +- { { echo "$as_me:5609: error: Cannot find libtool" >&5 ++ { { echo "$as_me:5604: error: Cannot find libtool" >&5 + echo "$as_me: error: Cannot find libtool" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -5622,7 +5617,7 @@ + + if test -n "$LIBTOOL" && test "$LIBTOOL" != none + then +- echo "$as_me:5625: checking version of $LIBTOOL" >&5 ++ echo "$as_me:5620: checking version of $LIBTOOL" >&5 + echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6 + + if test -n "$LIBTOOL" && test "$LIBTOOL" != none +@@ -5633,7 +5628,7 @@ + fi + test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version + +- echo "$as_me:5636: result: $cf_cv_libtool_version" >&5 ++ echo "$as_me:5631: result: $cf_cv_libtool_version" >&5 + echo "${ECHO_T}$cf_cv_libtool_version" >&6 + if test -n "$cf_cv_libtool_version" + then +@@ -5642,18 +5637,18 @@ + (*...GNU-libtool...*) + ;; + (*) +- { { echo "$as_me:5645: error: This is not GNU libtool" >&5 ++ { { echo "$as_me:5640: error: This is not GNU libtool" >&5 + echo "$as_me: error: This is not GNU libtool" >&2;} + { (exit 1); exit 1; }; } + ;; + esac + else +- { { echo "$as_me:5651: error: No version found for $LIBTOOL" >&5 ++ { { echo "$as_me:5646: error: No version found for $LIBTOOL" >&5 + echo "$as_me: error: No version found for $LIBTOOL" >&2;} + { (exit 1); exit 1; }; } + fi + else +- { { echo "$as_me:5656: error: GNU libtool has not been found" >&5 ++ { { echo "$as_me:5651: error: GNU libtool has not been found" >&5 + echo "$as_me: error: GNU libtool has not been found" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -5689,7 +5684,7 @@ + + else + +-echo "$as_me:5692: checking if you want to build shared libraries" >&5 ++echo "$as_me:5687: checking if you want to build shared libraries" >&5 + echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6 + + # Check whether --with-shared or --without-shared was given. +@@ -5699,11 +5694,11 @@ + else + with_shared=no + fi; +-echo "$as_me:5702: result: $with_shared" >&5 ++echo "$as_me:5697: result: $with_shared" >&5 + echo "${ECHO_T}$with_shared" >&6 + test "x$with_shared" = "xyes" && cf_list_models="$cf_list_models shared" + +-echo "$as_me:5706: checking if you want to build static libraries" >&5 ++echo "$as_me:5701: checking if you want to build static libraries" >&5 + echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6 + + # Check whether --with-normal or --without-normal was given. +@@ -5713,11 +5708,11 @@ + else + with_normal=yes + fi; +-echo "$as_me:5716: result: $with_normal" >&5 ++echo "$as_me:5711: result: $with_normal" >&5 + echo "${ECHO_T}$with_normal" >&6 + test "x$with_normal" = "xyes" && cf_list_models="$cf_list_models normal" + +-echo "$as_me:5720: checking if you want to build debug libraries" >&5 ++echo "$as_me:5715: checking if you want to build debug libraries" >&5 + echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6 + + # Check whether --with-debug or --without-debug was given. +@@ -5727,11 +5722,11 @@ + else + with_debug=yes + fi; +-echo "$as_me:5730: result: $with_debug" >&5 ++echo "$as_me:5725: result: $with_debug" >&5 + echo "${ECHO_T}$with_debug" >&6 + test "x$with_debug" = "xyes" && cf_list_models="$cf_list_models debug" + +-echo "$as_me:5734: checking if you want to build profiling libraries" >&5 ++echo "$as_me:5729: checking if you want to build profiling libraries" >&5 + echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6 + + # Check whether --with-profile or --without-profile was given. +@@ -5741,7 +5736,7 @@ + else + with_profile=no + fi; +-echo "$as_me:5744: result: $with_profile" >&5 ++echo "$as_me:5739: result: $with_profile" >&5 + echo "${ECHO_T}$with_profile" >&6 + test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile" + +@@ -5749,7 +5744,7 @@ + + if test "X$cf_with_cxx_binding" != Xno; then + if test "x$with_shared" = "xyes"; then +-echo "$as_me:5752: checking if you want to build C++ shared libraries" >&5 ++echo "$as_me:5747: checking if you want to build C++ shared libraries" >&5 + echo $ECHO_N "checking if you want to build C++ shared libraries... $ECHO_C" >&6 + + # Check whether --with-cxx-shared or --without-cxx-shared was given. +@@ -5759,26 +5754,26 @@ + else + with_shared_cxx=no + fi; +-echo "$as_me:5762: result: $with_shared_cxx" >&5 ++echo "$as_me:5757: result: $with_shared_cxx" >&5 + echo "${ECHO_T}$with_shared_cxx" >&6 + fi + fi + + ############################################################################### + +-echo "$as_me:5769: checking for specified models" >&5 ++echo "$as_me:5764: checking for specified models" >&5 + echo $ECHO_N "checking for specified models... $ECHO_C" >&6 + test -z "$cf_list_models" && cf_list_models=normal + test "$with_libtool" != "no" && cf_list_models=libtool +-echo "$as_me:5773: result: $cf_list_models" >&5 ++echo "$as_me:5768: result: $cf_list_models" >&5 + echo "${ECHO_T}$cf_list_models" >&6 + + ### Use the first model as the default, and save its suffix for use in building + ### up test-applications. +-echo "$as_me:5778: checking for default model" >&5 ++echo "$as_me:5773: checking for default model" >&5 + echo $ECHO_N "checking for default model... $ECHO_C" >&6 + DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'` +-echo "$as_me:5781: result: $DFT_LWR_MODEL" >&5 ++echo "$as_me:5776: result: $DFT_LWR_MODEL" >&5 + echo "${ECHO_T}$DFT_LWR_MODEL" >&6 + + DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` +@@ -5792,7 +5787,7 @@ + LIB_DIR=../lib + LIB_2ND=../../lib + +-echo "$as_me:5795: checking if you want to have a library-prefix" >&5 ++echo "$as_me:5790: checking if you want to have a library-prefix" >&5 + echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6 + + # Check whether --with-lib-prefix or --without-lib-prefix was given. +@@ -5802,7 +5797,7 @@ + else + with_lib_prefix=auto + fi; +-echo "$as_me:5805: result: $with_lib_prefix" >&5 ++echo "$as_me:5800: result: $with_lib_prefix" >&5 + echo "${ECHO_T}$with_lib_prefix" >&6 + + if test "$with_lib_prefix" = auto +@@ -5833,19 +5828,19 @@ + + LIB_SUFFIX= + +- echo "$as_me:5836: checking for PATH separator" >&5 ++ echo "$as_me:5831: checking for PATH separator" >&5 + echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6 + case "$cf_cv_system_name" in + (os2*) PATH_SEPARATOR=';' ;; + (*) ${PATH_SEPARATOR:=':'} ;; + esac + +- echo "$as_me:5843: result: $PATH_SEPARATOR" >&5 ++ echo "$as_me:5838: result: $PATH_SEPARATOR" >&5 + echo "${ECHO_T}$PATH_SEPARATOR" >&6 + + ############################################################################### + +-echo "$as_me:5848: checking if you want to build a separate terminfo library" >&5 ++echo "$as_me:5843: checking if you want to build a separate terminfo library" >&5 + echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6 + + # Check whether --with-termlib or --without-termlib was given. +@@ -5855,10 +5850,10 @@ + else + with_termlib=no + fi; +-echo "$as_me:5858: result: $with_termlib" >&5 ++echo "$as_me:5853: result: $with_termlib" >&5 + echo "${ECHO_T}$with_termlib" >&6 + +-echo "$as_me:5861: checking if you want to build a separate tic library" >&5 ++echo "$as_me:5856: checking if you want to build a separate tic library" >&5 + echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6 + + # Check whether --with-ticlib or --without-ticlib was given. +@@ -5868,7 +5863,7 @@ + else + with_ticlib=no + fi; +-echo "$as_me:5871: result: $with_ticlib" >&5 ++echo "$as_me:5866: result: $with_ticlib" >&5 + echo "${ECHO_T}$with_ticlib" >&6 + + if test X"$CC_G_OPT" = X"" ; then +@@ -5881,7 +5876,7 @@ + test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT='' + fi + +-echo "$as_me:5884: checking for default loader flags" >&5 ++echo "$as_me:5879: checking for default loader flags" >&5 + echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6 + case "$DFT_LWR_MODEL" in + (libtool) LD_MODEL='' ;; +@@ -5890,13 +5885,13 @@ + (profile) LD_MODEL='-pg';; + (shared) LD_MODEL='' ;; + esac +-echo "$as_me:5893: result: $LD_MODEL" >&5 ++echo "$as_me:5888: result: $LD_MODEL" >&5 + echo "${ECHO_T}$LD_MODEL" >&6 + + case "$DFT_LWR_MODEL" in + (shared) + +-echo "$as_me:5899: checking if rpath option should be used" >&5 ++echo "$as_me:5894: checking if rpath option should be used" >&5 + echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6 + + # Check whether --enable-rpath or --disable-rpath was given. +@@ -5906,10 +5901,10 @@ + else + cf_cv_enable_rpath=no + fi; +-echo "$as_me:5909: result: $cf_cv_enable_rpath" >&5 ++echo "$as_me:5904: result: $cf_cv_enable_rpath" >&5 + echo "${ECHO_T}$cf_cv_enable_rpath" >&6 + +-echo "$as_me:5912: checking if shared libraries should be relinked during install" >&5 ++echo "$as_me:5907: checking if shared libraries should be relinked during install" >&5 + echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6 + + # Check whether --enable-relink or --disable-relink was given. +@@ -5919,7 +5914,7 @@ + else + cf_cv_do_relink=yes + fi; +-echo "$as_me:5922: result: $cf_cv_do_relink" >&5 ++echo "$as_me:5917: result: $cf_cv_do_relink" >&5 + echo "${ECHO_T}$cf_cv_do_relink" >&6 + ;; + esac +@@ -5930,7 +5925,7 @@ + LD_RPATH_OPT= + if test "x$cf_cv_enable_rpath" != xno + then +- echo "$as_me:5933: checking for an rpath option" >&5 ++ echo "$as_me:5928: checking for an rpath option" >&5 + echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 + case "$cf_cv_system_name" in + (irix*) +@@ -5961,12 +5956,12 @@ + (*) + ;; + esac +- echo "$as_me:5964: result: $LD_RPATH_OPT" >&5 ++ echo "$as_me:5959: result: $LD_RPATH_OPT" >&5 + echo "${ECHO_T}$LD_RPATH_OPT" >&6 + + case "x$LD_RPATH_OPT" in + (x-R*) +- echo "$as_me:5969: checking if we need a space after rpath option" >&5 ++ echo "$as_me:5964: checking if we need a space after rpath option" >&5 + echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6 + cf_save_LIBS="$LIBS" + +@@ -5987,7 +5982,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 5990 "configure" ++#line 5985 "configure" + #include "confdefs.h" + + int +@@ -5999,16 +5994,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6002: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5997: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6005: \$? = $ac_status" >&5 ++ echo "$as_me:6000: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6008: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6003: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6011: \$? = $ac_status" >&5 ++ echo "$as_me:6006: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_rpath_space=no + else +@@ -6018,7 +6013,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS="$cf_save_LIBS" +- echo "$as_me:6021: result: $cf_rpath_space" >&5 ++ echo "$as_me:6016: result: $cf_rpath_space" >&5 + echo "${ECHO_T}$cf_rpath_space" >&6 + test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " + ;; +@@ -6040,7 +6035,7 @@ + cf_ld_rpath_opt= + test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT" + +- echo "$as_me:6043: checking if release/abi version should be used for shared libs" >&5 ++ echo "$as_me:6038: checking if release/abi version should be used for shared libs" >&5 + echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6 + + # Check whether --with-shlib-version or --without-shlib-version was given. +@@ -6055,9 +6050,9 @@ + cf_cv_shlib_version=$withval + ;; + (*) +- echo "$as_me:6058: result: $withval" >&5 ++ echo "$as_me:6053: result: $withval" >&5 + echo "${ECHO_T}$withval" >&6 +- { { echo "$as_me:6060: error: option value must be one of: rel, abi, or auto" >&5 ++ { { echo "$as_me:6055: error: option value must be one of: rel, abi, or auto" >&5 + echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -6066,7 +6061,7 @@ + else + cf_cv_shlib_version=auto + fi; +- echo "$as_me:6069: result: $cf_cv_shlib_version" >&5 ++ echo "$as_me:6064: result: $cf_cv_shlib_version" >&5 + echo "${ECHO_T}$cf_cv_shlib_version" >&6 + + cf_cv_rm_so_locs=no +@@ -6089,14 +6084,14 @@ + + if test "$cf_try_fPIC" = yes + then +- echo "$as_me:6092: checking which $CC option to use" >&5 ++ echo "$as_me:6087: checking which $CC option to use" >&5 + echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6 + cf_save_CFLAGS="$CFLAGS" + for CC_SHARED_OPTS in -fPIC -fpic '' + do + CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6099 "configure" ++#line 6094 "configure" + #include "confdefs.h" + #include + int +@@ -6108,16 +6103,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:6111: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6106: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6114: \$? = $ac_status" >&5 ++ echo "$as_me:6109: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:6117: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6112: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6120: \$? = $ac_status" >&5 ++ echo "$as_me:6115: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -6126,7 +6121,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + done +- echo "$as_me:6129: result: $CC_SHARED_OPTS" >&5 ++ echo "$as_me:6124: result: $CC_SHARED_OPTS" >&5 + echo "${ECHO_T}$CC_SHARED_OPTS" >&6 + CFLAGS="$cf_save_CFLAGS" + fi +@@ -6197,7 +6192,7 @@ + MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@' + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi + cf_cv_shlib_version_infix=yes +- echo "$as_me:6200: checking if ld -search_paths_first works" >&5 ++ echo "$as_me:6195: checking if ld -search_paths_first works" >&5 + echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6 + if test "${cf_cv_ldflags_search_paths_first+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6206,7 +6201,7 @@ + cf_save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -Wl,-search_paths_first" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6209 "configure" ++#line 6204 "configure" + #include "confdefs.h" + + int +@@ -6218,16 +6213,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6221: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6216: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6224: \$? = $ac_status" >&5 ++ echo "$as_me:6219: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6227: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6222: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6230: \$? = $ac_status" >&5 ++ echo "$as_me:6225: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ldflags_search_paths_first=yes + else +@@ -6238,7 +6233,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LDFLAGS=$cf_save_LDFLAGS + fi +-echo "$as_me:6241: result: $cf_cv_ldflags_search_paths_first" >&5 ++echo "$as_me:6236: result: $cf_cv_ldflags_search_paths_first" >&5 + echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 + if test "$cf_cv_ldflags_search_paths_first" = yes; then + LDFLAGS="$LDFLAGS -Wl,-search_paths_first" +@@ -6588,7 +6583,7 @@ + do + CFLAGS="$cf_shared_opts $cf_save_CFLAGS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6591 "configure" ++#line 6586 "configure" + #include "confdefs.h" + #include + int +@@ -6600,16 +6595,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:6603: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6598: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6606: \$? = $ac_status" >&5 ++ echo "$as_me:6601: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:6609: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6604: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6612: \$? = $ac_status" >&5 ++ echo "$as_me:6607: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -6646,7 +6641,7 @@ + test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes + ;; + (*) +- { echo "$as_me:6649: WARNING: ignored --with-shlib-version" >&5 ++ { echo "$as_me:6644: WARNING: ignored --with-shlib-version" >&5 + echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} + ;; + esac +@@ -6656,7 +6651,7 @@ + if test -n "$cf_try_cflags" + then + cat > conftest.$ac_ext < + int main(int argc, char *argv[]) + { +@@ -6668,18 +6663,18 @@ + for cf_opt in $cf_try_cflags + do + CFLAGS="$cf_save_CFLAGS -$cf_opt" +- echo "$as_me:6671: checking if CFLAGS option -$cf_opt works" >&5 ++ echo "$as_me:6666: checking if CFLAGS option -$cf_opt works" >&5 + echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6 +- if { (eval echo "$as_me:6673: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:6668: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6676: \$? = $ac_status" >&5 ++ echo "$as_me:6671: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- echo "$as_me:6678: result: yes" >&5 ++ echo "$as_me:6673: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + cf_save_CFLAGS="$CFLAGS" + else +- echo "$as_me:6682: result: no" >&5 ++ echo "$as_me:6677: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + done +@@ -6694,17 +6689,17 @@ + + test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6 + +-echo "${as_me:-configure}:6697: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 ++echo "${as_me:-configure}:6692: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 + + test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 + +-echo "${as_me:-configure}:6701: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 ++echo "${as_me:-configure}:6696: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 + + for model in $cf_list_models ; do + case "$model" in + (libtool) + +-echo "$as_me:6707: checking for additional libtool options" >&5 ++echo "$as_me:6702: checking for additional libtool options" >&5 + echo $ECHO_N "checking for additional libtool options... $ECHO_C" >&6 + + # Check whether --with-libtool-opts or --without-libtool-opts was given. +@@ -6714,7 +6709,7 @@ + else + with_libtool_opts=no + fi; +-echo "$as_me:6717: result: $with_libtool_opts" >&5 ++echo "$as_me:6712: result: $with_libtool_opts" >&5 + echo "${ECHO_T}$with_libtool_opts" >&6 + + case .$with_libtool_opts in +@@ -6725,7 +6720,7 @@ + ;; + esac + +-echo "$as_me:6728: checking if exported-symbols file should be used" >&5 ++echo "$as_me:6723: checking if exported-symbols file should be used" >&5 + echo $ECHO_N "checking if exported-symbols file should be used... $ECHO_C" >&6 + + # Check whether --with-export-syms or --without-export-syms was given. +@@ -6740,7 +6735,7 @@ + with_export_syms='${top_srcdir}/package/${PACKAGE}.sym' + + fi +-echo "$as_me:6743: result: $with_export_syms" >&5 ++echo "$as_me:6738: result: $with_export_syms" >&5 + echo "${ECHO_T}$with_export_syms" >&6 + if test "x$with_export_syms" != xno + then +@@ -6751,15 +6746,15 @@ + ;; + (shared) + if test "$CC_SHARED_OPTS" = "unknown"; then +- { { echo "$as_me:6754: error: Shared libraries are not supported in this version" >&5 ++ { { echo "$as_me:6749: error: Shared libraries are not supported in this version" >&5 + echo "$as_me: error: Shared libraries are not supported in this version" >&2;} + { (exit 1); exit 1; }; } + fi + # workaround for inept transition to PIE vs PIC... +- echo "$as_me:6759: checking if current CFLAGS link properly" >&5 ++ echo "$as_me:6754: checking if current CFLAGS link properly" >&5 + echo $ECHO_N "checking if current CFLAGS link properly... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6762 "configure" ++#line 6757 "configure" + #include "confdefs.h" + #include + int +@@ -6771,16 +6766,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6774: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6769: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6777: \$? = $ac_status" >&5 ++ echo "$as_me:6772: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6780: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6775: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6783: \$? = $ac_status" >&5 ++ echo "$as_me:6778: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cflags_work=yes + else +@@ -6789,18 +6784,18 @@ + cf_cflags_work=no + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +- echo "$as_me:6792: result: $cf_cflags_work" >&5 ++ echo "$as_me:6787: result: $cf_cflags_work" >&5 + echo "${ECHO_T}$cf_cflags_work" >&6 + if test "$cf_cflags_work" = no + then + test -n "$verbose" && echo " try to work around by appending shared-options" 1>&6 + +-echo "${as_me:-configure}:6798: testing try to work around by appending shared-options ..." 1>&5 ++echo "${as_me:-configure}:6793: testing try to work around by appending shared-options ..." 1>&5 + + CFLAGS="$CFLAGS $CC_SHARED_OPTS" + fi + +-echo "$as_me:6803: checking if versioned-symbols file should be used" >&5 ++echo "$as_me:6798: checking if versioned-symbols file should be used" >&5 + echo $ECHO_N "checking if versioned-symbols file should be used... $ECHO_C" >&6 + + # Check whether --with-versioned-syms or --without-versioned-syms was given. +@@ -6818,18 +6813,18 @@ + (xno) + ;; + (x/*) +- test -f "$with_versioned_syms" || { { echo "$as_me:6821: error: expected a filename: $with_versioned_syms" >&5 ++ test -f "$with_versioned_syms" || { { echo "$as_me:6816: error: expected a filename: $with_versioned_syms" >&5 + echo "$as_me: error: expected a filename: $with_versioned_syms" >&2;} + { (exit 1); exit 1; }; } + ;; + (*) +- test -f "$with_versioned_syms" || { { echo "$as_me:6826: error: expected a filename: $with_versioned_syms" >&5 ++ test -f "$with_versioned_syms" || { { echo "$as_me:6821: error: expected a filename: $with_versioned_syms" >&5 + echo "$as_me: error: expected a filename: $with_versioned_syms" >&2;} + { (exit 1); exit 1; }; } + with_versioned_syms=`pwd`/"$with_versioned_syms" + ;; + esac +-echo "$as_me:6832: result: $with_versioned_syms" >&5 ++echo "$as_me:6827: result: $with_versioned_syms" >&5 + echo "${ECHO_T}$with_versioned_syms" >&6 + + RESULTING_SYMS= +@@ -6845,7 +6840,7 @@ + MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-Wl,%\\${VERSIONED_SYMS} -Wl,%"` + test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 + +-echo "${as_me:-configure}:6848: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 ++echo "${as_me:-configure}:6843: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 + + ;; + (*-dy\ *) +@@ -6853,11 +6848,11 @@ + MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-dy%\\${VERSIONED_SYMS} -dy%"` + test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 + +-echo "${as_me:-configure}:6856: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 ++echo "${as_me:-configure}:6851: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 + + ;; + (*) +- { echo "$as_me:6860: WARNING: this system does not support versioned-symbols" >&5 ++ { echo "$as_me:6855: WARNING: this system does not support versioned-symbols" >&5 + echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;} + ;; + esac +@@ -6869,7 +6864,7 @@ + # symbols. + if test "x$VERSIONED_SYMS" != "x" + then +- echo "$as_me:6872: checking if wildcards can be used to selectively omit symbols" >&5 ++ echo "$as_me:6867: checking if wildcards can be used to selectively omit symbols" >&5 + echo $ECHO_N "checking if wildcards can be used to selectively omit symbols... $ECHO_C" >&6 + WILDCARD_SYMS=no + +@@ -6906,7 +6901,7 @@ + } submodule_1.0; + EOF + cat >conftest.$ac_ext <&5 ++ echo "$as_me:6935: result: $WILDCARD_SYMS" >&5 + echo "${ECHO_T}$WILDCARD_SYMS" >&6 + rm -f conftest.* + fi +@@ -6950,7 +6945,7 @@ + ### Checks for special libraries, must be done up-front. + SHLIB_LIST="" + +-echo "$as_me:6953: checking if you want to link with the GPM mouse library" >&5 ++echo "$as_me:6948: checking if you want to link with the GPM mouse library" >&5 + echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6 + + # Check whether --with-gpm or --without-gpm was given. +@@ -6960,27 +6955,27 @@ + else + with_gpm=maybe + fi; +-echo "$as_me:6963: result: $with_gpm" >&5 ++echo "$as_me:6958: result: $with_gpm" >&5 + echo "${ECHO_T}$with_gpm" >&6 + + if test "$with_gpm" != no ; then +- echo "$as_me:6967: checking for gpm.h" >&5 ++ echo "$as_me:6962: checking for gpm.h" >&5 + echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6 + if test "${ac_cv_header_gpm_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6973 "configure" ++#line 6968 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:6977: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:6972: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:6983: \$? = $ac_status" >&5 ++ echo "$as_me:6978: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -6999,7 +6994,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:7002: result: $ac_cv_header_gpm_h" >&5 ++echo "$as_me:6997: result: $ac_cv_header_gpm_h" >&5 + echo "${ECHO_T}$ac_cv_header_gpm_h" >&6 + if test "$ac_cv_header_gpm_h" = yes; then + +@@ -7010,7 +7005,7 @@ + if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then + test -n "$verbose" && echo " assuming we really have GPM library" 1>&6 + +-echo "${as_me:-configure}:7013: testing assuming we really have GPM library ..." 1>&5 ++echo "${as_me:-configure}:7008: testing assuming we really have GPM library ..." 1>&5 + + cat >>confdefs.h <<\EOF + #define HAVE_LIBGPM 1 +@@ -7018,7 +7013,7 @@ + + with_gpm=yes + else +- echo "$as_me:7021: checking for Gpm_Open in -lgpm" >&5 ++ echo "$as_me:7016: checking for Gpm_Open in -lgpm" >&5 + echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 + if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7026,7 +7021,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7029 "configure" ++#line 7024 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -7045,16 +7040,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7048: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7043: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7051: \$? = $ac_status" >&5 ++ echo "$as_me:7046: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7054: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7049: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7057: \$? = $ac_status" >&5 ++ echo "$as_me:7052: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gpm_Gpm_Open=yes + else +@@ -7065,18 +7060,18 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:7068: result: $ac_cv_lib_gpm_Gpm_Open" >&5 ++echo "$as_me:7063: result: $ac_cv_lib_gpm_Gpm_Open" >&5 + echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 + if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then + with_gpm=yes + else + + if test "$with_gpm" = maybe; then +- { echo "$as_me:7075: WARNING: Cannot link with GPM library" >&5 ++ { echo "$as_me:7070: WARNING: Cannot link with GPM library" >&5 + echo "$as_me: WARNING: Cannot link with GPM library" >&2;} + with_gpm=no + else +- { { echo "$as_me:7079: error: Cannot link with GPM library" >&5 ++ { { echo "$as_me:7074: error: Cannot link with GPM library" >&5 + echo "$as_me: error: Cannot link with GPM library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -7087,7 +7082,7 @@ + + else + +- test "$with_gpm" != maybe && { echo "$as_me:7090: WARNING: Cannot find GPM header" >&5 ++ test "$with_gpm" != maybe && { echo "$as_me:7085: WARNING: Cannot find GPM header" >&5 + echo "$as_me: WARNING: Cannot find GPM header" >&2;} + with_gpm=no + +@@ -7096,7 +7091,7 @@ + fi + + if test "$with_gpm" != no ; then +- echo "$as_me:7099: checking if you want to load GPM dynamically" >&5 ++ echo "$as_me:7094: checking if you want to load GPM dynamically" >&5 + echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6 + + # Check whether --with-dlsym or --without-dlsym was given. +@@ -7106,18 +7101,18 @@ + else + with_dlsym=yes + fi; +- echo "$as_me:7109: result: $with_dlsym" >&5 ++ echo "$as_me:7104: result: $with_dlsym" >&5 + echo "${ECHO_T}$with_dlsym" >&6 + if test "x$with_dlsym" = xyes ; then + + cf_have_dlsym=no +-echo "$as_me:7114: checking for dlsym" >&5 ++echo "$as_me:7109: checking for dlsym" >&5 + echo $ECHO_N "checking for dlsym... $ECHO_C" >&6 + if test "${ac_cv_func_dlsym+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7120 "configure" ++#line 7115 "configure" + #include "confdefs.h" + #define dlsym autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -7148,16 +7143,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7151: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7146: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7154: \$? = $ac_status" >&5 ++ echo "$as_me:7149: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7157: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7152: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7160: \$? = $ac_status" >&5 ++ echo "$as_me:7155: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_dlsym=yes + else +@@ -7167,14 +7162,14 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:7170: result: $ac_cv_func_dlsym" >&5 ++echo "$as_me:7165: result: $ac_cv_func_dlsym" >&5 + echo "${ECHO_T}$ac_cv_func_dlsym" >&6 + if test "$ac_cv_func_dlsym" = yes; then + cf_have_dlsym=yes + else + + cf_have_libdl=no +-echo "$as_me:7177: checking for dlsym in -ldl" >&5 ++echo "$as_me:7172: checking for dlsym in -ldl" >&5 + echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6 + if test "${ac_cv_lib_dl_dlsym+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7182,7 +7177,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldl $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7185 "configure" ++#line 7180 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -7201,16 +7196,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7204: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7199: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7207: \$? = $ac_status" >&5 ++ echo "$as_me:7202: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7210: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7205: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7213: \$? = $ac_status" >&5 ++ echo "$as_me:7208: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_dl_dlsym=yes + else +@@ -7221,7 +7216,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:7224: result: $ac_cv_lib_dl_dlsym" >&5 ++echo "$as_me:7219: result: $ac_cv_lib_dl_dlsym" >&5 + echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6 + if test "$ac_cv_lib_dl_dlsym" = yes; then + +@@ -7250,10 +7245,10 @@ + LIBS="$cf_add_libs" + } + +- echo "$as_me:7253: checking whether able to link to dl*() functions" >&5 ++ echo "$as_me:7248: checking whether able to link to dl*() functions" >&5 + echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7256 "configure" ++#line 7251 "configure" + #include "confdefs.h" + #include + int +@@ -7271,16 +7266,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7274: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7269: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7277: \$? = $ac_status" >&5 ++ echo "$as_me:7272: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7280: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7275: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7283: \$? = $ac_status" >&5 ++ echo "$as_me:7278: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cat >>confdefs.h <<\EOF +@@ -7291,15 +7286,15 @@ + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + +- { { echo "$as_me:7294: error: Cannot link test program for libdl" >&5 ++ { { echo "$as_me:7289: error: Cannot link test program for libdl" >&5 + echo "$as_me: error: Cannot link test program for libdl" >&2;} + { (exit 1); exit 1; }; } + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +- echo "$as_me:7299: result: ok" >&5 ++ echo "$as_me:7294: result: ok" >&5 + echo "${ECHO_T}ok" >&6 + else +- { { echo "$as_me:7302: error: Cannot find dlsym function" >&5 ++ { { echo "$as_me:7297: error: Cannot find dlsym function" >&5 + echo "$as_me: error: Cannot find dlsym function" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -7307,12 +7302,12 @@ + if test "x$with_gpm" != xyes ; then + test -n "$verbose" && echo " assuming soname for gpm is $with_gpm" 1>&6 + +-echo "${as_me:-configure}:7310: testing assuming soname for gpm is $with_gpm ..." 1>&5 ++echo "${as_me:-configure}:7305: testing assuming soname for gpm is $with_gpm ..." 1>&5 + + cf_cv_gpm_soname="$with_gpm" + else + +-echo "$as_me:7315: checking for soname of gpm library" >&5 ++echo "$as_me:7310: checking for soname of gpm library" >&5 + echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6 + if test "${cf_cv_gpm_soname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7346,15 +7341,15 @@ + done + LIBS="$cf_add_libs" + +- if { (eval echo "$as_me:7349: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:7344: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7352: \$? = $ac_status" >&5 ++ echo "$as_me:7347: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then +- if { (eval echo "$as_me:7354: \"$ac_link\"") >&5 ++ if { (eval echo "$as_me:7349: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7357: \$? = $ac_status" >&5 ++ echo "$as_me:7352: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then + cf_cv_gpm_soname="`ldd \"conftest$ac_exeext\" 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | ${FGREP-fgrep} libgpm.`" + test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown +@@ -7365,7 +7360,7 @@ + fi + + fi +-echo "$as_me:7368: result: $cf_cv_gpm_soname" >&5 ++echo "$as_me:7363: result: $cf_cv_gpm_soname" >&5 + echo "${ECHO_T}$cf_cv_gpm_soname" >&6 + + fi +@@ -7433,7 +7428,7 @@ + #define HAVE_LIBGPM 1 + EOF + +-echo "$as_me:7436: checking for Gpm_Wgetch in -lgpm" >&5 ++echo "$as_me:7431: checking for Gpm_Wgetch in -lgpm" >&5 + echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6 + if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7441,7 +7436,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7444 "configure" ++#line 7439 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -7460,16 +7455,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7463: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7458: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7466: \$? = $ac_status" >&5 ++ echo "$as_me:7461: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7469: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7464: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7472: \$? = $ac_status" >&5 ++ echo "$as_me:7467: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gpm_Gpm_Wgetch=yes + else +@@ -7480,11 +7475,11 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:7483: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5 ++echo "$as_me:7478: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5 + echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6 + if test "$ac_cv_lib_gpm_Gpm_Wgetch" = yes; then + +-echo "$as_me:7487: checking if GPM is weakly bound to curses library" >&5 ++echo "$as_me:7482: checking if GPM is weakly bound to curses library" >&5 + echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6 + if test "${cf_cv_check_gpm_wgetch+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7508,15 +7503,15 @@ + # to rely on the static library, noting that some packagers may not + # include it. + LIBS="-static -lgpm -dynamic $LIBS" +- if { (eval echo "$as_me:7511: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:7506: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7514: \$? = $ac_status" >&5 ++ echo "$as_me:7509: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then +- if { (eval echo "$as_me:7516: \"$ac_link\"") >&5 ++ if { (eval echo "$as_me:7511: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7519: \$? = $ac_status" >&5 ++ echo "$as_me:7514: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then + cf_cv_check_gpm_wgetch="`nm \"conftest$ac_exeext\" | ${EGREP-egrep} '\' | ${EGREP-egrep} '\<[vVwW]\>'`" + test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes +@@ -7528,11 +7523,11 @@ + fi + + fi +-echo "$as_me:7531: result: $cf_cv_check_gpm_wgetch" >&5 ++echo "$as_me:7526: result: $cf_cv_check_gpm_wgetch" >&5 + echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6 + + if test "$cf_cv_check_gpm_wgetch" != yes ; then +- { echo "$as_me:7535: WARNING: GPM library is already linked with curses - read the FAQ" >&5 ++ { echo "$as_me:7530: WARNING: GPM library is already linked with curses - read the FAQ" >&5 + echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;} + fi + +@@ -7540,7 +7535,7 @@ + + fi + +-echo "$as_me:7543: checking if you want to use PCRE2 for regular-expressions" >&5 ++echo "$as_me:7538: checking if you want to use PCRE2 for regular-expressions" >&5 + echo $ECHO_N "checking if you want to use PCRE2 for regular-expressions... $ECHO_C" >&6 + + # Check whether --with-pcre2 or --without-pcre2 was given. +@@ -7549,7 +7544,7 @@ + + fi; + test -z "$with_pcre2" && with_pcre2=no +-echo "$as_me:7552: result: $with_pcre2" >&5 ++echo "$as_me:7547: result: $with_pcre2" >&5 + echo "${ECHO_T}$with_pcre2" >&6 + + if test "x$with_pcre2" != xno ; then +@@ -7560,17 +7555,17 @@ + if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then + test -n "$verbose" && echo " found package $cf_with_pcre2" 1>&6 + +-echo "${as_me:-configure}:7563: testing found package $cf_with_pcre2 ..." 1>&5 ++echo "${as_me:-configure}:7558: testing found package $cf_with_pcre2 ..." 1>&5 + + cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_with_pcre2" 2>/dev/null`" + cf_pkgconfig_libs="`$PKG_CONFIG --libs "$cf_with_pcre2" 2>/dev/null`" + test -n "$verbose" && echo " package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs" 1>&6 + +-echo "${as_me:-configure}:7569: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 ++echo "${as_me:-configure}:7564: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 + + test -n "$verbose" && echo " package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs" 1>&6 + +-echo "${as_me:-configure}:7573: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5 ++echo "${as_me:-configure}:7568: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5 + + cf_fix_cppflags=no + cf_new_cflags= +@@ -7694,7 +7689,7 @@ + fi + + done +- cf_with_pcre2_ok=yes || { { echo "$as_me:7697: error: Cannot find PCRE2 library" >&5 ++ cf_with_pcre2_ok=yes || { { echo "$as_me:7692: error: Cannot find PCRE2 library" >&5 + echo "$as_me: error: Cannot find PCRE2 library" >&2;} + { (exit 1); exit 1; }; } + +@@ -7707,7 +7702,7 @@ + (*pcre2-posix*|*pcreposix*) + ;; + (*) +- echo "$as_me:7710: checking for regcomp in -lpcre2-posix" >&5 ++ echo "$as_me:7705: checking for regcomp in -lpcre2-posix" >&5 + echo $ECHO_N "checking for regcomp in -lpcre2-posix... $ECHO_C" >&6 + if test "${ac_cv_lib_pcre2_posix_regcomp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7715,7 +7710,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lpcre2-posix $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7718 "configure" ++#line 7713 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -7734,16 +7729,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7737: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7732: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7740: \$? = $ac_status" >&5 ++ echo "$as_me:7735: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7743: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7738: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7746: \$? = $ac_status" >&5 ++ echo "$as_me:7741: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_pcre2_posix_regcomp=yes + else +@@ -7754,7 +7749,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:7757: result: $ac_cv_lib_pcre2_posix_regcomp" >&5 ++echo "$as_me:7752: result: $ac_cv_lib_pcre2_posix_regcomp" >&5 + echo "${ECHO_T}$ac_cv_lib_pcre2_posix_regcomp" >&6 + if test "$ac_cv_lib_pcre2_posix_regcomp" = yes; then + +@@ -7775,7 +7770,7 @@ + LIBS="$cf_add_libs" + + else +- echo "$as_me:7778: checking for regcomp in -lpcreposix" >&5 ++ echo "$as_me:7773: checking for regcomp in -lpcreposix" >&5 + echo $ECHO_N "checking for regcomp in -lpcreposix... $ECHO_C" >&6 + if test "${ac_cv_lib_pcreposix_regcomp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7783,7 +7778,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lpcreposix $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7786 "configure" ++#line 7781 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -7802,16 +7797,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7805: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7800: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7808: \$? = $ac_status" >&5 ++ echo "$as_me:7803: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7811: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7806: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7814: \$? = $ac_status" >&5 ++ echo "$as_me:7809: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_pcreposix_regcomp=yes + else +@@ -7822,7 +7817,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:7825: result: $ac_cv_lib_pcreposix_regcomp" >&5 ++echo "$as_me:7820: result: $ac_cv_lib_pcreposix_regcomp" >&5 + echo "${ECHO_T}$ac_cv_lib_pcreposix_regcomp" >&6 + if test "$ac_cv_lib_pcreposix_regcomp" = yes; then + +@@ -7843,7 +7838,7 @@ + LIBS="$cf_add_libs" + + else +- { { echo "$as_me:7846: error: Cannot find PCRE2 POSIX library" >&5 ++ { { echo "$as_me:7841: error: Cannot find PCRE2 POSIX library" >&5 + echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -7858,23 +7853,23 @@ + for ac_header in pcre2posix.h pcreposix.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:7861: checking for $ac_header" >&5 ++echo "$as_me:7856: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7867 "configure" ++#line 7862 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:7871: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:7866: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:7877: \$? = $ac_status" >&5 ++ echo "$as_me:7872: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -7893,7 +7888,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:7896: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:7891: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:7904: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7915 "configure" ++#line 7910 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -7943,16 +7938,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7946: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7941: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7949: \$? = $ac_status" >&5 ++ echo "$as_me:7944: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7952: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7947: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7955: \$? = $ac_status" >&5 ++ echo "$as_me:7950: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -7962,7 +7957,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:7965: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:7960: result: `eval echo '${'"$as_ac_var"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 + if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then + cat >>confdefs.h </dev/null ; then +-echo "$as_me:7979: checking if you want to use sysmouse" >&5 ++echo "$as_me:7974: checking if you want to use sysmouse" >&5 + echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6 + + # Check whether --with-sysmouse or --without-sysmouse was given. +@@ -7988,7 +7983,7 @@ + fi; + if test "$cf_with_sysmouse" != no ; then + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7991 "configure" ++#line 7986 "configure" + #include "confdefs.h" + + #include +@@ -8011,16 +8006,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:8014: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8009: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8017: \$? = $ac_status" >&5 ++ echo "$as_me:8012: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:8020: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8015: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8023: \$? = $ac_status" >&5 ++ echo "$as_me:8018: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_with_sysmouse=yes + else +@@ -8030,7 +8025,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:8033: result: $cf_with_sysmouse" >&5 ++echo "$as_me:8028: result: $cf_with_sysmouse" >&5 + echo "${ECHO_T}$cf_with_sysmouse" >&6 + test "$cf_with_sysmouse" = yes && + cat >>confdefs.h <<\EOF +@@ -8040,7 +8035,7 @@ + fi + + # pretend that ncurses==ncursesw==ncursest +-echo "$as_me:8043: checking if you want to disable library suffixes" >&5 ++echo "$as_me:8038: checking if you want to disable library suffixes" >&5 + echo $ECHO_N "checking if you want to disable library suffixes... $ECHO_C" >&6 + + # Check whether --enable-lib-suffixes or --disable-lib-suffixes was given. +@@ -8057,13 +8052,13 @@ + disable_lib_suffixes=no + + fi; +-echo "$as_me:8060: result: $disable_lib_suffixes" >&5 ++echo "$as_me:8055: result: $disable_lib_suffixes" >&5 + echo "${ECHO_T}$disable_lib_suffixes" >&6 + + ### If we're building with rpath, try to link non-standard libs that way too. + if test "$DFT_LWR_MODEL" = "shared" && test "x$cf_cv_enable_rpath" != xno; then + +-echo "$as_me:8066: checking if rpath-hack should be disabled" >&5 ++echo "$as_me:8061: checking if rpath-hack should be disabled" >&5 + echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6 + + # Check whether --enable-rpath-hack or --disable-rpath-hack was given. +@@ -8081,22 +8076,22 @@ + + fi; + if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi +-echo "$as_me:8084: result: $cf_disable_rpath_hack" >&5 ++echo "$as_me:8079: result: $cf_disable_rpath_hack" >&5 + echo "${ECHO_T}$cf_disable_rpath_hack" >&6 + + if test "$enable_rpath_hack" = yes ; then + +-echo "$as_me:8089: checking for updated LDFLAGS" >&5 ++echo "$as_me:8084: checking for updated LDFLAGS" >&5 + echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6 + if test -n "$LD_RPATH_OPT" ; then +- echo "$as_me:8092: result: maybe" >&5 ++ echo "$as_me:8087: result: maybe" >&5 + echo "${ECHO_T}maybe" >&6 + + for ac_prog in ldd + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:8099: checking for $ac_word" >&5 ++echo "$as_me:8094: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8111,7 +8106,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_cf_ldd_prog="$ac_prog" +-echo "$as_me:8114: found $ac_dir/$ac_word" >&5 ++echo "$as_me:8109: found $ac_dir/$ac_word" >&5 + break + done + +@@ -8119,10 +8114,10 @@ + fi + cf_ldd_prog=$ac_cv_prog_cf_ldd_prog + if test -n "$cf_ldd_prog"; then +- echo "$as_me:8122: result: $cf_ldd_prog" >&5 ++ echo "$as_me:8117: result: $cf_ldd_prog" >&5 + echo "${ECHO_T}$cf_ldd_prog" >&6 + else +- echo "$as_me:8125: result: no" >&5 ++ echo "$as_me:8120: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -8136,7 +8131,7 @@ + cf_rpath_oops= + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8139 "configure" ++#line 8134 "configure" + #include "confdefs.h" + #include + int +@@ -8148,16 +8143,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:8151: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8146: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8154: \$? = $ac_status" >&5 ++ echo "$as_me:8149: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:8157: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8152: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8160: \$? = $ac_status" >&5 ++ echo "$as_me:8155: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq` + cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq` +@@ -8185,7 +8180,7 @@ + then + test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6 + +-echo "${as_me:-configure}:8188: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 ++echo "${as_me:-configure}:8183: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 + + LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" + break +@@ -8197,11 +8192,11 @@ + + test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:8200: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:8195: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:8204: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:8199: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 + + cf_rpath_dst= + for cf_rpath_src in $LDFLAGS +@@ -8238,7 +8233,7 @@ + then + test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 + +-echo "${as_me:-configure}:8241: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 ++echo "${as_me:-configure}:8236: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 + + EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" + fi +@@ -8251,11 +8246,11 @@ + + test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:8254: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:8249: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 + +-echo "${as_me:-configure}:8258: testing ...checking LIBS $LIBS ..." 1>&5 ++echo "${as_me:-configure}:8253: testing ...checking LIBS $LIBS ..." 1>&5 + + cf_rpath_dst= + for cf_rpath_src in $LIBS +@@ -8292,7 +8287,7 @@ + then + test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 + +-echo "${as_me:-configure}:8295: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 ++echo "${as_me:-configure}:8290: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 + + EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" + fi +@@ -8305,14 +8300,14 @@ + + test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 + +-echo "${as_me:-configure}:8308: testing ...checked LIBS $LIBS ..." 1>&5 ++echo "${as_me:-configure}:8303: testing ...checked LIBS $LIBS ..." 1>&5 + + test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:8312: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:8307: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 + + else +- echo "$as_me:8315: result: no" >&5 ++ echo "$as_me:8310: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -8326,7 +8321,7 @@ + EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS" + if test -n "$EXTRA_PKG_LDFLAGS" + then +- echo "$as_me:8329: checking if you want to disable extra LDFLAGS for package-scripts" >&5 ++ echo "$as_me:8324: checking if you want to disable extra LDFLAGS for package-scripts" >&5 + echo $ECHO_N "checking if you want to disable extra LDFLAGS for package-scripts... $ECHO_C" >&6 + + # Check whether --enable-pkg-ldflags or --disable-pkg-ldflags was given. +@@ -8343,7 +8338,7 @@ + disable_pkg_ldflags=no + + fi; +- echo "$as_me:8346: result: $disable_pkg_ldflags" >&5 ++ echo "$as_me:8341: result: $disable_pkg_ldflags" >&5 + echo "${ECHO_T}$disable_pkg_ldflags" >&6 + test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS= + fi +@@ -8351,7 +8346,7 @@ + ############################################################################### + + ### use option --with-extra-suffix to append suffix to headers and libraries +-echo "$as_me:8354: checking if you wish to append extra suffix to header/library paths" >&5 ++echo "$as_me:8349: checking if you wish to append extra suffix to header/library paths" >&5 + echo $ECHO_N "checking if you wish to append extra suffix to header/library paths... $ECHO_C" >&6 + EXTRA_SUFFIX= + +@@ -8370,11 +8365,11 @@ + esac + + fi; +-echo "$as_me:8373: result: $EXTRA_SUFFIX" >&5 ++echo "$as_me:8368: result: $EXTRA_SUFFIX" >&5 + echo "${ECHO_T}$EXTRA_SUFFIX" >&6 + + ### use option --disable-overwrite to leave out the link to -lcurses +-echo "$as_me:8377: checking if you wish to install ncurses overwriting curses" >&5 ++echo "$as_me:8372: checking if you wish to install ncurses overwriting curses" >&5 + echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6 + + # Check whether --enable-overwrite or --disable-overwrite was given. +@@ -8384,10 +8379,10 @@ + else + if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi + fi; +-echo "$as_me:8387: result: $with_overwrite" >&5 ++echo "$as_me:8382: result: $with_overwrite" >&5 + echo "${ECHO_T}$with_overwrite" >&6 + +-echo "$as_me:8390: checking if external terminfo-database is used" >&5 ++echo "$as_me:8385: checking if external terminfo-database is used" >&5 + echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6 + + # Check whether --enable-database or --disable-database was given. +@@ -8397,7 +8392,7 @@ + else + use_database=yes + fi; +-echo "$as_me:8400: result: $use_database" >&5 ++echo "$as_me:8395: result: $use_database" >&5 + echo "${ECHO_T}$use_database" >&6 + + case "$host_os" in +@@ -8413,7 +8408,7 @@ + if test "$use_database" != no ; then + NCURSES_USE_DATABASE=1 + +- echo "$as_me:8416: checking which terminfo source-file will be installed" >&5 ++ echo "$as_me:8411: checking which terminfo source-file will be installed" >&5 + echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6 + + # Check whether --with-database or --without-database was given. +@@ -8421,10 +8416,10 @@ + withval="$with_database" + TERMINFO_SRC=$withval + fi; +- echo "$as_me:8424: result: $TERMINFO_SRC" >&5 ++ echo "$as_me:8419: result: $TERMINFO_SRC" >&5 + echo "${ECHO_T}$TERMINFO_SRC" >&6 + +- echo "$as_me:8427: checking whether to use hashed database instead of directory/tree" >&5 ++ echo "$as_me:8422: checking whether to use hashed database instead of directory/tree" >&5 + echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6 + + # Check whether --with-hashed-db or --without-hashed-db was given. +@@ -8434,13 +8429,13 @@ + else + with_hashed_db=no + fi; +- echo "$as_me:8437: result: $with_hashed_db" >&5 ++ echo "$as_me:8432: result: $with_hashed_db" >&5 + echo "${ECHO_T}$with_hashed_db" >&6 + else + with_hashed_db=no + fi + +-echo "$as_me:8443: checking for list of fallback descriptions" >&5 ++echo "$as_me:8438: checking for list of fallback descriptions" >&5 + echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6 + + # Check whether --with-fallbacks or --without-fallbacks was given. +@@ -8450,7 +8445,7 @@ + else + with_fallback= + fi; +-echo "$as_me:8453: result: $with_fallback" >&5 ++echo "$as_me:8448: result: $with_fallback" >&5 + echo "${ECHO_T}$with_fallback" >&6 + + case ".$with_fallback" in +@@ -8458,7 +8453,7 @@ + FALLBACK_LIST= + ;; + (.yes) +- { echo "$as_me:8461: WARNING: expected a list of terminal descriptions" >&5 ++ { echo "$as_me:8456: WARNING: expected a list of terminal descriptions" >&5 + echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;} + ;; + (*) +@@ -8474,7 +8469,7 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}tic", so it can be a program name with args. + set dummy ${ac_tool_prefix}tic; ac_word=$2 +-echo "$as_me:8477: checking for $ac_word" >&5 ++echo "$as_me:8472: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_TIC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8489,7 +8484,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_TIC="${ac_tool_prefix}tic" +-echo "$as_me:8492: found $ac_dir/$ac_word" >&5 ++echo "$as_me:8487: found $ac_dir/$ac_word" >&5 + break + done + +@@ -8497,10 +8492,10 @@ + fi + TIC=$ac_cv_prog_TIC + if test -n "$TIC"; then +- echo "$as_me:8500: result: $TIC" >&5 ++ echo "$as_me:8495: result: $TIC" >&5 + echo "${ECHO_T}$TIC" >&6 + else +- echo "$as_me:8503: result: no" >&5 ++ echo "$as_me:8498: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -8509,7 +8504,7 @@ + ac_ct_TIC=$TIC + # Extract the first word of "tic", so it can be a program name with args. + set dummy tic; ac_word=$2 +-echo "$as_me:8512: checking for $ac_word" >&5 ++echo "$as_me:8507: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_TIC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8524,7 +8519,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_TIC="tic" +-echo "$as_me:8527: found $ac_dir/$ac_word" >&5 ++echo "$as_me:8522: found $ac_dir/$ac_word" >&5 + break + done + +@@ -8532,10 +8527,10 @@ + fi + ac_ct_TIC=$ac_cv_prog_ac_ct_TIC + if test -n "$ac_ct_TIC"; then +- echo "$as_me:8535: result: $ac_ct_TIC" >&5 ++ echo "$as_me:8530: result: $ac_ct_TIC" >&5 + echo "${ECHO_T}$ac_ct_TIC" >&6 + else +- echo "$as_me:8538: result: no" >&5 ++ echo "$as_me:8533: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -8547,7 +8542,7 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}infocmp", so it can be a program name with args. + set dummy ${ac_tool_prefix}infocmp; ac_word=$2 +-echo "$as_me:8550: checking for $ac_word" >&5 ++echo "$as_me:8545: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_INFOCMP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8562,7 +8557,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_INFOCMP="${ac_tool_prefix}infocmp" +-echo "$as_me:8565: found $ac_dir/$ac_word" >&5 ++echo "$as_me:8560: found $ac_dir/$ac_word" >&5 + break + done + +@@ -8570,10 +8565,10 @@ + fi + INFOCMP=$ac_cv_prog_INFOCMP + if test -n "$INFOCMP"; then +- echo "$as_me:8573: result: $INFOCMP" >&5 ++ echo "$as_me:8568: result: $INFOCMP" >&5 + echo "${ECHO_T}$INFOCMP" >&6 + else +- echo "$as_me:8576: result: no" >&5 ++ echo "$as_me:8571: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -8582,7 +8577,7 @@ + ac_ct_INFOCMP=$INFOCMP + # Extract the first word of "infocmp", so it can be a program name with args. + set dummy infocmp; ac_word=$2 +-echo "$as_me:8585: checking for $ac_word" >&5 ++echo "$as_me:8580: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_INFOCMP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8597,7 +8592,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_INFOCMP="infocmp" +-echo "$as_me:8600: found $ac_dir/$ac_word" >&5 ++echo "$as_me:8595: found $ac_dir/$ac_word" >&5 + break + done + +@@ -8605,10 +8600,10 @@ + fi + ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP + if test -n "$ac_ct_INFOCMP"; then +- echo "$as_me:8608: result: $ac_ct_INFOCMP" >&5 ++ echo "$as_me:8603: result: $ac_ct_INFOCMP" >&5 + echo "${ECHO_T}$ac_ct_INFOCMP" >&6 + else +- echo "$as_me:8611: result: no" >&5 ++ echo "$as_me:8606: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -8623,10 +8618,10 @@ + # Check whether --with-tic-path or --without-tic-path was given. + if test "${with_tic_path+set}" = set; then + withval="$with_tic_path" +- echo "$as_me:8626: checking for tic program for fallbacks" >&5 ++ echo "$as_me:8621: checking for tic program for fallbacks" >&5 + echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6 + TIC=$withval +- echo "$as_me:8629: result: $TIC" >&5 ++ echo "$as_me:8624: result: $TIC" >&5 + echo "${ECHO_T}$TIC" >&6 + + if test "x$prefix" != xNONE; then +@@ -8654,7 +8649,7 @@ + TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:8657: error: expected a pathname, not \"$TIC\"" >&5 ++ { { echo "$as_me:8652: error: expected a pathname, not \"$TIC\"" >&5 + echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -8667,7 +8662,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:8670: checking for $ac_word" >&5 ++echo "$as_me:8665: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_TIC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8684,7 +8679,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_TIC="$ac_dir/$ac_word" +- echo "$as_me:8687: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:8682: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -8695,10 +8690,10 @@ + TIC=$ac_cv_path_TIC + + if test -n "$TIC"; then +- echo "$as_me:8698: result: $TIC" >&5 ++ echo "$as_me:8693: result: $TIC" >&5 + echo "${ECHO_T}$TIC" >&6 + else +- echo "$as_me:8701: result: no" >&5 ++ echo "$as_me:8696: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -8757,7 +8752,7 @@ + + if test -n "$cf_path_prog" ; then + +-echo "${as_me:-configure}:8760: testing defining path for ${cf_path_prog} ..." 1>&5 ++echo "${as_me:-configure}:8755: testing defining path for ${cf_path_prog} ..." 1>&5 + + cat >>confdefs.h <&5 ++ { echo "$as_me:8770: WARNING: no tic program found for fallbacks" >&5 + echo "$as_me: WARNING: no tic program found for fallbacks" >&2;} + fi + +@@ -8781,10 +8776,10 @@ + # Check whether --with-infocmp-path or --without-infocmp-path was given. + if test "${with_infocmp_path+set}" = set; then + withval="$with_infocmp_path" +- echo "$as_me:8784: checking for infocmp program for fallbacks" >&5 ++ echo "$as_me:8779: checking for infocmp program for fallbacks" >&5 + echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6 + INFOCMP=$withval +- echo "$as_me:8787: result: $INFOCMP" >&5 ++ echo "$as_me:8782: result: $INFOCMP" >&5 + echo "${ECHO_T}$INFOCMP" >&6 + + if test "x$prefix" != xNONE; then +@@ -8812,7 +8807,7 @@ + INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:8815: error: expected a pathname, not \"$INFOCMP\"" >&5 ++ { { echo "$as_me:8810: error: expected a pathname, not \"$INFOCMP\"" >&5 + echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -8825,7 +8820,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:8828: checking for $ac_word" >&5 ++echo "$as_me:8823: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_INFOCMP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8842,7 +8837,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_INFOCMP="$ac_dir/$ac_word" +- echo "$as_me:8845: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:8840: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -8853,10 +8848,10 @@ + INFOCMP=$ac_cv_path_INFOCMP + + if test -n "$INFOCMP"; then +- echo "$as_me:8856: result: $INFOCMP" >&5 ++ echo "$as_me:8851: result: $INFOCMP" >&5 + echo "${ECHO_T}$INFOCMP" >&6 + else +- echo "$as_me:8859: result: no" >&5 ++ echo "$as_me:8854: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -8915,7 +8910,7 @@ + + if test -n "$cf_path_prog" ; then + +-echo "${as_me:-configure}:8918: testing defining path for ${cf_path_prog} ..." 1>&5 ++echo "${as_me:-configure}:8913: testing defining path for ${cf_path_prog} ..." 1>&5 + + cat >>confdefs.h <&5 ++ { echo "$as_me:8928: WARNING: no infocmp program found for fallbacks" >&5 + echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;} + fi + +@@ -8940,7 +8935,7 @@ + test -z "$INFOCMP" && FALLBACK_LIST= + if test -z "$FALLBACK_LIST" + then +- { echo "$as_me:8943: WARNING: ignoring fallback option because tic/infocmp are not available" >&5 ++ { echo "$as_me:8938: WARNING: ignoring fallback option because tic/infocmp are not available" >&5 + echo "$as_me: WARNING: ignoring fallback option because tic/infocmp are not available" >&2;} + fi + fi +@@ -8948,7 +8943,7 @@ + USE_FALLBACKS= + test -z "$FALLBACK_LIST" && USE_FALLBACKS="#" + +-echo "$as_me:8951: checking if you want modern xterm or antique" >&5 ++echo "$as_me:8946: checking if you want modern xterm or antique" >&5 + echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6 + + # Check whether --with-xterm-new or --without-xterm-new was given. +@@ -8962,11 +8957,11 @@ + (no) with_xterm_new=xterm-old;; + (*) with_xterm_new=xterm-new;; + esac +-echo "$as_me:8965: result: $with_xterm_new" >&5 ++echo "$as_me:8960: result: $with_xterm_new" >&5 + echo "${ECHO_T}$with_xterm_new" >&6 + WHICH_XTERM=$with_xterm_new + +-echo "$as_me:8969: checking if xterm backspace sends BS or DEL" >&5 ++echo "$as_me:8964: checking if xterm backspace sends BS or DEL" >&5 + echo $ECHO_N "checking if xterm backspace sends BS or DEL... $ECHO_C" >&6 + + # Check whether --with-xterm-kbs or --without-xterm-kbs was given. +@@ -8987,7 +8982,7 @@ + with_xterm_kbs=$withval + ;; + esac +-echo "$as_me:8990: result: $with_xterm_kbs" >&5 ++echo "$as_me:8985: result: $with_xterm_kbs" >&5 + echo "${ECHO_T}$with_xterm_kbs" >&6 + XTERM_KBS=$with_xterm_kbs + +@@ -8997,7 +8992,7 @@ + MAKE_TERMINFO="#" + else + +-echo "$as_me:9000: checking for list of terminfo directories" >&5 ++echo "$as_me:8995: checking for list of terminfo directories" >&5 + echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6 + + # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given. +@@ -9037,7 +9032,7 @@ + cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:9040: error: expected a pathname, not \"$cf_src_path\"" >&5 ++ { { echo "$as_me:9035: error: expected a pathname, not \"$cf_src_path\"" >&5 + echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -9060,7 +9055,7 @@ + ;; + esac + +-echo "$as_me:9063: result: $TERMINFO_DIRS" >&5 ++echo "$as_me:9058: result: $TERMINFO_DIRS" >&5 + echo "${ECHO_T}$TERMINFO_DIRS" >&6 + test -n "$TERMINFO_DIRS" && + cat >>confdefs.h <&5 ++ { echo "$as_me:9067: WARNING: ignoring non-directory/file TERMINFO value" >&5 + echo "$as_me: WARNING: ignoring non-directory/file TERMINFO value" >&2;} + unset TERMINFO + ;; + esac + +-echo "$as_me:9078: checking for default terminfo directory" >&5 ++echo "$as_me:9073: checking for default terminfo directory" >&5 + echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6 + + # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given. +@@ -9111,7 +9106,7 @@ + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:9114: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:9109: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -9120,7 +9115,7 @@ + fi + eval TERMINFO="$withval" + +-echo "$as_me:9123: result: $TERMINFO" >&5 ++echo "$as_me:9118: result: $TERMINFO" >&5 + echo "${ECHO_T}$TERMINFO" >&6 + + cat >>confdefs.h <&5 ++echo "$as_me:9129: checking if big-core option selected" >&5 + echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6 + + # Check whether --enable-big-core or --disable-big-core was given. +@@ -9143,7 +9138,7 @@ + with_big_core=no + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9146 "configure" ++#line 9141 "configure" + #include "confdefs.h" + + #include +@@ -9157,15 +9152,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:9160: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9155: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9163: \$? = $ac_status" >&5 ++ echo "$as_me:9158: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:9165: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9160: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9168: \$? = $ac_status" >&5 ++ echo "$as_me:9163: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + with_big_core=yes + else +@@ -9177,7 +9172,7 @@ + rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" + fi + fi; +-echo "$as_me:9180: result: $with_big_core" >&5 ++echo "$as_me:9175: result: $with_big_core" >&5 + echo "${ECHO_T}$with_big_core" >&6 + test "x$with_big_core" = "xyes" && + cat >>confdefs.h <<\EOF +@@ -9187,7 +9182,7 @@ + ### ISO C only guarantees 512-char strings, we have tables which load faster + ### when constructed using "big" strings. More than the C compiler, the awk + ### program is a limit on most vendor UNIX systems. Check that we can build. +-echo "$as_me:9190: checking if big-strings option selected" >&5 ++echo "$as_me:9185: checking if big-strings option selected" >&5 + echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6 + + # Check whether --enable-big-strings or --disable-big-strings was given. +@@ -9211,14 +9206,14 @@ + esac + + fi; +-echo "$as_me:9214: result: $with_big_strings" >&5 ++echo "$as_me:9209: result: $with_big_strings" >&5 + echo "${ECHO_T}$with_big_strings" >&6 + + USE_BIG_STRINGS=0 + test "x$with_big_strings" = "xyes" && USE_BIG_STRINGS=1 + + ### use option --enable-termcap to compile in the termcap fallback support +-echo "$as_me:9221: checking if you want termcap-fallback support" >&5 ++echo "$as_me:9216: checking if you want termcap-fallback support" >&5 + echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6 + + # Check whether --enable-termcap or --disable-termcap was given. +@@ -9228,14 +9223,14 @@ + else + with_termcap=no + fi; +-echo "$as_me:9231: result: $with_termcap" >&5 ++echo "$as_me:9226: result: $with_termcap" >&5 + echo "${ECHO_T}$with_termcap" >&6 + + NCURSES_USE_TERMCAP=0 + if test "x$with_termcap" != "xyes" ; then + if test "$use_database" = no ; then + if test -z "$with_fallback" ; then +- { { echo "$as_me:9238: error: You have disabled the database w/o specifying fallbacks" >&5 ++ { { echo "$as_me:9233: error: You have disabled the database w/o specifying fallbacks" >&5 + echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -9248,13 +9243,13 @@ + else + + if test "$with_ticlib" != no ; then +- { { echo "$as_me:9251: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5 ++ { { echo "$as_me:9246: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5 + echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;} + { (exit 1); exit 1; }; } + fi + + NCURSES_USE_TERMCAP=1 +- echo "$as_me:9257: checking for list of termcap files" >&5 ++ echo "$as_me:9252: checking for list of termcap files" >&5 + echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6 + + # Check whether --with-termpath or --without-termpath was given. +@@ -9294,7 +9289,7 @@ + cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:9297: error: expected a pathname, not \"$cf_src_path\"" >&5 ++ { { echo "$as_me:9292: error: expected a pathname, not \"$cf_src_path\"" >&5 + echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -9317,7 +9312,7 @@ + ;; + esac + +- echo "$as_me:9320: result: $TERMPATH" >&5 ++ echo "$as_me:9315: result: $TERMPATH" >&5 + echo "${ECHO_T}$TERMPATH" >&6 + test -n "$TERMPATH" && + cat >>confdefs.h <&5 ++ echo "$as_me:9323: checking if fast termcap-loader is needed" >&5 + echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6 + + # Check whether --enable-getcap or --disable-getcap was given. +@@ -9335,14 +9330,14 @@ + else + with_getcap=no + fi; +- echo "$as_me:9338: result: $with_getcap" >&5 ++ echo "$as_me:9333: result: $with_getcap" >&5 + echo "${ECHO_T}$with_getcap" >&6 + test "x$with_getcap" = "xyes" && + cat >>confdefs.h <<\EOF + #define USE_GETCAP 1 + EOF + +- echo "$as_me:9345: checking if translated termcaps will be cached in ~/.terminfo" >&5 ++ echo "$as_me:9340: checking if translated termcaps will be cached in ~/.terminfo" >&5 + echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6 + + # Check whether --enable-getcap-cache or --disable-getcap-cache was given. +@@ -9352,7 +9347,7 @@ + else + with_getcap_cache=no + fi; +- echo "$as_me:9355: result: $with_getcap_cache" >&5 ++ echo "$as_me:9350: result: $with_getcap_cache" >&5 + echo "${ECHO_T}$with_getcap_cache" >&6 + test "x$with_getcap_cache" = "xyes" && + cat >>confdefs.h <<\EOF +@@ -9362,7 +9357,7 @@ + fi + + ### Use option --disable-home-terminfo to completely remove ~/.terminfo +-echo "$as_me:9365: checking if ~/.terminfo is wanted" >&5 ++echo "$as_me:9360: checking if ~/.terminfo is wanted" >&5 + echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6 + + # Check whether --enable-home-terminfo or --disable-home-terminfo was given. +@@ -9372,14 +9367,14 @@ + else + with_home_terminfo=yes + fi; +-echo "$as_me:9375: result: $with_home_terminfo" >&5 ++echo "$as_me:9370: result: $with_home_terminfo" >&5 + echo "${ECHO_T}$with_home_terminfo" >&6 + test "x$with_home_terminfo" = "xyes" && + cat >>confdefs.h <<\EOF + #define USE_HOME_TERMINFO 1 + EOF + +-echo "$as_me:9382: checking if you want to permit root to use ncurses environment variables" >&5 ++echo "$as_me:9377: checking if you want to permit root to use ncurses environment variables" >&5 + echo $ECHO_N "checking if you want to permit root to use ncurses environment variables... $ECHO_C" >&6 + + # Check whether --enable-root-environ or --disable-root-environ was given. +@@ -9389,14 +9384,14 @@ + else + with_root_environ=yes + fi; +-echo "$as_me:9392: result: $with_root_environ" >&5 ++echo "$as_me:9387: result: $with_root_environ" >&5 + echo "${ECHO_T}$with_root_environ" >&6 + test "x$with_root_environ" = xyes && + cat >>confdefs.h <<\EOF + #define USE_ROOT_ENVIRON 1 + EOF + +-echo "$as_me:9399: checking if you want to permit setuid programs to access all files" >&5 ++echo "$as_me:9394: checking if you want to permit setuid programs to access all files" >&5 + echo $ECHO_N "checking if you want to permit setuid programs to access all files... $ECHO_C" >&6 + + # Check whether --enable-root-environ or --disable-root-environ was given. +@@ -9406,7 +9401,7 @@ + else + with_root_access=yes + fi; +-echo "$as_me:9409: result: $with_root_access" >&5 ++echo "$as_me:9404: result: $with_root_access" >&5 + echo "${ECHO_T}$with_root_access" >&6 + test "x$with_root_access" = xyes && + cat >>confdefs.h <<\EOF +@@ -9421,23 +9416,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:9424: checking for $ac_header" >&5 ++echo "$as_me:9419: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9430 "configure" ++#line 9425 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:9434: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:9429: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:9440: \$? = $ac_status" >&5 ++ echo "$as_me:9435: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -9456,7 +9451,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:9459: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:9454: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:9469: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9480 "configure" ++#line 9475 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -9508,16 +9503,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:9511: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9506: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9514: \$? = $ac_status" >&5 ++ echo "$as_me:9509: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:9517: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9512: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9520: \$? = $ac_status" >&5 ++ echo "$as_me:9515: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -9527,7 +9522,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:9530: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:9525: result: `eval echo '${'"$as_ac_var"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 + if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:9542: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9553 "configure" ++#line 9548 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -9581,16 +9576,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:9584: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9579: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9587: \$? = $ac_status" >&5 ++ echo "$as_me:9582: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:9590: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9585: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9593: \$? = $ac_status" >&5 ++ echo "$as_me:9588: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -9600,7 +9595,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:9603: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:9598: result: `eval echo '${'"$as_ac_var"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 + if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then + cat >>confdefs.h <&5 ++ echo "$as_me:9609: checking if link/symlink functions work" >&5 + echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6 + if test "${cf_cv_link_funcs+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -9624,7 +9619,7 @@ + eval 'ac_cv_func_'$cf_func'=error' + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9627 "configure" ++#line 9622 "configure" + #include "confdefs.h" + + #include +@@ -9662,15 +9657,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:9665: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9660: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9668: \$? = $ac_status" >&5 ++ echo "$as_me:9663: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:9670: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9665: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9673: \$? = $ac_status" >&5 ++ echo "$as_me:9668: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_link_funcs="$cf_cv_link_funcs $cf_func" +@@ -9688,7 +9683,7 @@ + test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no + + fi +-echo "$as_me:9691: result: $cf_cv_link_funcs" >&5 ++echo "$as_me:9686: result: $cf_cv_link_funcs" >&5 + echo "${ECHO_T}$cf_cv_link_funcs" >&6 + test "$ac_cv_func_link" = yes && + cat >>confdefs.h <<\EOF +@@ -9708,7 +9703,7 @@ + # soft links (symbolic links) are useful for some systems where hard links do + # not work, or to make it simpler to copy terminfo trees around. + if test "x$ac_cv_func_symlink" = xyes ; then +- echo "$as_me:9711: checking if tic should use symbolic links" >&5 ++ echo "$as_me:9706: checking if tic should use symbolic links" >&5 + echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6 + + # Check whether --enable-symlinks or --disable-symlinks was given. +@@ -9718,21 +9713,21 @@ + else + with_symlinks=no + fi; +- echo "$as_me:9721: result: $with_symlinks" >&5 ++ echo "$as_me:9716: result: $with_symlinks" >&5 + echo "${ECHO_T}$with_symlinks" >&6 + fi + + # If we have hard links and did not choose to use soft links instead, there is + # no reason to make this choice optional - use the hard links. + if test "$with_symlinks" = no ; then +- echo "$as_me:9728: checking if tic should use hard links" >&5 ++ echo "$as_me:9723: checking if tic should use hard links" >&5 + echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6 + if test "x$ac_cv_func_link" = xyes ; then + with_links=yes + else + with_links=no + fi +- echo "$as_me:9735: result: $with_links" >&5 ++ echo "$as_me:9730: result: $with_links" >&5 + echo "${ECHO_T}$with_links" >&6 + fi + +@@ -9748,7 +9743,7 @@ + + ### use option --enable-broken-linker to force on use of broken-linker support + +-echo "$as_me:9751: checking if you want broken-linker support code" >&5 ++echo "$as_me:9746: checking if you want broken-linker support code" >&5 + echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6 + + # Check whether --enable-broken_linker or --disable-broken_linker was given. +@@ -9758,7 +9753,7 @@ + else + with_broken_linker=no + fi; +-echo "$as_me:9761: result: $with_broken_linker" >&5 ++echo "$as_me:9756: result: $with_broken_linker" >&5 + echo "${ECHO_T}$with_broken_linker" >&6 + + : "${BROKEN_LINKER:=0}" +@@ -9772,7 +9767,7 @@ + fi + + ### use option --enable-bsdpad to have tputs process BSD-style prefix padding +-echo "$as_me:9775: checking if tputs should process BSD-style prefix padding" >&5 ++echo "$as_me:9770: checking if tputs should process BSD-style prefix padding" >&5 + echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6 + + # Check whether --enable-bsdpad or --disable-bsdpad was given. +@@ -9782,7 +9777,7 @@ + else + with_bsdpad=no + fi; +-echo "$as_me:9785: result: $with_bsdpad" >&5 ++echo "$as_me:9780: result: $with_bsdpad" >&5 + echo "${ECHO_T}$with_bsdpad" >&6 + test "x$with_bsdpad" = xyes && + cat >>confdefs.h <<\EOF +@@ -9801,14 +9796,14 @@ + # Check to define _XOPEN_SOURCE "automatically" + CPPFLAGS_before_XOPEN="$CPPFLAGS" + +-echo "$as_me:9804: checking if the POSIX test-macros are already defined" >&5 ++echo "$as_me:9799: checking if the POSIX test-macros are already defined" >&5 + echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6 + if test "${cf_cv_posix_visible+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9811 "configure" ++#line 9806 "configure" + #include "confdefs.h" + #include + int +@@ -9827,16 +9822,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:9830: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9825: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9833: \$? = $ac_status" >&5 ++ echo "$as_me:9828: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:9836: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9831: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9839: \$? = $ac_status" >&5 ++ echo "$as_me:9834: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_posix_visible=no + else +@@ -9847,7 +9842,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:9850: result: $cf_cv_posix_visible" >&5 ++echo "$as_me:9845: result: $cf_cv_posix_visible" >&5 + echo "${ECHO_T}$cf_cv_posix_visible" >&6 + + if test "$cf_cv_posix_visible" = no; then +@@ -9892,14 +9887,14 @@ + + cf_gnu_xopen_source=$cf_XOPEN_SOURCE + +-echo "$as_me:9895: checking if this is the GNU C library" >&5 ++echo "$as_me:9890: checking if this is the GNU C library" >&5 + echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6 + if test "${cf_cv_gnu_library+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9902 "configure" ++#line 9897 "configure" + #include "confdefs.h" + #include + int +@@ -9918,16 +9913,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:9921: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9916: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9924: \$? = $ac_status" >&5 ++ echo "$as_me:9919: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:9927: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9922: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9930: \$? = $ac_status" >&5 ++ echo "$as_me:9925: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_library=yes + else +@@ -9938,7 +9933,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:9941: result: $cf_cv_gnu_library" >&5 ++echo "$as_me:9936: result: $cf_cv_gnu_library" >&5 + echo "${ECHO_T}$cf_cv_gnu_library" >&6 + + if test x$cf_cv_gnu_library = xyes; then +@@ -9946,7 +9941,7 @@ + # With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE + # was changed to help a little. newlib incorporated the change about 4 + # years later. +- echo "$as_me:9949: checking if _DEFAULT_SOURCE can be used as a basis" >&5 ++ echo "$as_me:9944: checking if _DEFAULT_SOURCE can be used as a basis" >&5 + echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6 + if test "${cf_cv_gnu_library_219+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -9958,7 +9953,7 @@ + CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9961 "configure" ++#line 9956 "configure" + #include "confdefs.h" + #include + int +@@ -9977,16 +9972,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:9980: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9975: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9983: \$? = $ac_status" >&5 ++ echo "$as_me:9978: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:9986: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9981: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9989: \$? = $ac_status" >&5 ++ echo "$as_me:9984: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_library_219=yes + else +@@ -9998,12 +9993,12 @@ + CPPFLAGS="$cf_save" + + fi +-echo "$as_me:10001: result: $cf_cv_gnu_library_219" >&5 ++echo "$as_me:9996: result: $cf_cv_gnu_library_219" >&5 + echo "${ECHO_T}$cf_cv_gnu_library_219" >&6 + + if test "x$cf_cv_gnu_library_219" = xyes; then + cf_save="$CPPFLAGS" +- echo "$as_me:10006: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 ++ echo "$as_me:10001: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 + echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_gnu_dftsrc_219+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10108,7 +10103,7 @@ + fi + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10111 "configure" ++#line 10106 "configure" + #include "confdefs.h" + + #include +@@ -10128,16 +10123,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10131: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10126: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10134: \$? = $ac_status" >&5 ++ echo "$as_me:10129: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10137: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10132: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10140: \$? = $ac_status" >&5 ++ echo "$as_me:10135: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_dftsrc_219=yes + else +@@ -10148,7 +10143,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:10151: result: $cf_cv_gnu_dftsrc_219" >&5 ++echo "$as_me:10146: result: $cf_cv_gnu_dftsrc_219" >&5 + echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6 + test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save" + else +@@ -10157,14 +10152,14 @@ + + if test "x$cf_cv_gnu_dftsrc_219" != xyes; then + +- echo "$as_me:10160: checking if we must define _GNU_SOURCE" >&5 ++ echo "$as_me:10155: checking if we must define _GNU_SOURCE" >&5 + echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_gnu_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10167 "configure" ++#line 10162 "configure" + #include "confdefs.h" + #include + int +@@ -10179,16 +10174,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10182: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10177: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10185: \$? = $ac_status" >&5 ++ echo "$as_me:10180: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10188: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10183: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10191: \$? = $ac_status" >&5 ++ echo "$as_me:10186: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_source=no + else +@@ -10295,7 +10290,7 @@ + fi + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10298 "configure" ++#line 10293 "configure" + #include "confdefs.h" + #include + int +@@ -10310,16 +10305,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10313: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10308: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10316: \$? = $ac_status" >&5 ++ echo "$as_me:10311: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10319: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10314: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10322: \$? = $ac_status" >&5 ++ echo "$as_me:10317: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_source=no + else +@@ -10334,12 +10329,12 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:10337: result: $cf_cv_gnu_source" >&5 ++echo "$as_me:10332: result: $cf_cv_gnu_source" >&5 + echo "${ECHO_T}$cf_cv_gnu_source" >&6 + + if test "$cf_cv_gnu_source" = yes + then +- echo "$as_me:10342: checking if we should also define _DEFAULT_SOURCE" >&5 ++ echo "$as_me:10337: checking if we should also define _DEFAULT_SOURCE" >&5 + echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_default_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10349,7 +10344,7 @@ + CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10352 "configure" ++#line 10347 "configure" + #include "confdefs.h" + #include + int +@@ -10364,16 +10359,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10367: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10362: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10370: \$? = $ac_status" >&5 ++ echo "$as_me:10365: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10373: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10368: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10376: \$? = $ac_status" >&5 ++ echo "$as_me:10371: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_default_source=no + else +@@ -10384,7 +10379,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:10387: result: $cf_cv_default_source" >&5 ++echo "$as_me:10382: result: $cf_cv_default_source" >&5 + echo "${ECHO_T}$cf_cv_default_source" >&6 + if test "$cf_cv_default_source" = yes + then +@@ -10421,16 +10416,16 @@ + sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` + +-echo "$as_me:10424: checking if we should define _POSIX_C_SOURCE" >&5 ++echo "$as_me:10419: checking if we should define _POSIX_C_SOURCE" >&5 + echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_posix_c_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + +-echo "${as_me:-configure}:10430: testing if the symbol is already defined go no further ..." 1>&5 ++echo "${as_me:-configure}:10425: testing if the symbol is already defined go no further ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10433 "configure" ++#line 10428 "configure" + #include "confdefs.h" + #include + int +@@ -10445,16 +10440,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10448: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10443: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10451: \$? = $ac_status" >&5 ++ echo "$as_me:10446: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10454: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10449: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10457: \$? = $ac_status" >&5 ++ echo "$as_me:10452: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_posix_c_source=no + else +@@ -10475,7 +10470,7 @@ + esac + if test "$cf_want_posix_source" = yes ; then + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10478 "configure" ++#line 10473 "configure" + #include "confdefs.h" + #include + int +@@ -10490,16 +10485,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10493: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10488: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10496: \$? = $ac_status" >&5 ++ echo "$as_me:10491: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10499: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10494: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10502: \$? = $ac_status" >&5 ++ echo "$as_me:10497: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -10510,7 +10505,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi + +-echo "${as_me:-configure}:10513: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 ++echo "${as_me:-configure}:10508: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 + + CFLAGS="$cf_trim_CFLAGS" + CPPFLAGS="$cf_trim_CPPFLAGS" +@@ -10518,10 +10513,10 @@ + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" + +-echo "${as_me:-configure}:10521: testing if the second compile does not leave our definition intact error ..." 1>&5 ++echo "${as_me:-configure}:10516: testing if the second compile does not leave our definition intact error ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10524 "configure" ++#line 10519 "configure" + #include "confdefs.h" + #include + int +@@ -10536,16 +10531,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10539: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10534: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10542: \$? = $ac_status" >&5 ++ echo "$as_me:10537: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10545: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10540: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10548: \$? = $ac_status" >&5 ++ echo "$as_me:10543: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -10561,7 +10556,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:10564: result: $cf_cv_posix_c_source" >&5 ++echo "$as_me:10559: result: $cf_cv_posix_c_source" >&5 + echo "${ECHO_T}$cf_cv_posix_c_source" >&6 + + if test "$cf_cv_posix_c_source" != no ; then +@@ -10678,7 +10673,7 @@ + # OpenBSD 6.x has broken locale support, both compile-time and runtime. + # see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html + # Abusing the conformance level is a workaround. +- { echo "$as_me:10681: WARNING: this system does not provide usable locale support" >&5 ++ { echo "$as_me:10676: WARNING: this system does not provide usable locale support" >&5 + echo "$as_me: WARNING: this system does not provide usable locale support" >&2;} + cf_xopen_source="-D_BSD_SOURCE" + cf_XOPEN_SOURCE=700 +@@ -10710,14 +10705,14 @@ + ;; + (*) + +-echo "$as_me:10713: checking if we should define _XOPEN_SOURCE" >&5 ++echo "$as_me:10708: checking if we should define _XOPEN_SOURCE" >&5 + echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_xopen_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10720 "configure" ++#line 10715 "configure" + #include "confdefs.h" + + #include +@@ -10736,16 +10731,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10739: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10734: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10742: \$? = $ac_status" >&5 ++ echo "$as_me:10737: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10745: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10740: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10748: \$? = $ac_status" >&5 ++ echo "$as_me:10743: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_xopen_source=no + else +@@ -10757,7 +10752,7 @@ + CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10760 "configure" ++#line 10755 "configure" + #include "confdefs.h" + + #include +@@ -10776,16 +10771,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10779: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10774: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10782: \$? = $ac_status" >&5 ++ echo "$as_me:10777: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10785: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10780: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10788: \$? = $ac_status" >&5 ++ echo "$as_me:10783: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_xopen_source=no + else +@@ -10800,7 +10795,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:10803: result: $cf_cv_xopen_source" >&5 ++echo "$as_me:10798: result: $cf_cv_xopen_source" >&5 + echo "${ECHO_T}$cf_cv_xopen_source" >&6 + + if test "$cf_cv_xopen_source" != no ; then +@@ -10958,16 +10953,16 @@ + sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` + +-echo "$as_me:10961: checking if we should define _POSIX_C_SOURCE" >&5 ++echo "$as_me:10956: checking if we should define _POSIX_C_SOURCE" >&5 + echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_posix_c_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + +-echo "${as_me:-configure}:10967: testing if the symbol is already defined go no further ..." 1>&5 ++echo "${as_me:-configure}:10962: testing if the symbol is already defined go no further ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10970 "configure" ++#line 10965 "configure" + #include "confdefs.h" + #include + int +@@ -10982,16 +10977,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10985: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10980: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10988: \$? = $ac_status" >&5 ++ echo "$as_me:10983: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10991: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10986: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10994: \$? = $ac_status" >&5 ++ echo "$as_me:10989: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_posix_c_source=no + else +@@ -11012,7 +11007,7 @@ + esac + if test "$cf_want_posix_source" = yes ; then + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11015 "configure" ++#line 11010 "configure" + #include "confdefs.h" + #include + int +@@ -11027,16 +11022,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11030: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11025: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11033: \$? = $ac_status" >&5 ++ echo "$as_me:11028: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11036: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11031: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11039: \$? = $ac_status" >&5 ++ echo "$as_me:11034: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -11047,7 +11042,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi + +-echo "${as_me:-configure}:11050: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 ++echo "${as_me:-configure}:11045: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 + + CFLAGS="$cf_trim_CFLAGS" + CPPFLAGS="$cf_trim_CPPFLAGS" +@@ -11055,10 +11050,10 @@ + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" + +-echo "${as_me:-configure}:11058: testing if the second compile does not leave our definition intact error ..." 1>&5 ++echo "${as_me:-configure}:11053: testing if the second compile does not leave our definition intact error ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11061 "configure" ++#line 11056 "configure" + #include "confdefs.h" + #include + int +@@ -11073,16 +11068,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11076: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11071: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11079: \$? = $ac_status" >&5 ++ echo "$as_me:11074: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11082: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11077: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11085: \$? = $ac_status" >&5 ++ echo "$as_me:11080: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -11098,7 +11093,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:11101: result: $cf_cv_posix_c_source" >&5 ++echo "$as_me:11096: result: $cf_cv_posix_c_source" >&5 + echo "${ECHO_T}$cf_cv_posix_c_source" >&6 + + if test "$cf_cv_posix_c_source" != no ; then +@@ -11224,7 +11219,7 @@ + test "$CFLAGS" != "$cf_old_cflag" || break + test -n "$verbose" && echo " removing old option $cf_add_cflags from CFLAGS" 1>&6 + +-echo "${as_me:-configure}:11227: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:11222: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5 + + CFLAGS="$cf_old_cflag" + done +@@ -11236,7 +11231,7 @@ + test "$CPPFLAGS" != "$cf_old_cflag" || break + test -n "$verbose" && echo " removing old option $cf_add_cflags from CPPFLAGS" 1>&6 + +-echo "${as_me:-configure}:11239: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5 ++echo "${as_me:-configure}:11234: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5 + + CPPFLAGS="$cf_old_cflag" + done +@@ -11324,7 +11319,7 @@ + if test -n "$cf_new_cflags" ; then + test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 + +-echo "${as_me:-configure}:11327: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 ++echo "${as_me:-configure}:11322: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" +@@ -11334,7 +11329,7 @@ + if test -n "$cf_new_cppflags" ; then + test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 + +-echo "${as_me:-configure}:11337: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 ++echo "${as_me:-configure}:11332: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" +@@ -11344,7 +11339,7 @@ + if test -n "$cf_new_extra_cppflags" ; then + test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 + +-echo "${as_me:-configure}:11347: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 ++echo "${as_me:-configure}:11342: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 + + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" +@@ -11356,10 +11351,10 @@ + fi + + if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then +- echo "$as_me:11359: checking if _XOPEN_SOURCE really is set" >&5 ++ echo "$as_me:11354: checking if _XOPEN_SOURCE really is set" >&5 + echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11362 "configure" ++#line 11357 "configure" + #include "confdefs.h" + #include + int +@@ -11374,16 +11369,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11377: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11372: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11380: \$? = $ac_status" >&5 ++ echo "$as_me:11375: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11383: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11378: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11386: \$? = $ac_status" >&5 ++ echo "$as_me:11381: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_XOPEN_SOURCE_set=yes + else +@@ -11392,12 +11387,12 @@ + cf_XOPEN_SOURCE_set=no + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +- echo "$as_me:11395: result: $cf_XOPEN_SOURCE_set" >&5 ++ echo "$as_me:11390: result: $cf_XOPEN_SOURCE_set" >&5 + echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6 + if test "$cf_XOPEN_SOURCE_set" = yes + then + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11400 "configure" ++#line 11395 "configure" + #include "confdefs.h" + #include + int +@@ -11412,16 +11407,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11415: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11410: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11418: \$? = $ac_status" >&5 ++ echo "$as_me:11413: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11421: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11416: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11424: \$? = $ac_status" >&5 ++ echo "$as_me:11419: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_XOPEN_SOURCE_set_ok=yes + else +@@ -11432,19 +11427,19 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + if test "$cf_XOPEN_SOURCE_set_ok" = no + then +- { echo "$as_me:11435: WARNING: _XOPEN_SOURCE is lower than requested" >&5 ++ { echo "$as_me:11430: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} + fi + else + +-echo "$as_me:11440: checking if we should define _XOPEN_SOURCE" >&5 ++echo "$as_me:11435: checking if we should define _XOPEN_SOURCE" >&5 + echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_xopen_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11447 "configure" ++#line 11442 "configure" + #include "confdefs.h" + + #include +@@ -11463,16 +11458,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11466: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11461: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11469: \$? = $ac_status" >&5 ++ echo "$as_me:11464: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11472: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11467: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11475: \$? = $ac_status" >&5 ++ echo "$as_me:11470: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_xopen_source=no + else +@@ -11484,7 +11479,7 @@ + CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11487 "configure" ++#line 11482 "configure" + #include "confdefs.h" + + #include +@@ -11503,16 +11498,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11506: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11501: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11509: \$? = $ac_status" >&5 ++ echo "$as_me:11504: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11512: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11507: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11515: \$? = $ac_status" >&5 ++ echo "$as_me:11510: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_xopen_source=no + else +@@ -11527,7 +11522,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:11530: result: $cf_cv_xopen_source" >&5 ++echo "$as_me:11525: result: $cf_cv_xopen_source" >&5 + echo "${ECHO_T}$cf_cv_xopen_source" >&6 + + if test "$cf_cv_xopen_source" != no ; then +@@ -11678,14 +11673,14 @@ + + # Work around breakage on OS X + +-echo "$as_me:11681: checking if SIGWINCH is defined" >&5 ++echo "$as_me:11676: checking if SIGWINCH is defined" >&5 + echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6 + if test "${cf_cv_define_sigwinch+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11688 "configure" ++#line 11683 "configure" + #include "confdefs.h" + + #include +@@ -11700,23 +11695,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11703: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11698: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11706: \$? = $ac_status" >&5 ++ echo "$as_me:11701: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11709: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11704: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11712: \$? = $ac_status" >&5 ++ echo "$as_me:11707: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_define_sigwinch=yes + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11719 "configure" ++#line 11714 "configure" + #include "confdefs.h" + + #undef _XOPEN_SOURCE +@@ -11734,16 +11729,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11737: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11732: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11740: \$? = $ac_status" >&5 ++ echo "$as_me:11735: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11743: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11738: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11746: \$? = $ac_status" >&5 ++ echo "$as_me:11741: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_define_sigwinch=maybe + else +@@ -11757,11 +11752,11 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:11760: result: $cf_cv_define_sigwinch" >&5 ++echo "$as_me:11755: result: $cf_cv_define_sigwinch" >&5 + echo "${ECHO_T}$cf_cv_define_sigwinch" >&6 + + if test "$cf_cv_define_sigwinch" = maybe ; then +-echo "$as_me:11764: checking for actual SIGWINCH definition" >&5 ++echo "$as_me:11759: checking for actual SIGWINCH definition" >&5 + echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6 + if test "${cf_cv_fixup_sigwinch+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -11772,7 +11767,7 @@ + while test "$cf_sigwinch" != 1 + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11775 "configure" ++#line 11770 "configure" + #include "confdefs.h" + + #undef _XOPEN_SOURCE +@@ -11794,16 +11789,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11797: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11792: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11800: \$? = $ac_status" >&5 ++ echo "$as_me:11795: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11803: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11798: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11806: \$? = $ac_status" >&5 ++ echo "$as_me:11801: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_fixup_sigwinch=$cf_sigwinch + break +@@ -11817,7 +11812,7 @@ + done + + fi +-echo "$as_me:11820: result: $cf_cv_fixup_sigwinch" >&5 ++echo "$as_me:11815: result: $cf_cv_fixup_sigwinch" >&5 + echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 + + if test "$cf_cv_fixup_sigwinch" != unknown ; then +@@ -11827,13 +11822,13 @@ + + # Checks for CODESET support. + +-echo "$as_me:11830: checking for nl_langinfo and CODESET" >&5 ++echo "$as_me:11825: checking for nl_langinfo and CODESET" >&5 + echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6 + if test "${am_cv_langinfo_codeset+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11836 "configure" ++#line 11831 "configure" + #include "confdefs.h" + #include + int +@@ -11845,16 +11840,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:11848: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11843: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11851: \$? = $ac_status" >&5 ++ echo "$as_me:11846: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:11854: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11849: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11857: \$? = $ac_status" >&5 ++ echo "$as_me:11852: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + am_cv_langinfo_codeset=yes + else +@@ -11865,7 +11860,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + fi +-echo "$as_me:11868: result: $am_cv_langinfo_codeset" >&5 ++echo "$as_me:11863: result: $am_cv_langinfo_codeset" >&5 + echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 + if test "$am_cv_langinfo_codeset" = yes; then + +@@ -11879,7 +11874,7 @@ + NCURSES_OK_WCHAR_T= + NCURSES_OK_WINT_T= + +-echo "$as_me:11882: checking if you want wide-character code" >&5 ++echo "$as_me:11877: checking if you want wide-character code" >&5 + echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6 + + # Check whether --enable-widec or --disable-widec was given. +@@ -11889,7 +11884,7 @@ + else + with_widec=no + fi; +-echo "$as_me:11892: result: $with_widec" >&5 ++echo "$as_me:11887: result: $with_widec" >&5 + echo "${ECHO_T}$with_widec" >&6 + + NCURSES_WCWIDTH_GRAPHICS=1 +@@ -11913,23 +11908,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:11916: checking for $ac_header" >&5 ++echo "$as_me:11911: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11922 "configure" ++#line 11917 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:11926: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:11921: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:11932: \$? = $ac_status" >&5 ++ echo "$as_me:11927: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -11948,7 +11943,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:11951: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:11946: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:11956: checking if wchar.h can be used as is" >&5 + echo $ECHO_N "checking if wchar.h can be used as is... $ECHO_C" >&6 + if test "${cf_cv_wchar_h_okay+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11968 "configure" ++#line 11963 "configure" + #include "confdefs.h" + + #include +@@ -11987,16 +11982,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11990: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11985: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11993: \$? = $ac_status" >&5 ++ echo "$as_me:11988: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11996: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11991: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11999: \$? = $ac_status" >&5 ++ echo "$as_me:11994: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_wchar_h_okay=yes + else +@@ -12006,16 +12001,16 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:12009: result: $cf_cv_wchar_h_okay" >&5 ++echo "$as_me:12004: result: $cf_cv_wchar_h_okay" >&5 + echo "${ECHO_T}$cf_cv_wchar_h_okay" >&6 + + if test "$cf_cv_wchar_h_okay" = no + then + +-echo "$as_me:12015: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 ++echo "$as_me:12010: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 + echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12018 "configure" ++#line 12013 "configure" + #include "confdefs.h" + #include + +@@ -12031,16 +12026,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12034: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12029: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12037: \$? = $ac_status" >&5 ++ echo "$as_me:12032: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12040: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12035: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12043: \$? = $ac_status" >&5 ++ echo "$as_me:12038: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_result=no + else +@@ -12049,16 +12044,16 @@ + cf_result=yes + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +-echo "$as_me:12052: result: $cf_result" >&5 ++echo "$as_me:12047: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + + if test "$cf_result" = yes ; then + CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" + elif test "x" != "x" ; then +- echo "$as_me:12058: checking checking for compatible value versus " >&5 ++ echo "$as_me:12053: checking checking for compatible value versus " >&5 + echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12061 "configure" ++#line 12056 "configure" + #include "confdefs.h" + #include + +@@ -12074,16 +12069,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12077: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12072: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12080: \$? = $ac_status" >&5 ++ echo "$as_me:12075: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12083: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12078: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12086: \$? = $ac_status" >&5 ++ echo "$as_me:12081: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_result=yes + else +@@ -12092,7 +12087,7 @@ + cf_result=no + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +- echo "$as_me:12095: result: $cf_result" >&5 ++ echo "$as_me:12090: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test "$cf_result" = no ; then + # perhaps we can override it - try... +@@ -12102,7 +12097,7 @@ + + fi + +-echo "$as_me:12105: checking if wcwidth agrees graphics are single-width" >&5 ++echo "$as_me:12100: checking if wcwidth agrees graphics are single-width" >&5 + echo $ECHO_N "checking if wcwidth agrees graphics are single-width... $ECHO_C" >&6 + if test "${cf_cv_wcwidth_graphics+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -12173,7 +12168,7 @@ + cf_cv_wcwidth_graphics=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12176 "configure" ++#line 12171 "configure" + #include "confdefs.h" + + #include +@@ -12217,15 +12212,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:12220: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12215: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12223: \$? = $ac_status" >&5 ++ echo "$as_me:12218: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:12225: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12220: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12228: \$? = $ac_status" >&5 ++ echo "$as_me:12223: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_wcwidth_graphics=yes + else +@@ -12238,7 +12233,7 @@ + fi + + fi +-echo "$as_me:12241: result: $cf_cv_wcwidth_graphics" >&5 ++echo "$as_me:12236: result: $cf_cv_wcwidth_graphics" >&5 + echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6 + + test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0 +@@ -12249,13 +12244,13 @@ + for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:12252: checking for $ac_func" >&5 ++echo "$as_me:12247: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12258 "configure" ++#line 12253 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -12286,16 +12281,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:12289: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12284: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12292: \$? = $ac_status" >&5 ++ echo "$as_me:12287: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:12295: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12290: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12298: \$? = $ac_status" >&5 ++ echo "$as_me:12293: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -12305,7 +12300,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:12308: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:12303: result: `eval echo '${'"$as_ac_var"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 + if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:12318: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12329 "configure" ++#line 12324 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:12333: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:12328: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:12339: \$? = $ac_status" >&5 ++ echo "$as_me:12334: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -12355,7 +12350,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:12358: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:12353: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:12363: checking for multibyte character support" >&5 + echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6 + if test "${cf_cv_utf8_lib+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -12373,7 +12368,7 @@ + + cf_save_LIBS="$LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12376 "configure" ++#line 12371 "configure" + #include "confdefs.h" + + #include +@@ -12391,16 +12386,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:12394: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12389: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12397: \$? = $ac_status" >&5 ++ echo "$as_me:12392: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:12400: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12395: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12403: \$? = $ac_status" >&5 ++ echo "$as_me:12398: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_utf8_lib=yes + else +@@ -12412,12 +12407,12 @@ + cf_cv_header_path_utf8= + cf_cv_library_path_utf8= + +-echo "${as_me:-configure}:12415: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:12410: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12420 "configure" ++#line 12415 "configure" + #include "confdefs.h" + + #include +@@ -12430,16 +12425,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:12433: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12428: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12436: \$? = $ac_status" >&5 ++ echo "$as_me:12431: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:12439: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12434: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12442: \$? = $ac_status" >&5 ++ echo "$as_me:12437: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_find_linkage_utf8=yes +@@ -12453,7 +12448,7 @@ + LIBS="-lutf8 $cf_save_LIBS" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12456 "configure" ++#line 12451 "configure" + #include "confdefs.h" + + #include +@@ -12466,16 +12461,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:12469: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12464: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12472: \$? = $ac_status" >&5 ++ echo "$as_me:12467: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:12475: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12470: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12478: \$? = $ac_status" >&5 ++ echo "$as_me:12473: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_find_linkage_utf8=yes +@@ -12492,9 +12487,9 @@ + + test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 + +-echo "${as_me:-configure}:12495: testing find linkage for utf8 library ..." 1>&5 ++echo "${as_me:-configure}:12490: testing find linkage for utf8 library ..." 1>&5 + +-echo "${as_me:-configure}:12497: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:12492: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_CPPFLAGS="$CPPFLAGS" + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -12585,7 +12580,7 @@ + if test -d "$cf_cv_header_path_utf8" ; then + test -n "$verbose" && echo " ... testing $cf_cv_header_path_utf8" 1>&6 + +-echo "${as_me:-configure}:12588: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:12583: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 + + CPPFLAGS="$cf_save_CPPFLAGS" + +@@ -12593,7 +12588,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12596 "configure" ++#line 12591 "configure" + #include "confdefs.h" + + #include +@@ -12606,21 +12601,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12609: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12604: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12612: \$? = $ac_status" >&5 ++ echo "$as_me:12607: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12615: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12610: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12618: \$? = $ac_status" >&5 ++ echo "$as_me:12613: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + test -n "$verbose" && echo " ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6 + +-echo "${as_me:-configure}:12623: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:12618: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 + + cf_cv_find_linkage_utf8=maybe + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -12638,7 +12633,7 @@ + + if test "$cf_cv_find_linkage_utf8" = maybe ; then + +-echo "${as_me:-configure}:12641: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:12636: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + cf_save_LDFLAGS="$LDFLAGS" +@@ -12713,13 +12708,13 @@ + if test -d "$cf_cv_library_path_utf8" ; then + test -n "$verbose" && echo " ... testing $cf_cv_library_path_utf8" 1>&6 + +-echo "${as_me:-configure}:12716: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:12711: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 + + CPPFLAGS="$cf_test_CPPFLAGS" + LIBS="-lutf8 $cf_save_LIBS" + LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12722 "configure" ++#line 12717 "configure" + #include "confdefs.h" + + #include +@@ -12732,21 +12727,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:12735: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12730: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12738: \$? = $ac_status" >&5 ++ echo "$as_me:12733: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:12741: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12736: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12744: \$? = $ac_status" >&5 ++ echo "$as_me:12739: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + test -n "$verbose" && echo " ... found utf8 library in $cf_cv_library_path_utf8" 1>&6 + +-echo "${as_me:-configure}:12749: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:12744: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 + + cf_cv_find_linkage_utf8=yes + cf_cv_library_file_utf8="-lutf8" +@@ -12788,7 +12783,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:12791: result: $cf_cv_utf8_lib" >&5 ++echo "$as_me:12786: result: $cf_cv_utf8_lib" >&5 + echo "${ECHO_T}$cf_cv_utf8_lib" >&6 + + # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between +@@ -12826,7 +12821,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12829 "configure" ++#line 12824 "configure" + #include "confdefs.h" + #include + int +@@ -12838,16 +12833,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12841: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12836: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12844: \$? = $ac_status" >&5 ++ echo "$as_me:12839: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12847: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12842: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12850: \$? = $ac_status" >&5 ++ echo "$as_me:12845: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -12864,7 +12859,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:12867: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:12862: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -12900,7 +12895,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me:-configure}:12903: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:12898: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -12932,14 +12927,14 @@ + fi + + # This is needed on Tru64 5.0 to declare mbstate_t +-echo "$as_me:12935: checking if we must include wchar.h to declare mbstate_t" >&5 ++echo "$as_me:12930: checking if we must include wchar.h to declare mbstate_t" >&5 + echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6 + if test "${cf_cv_mbstate_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12942 "configure" ++#line 12937 "configure" + #include "confdefs.h" + + #include +@@ -12957,23 +12952,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12960: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12955: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12963: \$? = $ac_status" >&5 ++ echo "$as_me:12958: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12966: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12961: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12969: \$? = $ac_status" >&5 ++ echo "$as_me:12964: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_mbstate_t=no + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12976 "configure" ++#line 12971 "configure" + #include "confdefs.h" + + #include +@@ -12992,16 +12987,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12995: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12990: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12998: \$? = $ac_status" >&5 ++ echo "$as_me:12993: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13001: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12996: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13004: \$? = $ac_status" >&5 ++ echo "$as_me:12999: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_mbstate_t=yes + else +@@ -13013,7 +13008,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:13016: result: $cf_cv_mbstate_t" >&5 ++echo "$as_me:13011: result: $cf_cv_mbstate_t" >&5 + echo "${ECHO_T}$cf_cv_mbstate_t" >&6 + + if test "$cf_cv_mbstate_t" = yes ; then +@@ -13031,14 +13026,14 @@ + fi + + # This is needed on Tru64 5.0 to declare wchar_t +-echo "$as_me:13034: checking if we must include wchar.h to declare wchar_t" >&5 ++echo "$as_me:13029: checking if we must include wchar.h to declare wchar_t" >&5 + echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6 + if test "${cf_cv_wchar_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13041 "configure" ++#line 13036 "configure" + #include "confdefs.h" + + #include +@@ -13056,23 +13051,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13059: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13054: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13062: \$? = $ac_status" >&5 ++ echo "$as_me:13057: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13065: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13060: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13068: \$? = $ac_status" >&5 ++ echo "$as_me:13063: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_wchar_t=no + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13075 "configure" ++#line 13070 "configure" + #include "confdefs.h" + + #include +@@ -13091,16 +13086,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13094: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13089: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13097: \$? = $ac_status" >&5 ++ echo "$as_me:13092: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13100: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13095: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13103: \$? = $ac_status" >&5 ++ echo "$as_me:13098: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_wchar_t=yes + else +@@ -13112,7 +13107,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:13115: result: $cf_cv_wchar_t" >&5 ++echo "$as_me:13110: result: $cf_cv_wchar_t" >&5 + echo "${ECHO_T}$cf_cv_wchar_t" >&6 + + if test "$cf_cv_wchar_t" = yes ; then +@@ -13135,14 +13130,14 @@ + fi + + # This is needed on Tru64 5.0 to declare wint_t +-echo "$as_me:13138: checking if we must include wchar.h to declare wint_t" >&5 ++echo "$as_me:13133: checking if we must include wchar.h to declare wint_t" >&5 + echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6 + if test "${cf_cv_wint_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13145 "configure" ++#line 13140 "configure" + #include "confdefs.h" + + #include +@@ -13160,23 +13155,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13163: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13158: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13166: \$? = $ac_status" >&5 ++ echo "$as_me:13161: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13169: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13164: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13172: \$? = $ac_status" >&5 ++ echo "$as_me:13167: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_wint_t=no + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13179 "configure" ++#line 13174 "configure" + #include "confdefs.h" + + #include +@@ -13195,16 +13190,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13198: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13193: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13201: \$? = $ac_status" >&5 ++ echo "$as_me:13196: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13204: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13199: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13207: \$? = $ac_status" >&5 ++ echo "$as_me:13202: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_wint_t=yes + else +@@ -13216,7 +13211,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:13219: result: $cf_cv_wint_t" >&5 ++echo "$as_me:13214: result: $cf_cv_wint_t" >&5 + echo "${ECHO_T}$cf_cv_wint_t" >&6 + + if test "$cf_cv_wint_t" = yes ; then +@@ -13248,7 +13243,7 @@ + fi + + ### use option --disable-lp64 to allow long chtype +-echo "$as_me:13251: checking whether to enable _LP64 definition in curses.h" >&5 ++echo "$as_me:13246: checking whether to enable _LP64 definition in curses.h" >&5 + echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6 + + # Check whether --enable-lp64 or --disable-lp64 was given. +@@ -13258,7 +13253,7 @@ + else + with_lp64=$cf_dft_with_lp64 + fi; +-echo "$as_me:13261: result: $with_lp64" >&5 ++echo "$as_me:13256: result: $with_lp64" >&5 + echo "${ECHO_T}$with_lp64" >&6 + + if test "x$with_lp64" = xyes ; then +@@ -13274,7 +13269,7 @@ + fi; + if test "$enable_largefile" != no; then + +- echo "$as_me:13277: checking for special C compiler options needed for large files" >&5 ++ echo "$as_me:13272: checking for special C compiler options needed for large files" >&5 + echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 + if test "${ac_cv_sys_largefile_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -13286,7 +13281,7 @@ + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13289 "configure" ++#line 13284 "configure" + #include "confdefs.h" + #include + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -13306,16 +13301,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13309: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13304: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13312: \$? = $ac_status" >&5 ++ echo "$as_me:13307: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13315: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13310: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13318: \$? = $ac_status" >&5 ++ echo "$as_me:13313: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -13325,16 +13320,16 @@ + rm -f "conftest.$ac_objext" + CC="$CC -n32" + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13328: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13323: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13331: \$? = $ac_status" >&5 ++ echo "$as_me:13326: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13334: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13329: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13337: \$? = $ac_status" >&5 ++ echo "$as_me:13332: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sys_largefile_CC=' -n32'; break + else +@@ -13348,13 +13343,13 @@ + rm -f "conftest.$ac_ext" + fi + fi +-echo "$as_me:13351: result: $ac_cv_sys_largefile_CC" >&5 ++echo "$as_me:13346: result: $ac_cv_sys_largefile_CC" >&5 + echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 + if test "$ac_cv_sys_largefile_CC" != no; then + CC=$CC$ac_cv_sys_largefile_CC + fi + +- echo "$as_me:13357: checking for _FILE_OFFSET_BITS value needed for large files" >&5 ++ echo "$as_me:13352: checking for _FILE_OFFSET_BITS value needed for large files" >&5 + echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 + if test "${ac_cv_sys_file_offset_bits+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -13362,7 +13357,7 @@ + while :; do + ac_cv_sys_file_offset_bits=no + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13365 "configure" ++#line 13360 "configure" + #include "confdefs.h" + #include + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -13382,16 +13377,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13385: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13380: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13388: \$? = $ac_status" >&5 ++ echo "$as_me:13383: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13391: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13386: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13394: \$? = $ac_status" >&5 ++ echo "$as_me:13389: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -13400,7 +13395,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13403 "configure" ++#line 13398 "configure" + #include "confdefs.h" + #define _FILE_OFFSET_BITS 64 + #include +@@ -13421,16 +13416,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13424: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13419: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13427: \$? = $ac_status" >&5 ++ echo "$as_me:13422: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13430: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13425: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13433: \$? = $ac_status" >&5 ++ echo "$as_me:13428: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sys_file_offset_bits=64; break + else +@@ -13441,7 +13436,7 @@ + break + done + fi +-echo "$as_me:13444: result: $ac_cv_sys_file_offset_bits" >&5 ++echo "$as_me:13439: result: $ac_cv_sys_file_offset_bits" >&5 + echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 + if test "$ac_cv_sys_file_offset_bits" != no; then + +@@ -13451,7 +13446,7 @@ + + fi + rm -rf conftest* +- echo "$as_me:13454: checking for _LARGE_FILES value needed for large files" >&5 ++ echo "$as_me:13449: checking for _LARGE_FILES value needed for large files" >&5 + echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 + if test "${ac_cv_sys_large_files+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -13459,7 +13454,7 @@ + while :; do + ac_cv_sys_large_files=no + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13462 "configure" ++#line 13457 "configure" + #include "confdefs.h" + #include + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -13479,16 +13474,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13482: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13477: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13485: \$? = $ac_status" >&5 ++ echo "$as_me:13480: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13488: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13483: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13491: \$? = $ac_status" >&5 ++ echo "$as_me:13486: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -13497,7 +13492,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13500 "configure" ++#line 13495 "configure" + #include "confdefs.h" + #define _LARGE_FILES 1 + #include +@@ -13518,16 +13513,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13521: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13516: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13524: \$? = $ac_status" >&5 ++ echo "$as_me:13519: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13527: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13522: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13530: \$? = $ac_status" >&5 ++ echo "$as_me:13525: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sys_large_files=1; break + else +@@ -13538,7 +13533,7 @@ + break + done + fi +-echo "$as_me:13541: result: $ac_cv_sys_large_files" >&5 ++echo "$as_me:13536: result: $ac_cv_sys_large_files" >&5 + echo "${ECHO_T}$ac_cv_sys_large_files" >&6 + if test "$ac_cv_sys_large_files" != no; then + +@@ -13551,7 +13546,7 @@ + fi + + if test "$enable_largefile" != no ; then +- echo "$as_me:13554: checking for _LARGEFILE_SOURCE value needed for large files" >&5 ++ echo "$as_me:13549: checking for _LARGEFILE_SOURCE value needed for large files" >&5 + echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6 + if test "${ac_cv_sys_largefile_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -13559,7 +13554,7 @@ + while :; do + ac_cv_sys_largefile_source=no + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13562 "configure" ++#line 13557 "configure" + #include "confdefs.h" + #include + int +@@ -13571,16 +13566,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13574: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13569: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13577: \$? = $ac_status" >&5 ++ echo "$as_me:13572: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13580: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13575: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13583: \$? = $ac_status" >&5 ++ echo "$as_me:13578: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -13589,7 +13584,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13592 "configure" ++#line 13587 "configure" + #include "confdefs.h" + #define _LARGEFILE_SOURCE 1 + #include +@@ -13602,16 +13597,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13605: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13600: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13608: \$? = $ac_status" >&5 ++ echo "$as_me:13603: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13611: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13606: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13614: \$? = $ac_status" >&5 ++ echo "$as_me:13609: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sys_largefile_source=1; break + else +@@ -13622,7 +13617,7 @@ + break + done + fi +-echo "$as_me:13625: result: $ac_cv_sys_largefile_source" >&5 ++echo "$as_me:13620: result: $ac_cv_sys_largefile_source" >&5 + echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6 + if test "$ac_cv_sys_largefile_source" != no; then + +@@ -13636,13 +13631,13 @@ + # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug + # in glibc 2.1.3, but that breaks too many other things. + # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. +-echo "$as_me:13639: checking for fseeko" >&5 ++echo "$as_me:13634: checking for fseeko" >&5 + echo $ECHO_N "checking for fseeko... $ECHO_C" >&6 + if test "${ac_cv_func_fseeko+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13645 "configure" ++#line 13640 "configure" + #include "confdefs.h" + #include + int +@@ -13654,16 +13649,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:13657: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:13652: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:13660: \$? = $ac_status" >&5 ++ echo "$as_me:13655: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:13663: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13658: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13666: \$? = $ac_status" >&5 ++ echo "$as_me:13661: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_fseeko=yes + else +@@ -13673,7 +13668,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:13676: result: $ac_cv_func_fseeko" >&5 ++echo "$as_me:13671: result: $ac_cv_func_fseeko" >&5 + echo "${ECHO_T}$ac_cv_func_fseeko" >&6 + if test $ac_cv_func_fseeko = yes; then + +@@ -13712,14 +13707,14 @@ + + fi + +- echo "$as_me:13715: checking whether to use struct dirent64" >&5 ++ echo "$as_me:13710: checking whether to use struct dirent64" >&5 + echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6 + if test "${cf_cv_struct_dirent64+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13722 "configure" ++#line 13717 "configure" + #include "confdefs.h" + + #pragma GCC diagnostic error "-Wincompatible-pointer-types" +@@ -13742,16 +13737,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13745: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13740: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13748: \$? = $ac_status" >&5 ++ echo "$as_me:13743: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13751: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13746: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13754: \$? = $ac_status" >&5 ++ echo "$as_me:13749: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_struct_dirent64=yes + else +@@ -13762,7 +13757,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:13765: result: $cf_cv_struct_dirent64" >&5 ++echo "$as_me:13760: result: $cf_cv_struct_dirent64" >&5 + echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 + test "$cf_cv_struct_dirent64" = yes && + cat >>confdefs.h <<\EOF +@@ -13772,7 +13767,7 @@ + fi + + ### use option --disable-tparm-varargs to make tparm() conform to X/Open +-echo "$as_me:13775: checking if you want tparm not to use X/Open fixed-parameter list" >&5 ++echo "$as_me:13770: checking if you want tparm not to use X/Open fixed-parameter list" >&5 + echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6 + + # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given. +@@ -13782,14 +13777,14 @@ + else + with_tparm_varargs=yes + fi; +-echo "$as_me:13785: result: $with_tparm_varargs" >&5 ++echo "$as_me:13780: result: $with_tparm_varargs" >&5 + echo "${ECHO_T}$with_tparm_varargs" >&6 + NCURSES_TPARM_VARARGS=0 + test "x$with_tparm_varargs" = xyes && NCURSES_TPARM_VARARGS=1 + + ### use option --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw + if test "$with_ticlib" != no ; then +-echo "$as_me:13792: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5 ++echo "$as_me:13787: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5 + echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6 + + # Check whether --enable-tic-depends or --disable-tic-depends was given. +@@ -13799,14 +13794,14 @@ + else + with_tic_depends=yes + fi; +-echo "$as_me:13802: result: $with_tic_depends" >&5 ++echo "$as_me:13797: result: $with_tic_depends" >&5 + echo "${ECHO_T}$with_tic_depends" >&6 + else + with_tic_depends=no + fi + + ### use option --enable-wattr-macros to enable wattr* macros in curses.h +-echo "$as_me:13809: checking if you want to enable wattr* macros" >&5 ++echo "$as_me:13804: checking if you want to enable wattr* macros" >&5 + echo $ECHO_N "checking if you want to enable wattr* macros... $ECHO_C" >&6 + + # Check whether --enable-wattr-macros or --disable-wattr-macros was given. +@@ -13818,15 +13813,15 @@ + fi; + if [ "x$with_wattr_macros" != xyes ]; then + NCURSES_WATTR_MACROS=0 +- echo "$as_me:13821: result: no" >&5 ++ echo "$as_me:13816: result: no" >&5 + echo "${ECHO_T}no" >&6 + else + NCURSES_WATTR_MACROS=1 +- echo "$as_me:13825: result: yes" >&5 ++ echo "$as_me:13820: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + fi + +-echo "$as_me:13829: checking for X11 rgb file" >&5 ++echo "$as_me:13824: checking for X11 rgb file" >&5 + echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6 + + # Check whether --with-x11-rgb or --without-x11-rgb was given. +@@ -13890,7 +13885,7 @@ + cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:13893: error: expected a pathname, not \"$cf_path\"" >&5 ++ { { echo "$as_me:13888: error: expected a pathname, not \"$cf_path\"" >&5 + echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -13898,7 +13893,7 @@ + + fi + +-echo "$as_me:13901: result: $RGB_PATH" >&5 ++echo "$as_me:13896: result: $RGB_PATH" >&5 + echo "${ECHO_T}$RGB_PATH" >&6 + + cat >>confdefs.h <&5 ++echo "$as_me:13910: checking for type of bool" >&5 + echo $ECHO_N "checking for type of bool... $ECHO_C" >&6 + + # Check whether --with-bool or --without-bool was given. +@@ -13922,10 +13917,10 @@ + else + NCURSES_BOOL=auto + fi; +-echo "$as_me:13925: result: $NCURSES_BOOL" >&5 ++echo "$as_me:13920: result: $NCURSES_BOOL" >&5 + echo "${ECHO_T}$NCURSES_BOOL" >&6 + +-echo "$as_me:13928: checking for alternate terminal capabilities file" >&5 ++echo "$as_me:13923: checking for alternate terminal capabilities file" >&5 + echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6 + + # Check whether --with-caps or --without-caps was given. +@@ -13936,11 +13931,11 @@ + TERMINFO_CAPS=Caps + fi; + test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps +-echo "$as_me:13939: result: $TERMINFO_CAPS" >&5 ++echo "$as_me:13934: result: $TERMINFO_CAPS" >&5 + echo "${ECHO_T}$TERMINFO_CAPS" >&6 + + ### use option --with-chtype to override chtype's type +-echo "$as_me:13943: checking for type of chtype" >&5 ++echo "$as_me:13938: checking for type of chtype" >&5 + echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 + + # Check whether --with-chtype or --without-chtype was given. +@@ -13950,11 +13945,11 @@ + else + NCURSES_CHTYPE=$cf_dft_chtype + fi; +-echo "$as_me:13953: result: $NCURSES_CHTYPE" >&5 ++echo "$as_me:13948: result: $NCURSES_CHTYPE" >&5 + echo "${ECHO_T}$NCURSES_CHTYPE" >&6 + + ### use option --with-ospeed to override ospeed's type +-echo "$as_me:13957: checking for type of ospeed" >&5 ++echo "$as_me:13952: checking for type of ospeed" >&5 + echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6 + + # Check whether --with-ospeed or --without-ospeed was given. +@@ -13964,11 +13959,11 @@ + else + NCURSES_OSPEED=short + fi; +-echo "$as_me:13967: result: $NCURSES_OSPEED" >&5 ++echo "$as_me:13962: result: $NCURSES_OSPEED" >&5 + echo "${ECHO_T}$NCURSES_OSPEED" >&6 + + ### use option --with-mmask-t to override mmask_t's type +-echo "$as_me:13971: checking for type of mmask_t" >&5 ++echo "$as_me:13966: checking for type of mmask_t" >&5 + echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6 + + # Check whether --with-mmask-t or --without-mmask-t was given. +@@ -13978,11 +13973,11 @@ + else + NCURSES_MMASK_T=$cf_dft_mmask_t + fi; +-echo "$as_me:13981: result: $NCURSES_MMASK_T" >&5 ++echo "$as_me:13976: result: $NCURSES_MMASK_T" >&5 + echo "${ECHO_T}$NCURSES_MMASK_T" >&6 + + ### use option --with-ccharw-max to override CCHARW_MAX size +-echo "$as_me:13985: checking for size CCHARW_MAX" >&5 ++echo "$as_me:13980: checking for size CCHARW_MAX" >&5 + echo $ECHO_N "checking for size CCHARW_MAX... $ECHO_C" >&6 + + # Check whether --with-ccharw-max or --without-ccharw-max was given. +@@ -13992,16 +13987,16 @@ + else + NCURSES_CCHARW_MAX=5 + fi; +-echo "$as_me:13995: result: $NCURSES_CCHARW_MAX" >&5 ++echo "$as_me:13990: result: $NCURSES_CCHARW_MAX" >&5 + echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6 + +-echo "$as_me:13998: checking for ANSI C header files" >&5 ++echo "$as_me:13993: checking for ANSI C header files" >&5 + echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 + if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14004 "configure" ++#line 13999 "configure" + #include "confdefs.h" + #include + #include +@@ -14009,13 +14004,13 @@ + #include + + _ACEOF +-if { (eval echo "$as_me:14012: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:14007: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:14018: \$? = $ac_status" >&5 ++ echo "$as_me:14013: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -14037,7 +14032,7 @@ + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14040 "configure" ++#line 14035 "configure" + #include "confdefs.h" + #include + +@@ -14055,7 +14050,7 @@ + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14058 "configure" ++#line 14053 "configure" + #include "confdefs.h" + #include + +@@ -14076,7 +14071,7 @@ + : + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14079 "configure" ++#line 14074 "configure" + #include "confdefs.h" + #include + #if ((' ' & 0x0FF) == 0x020) +@@ -14102,15 +14097,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:14105: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14100: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14108: \$? = $ac_status" >&5 ++ echo "$as_me:14103: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:14110: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14105: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14113: \$? = $ac_status" >&5 ++ echo "$as_me:14108: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -14123,7 +14118,7 @@ + fi + fi + fi +-echo "$as_me:14126: result: $ac_cv_header_stdc" >&5 ++echo "$as_me:14121: result: $ac_cv_header_stdc" >&5 + echo "${ECHO_T}$ac_cv_header_stdc" >&6 + if test $ac_cv_header_stdc = yes; then + +@@ -14139,28 +14134,28 @@ + inttypes.h stdint.h unistd.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:14142: checking for $ac_header" >&5 ++echo "$as_me:14137: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14148 "configure" ++#line 14143 "configure" + #include "confdefs.h" + $ac_includes_default + #include <$ac_header> + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14154: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14149: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14157: \$? = $ac_status" >&5 ++ echo "$as_me:14152: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14160: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14155: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14163: \$? = $ac_status" >&5 ++ echo "$as_me:14158: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_Header=yes" + else +@@ -14170,7 +14165,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:14173: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:14168: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:14178: checking for signed char" >&5 + echo $ECHO_N "checking for signed char... $ECHO_C" >&6 + if test "${ac_cv_type_signed_char+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14189 "configure" ++#line 14184 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -14201,16 +14196,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14204: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14199: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14207: \$? = $ac_status" >&5 ++ echo "$as_me:14202: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14210: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14205: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14213: \$? = $ac_status" >&5 ++ echo "$as_me:14208: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_signed_char=yes + else +@@ -14220,10 +14215,10 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:14223: result: $ac_cv_type_signed_char" >&5 ++echo "$as_me:14218: result: $ac_cv_type_signed_char" >&5 + echo "${ECHO_T}$ac_cv_type_signed_char" >&6 + +-echo "$as_me:14226: checking size of signed char" >&5 ++echo "$as_me:14221: checking size of signed char" >&5 + echo $ECHO_N "checking size of signed char... $ECHO_C" >&6 + if test "${ac_cv_sizeof_signed_char+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -14232,7 +14227,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14235 "configure" ++#line 14230 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -14244,21 +14239,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14247: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14242: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14250: \$? = $ac_status" >&5 ++ echo "$as_me:14245: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14253: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14248: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14256: \$? = $ac_status" >&5 ++ echo "$as_me:14251: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14261 "configure" ++#line 14256 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -14270,16 +14265,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14273: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14268: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14276: \$? = $ac_status" >&5 ++ echo "$as_me:14271: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14279: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14274: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14282: \$? = $ac_status" >&5 ++ echo "$as_me:14277: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid; break + else +@@ -14295,7 +14290,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14298 "configure" ++#line 14293 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -14307,16 +14302,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14310: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14305: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14313: \$? = $ac_status" >&5 ++ echo "$as_me:14308: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14316: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14311: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14319: \$? = $ac_status" >&5 ++ echo "$as_me:14314: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=$ac_mid; break + else +@@ -14332,7 +14327,7 @@ + while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14335 "configure" ++#line 14330 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -14344,16 +14339,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14347: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14342: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14350: \$? = $ac_status" >&5 ++ echo "$as_me:14345: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14353: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14348: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14356: \$? = $ac_status" >&5 ++ echo "$as_me:14351: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid + else +@@ -14366,12 +14361,12 @@ + ac_cv_sizeof_signed_char=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:14369: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:14364: error: cannot run test program while cross compiling" >&5 + echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14374 "configure" ++#line 14369 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -14387,15 +14382,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:14390: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14385: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14393: \$? = $ac_status" >&5 ++ echo "$as_me:14388: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:14395: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14390: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14398: \$? = $ac_status" >&5 ++ echo "$as_me:14393: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sizeof_signed_char=`cat conftest.val` + else +@@ -14411,7 +14406,7 @@ + ac_cv_sizeof_signed_char=0 + fi + fi +-echo "$as_me:14414: result: $ac_cv_sizeof_signed_char" >&5 ++echo "$as_me:14409: result: $ac_cv_sizeof_signed_char" >&5 + echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 + cat >>confdefs.h <&5 ++echo "$as_me:14420: checking if you want to use signed Boolean array in term.h" >&5 + echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6 + + # Check whether --enable-signed-char or --disable-signed-char was given. +@@ -14432,12 +14427,12 @@ + else + with_signed_char=no + fi; +-echo "$as_me:14435: result: $with_signed_char" >&5 ++echo "$as_me:14430: result: $with_signed_char" >&5 + echo "${ECHO_T}$with_signed_char" >&6 + test "x$with_signed_char" != xyes && NCURSES_SBOOL="char" + + ### use option --with-tparm-arg to override tparm's argument type +-echo "$as_me:14440: checking for type of tparm args" >&5 ++echo "$as_me:14435: checking for type of tparm args" >&5 + echo $ECHO_N "checking for type of tparm args... $ECHO_C" >&6 + + # Check whether --with-tparm-arg or --without-tparm-arg was given. +@@ -14447,11 +14442,11 @@ + else + NCURSES_TPARM_ARG=$cf_dft_tparm_arg + fi; +-echo "$as_me:14450: result: $NCURSES_TPARM_ARG" >&5 ++echo "$as_me:14445: result: $NCURSES_TPARM_ARG" >&5 + echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6 + + ### Enable compiling-in rcs id's +-echo "$as_me:14454: checking if RCS identifiers should be compiled-in" >&5 ++echo "$as_me:14449: checking if RCS identifiers should be compiled-in" >&5 + echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6 + + # Check whether --with-rcs-ids or --without-rcs-ids was given. +@@ -14461,7 +14456,7 @@ + else + with_rcs_ids=no + fi; +-echo "$as_me:14464: result: $with_rcs_ids" >&5 ++echo "$as_me:14459: result: $with_rcs_ids" >&5 + echo "${ECHO_T}$with_rcs_ids" >&6 + test "x$with_rcs_ids" = xyes && + cat >>confdefs.h <<\EOF +@@ -14470,7 +14465,7 @@ + + ############################################################################### + +-echo "$as_me:14473: checking format of man-pages" >&5 ++echo "$as_me:14468: checking format of man-pages" >&5 + echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6 + + # Check whether --with-manpage-format or --without-manpage-format was given. +@@ -14559,14 +14554,14 @@ + ;; + esac + +-echo "$as_me:14562: result: $MANPAGE_FORMAT" >&5 ++echo "$as_me:14557: result: $MANPAGE_FORMAT" >&5 + echo "${ECHO_T}$MANPAGE_FORMAT" >&6 + if test -n "$cf_unknown" ; then +- { echo "$as_me:14565: WARNING: Unexpected manpage-format $cf_unknown" >&5 ++ { echo "$as_me:14560: WARNING: Unexpected manpage-format $cf_unknown" >&5 + echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;} + fi + +-echo "$as_me:14569: checking for manpage renaming" >&5 ++echo "$as_me:14564: checking for manpage renaming" >&5 + echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6 + + # Check whether --with-manpage-renames or --without-manpage-renames was given. +@@ -14594,7 +14589,7 @@ + if test -f "$srcdir/man/$MANPAGE_RENAMES" ; then + MANPAGE_RENAMES=`cd "$srcdir/man" && pwd`/$MANPAGE_RENAMES + elif test ! -f "$MANPAGE_RENAMES" ; then +- { { echo "$as_me:14597: error: not a filename: $MANPAGE_RENAMES" >&5 ++ { { echo "$as_me:14592: error: not a filename: $MANPAGE_RENAMES" >&5 + echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -14608,10 +14603,10 @@ + fi + fi + +-echo "$as_me:14611: result: $MANPAGE_RENAMES" >&5 ++echo "$as_me:14606: result: $MANPAGE_RENAMES" >&5 + echo "${ECHO_T}$MANPAGE_RENAMES" >&6 + +-echo "$as_me:14614: checking if manpage aliases will be installed" >&5 ++echo "$as_me:14609: checking if manpage aliases will be installed" >&5 + echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6 + + # Check whether --with-manpage-aliases or --without-manpage-aliases was given. +@@ -14622,7 +14617,7 @@ + MANPAGE_ALIASES=yes + fi; + +-echo "$as_me:14625: result: $MANPAGE_ALIASES" >&5 ++echo "$as_me:14620: result: $MANPAGE_ALIASES" >&5 + echo "${ECHO_T}$MANPAGE_ALIASES" >&6 + + case "x$LN_S" in +@@ -14636,7 +14631,7 @@ + + MANPAGE_SYMLINKS=no + if test "$MANPAGE_ALIASES" = yes ; then +-echo "$as_me:14639: checking if manpage symlinks should be used" >&5 ++echo "$as_me:14634: checking if manpage symlinks should be used" >&5 + echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6 + + # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given. +@@ -14649,17 +14644,17 @@ + + if test "$$cf_use_symlinks" = no; then + if test "$MANPAGE_SYMLINKS" = yes ; then +- { echo "$as_me:14652: WARNING: cannot make symlinks" >&5 ++ { echo "$as_me:14647: WARNING: cannot make symlinks" >&5 + echo "$as_me: WARNING: cannot make symlinks" >&2;} + MANPAGE_SYMLINKS=no + fi + fi + +-echo "$as_me:14658: result: $MANPAGE_SYMLINKS" >&5 ++echo "$as_me:14653: result: $MANPAGE_SYMLINKS" >&5 + echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6 + fi + +-echo "$as_me:14662: checking for manpage tbl" >&5 ++echo "$as_me:14657: checking for manpage tbl" >&5 + echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6 + + # Check whether --with-manpage-tbl or --without-manpage-tbl was given. +@@ -14670,7 +14665,7 @@ + MANPAGE_TBL=no + fi; + +-echo "$as_me:14673: result: $MANPAGE_TBL" >&5 ++echo "$as_me:14668: result: $MANPAGE_TBL" >&5 + echo "${ECHO_T}$MANPAGE_TBL" >&6 + + if test "$prefix" = "NONE" ; then +@@ -15003,7 +14998,7 @@ + ############################################################################### + + ### Note that some functions (such as const) are normally disabled anyway. +-echo "$as_me:15006: checking if you want to build with function extensions" >&5 ++echo "$as_me:15001: checking if you want to build with function extensions" >&5 + echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6 + + # Check whether --enable-ext-funcs or --disable-ext-funcs was given. +@@ -15013,7 +15008,7 @@ + else + with_ext_funcs=yes + fi; +-echo "$as_me:15016: result: $with_ext_funcs" >&5 ++echo "$as_me:15011: result: $with_ext_funcs" >&5 + echo "${ECHO_T}$with_ext_funcs" >&6 + if test "x$with_ext_funcs" = xyes ; then + NCURSES_EXT_FUNCS=1 +@@ -15073,7 +15068,7 @@ + GENERATED_EXT_FUNCS= + fi + +-echo "$as_me:15076: checking if you want to build with SCREEN extensions" >&5 ++echo "$as_me:15071: checking if you want to build with SCREEN extensions" >&5 + echo $ECHO_N "checking if you want to build with SCREEN extensions... $ECHO_C" >&6 + + # Check whether --enable-sp-funcs or --disable-sp-funcs was given. +@@ -15083,7 +15078,7 @@ + else + with_sp_funcs=$cf_dft_ext_spfuncs + fi; +-echo "$as_me:15086: result: $with_sp_funcs" >&5 ++echo "$as_me:15081: result: $with_sp_funcs" >&5 + echo "${ECHO_T}$with_sp_funcs" >&6 + if test "x$with_sp_funcs" = xyes ; then + NCURSES_SP_FUNCS=1 +@@ -15102,7 +15097,7 @@ + GENERATED_SP_FUNCS= + fi + +-echo "$as_me:15105: checking if you want to build with terminal-driver" >&5 ++echo "$as_me:15100: checking if you want to build with terminal-driver" >&5 + echo $ECHO_N "checking if you want to build with terminal-driver... $ECHO_C" >&6 + + # Check whether --enable-term-driver or --disable-term-driver was given. +@@ -15112,7 +15107,7 @@ + else + with_term_driver=no + fi; +-echo "$as_me:15115: result: $with_term_driver" >&5 ++echo "$as_me:15110: result: $with_term_driver" >&5 + echo "${ECHO_T}$with_term_driver" >&6 + if test "x$with_term_driver" = xyes ; then + +@@ -15121,19 +15116,19 @@ + EOF + + if test "x$with_termlib" != xno ; then +- { { echo "$as_me:15124: error: The term-driver option conflicts with the termlib option" >&5 ++ { { echo "$as_me:15119: error: The term-driver option conflicts with the termlib option" >&5 + echo "$as_me: error: The term-driver option conflicts with the termlib option" >&2;} + { (exit 1); exit 1; }; } + fi + if test "x$with_sp_funcs" != xyes ; then +- { { echo "$as_me:15129: error: The term-driver option relies upon sp-funcs" >&5 ++ { { echo "$as_me:15124: error: The term-driver option relies upon sp-funcs" >&5 + echo "$as_me: error: The term-driver option relies upon sp-funcs" >&2;} + { (exit 1); exit 1; }; } + fi + fi + + ### use option --enable-const to turn on use of const beyond that in XSI. +-echo "$as_me:15136: checking for extended use of const keyword" >&5 ++echo "$as_me:15131: checking for extended use of const keyword" >&5 + echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6 + + # Check whether --enable-const or --disable-const was given. +@@ -15143,7 +15138,7 @@ + else + with_ext_const=$cf_dft_ext_const + fi; +-echo "$as_me:15146: result: $with_ext_const" >&5 ++echo "$as_me:15141: result: $with_ext_const" >&5 + echo "${ECHO_T}$with_ext_const" >&6 + NCURSES_CONST='/*nothing*/' + if test "x$with_ext_const" = xyes ; then +@@ -15151,7 +15146,7 @@ + fi + + ### use option --enable-ext-colors to turn on use of colors beyond 16. +-echo "$as_me:15154: checking if you want to use extended colors" >&5 ++echo "$as_me:15149: checking if you want to use extended colors" >&5 + echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6 + + # Check whether --enable-ext-colors or --disable-ext-colors was given. +@@ -15161,12 +15156,12 @@ + else + with_ext_colors=$cf_dft_ext_colors + fi; +-echo "$as_me:15164: result: $with_ext_colors" >&5 ++echo "$as_me:15159: result: $with_ext_colors" >&5 + echo "${ECHO_T}$with_ext_colors" >&6 + NCURSES_EXT_COLORS=0 + if test "x$with_ext_colors" = xyes ; then + if test "x$with_widec" != xyes ; then +- { echo "$as_me:15169: WARNING: This option applies only to wide-character library" >&5 ++ { echo "$as_me:15164: WARNING: This option applies only to wide-character library" >&5 + echo "$as_me: WARNING: This option applies only to wide-character library" >&2;} + else + # cannot be ABI 5 since it changes sizeof(cchar_t) +@@ -15176,7 +15171,7 @@ + (5.*) + cf_cv_rel_version=6.0 + cf_cv_abi_version=6 +- { echo "$as_me:15179: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 ++ { echo "$as_me:15174: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 + echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;} + ;; + esac +@@ -15204,7 +15199,7 @@ + fi + + ### use option --enable-ext-mouse to modify coding to support 5-button mice +-echo "$as_me:15207: checking if you want to use extended mouse encoding" >&5 ++echo "$as_me:15202: checking if you want to use extended mouse encoding" >&5 + echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6 + + # Check whether --enable-ext-mouse or --disable-ext-mouse was given. +@@ -15214,7 +15209,7 @@ + else + with_ext_mouse=$cf_dft_ext_mouse + fi; +-echo "$as_me:15217: result: $with_ext_mouse" >&5 ++echo "$as_me:15212: result: $with_ext_mouse" >&5 + echo "${ECHO_T}$with_ext_mouse" >&6 + NCURSES_MOUSE_VERSION=1 + if test "x$with_ext_mouse" = xyes ; then +@@ -15225,7 +15220,7 @@ + (5.*) + cf_cv_rel_version=6.0 + cf_cv_abi_version=6 +- { echo "$as_me:15228: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 ++ { echo "$as_me:15223: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 + echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;} + ;; + esac +@@ -15234,7 +15229,7 @@ + fi + + ### use option --enable-ext-putwin to turn on extended screendumps +-echo "$as_me:15237: checking if you want to use extended putwin/screendump" >&5 ++echo "$as_me:15232: checking if you want to use extended putwin/screendump" >&5 + echo $ECHO_N "checking if you want to use extended putwin/screendump... $ECHO_C" >&6 + + # Check whether --enable-ext-putwin or --disable-ext-putwin was given. +@@ -15244,7 +15239,7 @@ + else + with_ext_putwin=$cf_dft_ext_putwin + fi; +-echo "$as_me:15247: result: $with_ext_putwin" >&5 ++echo "$as_me:15242: result: $with_ext_putwin" >&5 + echo "${ECHO_T}$with_ext_putwin" >&6 + if test "x$with_ext_putwin" = xyes ; then + +@@ -15254,7 +15249,7 @@ + + fi + +-echo "$as_me:15257: checking if you want \$NCURSES_NO_PADDING code" >&5 ++echo "$as_me:15252: checking if you want \$NCURSES_NO_PADDING code" >&5 + echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6 + + # Check whether --enable-no-padding or --disable-no-padding was given. +@@ -15264,7 +15259,7 @@ + else + with_no_padding=$with_ext_funcs + fi; +-echo "$as_me:15267: result: $with_no_padding" >&5 ++echo "$as_me:15262: result: $with_no_padding" >&5 + echo "${ECHO_T}$with_no_padding" >&6 + test "x$with_no_padding" = xyes && + cat >>confdefs.h <<\EOF +@@ -15272,7 +15267,7 @@ + EOF + + ### use option --enable-sigwinch to turn on use of SIGWINCH logic +-echo "$as_me:15275: checking if you want SIGWINCH handler" >&5 ++echo "$as_me:15270: checking if you want SIGWINCH handler" >&5 + echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6 + + # Check whether --enable-sigwinch or --disable-sigwinch was given. +@@ -15282,7 +15277,7 @@ + else + with_sigwinch=$with_ext_funcs + fi; +-echo "$as_me:15285: result: $with_sigwinch" >&5 ++echo "$as_me:15280: result: $with_sigwinch" >&5 + echo "${ECHO_T}$with_sigwinch" >&6 + test "x$with_sigwinch" = xyes && + cat >>confdefs.h <<\EOF +@@ -15290,7 +15285,7 @@ + EOF + + ### use option --enable-tcap-names to allow user to define new capabilities +-echo "$as_me:15293: checking if you want user-definable terminal capabilities like termcap" >&5 ++echo "$as_me:15288: checking if you want user-definable terminal capabilities like termcap" >&5 + echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6 + + # Check whether --enable-tcap-names or --disable-tcap-names was given. +@@ -15300,14 +15295,14 @@ + else + with_tcap_names=$with_ext_funcs + fi; +-echo "$as_me:15303: result: $with_tcap_names" >&5 ++echo "$as_me:15298: result: $with_tcap_names" >&5 + echo "${ECHO_T}$with_tcap_names" >&6 + NCURSES_XNAMES=0 + test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1 + + ############################################################################## + +-echo "$as_me:15310: checking if you want to link with the pthread library" >&5 ++echo "$as_me:15305: checking if you want to link with the pthread library" >&5 + echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6 + + # Check whether --with-pthread or --without-pthread was given. +@@ -15317,27 +15312,27 @@ + else + with_pthread=no + fi; +-echo "$as_me:15320: result: $with_pthread" >&5 ++echo "$as_me:15315: result: $with_pthread" >&5 + echo "${ECHO_T}$with_pthread" >&6 + + if test "$with_pthread" != no ; then +- echo "$as_me:15324: checking for pthread.h" >&5 ++ echo "$as_me:15319: checking for pthread.h" >&5 + echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 + if test "${ac_cv_header_pthread_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 15330 "configure" ++#line 15325 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:15334: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:15329: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:15340: \$? = $ac_status" >&5 ++ echo "$as_me:15335: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -15356,7 +15351,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:15359: result: $ac_cv_header_pthread_h" >&5 ++echo "$as_me:15354: result: $ac_cv_header_pthread_h" >&5 + echo "${ECHO_T}$ac_cv_header_pthread_h" >&6 + if test "$ac_cv_header_pthread_h" = yes; then + +@@ -15366,7 +15361,7 @@ + + for cf_lib_pthread in pthread c_r + do +- echo "$as_me:15369: checking if we can link with the $cf_lib_pthread library" >&5 ++ echo "$as_me:15364: checking if we can link with the $cf_lib_pthread library" >&5 + echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6 + cf_save_LIBS="$LIBS" + +@@ -15387,7 +15382,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 15390 "configure" ++#line 15385 "configure" + #include "confdefs.h" + + #include +@@ -15404,16 +15399,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:15407: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15402: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15410: \$? = $ac_status" >&5 ++ echo "$as_me:15405: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:15413: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15408: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15416: \$? = $ac_status" >&5 ++ echo "$as_me:15411: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + with_pthread=yes + else +@@ -15423,7 +15418,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS="$cf_save_LIBS" +- echo "$as_me:15426: result: $with_pthread" >&5 ++ echo "$as_me:15421: result: $with_pthread" >&5 + echo "${ECHO_T}$with_pthread" >&6 + test "$with_pthread" = yes && break + done +@@ -15451,7 +15446,7 @@ + EOF + + else +- { { echo "$as_me:15454: error: Cannot link with pthread library" >&5 ++ { { echo "$as_me:15449: error: Cannot link with pthread library" >&5 + echo "$as_me: error: Cannot link with pthread library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -15461,13 +15456,13 @@ + fi + + if test "x$with_pthread" != xno; then +- echo "$as_me:15464: checking for pthread_kill" >&5 ++ echo "$as_me:15459: checking for pthread_kill" >&5 + echo $ECHO_N "checking for pthread_kill... $ECHO_C" >&6 + if test "${ac_cv_func_pthread_kill+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 15470 "configure" ++#line 15465 "configure" + #include "confdefs.h" + #define pthread_kill autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -15498,16 +15493,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:15501: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15496: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15504: \$? = $ac_status" >&5 ++ echo "$as_me:15499: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:15507: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15502: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15510: \$? = $ac_status" >&5 ++ echo "$as_me:15505: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_pthread_kill=yes + else +@@ -15517,11 +15512,11 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:15520: result: $ac_cv_func_pthread_kill" >&5 ++echo "$as_me:15515: result: $ac_cv_func_pthread_kill" >&5 + echo "${ECHO_T}$ac_cv_func_pthread_kill" >&6 + if test "$ac_cv_func_pthread_kill" = yes; then + +- echo "$as_me:15524: checking if you want to allow EINTR in wgetch with pthreads" >&5 ++ echo "$as_me:15519: checking if you want to allow EINTR in wgetch with pthreads" >&5 + echo $ECHO_N "checking if you want to allow EINTR in wgetch with pthreads... $ECHO_C" >&6 + + # Check whether --enable-pthreads-eintr or --disable-pthreads-eintr was given. +@@ -15531,7 +15526,7 @@ + else + use_pthreads_eintr=no + fi; +- echo "$as_me:15534: result: $use_pthreads_eintr" >&5 ++ echo "$as_me:15529: result: $use_pthreads_eintr" >&5 + echo "${ECHO_T}$use_pthreads_eintr" >&6 + if test "x$use_pthreads_eintr" = xyes ; then + +@@ -15542,7 +15537,7 @@ + fi + fi + +- echo "$as_me:15545: checking if you want to use weak-symbols for pthreads" >&5 ++ echo "$as_me:15540: checking if you want to use weak-symbols for pthreads" >&5 + echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6 + + # Check whether --enable-weak-symbols or --disable-weak-symbols was given. +@@ -15552,18 +15547,18 @@ + else + use_weak_symbols=no + fi; +- echo "$as_me:15555: result: $use_weak_symbols" >&5 ++ echo "$as_me:15550: result: $use_weak_symbols" >&5 + echo "${ECHO_T}$use_weak_symbols" >&6 + if test "x$use_weak_symbols" = xyes ; then + +-echo "$as_me:15559: checking if $CC supports weak symbols" >&5 ++echo "$as_me:15554: checking if $CC supports weak symbols" >&5 + echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6 + if test "${cf_cv_weak_symbols+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 15566 "configure" ++#line 15561 "configure" + #include "confdefs.h" + + #include +@@ -15589,16 +15584,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:15592: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15587: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15595: \$? = $ac_status" >&5 ++ echo "$as_me:15590: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:15598: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15593: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15601: \$? = $ac_status" >&5 ++ echo "$as_me:15596: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_weak_symbols=yes + else +@@ -15609,7 +15604,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:15612: result: $cf_cv_weak_symbols" >&5 ++echo "$as_me:15607: result: $cf_cv_weak_symbols" >&5 + echo "${ECHO_T}$cf_cv_weak_symbols" >&6 + + else +@@ -15659,7 +15654,7 @@ + # opaque outside of that, so there is no --enable-opaque option. We can use + # this option without --with-pthreads, but this will be always set for + # pthreads. +-echo "$as_me:15662: checking if you want reentrant code" >&5 ++echo "$as_me:15657: checking if you want reentrant code" >&5 + echo $ECHO_N "checking if you want reentrant code... $ECHO_C" >&6 + + # Check whether --enable-reentrant or --disable-reentrant was given. +@@ -15669,7 +15664,7 @@ + else + with_reentrant=no + fi; +-echo "$as_me:15672: result: $with_reentrant" >&5 ++echo "$as_me:15667: result: $with_reentrant" >&5 + echo "${ECHO_T}$with_reentrant" >&6 + if test "x$with_reentrant" = xyes ; then + cf_cv_enable_reentrant=1 +@@ -15757,7 +15752,7 @@ + (5.*) + cf_cv_rel_version=6.0 + cf_cv_abi_version=6 +- { echo "$as_me:15760: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 ++ { echo "$as_me:15755: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 + echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;} + ;; + esac +@@ -15769,7 +15764,7 @@ + NCURSES_SIZE_T=short + fi + +-echo "$as_me:15772: checking if you want opaque curses-library structures" >&5 ++echo "$as_me:15767: checking if you want opaque curses-library structures" >&5 + echo $ECHO_N "checking if you want opaque curses-library structures... $ECHO_C" >&6 + + # Check whether --enable-opaque-curses or --disable-opaque-curses was given. +@@ -15791,16 +15786,16 @@ + test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=no + + fi; +-echo "$as_me:15794: result: $enable_opaque_curses" >&5 ++echo "$as_me:15789: result: $enable_opaque_curses" >&5 + echo "${ECHO_T}$enable_opaque_curses" >&6 + + test "$cf_cv_enable_reentrant" = 1 && \ + test "$enable_opaque_curses" = no && \ +-{ { echo "$as_me:15799: error: reentrant configuration requires opaque library" >&5 ++{ { echo "$as_me:15794: error: reentrant configuration requires opaque library" >&5 + echo "$as_me: error: reentrant configuration requires opaque library" >&2;} + { (exit 1); exit 1; }; } + +-echo "$as_me:15803: checking if you want opaque form-library structures" >&5 ++echo "$as_me:15798: checking if you want opaque form-library structures" >&5 + echo $ECHO_N "checking if you want opaque form-library structures... $ECHO_C" >&6 + + # Check whether --enable-opaque-form or --disable-opaque-form was given. +@@ -15810,10 +15805,10 @@ + else + enable_opaque_form=no + fi; +-echo "$as_me:15813: result: $enable_opaque_form" >&5 ++echo "$as_me:15808: result: $enable_opaque_form" >&5 + echo "${ECHO_T}$enable_opaque_form" >&6 + +-echo "$as_me:15816: checking if you want opaque menu-library structures" >&5 ++echo "$as_me:15811: checking if you want opaque menu-library structures" >&5 + echo $ECHO_N "checking if you want opaque menu-library structures... $ECHO_C" >&6 + + # Check whether --enable-opaque-menu or --disable-opaque-menu was given. +@@ -15823,10 +15818,10 @@ + else + enable_opaque_menu=no + fi; +-echo "$as_me:15826: result: $enable_opaque_menu" >&5 ++echo "$as_me:15821: result: $enable_opaque_menu" >&5 + echo "${ECHO_T}$enable_opaque_menu" >&6 + +-echo "$as_me:15829: checking if you want opaque panel-library structures" >&5 ++echo "$as_me:15824: checking if you want opaque panel-library structures" >&5 + echo $ECHO_N "checking if you want opaque panel-library structures... $ECHO_C" >&6 + + # Check whether --enable-opaque-panel or --disable-opaque-panel was given. +@@ -15836,7 +15831,7 @@ + else + enable_opaque_panel=no + fi; +-echo "$as_me:15839: result: $enable_opaque_panel" >&5 ++echo "$as_me:15834: result: $enable_opaque_panel" >&5 + echo "${ECHO_T}$enable_opaque_panel" >&6 + + NCURSES_OPAQUE=0; test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1 +@@ -15846,7 +15841,7 @@ + + ### Allow using a different wrap-prefix + if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then +- echo "$as_me:15849: checking for prefix used to wrap public variables" >&5 ++ echo "$as_me:15844: checking for prefix used to wrap public variables" >&5 + echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6 + + # Check whether --with-wrap-prefix or --without-wrap-prefix was given. +@@ -15856,7 +15851,7 @@ + else + NCURSES_WRAP_PREFIX=_nc_ + fi; +- echo "$as_me:15859: result: $NCURSES_WRAP_PREFIX" >&5 ++ echo "$as_me:15854: result: $NCURSES_WRAP_PREFIX" >&5 + echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 + else + NCURSES_WRAP_PREFIX=_nc_ +@@ -15869,7 +15864,7 @@ + ############################################################################### + # These options are relatively safe to experiment with. + +-echo "$as_me:15872: checking if you want all development code" >&5 ++echo "$as_me:15867: checking if you want all development code" >&5 + echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6 + + # Check whether --with-develop or --without-develop was given. +@@ -15879,11 +15874,11 @@ + else + with_develop=no + fi; +-echo "$as_me:15882: result: $with_develop" >&5 ++echo "$as_me:15877: result: $with_develop" >&5 + echo "${ECHO_T}$with_develop" >&6 + + ### use option --enable-hard-tabs to turn on use of hard-tabs optimize +-echo "$as_me:15886: checking if you want hard-tabs code" >&5 ++echo "$as_me:15881: checking if you want hard-tabs code" >&5 + echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6 + + # Check whether --enable-hard-tabs or --disable-hard-tabs was given. +@@ -15893,7 +15888,7 @@ + else + enable_hard_tabs=$with_develop + fi; +-echo "$as_me:15896: result: $enable_hard_tabs" >&5 ++echo "$as_me:15891: result: $enable_hard_tabs" >&5 + echo "${ECHO_T}$enable_hard_tabs" >&6 + test "x$enable_hard_tabs" = xyes && + cat >>confdefs.h <<\EOF +@@ -15901,7 +15896,7 @@ + EOF + + ### use option --enable-xmc-glitch to turn on use of magic-cookie optimize +-echo "$as_me:15904: checking if you want limited support for xmc" >&5 ++echo "$as_me:15899: checking if you want limited support for xmc" >&5 + echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6 + + # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given. +@@ -15911,7 +15906,7 @@ + else + enable_xmc_glitch=$with_develop + fi; +-echo "$as_me:15914: result: $enable_xmc_glitch" >&5 ++echo "$as_me:15909: result: $enable_xmc_glitch" >&5 + echo "${ECHO_T}$enable_xmc_glitch" >&6 + test "x$enable_xmc_glitch" = xyes && + cat >>confdefs.h <<\EOF +@@ -15921,7 +15916,7 @@ + ############################################################################### + # These are just experimental, probably should not be in a package: + +-echo "$as_me:15924: checking if you do not want to assume colors are white-on-black" >&5 ++echo "$as_me:15919: checking if you do not want to assume colors are white-on-black" >&5 + echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6 + + # Check whether --enable-assumed-color or --disable-assumed-color was given. +@@ -15931,7 +15926,7 @@ + else + with_assumed_color=yes + fi; +-echo "$as_me:15934: result: $with_assumed_color" >&5 ++echo "$as_me:15929: result: $with_assumed_color" >&5 + echo "${ECHO_T}$with_assumed_color" >&6 + test "x$with_assumed_color" = xyes && + cat >>confdefs.h <<\EOF +@@ -15939,7 +15934,7 @@ + EOF + + ### use option --enable-hashmap to turn on use of hashmap scrolling logic +-echo "$as_me:15942: checking if you want hashmap scrolling-optimization code" >&5 ++echo "$as_me:15937: checking if you want hashmap scrolling-optimization code" >&5 + echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6 + + # Check whether --enable-hashmap or --disable-hashmap was given. +@@ -15949,7 +15944,7 @@ + else + with_hashmap=yes + fi; +-echo "$as_me:15952: result: $with_hashmap" >&5 ++echo "$as_me:15947: result: $with_hashmap" >&5 + echo "${ECHO_T}$with_hashmap" >&6 + test "x$with_hashmap" = xyes && + cat >>confdefs.h <<\EOF +@@ -15957,7 +15952,7 @@ + EOF + + ### use option --enable-colorfgbg to turn on use of $COLORFGBG environment +-echo "$as_me:15960: checking if you want colorfgbg code" >&5 ++echo "$as_me:15955: checking if you want colorfgbg code" >&5 + echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6 + + # Check whether --enable-colorfgbg or --disable-colorfgbg was given. +@@ -15967,7 +15962,7 @@ + else + with_colorfgbg=no + fi; +-echo "$as_me:15970: result: $with_colorfgbg" >&5 ++echo "$as_me:15965: result: $with_colorfgbg" >&5 + echo "${ECHO_T}$with_colorfgbg" >&6 + test "x$with_colorfgbg" = xyes && + cat >>confdefs.h <<\EOF +@@ -15975,7 +15970,7 @@ + EOF + + ### use option --enable-fvisibility to turn on use of gcc-specific feature +-echo "$as_me:15978: checking if you want to use gcc -fvisibility option" >&5 ++echo "$as_me:15973: checking if you want to use gcc -fvisibility option" >&5 + echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6 + + # Check whether --enable-fvisibility or --disable-fvisibility was given. +@@ -15985,14 +15980,14 @@ + else + cf_with_fvisibility=no + fi; +-echo "$as_me:15988: result: $cf_with_fvisibility" >&5 ++echo "$as_me:15983: result: $cf_with_fvisibility" >&5 + echo "${ECHO_T}$cf_with_fvisibility" >&6 + + NCURSES_IMPEXP= + NCURSES_CXX_IMPEXP= + if test "x$cf_with_fvisibility" = xyes; then + +-echo "$as_me:15995: checking if $CC -fvisibility=hidden option works" >&5 ++echo "$as_me:15990: checking if $CC -fvisibility=hidden option works" >&5 + echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6 + if test "${cf_cv_fvisibility_hidden+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -16001,7 +15996,7 @@ + cf_save_cflags="$CFLAGS" + CFLAGS="$CFLAGS -fvisibility=hidden" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16004 "configure" ++#line 15999 "configure" + #include "confdefs.h" + + __attribute__ ((visibility("default"))) int somefunc() {return 42;} +@@ -16017,16 +16012,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:16020: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16015: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16023: \$? = $ac_status" >&5 ++ echo "$as_me:16018: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:16026: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16021: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16029: \$? = $ac_status" >&5 ++ echo "$as_me:16024: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_fvisibility_hidden=yes + else +@@ -16038,7 +16033,7 @@ + CFLAGS=$cf_save_cflags + + fi +-echo "$as_me:16041: result: $cf_cv_fvisibility_hidden" >&5 ++echo "$as_me:16036: result: $cf_cv_fvisibility_hidden" >&5 + echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6 + + if test "x$cf_cv_fvisibility_hidden" = xyes +@@ -16153,7 +16148,7 @@ + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + ac_main_return="return" + +-echo "$as_me:16156: checking if $CXX -fvisibility=hidden option works" >&5 ++echo "$as_me:16151: checking if $CXX -fvisibility=hidden option works" >&5 + echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6 + if test "${cf_cv_fvisibility_hidden2+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -16162,7 +16157,7 @@ + cf_save_cflags="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -fvisibility=hidden" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16165 "configure" ++#line 16160 "configure" + #include "confdefs.h" + + __attribute__ ((visibility("default"))) int somefunc() {return 42;} +@@ -16178,16 +16173,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:16181: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16176: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16184: \$? = $ac_status" >&5 ++ echo "$as_me:16179: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:16187: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16182: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16190: \$? = $ac_status" >&5 ++ echo "$as_me:16185: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_fvisibility_hidden2=yes + else +@@ -16199,7 +16194,7 @@ + CXXFLAGS=$cf_save_cflags + + fi +-echo "$as_me:16202: result: $cf_cv_fvisibility_hidden2" >&5 ++echo "$as_me:16197: result: $cf_cv_fvisibility_hidden2" >&5 + echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6 + + if test "x$cf_cv_fvisibility_hidden2" = xyes +@@ -16322,7 +16317,7 @@ + fi + + ### use option --enable-interop to turn on use of bindings used for interop +-echo "$as_me:16325: checking if you want interop bindings" >&5 ++echo "$as_me:16320: checking if you want interop bindings" >&5 + echo $ECHO_N "checking if you want interop bindings... $ECHO_C" >&6 + + # Check whether --enable-interop or --disable-interop was given. +@@ -16332,13 +16327,13 @@ + else + with_exp_interop=$cf_dft_interop + fi; +-echo "$as_me:16335: result: $with_exp_interop" >&5 ++echo "$as_me:16330: result: $with_exp_interop" >&5 + echo "${ECHO_T}$with_exp_interop" >&6 + + NCURSES_INTEROP_FUNCS=0 + test "x$with_exp_interop" = xyes && NCURSES_INTEROP_FUNCS=1 + +-echo "$as_me:16341: checking if you want experimental safe-sprintf code" >&5 ++echo "$as_me:16336: checking if you want experimental safe-sprintf code" >&5 + echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6 + + # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given. +@@ -16348,13 +16343,13 @@ + else + with_safe_sprintf=no + fi; +-echo "$as_me:16351: result: $with_safe_sprintf" >&5 ++echo "$as_me:16346: result: $with_safe_sprintf" >&5 + echo "${ECHO_T}$with_safe_sprintf" >&6 + + ### use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic + # when hashmap is used scroll hints are useless + if test "$with_hashmap" = no ; then +-echo "$as_me:16357: checking if you want to experiment without scrolling-hints code" >&5 ++echo "$as_me:16352: checking if you want to experiment without scrolling-hints code" >&5 + echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6 + + # Check whether --enable-scroll-hints or --disable-scroll-hints was given. +@@ -16364,7 +16359,7 @@ + else + with_scroll_hints=yes + fi; +-echo "$as_me:16367: result: $with_scroll_hints" >&5 ++echo "$as_me:16362: result: $with_scroll_hints" >&5 + echo "${ECHO_T}$with_scroll_hints" >&6 + test "x$with_scroll_hints" = xyes && + cat >>confdefs.h <<\EOF +@@ -16373,7 +16368,7 @@ + + fi + +-echo "$as_me:16376: checking if you want wgetch-events code" >&5 ++echo "$as_me:16371: checking if you want wgetch-events code" >&5 + echo $ECHO_N "checking if you want wgetch-events code... $ECHO_C" >&6 + + # Check whether --enable-wgetch-events or --disable-wgetch-events was given. +@@ -16383,7 +16378,7 @@ + else + with_wgetch_events=no + fi; +-echo "$as_me:16386: result: $with_wgetch_events" >&5 ++echo "$as_me:16381: result: $with_wgetch_events" >&5 + echo "${ECHO_T}$with_wgetch_events" >&6 + if test "x$with_wgetch_events" = xyes ; then + +@@ -16398,7 +16393,7 @@ + + case "$cf_cv_system_name" in + (*mingw32*|*mingw64*|*-msvc*) +- echo "$as_me:16401: checking if you want experimental-Windows driver" >&5 ++ echo "$as_me:16396: checking if you want experimental-Windows driver" >&5 + echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6 + + # Check whether --enable-exp-win32 or --disable-exp-win32 was given. +@@ -16408,7 +16403,7 @@ + else + with_exp_win32=no + fi; +- echo "$as_me:16411: result: $with_exp_win32" >&5 ++ echo "$as_me:16406: result: $with_exp_win32" >&5 + echo "${ECHO_T}$with_exp_win32" >&6 + if test "x$with_exp_win32" = xyes + then +@@ -16434,7 +16429,7 @@ + + ### use option --disable-echo to suppress full display compiling commands + +-echo "$as_me:16437: checking if you want to see long compiling messages" >&5 ++echo "$as_me:16432: checking if you want to see long compiling messages" >&5 + echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6 + + # Check whether --enable-echo or --disable-echo was given. +@@ -16468,7 +16463,7 @@ + ECHO_CC='' + + fi; +-echo "$as_me:16471: result: $enableval" >&5 ++echo "$as_me:16466: result: $enableval" >&5 + echo "${ECHO_T}$enableval" >&6 + + if test "x$enable_echo" = xyes; then +@@ -16481,7 +16476,7 @@ + + # --disable-stripping is used for debugging + +-echo "$as_me:16484: checking if you want to install stripped executables" >&5 ++echo "$as_me:16479: checking if you want to install stripped executables" >&5 + echo $ECHO_N "checking if you want to install stripped executables... $ECHO_C" >&6 + + # Check whether --enable-stripping or --disable-stripping was given. +@@ -16498,7 +16493,7 @@ + enable_stripping=yes + + fi; +-echo "$as_me:16501: result: $enable_stripping" >&5 ++echo "$as_me:16496: result: $enable_stripping" >&5 + echo "${ECHO_T}$enable_stripping" >&6 + + if test "$enable_stripping" = yes +@@ -16509,7 +16504,7 @@ + fi + + : "${INSTALL:=install}" +-echo "$as_me:16512: checking if install accepts -p option" >&5 ++echo "$as_me:16507: checking if install accepts -p option" >&5 + echo $ECHO_N "checking if install accepts -p option... $ECHO_C" >&6 + if test "${cf_cv_install_p+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -16540,10 +16535,10 @@ + rm -rf ./conftest* + + fi +-echo "$as_me:16543: result: $cf_cv_install_p" >&5 ++echo "$as_me:16538: result: $cf_cv_install_p" >&5 + echo "${ECHO_T}$cf_cv_install_p" >&6 + +-echo "$as_me:16546: checking if install needs to be told about ownership" >&5 ++echo "$as_me:16541: checking if install needs to be told about ownership" >&5 + echo $ECHO_N "checking if install needs to be told about ownership... $ECHO_C" >&6 + case `$ac_config_guess` in + (*minix) +@@ -16554,7 +16549,7 @@ + ;; + esac + +-echo "$as_me:16557: result: $with_install_o" >&5 ++echo "$as_me:16552: result: $with_install_o" >&5 + echo "${ECHO_T}$with_install_o" >&6 + if test "x$with_install_o" = xyes + then +@@ -16579,7 +16574,7 @@ + + ### use option --enable-warnings to turn on all gcc warnings + +-echo "$as_me:16582: checking if you want to use C11 _Noreturn feature" >&5 ++echo "$as_me:16577: checking if you want to use C11 _Noreturn feature" >&5 + echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6 + + # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given. +@@ -16596,17 +16591,17 @@ + enable_stdnoreturn=no + + fi; +-echo "$as_me:16599: result: $enable_stdnoreturn" >&5 ++echo "$as_me:16594: result: $enable_stdnoreturn" >&5 + echo "${ECHO_T}$enable_stdnoreturn" >&6 + + if test $enable_stdnoreturn = yes; then +-echo "$as_me:16603: checking for C11 _Noreturn feature" >&5 ++echo "$as_me:16598: checking for C11 _Noreturn feature" >&5 + echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6 + if test "${cf_cv_c11_noreturn+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16609 "configure" ++#line 16604 "configure" + #include "confdefs.h" + + #include +@@ -16623,16 +16618,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16626: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16621: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16629: \$? = $ac_status" >&5 ++ echo "$as_me:16624: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16632: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16627: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16635: \$? = $ac_status" >&5 ++ echo "$as_me:16630: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_c11_noreturn=yes + else +@@ -16643,7 +16638,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:16646: result: $cf_cv_c11_noreturn" >&5 ++echo "$as_me:16641: result: $cf_cv_c11_noreturn" >&5 + echo "${ECHO_T}$cf_cv_c11_noreturn" >&6 + else + cf_cv_c11_noreturn=no, +@@ -16673,7 +16668,7 @@ + (*-Werror=*) + test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 + +-echo "${as_me:-configure}:16676: testing repairing CFLAGS: $CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:16671: testing repairing CFLAGS: $CFLAGS ..." 1>&5 + + cf_temp_flags= + for cf_temp_scan in $CFLAGS +@@ -16696,11 +16691,11 @@ + CFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 + +-echo "${as_me:-configure}:16699: testing ... fixed $CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:16694: testing ... fixed $CFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +-echo "${as_me:-configure}:16703: testing ... extra $EXTRA_CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:16698: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + ;; + esac +@@ -16712,7 +16707,7 @@ + (*-Werror=*) + test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 + +-echo "${as_me:-configure}:16715: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 ++echo "${as_me:-configure}:16710: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 + + cf_temp_flags= + for cf_temp_scan in $CPPFLAGS +@@ -16735,11 +16730,11 @@ + CPPFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 + +-echo "${as_me:-configure}:16738: testing ... fixed $CPPFLAGS ..." 1>&5 ++echo "${as_me:-configure}:16733: testing ... fixed $CPPFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +-echo "${as_me:-configure}:16742: testing ... extra $EXTRA_CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:16737: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + ;; + esac +@@ -16751,7 +16746,7 @@ + (*-Werror=*) + test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:16754: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:16749: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 + + cf_temp_flags= + for cf_temp_scan in $LDFLAGS +@@ -16774,17 +16769,17 @@ + LDFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:16777: testing ... fixed $LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:16772: testing ... fixed $LDFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +-echo "${as_me:-configure}:16781: testing ... extra $EXTRA_CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:16776: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + ;; + esac + fi + +-echo "$as_me:16787: checking if you want to turn on gcc warnings" >&5 ++echo "$as_me:16782: checking if you want to turn on gcc warnings" >&5 + echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6 + + # Check whether --enable-warnings or --disable-warnings was given. +@@ -16801,7 +16796,7 @@ + enable_warnings=no + + fi; +-echo "$as_me:16804: result: $enable_warnings" >&5 ++echo "$as_me:16799: result: $enable_warnings" >&5 + echo "${ECHO_T}$enable_warnings" >&6 + if test "$enable_warnings" = "yes" + then +@@ -16825,7 +16820,7 @@ + done + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16828 "configure" ++#line 16823 "configure" + #include "confdefs.h" + + #include +@@ -16840,26 +16835,26 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16843: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16838: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16846: \$? = $ac_status" >&5 ++ echo "$as_me:16841: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16849: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16844: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16852: \$? = $ac_status" >&5 ++ echo "$as_me:16847: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + +-echo "$as_me:16855: checking for X11/Xt const-feature" >&5 ++echo "$as_me:16850: checking for X11/Xt const-feature" >&5 + echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6 + if test "${cf_cv_const_x_string+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16862 "configure" ++#line 16857 "configure" + #include "confdefs.h" + + #define _CONST_X_STRING /* X11R7.8 (perhaps) */ +@@ -16876,16 +16871,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16879: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16874: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16882: \$? = $ac_status" >&5 ++ echo "$as_me:16877: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16885: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16880: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16888: \$? = $ac_status" >&5 ++ echo "$as_me:16883: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_const_x_string=no +@@ -16900,7 +16895,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:16903: result: $cf_cv_const_x_string" >&5 ++echo "$as_me:16898: result: $cf_cv_const_x_string" >&5 + echo "${ECHO_T}$cf_cv_const_x_string" >&6 + + LIBS="$cf_save_LIBS_CF_CONST_X_STRING" +@@ -16929,7 +16924,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi + cat > "conftest.$ac_ext" <&5 ++ { echo "$as_me:16943: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" +@@ -16961,12 +16956,12 @@ + wd981 + do + CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" +- if { (eval echo "$as_me:16964: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:16959: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16967: \$? = $ac_status" >&5 ++ echo "$as_me:16962: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- test -n "$verbose" && echo "$as_me:16969: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:16964: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" + fi +@@ -16974,7 +16969,7 @@ + CFLAGS="$cf_save_CFLAGS" + elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" + then +- { echo "$as_me:16977: checking for $CC warning options..." >&5 ++ { echo "$as_me:16972: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + cf_warn_CONST="" +@@ -16997,12 +16992,12 @@ + Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum + do + CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" +- if { (eval echo "$as_me:17000: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:16995: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17003: \$? = $ac_status" >&5 ++ echo "$as_me:16998: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- test -n "$verbose" && echo "$as_me:17005: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:17000: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + case "$cf_opt" in + (Winline) +@@ -17010,7 +17005,7 @@ + ([34].*) + test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 + +-echo "${as_me:-configure}:17013: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 ++echo "${as_me:-configure}:17008: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 + + continue;; + esac +@@ -17020,7 +17015,7 @@ + ([12].*) + test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 + +-echo "${as_me:-configure}:17023: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 ++echo "${as_me:-configure}:17018: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 + + continue;; + esac +@@ -17053,10 +17048,10 @@ + EOF + if test "$GCC" = yes + then +- { echo "$as_me:17056: checking for $CC __attribute__ directives..." >&5 ++ { echo "$as_me:17051: checking for $CC __attribute__ directives..." >&5 + echo "$as_me: checking for $CC __attribute__ directives..." >&6;} + cat > "conftest.$ac_ext" <&5 ++ if { (eval echo "$as_me:17103: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17111: \$? = $ac_status" >&5 ++ echo "$as_me:17106: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- test -n "$verbose" && echo "$as_me:17113: result: ... $cf_attribute" >&5 ++ test -n "$verbose" && echo "$as_me:17108: result: ... $cf_attribute" >&5 + echo "${ECHO_T}... $cf_attribute" >&6 + cat conftest.h >>confdefs.h + case "$cf_attribute" in +@@ -17182,12 +17177,12 @@ + if test "$GCC" = yes ; then + case "$host_os" in + (linux*|gnu*) +- echo "$as_me:17185: checking if this is really Intel C++ compiler" >&5 ++ echo "$as_me:17180: checking if this is really Intel C++ compiler" >&5 + echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6 + cf_save_CFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -no-gcc" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17190 "configure" ++#line 17185 "configure" + #include "confdefs.h" + + int +@@ -17204,16 +17199,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:17207: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17202: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17210: \$? = $ac_status" >&5 ++ echo "$as_me:17205: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:17213: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17208: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17216: \$? = $ac_status" >&5 ++ echo "$as_me:17211: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + INTEL_CPLUSPLUS=yes + cf_save_CFLAGS="$cf_save_CFLAGS -we147" +@@ -17224,7 +17219,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + CXXFLAGS="$cf_save_CFLAGS" +- echo "$as_me:17227: result: $INTEL_CPLUSPLUS" >&5 ++ echo "$as_me:17222: result: $INTEL_CPLUSPLUS" >&5 + echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6 + ;; + esac +@@ -17233,11 +17228,11 @@ + CLANG_CPLUSPLUS=no + + if test "$GCC" = yes ; then +- echo "$as_me:17236: checking if this is really Clang C++ compiler" >&5 ++ echo "$as_me:17231: checking if this is really Clang C++ compiler" >&5 + echo $ECHO_N "checking if this is really Clang C++ compiler... $ECHO_C" >&6 + cf_save_CFLAGS="$CXXFLAGS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17240 "configure" ++#line 17235 "configure" + #include "confdefs.h" + + int +@@ -17254,16 +17249,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:17257: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17252: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17260: \$? = $ac_status" >&5 ++ echo "$as_me:17255: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:17263: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17258: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17266: \$? = $ac_status" >&5 ++ echo "$as_me:17261: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + CLANG_CPLUSPLUS=yes + +@@ -17273,7 +17268,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + CXXFLAGS="$cf_save_CFLAGS" +- echo "$as_me:17276: result: $CLANG_CPLUSPLUS" >&5 ++ echo "$as_me:17271: result: $CLANG_CPLUSPLUS" >&5 + echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6 + fi + +@@ -17282,30 +17277,30 @@ + if test "x$CLANG_CPLUSPLUS" = "xyes" ; then + case "$CC" in + (c[1-9][0-9]|*/c[1-9][0-9]) +- { echo "$as_me:17285: WARNING: replacing broken compiler alias $CC" >&5 ++ { echo "$as_me:17280: WARNING: replacing broken compiler alias $CC" >&5 + echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;} + CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`" + CC=clang + ;; + esac + +- echo "$as_me:17292: checking version of $CC" >&5 ++ echo "$as_me:17287: checking version of $CC" >&5 + echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 + CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" + test -z "$CLANG_VERSION" && CLANG_VERSION=unknown +- echo "$as_me:17296: result: $CLANG_VERSION" >&5 ++ echo "$as_me:17291: result: $CLANG_VERSION" >&5 + echo "${ECHO_T}$CLANG_VERSION" >&6 + + for cf_clang_opt in \ + -Qunused-arguments \ + -Wno-error=implicit-function-declaration + do +- echo "$as_me:17303: checking if option $cf_clang_opt works" >&5 ++ echo "$as_me:17298: checking if option $cf_clang_opt works" >&5 + echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6 + cf_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $cf_clang_opt" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17308 "configure" ++#line 17303 "configure" + #include "confdefs.h" + + #include +@@ -17319,16 +17314,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:17322: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17317: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17325: \$? = $ac_status" >&5 ++ echo "$as_me:17320: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:17328: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17323: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17331: \$? = $ac_status" >&5 ++ echo "$as_me:17326: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_clang_optok=yes +@@ -17339,13 +17334,13 @@ + cf_clang_optok=no + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +- echo "$as_me:17342: result: $cf_clang_optok" >&5 ++ echo "$as_me:17337: result: $cf_clang_optok" >&5 + echo "${ECHO_T}$cf_clang_optok" >&6 + CFLAGS="$cf_save_CFLAGS" + if test "$cf_clang_optok" = yes; then + test -n "$verbose" && echo " adding option $cf_clang_opt" 1>&6 + +-echo "${as_me:-configure}:17348: testing adding option $cf_clang_opt ..." 1>&5 ++echo "${as_me:-configure}:17343: testing adding option $cf_clang_opt ..." 1>&5 + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_clang_opt" +@@ -17362,7 +17357,7 @@ + ac_main_return="return" + + cat > conftest.$ac_ext <&5 ++ { echo "$as_me:17378: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CXXFLAGS="$CXXFLAGS" + EXTRA_CXXFLAGS="-Wall" +@@ -17397,12 +17392,12 @@ + wd981 + do + CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt" +- if { (eval echo "$as_me:17400: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:17395: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17403: \$? = $ac_status" >&5 ++ echo "$as_me:17398: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- test -n "$verbose" && echo "$as_me:17405: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:17400: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" + fi +@@ -17411,7 +17406,7 @@ + + elif test "$GXX" = yes + then +- { echo "$as_me:17414: checking for $CXX warning options..." >&5 ++ { echo "$as_me:17409: checking for $CXX warning options..." >&5 + echo "$as_me: checking for $CXX warning options..." >&6;} + cf_save_CXXFLAGS="$CXXFLAGS" + EXTRA_CXXFLAGS="-W -Wall" +@@ -17441,16 +17436,16 @@ + Wundef $cf_gxx_extra_warnings Wno-unused + do + CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt" +- if { (eval echo "$as_me:17444: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:17439: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17447: \$? = $ac_status" >&5 ++ echo "$as_me:17442: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- test -n "$verbose" && echo "$as_me:17449: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:17444: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" + else +- test -n "$verbose" && echo "$as_me:17453: result: ... no -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:17448: result: ... no -$cf_opt" >&5 + echo "${ECHO_T}... no -$cf_opt" >&6 + fi + done +@@ -17468,7 +17463,7 @@ + fi + fi + +-echo "$as_me:17471: checking if you want to work around bogus compiler/loader warnings" >&5 ++echo "$as_me:17466: checking if you want to work around bogus compiler/loader warnings" >&5 + echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6 + + # Check whether --enable-string-hacks or --disable-string-hacks was given. +@@ -17478,7 +17473,7 @@ + else + enable_string_hacks=no + fi; +-echo "$as_me:17481: result: $enable_string_hacks" >&5 ++echo "$as_me:17476: result: $enable_string_hacks" >&5 + echo "${ECHO_T}$enable_string_hacks" >&6 + + if test "x$enable_string_hacks" = "xyes"; then +@@ -17487,15 +17482,15 @@ + #define USE_STRING_HACKS 1 + EOF + +- { echo "$as_me:17490: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 ++ { echo "$as_me:17485: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 + echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;} +- echo "$as_me:17492: checking for strlcat" >&5 ++ echo "$as_me:17487: checking for strlcat" >&5 + echo $ECHO_N "checking for strlcat... $ECHO_C" >&6 + if test "${ac_cv_func_strlcat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17498 "configure" ++#line 17493 "configure" + #include "confdefs.h" + #define strlcat autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -17526,16 +17521,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:17529: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17524: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17532: \$? = $ac_status" >&5 ++ echo "$as_me:17527: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:17535: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17530: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17538: \$? = $ac_status" >&5 ++ echo "$as_me:17533: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_strlcat=yes + else +@@ -17545,7 +17540,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:17548: result: $ac_cv_func_strlcat" >&5 ++echo "$as_me:17543: result: $ac_cv_func_strlcat" >&5 + echo "${ECHO_T}$ac_cv_func_strlcat" >&6 + if test "$ac_cv_func_strlcat" = yes; then + +@@ -17555,7 +17550,7 @@ + + else + +- echo "$as_me:17558: checking for strlcat in -lbsd" >&5 ++ echo "$as_me:17553: checking for strlcat in -lbsd" >&5 + echo $ECHO_N "checking for strlcat in -lbsd... $ECHO_C" >&6 + if test "${ac_cv_lib_bsd_strlcat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17563,7 +17558,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17566 "configure" ++#line 17561 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -17582,16 +17577,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:17585: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17580: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17588: \$? = $ac_status" >&5 ++ echo "$as_me:17583: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:17591: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17586: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17594: \$? = $ac_status" >&5 ++ echo "$as_me:17589: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_bsd_strlcat=yes + else +@@ -17602,7 +17597,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:17605: result: $ac_cv_lib_bsd_strlcat" >&5 ++echo "$as_me:17600: result: $ac_cv_lib_bsd_strlcat" >&5 + echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6 + if test "$ac_cv_lib_bsd_strlcat" = yes; then + +@@ -17625,23 +17620,23 @@ + for ac_header in bsd/string.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:17628: checking for $ac_header" >&5 ++echo "$as_me:17623: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17634 "configure" ++#line 17629 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:17638: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:17633: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:17644: \$? = $ac_status" >&5 ++ echo "$as_me:17639: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -17660,7 +17655,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:17663: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:17658: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:17679: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17690 "configure" ++#line 17685 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -17718,16 +17713,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:17721: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17716: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17724: \$? = $ac_status" >&5 ++ echo "$as_me:17719: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:17727: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17722: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17730: \$? = $ac_status" >&5 ++ echo "$as_me:17725: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -17737,7 +17732,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:17740: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:17735: result: `eval echo '${'"$as_ac_var"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 + if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:17748: checking if you want to enable runtime assertions" >&5 + echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6 + + # Check whether --enable-assertions or --disable-assertions was given. +@@ -17760,7 +17755,7 @@ + else + with_assertions=no + fi; +-echo "$as_me:17763: result: $with_assertions" >&5 ++echo "$as_me:17758: result: $with_assertions" >&5 + echo "${ECHO_T}$with_assertions" >&6 + if test -n "$GCC" + then +@@ -17776,7 +17771,7 @@ + + ### use option --disable-leaks to suppress "permanent" leaks, for testing + +-echo "$as_me:17779: checking if you want to use dmalloc for testing" >&5 ++echo "$as_me:17774: checking if you want to use dmalloc for testing" >&5 + echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6 + + # Check whether --with-dmalloc or --without-dmalloc was given. +@@ -17798,7 +17793,7 @@ + else + with_dmalloc= + fi; +-echo "$as_me:17801: result: ${with_dmalloc:-no}" >&5 ++echo "$as_me:17796: result: ${with_dmalloc:-no}" >&5 + echo "${ECHO_T}${with_dmalloc:-no}" >&6 + + case ".$with_cflags" in +@@ -17912,23 +17907,23 @@ + esac + + if test "$with_dmalloc" = yes ; then +- echo "$as_me:17915: checking for dmalloc.h" >&5 ++ echo "$as_me:17910: checking for dmalloc.h" >&5 + echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6 + if test "${ac_cv_header_dmalloc_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17921 "configure" ++#line 17916 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:17925: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:17920: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:17931: \$? = $ac_status" >&5 ++ echo "$as_me:17926: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -17947,11 +17942,11 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:17950: result: $ac_cv_header_dmalloc_h" >&5 ++echo "$as_me:17945: result: $ac_cv_header_dmalloc_h" >&5 + echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6 + if test "$ac_cv_header_dmalloc_h" = yes; then + +-echo "$as_me:17954: checking for dmalloc_debug in -ldmalloc" >&5 ++echo "$as_me:17949: checking for dmalloc_debug in -ldmalloc" >&5 + echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6 + if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17959,7 +17954,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldmalloc $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17962 "configure" ++#line 17957 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -17978,16 +17973,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:17981: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17976: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17984: \$? = $ac_status" >&5 ++ echo "$as_me:17979: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:17987: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17982: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17990: \$? = $ac_status" >&5 ++ echo "$as_me:17985: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_dmalloc_dmalloc_debug=yes + else +@@ -17998,7 +17993,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:18001: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 ++echo "$as_me:17996: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 + echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6 + if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:18011: checking if you want to use dbmalloc for testing" >&5 + echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6 + + # Check whether --with-dbmalloc or --without-dbmalloc was given. +@@ -18035,7 +18030,7 @@ + else + with_dbmalloc= + fi; +-echo "$as_me:18038: result: ${with_dbmalloc:-no}" >&5 ++echo "$as_me:18033: result: ${with_dbmalloc:-no}" >&5 + echo "${ECHO_T}${with_dbmalloc:-no}" >&6 + + case ".$with_cflags" in +@@ -18149,23 +18144,23 @@ + esac + + if test "$with_dbmalloc" = yes ; then +- echo "$as_me:18152: checking for dbmalloc.h" >&5 ++ echo "$as_me:18147: checking for dbmalloc.h" >&5 + echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6 + if test "${ac_cv_header_dbmalloc_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18158 "configure" ++#line 18153 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:18162: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:18157: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:18168: \$? = $ac_status" >&5 ++ echo "$as_me:18163: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -18184,11 +18179,11 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:18187: result: $ac_cv_header_dbmalloc_h" >&5 ++echo "$as_me:18182: result: $ac_cv_header_dbmalloc_h" >&5 + echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6 + if test "$ac_cv_header_dbmalloc_h" = yes; then + +-echo "$as_me:18191: checking for debug_malloc in -ldbmalloc" >&5 ++echo "$as_me:18186: checking for debug_malloc in -ldbmalloc" >&5 + echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6 + if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -18196,7 +18191,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldbmalloc $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18199 "configure" ++#line 18194 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -18215,16 +18210,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:18218: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18213: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18221: \$? = $ac_status" >&5 ++ echo "$as_me:18216: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:18224: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18219: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18227: \$? = $ac_status" >&5 ++ echo "$as_me:18222: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_dbmalloc_debug_malloc=yes + else +@@ -18235,7 +18230,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:18238: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 ++echo "$as_me:18233: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 + echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6 + if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:18248: checking if you want to use valgrind for testing" >&5 + echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6 + + # Check whether --with-valgrind or --without-valgrind was given. +@@ -18272,7 +18267,7 @@ + else + with_valgrind= + fi; +-echo "$as_me:18275: result: ${with_valgrind:-no}" >&5 ++echo "$as_me:18270: result: ${with_valgrind:-no}" >&5 + echo "${ECHO_T}${with_valgrind:-no}" >&6 + + case ".$with_cflags" in +@@ -18385,7 +18380,7 @@ + ;; + esac + +-echo "$as_me:18388: checking if you want to perform memory-leak testing" >&5 ++echo "$as_me:18383: checking if you want to perform memory-leak testing" >&5 + echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6 + + # Check whether --enable-leaks or --disable-leaks was given. +@@ -18396,7 +18391,7 @@ + enable_leaks=yes + fi; + if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi +-echo "$as_me:18399: result: $with_no_leaks" >&5 ++echo "$as_me:18394: result: $with_no_leaks" >&5 + echo "${ECHO_T}$with_no_leaks" >&6 + + if test "$enable_leaks" = no ; then +@@ -18448,7 +18443,7 @@ + ;; + esac + +-echo "$as_me:18451: checking whether to add trace feature to all models" >&5 ++echo "$as_me:18446: checking whether to add trace feature to all models" >&5 + echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6 + + # Check whether --with-trace or --without-trace was given. +@@ -18458,7 +18453,7 @@ + else + cf_with_trace=$cf_all_traces + fi; +-echo "$as_me:18461: result: $cf_with_trace" >&5 ++echo "$as_me:18456: result: $cf_with_trace" >&5 + echo "${ECHO_T}$cf_with_trace" >&6 + + if test "x$cf_with_trace" = xyes ; then +@@ -18572,7 +18567,7 @@ + ADA_TRACE=FALSE + fi + +-echo "$as_me:18575: checking if we want to use GNAT projects" >&5 ++echo "$as_me:18570: checking if we want to use GNAT projects" >&5 + echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6 + + # Check whether --enable-gnat-projects or --disable-gnat-projects was given. +@@ -18589,7 +18584,7 @@ + enable_gnat_projects=yes + + fi; +-echo "$as_me:18592: result: $enable_gnat_projects" >&5 ++echo "$as_me:18587: result: $enable_gnat_projects" >&5 + echo "${ECHO_T}$enable_gnat_projects" >&6 + + ### Checks for libraries. +@@ -18603,13 +18598,13 @@ + # Note: WINVER may be a problem with Windows 10 + ;; + (*) +-echo "$as_me:18606: checking for gettimeofday" >&5 ++echo "$as_me:18601: checking for gettimeofday" >&5 + echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6 + if test "${ac_cv_func_gettimeofday+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18612 "configure" ++#line 18607 "configure" + #include "confdefs.h" + #define gettimeofday autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -18640,16 +18635,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:18643: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18638: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18646: \$? = $ac_status" >&5 ++ echo "$as_me:18641: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:18649: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18644: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18652: \$? = $ac_status" >&5 ++ echo "$as_me:18647: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_gettimeofday=yes + else +@@ -18659,7 +18654,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:18662: result: $ac_cv_func_gettimeofday" >&5 ++echo "$as_me:18657: result: $ac_cv_func_gettimeofday" >&5 + echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 + if test "$ac_cv_func_gettimeofday" = yes; then + +@@ -18669,7 +18664,7 @@ + + else + +-echo "$as_me:18672: checking for gettimeofday in -lbsd" >&5 ++echo "$as_me:18667: checking for gettimeofday in -lbsd" >&5 + echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6 + if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -18677,7 +18672,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18680 "configure" ++#line 18675 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -18696,16 +18691,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:18699: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18694: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18702: \$? = $ac_status" >&5 ++ echo "$as_me:18697: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:18705: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18700: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18708: \$? = $ac_status" >&5 ++ echo "$as_me:18703: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_bsd_gettimeofday=yes + else +@@ -18716,7 +18711,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:18719: result: $ac_cv_lib_bsd_gettimeofday" >&5 ++echo "$as_me:18714: result: $ac_cv_lib_bsd_gettimeofday" >&5 + echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6 + if test "$ac_cv_lib_bsd_gettimeofday" = yes; then + +@@ -18746,14 +18741,14 @@ + ;; + esac + +-echo "$as_me:18749: checking if -lm needed for math functions" >&5 ++echo "$as_me:18744: checking if -lm needed for math functions" >&5 + echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6 + if test "${cf_cv_need_libm+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18756 "configure" ++#line 18751 "configure" + #include "confdefs.h" + + #include +@@ -18769,16 +18764,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:18772: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18767: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18775: \$? = $ac_status" >&5 ++ echo "$as_me:18770: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:18778: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18773: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18781: \$? = $ac_status" >&5 ++ echo "$as_me:18776: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_need_libm=no + else +@@ -18788,7 +18783,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:18791: result: $cf_cv_need_libm" >&5 ++echo "$as_me:18786: result: $cf_cv_need_libm" >&5 + echo "${ECHO_T}$cf_cv_need_libm" >&6 + if test "$cf_cv_need_libm" = yes + then +@@ -18796,13 +18791,13 @@ + fi + + ### Checks for header files. +-echo "$as_me:18799: checking for ANSI C header files" >&5 ++echo "$as_me:18794: checking for ANSI C header files" >&5 + echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 + if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18805 "configure" ++#line 18800 "configure" + #include "confdefs.h" + #include + #include +@@ -18810,13 +18805,13 @@ + #include + + _ACEOF +-if { (eval echo "$as_me:18813: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:18808: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:18819: \$? = $ac_status" >&5 ++ echo "$as_me:18814: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -18838,7 +18833,7 @@ + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18841 "configure" ++#line 18836 "configure" + #include "confdefs.h" + #include + +@@ -18856,7 +18851,7 @@ + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18859 "configure" ++#line 18854 "configure" + #include "confdefs.h" + #include + +@@ -18877,7 +18872,7 @@ + : + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18880 "configure" ++#line 18875 "configure" + #include "confdefs.h" + #include + #if ((' ' & 0x0FF) == 0x020) +@@ -18903,15 +18898,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:18906: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18901: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18909: \$? = $ac_status" >&5 ++ echo "$as_me:18904: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:18911: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18906: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18914: \$? = $ac_status" >&5 ++ echo "$as_me:18909: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -18924,7 +18919,7 @@ + fi + fi + fi +-echo "$as_me:18927: result: $ac_cv_header_stdc" >&5 ++echo "$as_me:18922: result: $ac_cv_header_stdc" >&5 + echo "${ECHO_T}$ac_cv_header_stdc" >&6 + if test $ac_cv_header_stdc = yes; then + +@@ -18937,13 +18932,13 @@ + ac_header_dirent=no + for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do + as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` +-echo "$as_me:18940: checking for $ac_hdr that defines DIR" >&5 ++echo "$as_me:18935: checking for $ac_hdr that defines DIR" >&5 + echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18946 "configure" ++#line 18941 "configure" + #include "confdefs.h" + #include + #include <$ac_hdr> +@@ -18958,16 +18953,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:18961: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18956: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:18964: \$? = $ac_status" >&5 ++ echo "$as_me:18959: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:18967: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18962: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18970: \$? = $ac_status" >&5 ++ echo "$as_me:18965: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_Header=yes" + else +@@ -18977,7 +18972,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:18980: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:18975: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++ echo "$as_me:18988: checking for opendir in -ldir" >&5 + echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 + if test "${ac_cv_lib_dir_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -18998,7 +18993,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldir $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19001 "configure" ++#line 18996 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19017,16 +19012,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19020: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19015: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19023: \$? = $ac_status" >&5 ++ echo "$as_me:19018: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19026: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19021: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19029: \$? = $ac_status" >&5 ++ echo "$as_me:19024: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_dir_opendir=yes + else +@@ -19037,14 +19032,14 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19040: result: $ac_cv_lib_dir_opendir" >&5 ++echo "$as_me:19035: result: $ac_cv_lib_dir_opendir" >&5 + echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 + if test "$ac_cv_lib_dir_opendir" = yes; then + LIBS="$LIBS -ldir" + fi + + else +- echo "$as_me:19047: checking for opendir in -lx" >&5 ++ echo "$as_me:19042: checking for opendir in -lx" >&5 + echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 + if test "${ac_cv_lib_x_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19052,7 +19047,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lx $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19055 "configure" ++#line 19050 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19071,16 +19066,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19074: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19069: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19077: \$? = $ac_status" >&5 ++ echo "$as_me:19072: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19080: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19075: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19083: \$? = $ac_status" >&5 ++ echo "$as_me:19078: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_x_opendir=yes + else +@@ -19091,7 +19086,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19094: result: $ac_cv_lib_x_opendir" >&5 ++echo "$as_me:19089: result: $ac_cv_lib_x_opendir" >&5 + echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 + if test "$ac_cv_lib_x_opendir" = yes; then + LIBS="$LIBS -lx" +@@ -19099,13 +19094,13 @@ + + fi + +-echo "$as_me:19102: checking whether time.h and sys/time.h may both be included" >&5 ++echo "$as_me:19097: checking whether time.h and sys/time.h may both be included" >&5 + echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 + if test "${ac_cv_header_time+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19108 "configure" ++#line 19103 "configure" + #include "confdefs.h" + #include + #include +@@ -19121,16 +19116,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:19124: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19119: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19127: \$? = $ac_status" >&5 ++ echo "$as_me:19122: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:19130: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19125: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19133: \$? = $ac_status" >&5 ++ echo "$as_me:19128: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_header_time=yes + else +@@ -19140,7 +19135,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:19143: result: $ac_cv_header_time" >&5 ++echo "$as_me:19138: result: $ac_cv_header_time" >&5 + echo "${ECHO_T}$ac_cv_header_time" >&6 + if test $ac_cv_header_time = yes; then + +@@ -19155,7 +19150,7 @@ + case "$host_os" in + (mingw*) + # -lsystre -ltre -lintl -liconv +- echo "$as_me:19158: checking for regcomp in -lsystre" >&5 ++ echo "$as_me:19153: checking for regcomp in -lsystre" >&5 + echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6 + if test "${ac_cv_lib_systre_regcomp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19163,7 +19158,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lsystre $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19166 "configure" ++#line 19161 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19182,16 +19177,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19185: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19180: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19188: \$? = $ac_status" >&5 ++ echo "$as_me:19183: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19191: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19186: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19194: \$? = $ac_status" >&5 ++ echo "$as_me:19189: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_systre_regcomp=yes + else +@@ -19202,11 +19197,11 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19205: result: $ac_cv_lib_systre_regcomp" >&5 ++echo "$as_me:19200: result: $ac_cv_lib_systre_regcomp" >&5 + echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6 + if test "$ac_cv_lib_systre_regcomp" = yes; then + +- echo "$as_me:19209: checking for libiconv_open in -liconv" >&5 ++ echo "$as_me:19204: checking for libiconv_open in -liconv" >&5 + echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6 + if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19214,7 +19209,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-liconv $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19217 "configure" ++#line 19212 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19233,16 +19228,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19236: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19231: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19239: \$? = $ac_status" >&5 ++ echo "$as_me:19234: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19242: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19237: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19245: \$? = $ac_status" >&5 ++ echo "$as_me:19240: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_iconv_libiconv_open=yes + else +@@ -19253,7 +19248,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19256: result: $ac_cv_lib_iconv_libiconv_open" >&5 ++echo "$as_me:19251: result: $ac_cv_lib_iconv_libiconv_open" >&5 + echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6 + if test "$ac_cv_lib_iconv_libiconv_open" = yes; then + +@@ -19275,7 +19270,7 @@ + + fi + +- echo "$as_me:19278: checking for libintl_gettext in -lintl" >&5 ++ echo "$as_me:19273: checking for libintl_gettext in -lintl" >&5 + echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6 + if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19283,7 +19278,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19286 "configure" ++#line 19281 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19302,16 +19297,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19305: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19300: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19308: \$? = $ac_status" >&5 ++ echo "$as_me:19303: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19311: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19306: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19314: \$? = $ac_status" >&5 ++ echo "$as_me:19309: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_intl_libintl_gettext=yes + else +@@ -19322,7 +19317,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19325: result: $ac_cv_lib_intl_libintl_gettext" >&5 ++echo "$as_me:19320: result: $ac_cv_lib_intl_libintl_gettext" >&5 + echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6 + if test "$ac_cv_lib_intl_libintl_gettext" = yes; then + +@@ -19344,7 +19339,7 @@ + + fi + +- echo "$as_me:19347: checking for tre_regcomp in -ltre" >&5 ++ echo "$as_me:19342: checking for tre_regcomp in -ltre" >&5 + echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6 + if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19352,7 +19347,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ltre $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19355 "configure" ++#line 19350 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19371,16 +19366,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19374: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19369: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19377: \$? = $ac_status" >&5 ++ echo "$as_me:19372: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19380: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19375: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19383: \$? = $ac_status" >&5 ++ echo "$as_me:19378: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_tre_tre_regcomp=yes + else +@@ -19391,7 +19386,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19394: result: $ac_cv_lib_tre_tre_regcomp" >&5 ++echo "$as_me:19389: result: $ac_cv_lib_tre_tre_regcomp" >&5 + echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6 + if test "$ac_cv_lib_tre_tre_regcomp" = yes; then + +@@ -19433,7 +19428,7 @@ + + else + +- echo "$as_me:19436: checking for regcomp in -lgnurx" >&5 ++ echo "$as_me:19431: checking for regcomp in -lgnurx" >&5 + echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6 + if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19441,7 +19436,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgnurx $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19444 "configure" ++#line 19439 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19460,16 +19455,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19463: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19458: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19466: \$? = $ac_status" >&5 ++ echo "$as_me:19461: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19469: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19464: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19472: \$? = $ac_status" >&5 ++ echo "$as_me:19467: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gnurx_regcomp=yes + else +@@ -19480,7 +19475,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19483: result: $ac_cv_lib_gnurx_regcomp" >&5 ++echo "$as_me:19478: result: $ac_cv_lib_gnurx_regcomp" >&5 + echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6 + if test "$ac_cv_lib_gnurx_regcomp" = yes; then + +@@ -19508,13 +19503,13 @@ + ;; + (*) + cf_regex_libs="regex re" +- echo "$as_me:19511: checking for regcomp" >&5 ++ echo "$as_me:19506: checking for regcomp" >&5 + echo $ECHO_N "checking for regcomp... $ECHO_C" >&6 + if test "${ac_cv_func_regcomp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19517 "configure" ++#line 19512 "configure" + #include "confdefs.h" + #define regcomp autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -19545,16 +19540,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19548: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19543: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19551: \$? = $ac_status" >&5 ++ echo "$as_me:19546: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19554: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19549: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19557: \$? = $ac_status" >&5 ++ echo "$as_me:19552: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_regcomp=yes + else +@@ -19564,7 +19559,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:19567: result: $ac_cv_func_regcomp" >&5 ++echo "$as_me:19562: result: $ac_cv_func_regcomp" >&5 + echo "${ECHO_T}$ac_cv_func_regcomp" >&6 + if test "$ac_cv_func_regcomp" = yes; then + cf_regex_func=regcomp +@@ -19573,7 +19568,7 @@ + for cf_regex_lib in $cf_regex_libs + do + as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh` +-echo "$as_me:19576: checking for regcomp in -l$cf_regex_lib" >&5 ++echo "$as_me:19571: checking for regcomp in -l$cf_regex_lib" >&5 + echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Lib+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19581,7 +19576,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-l$cf_regex_lib $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19584 "configure" ++#line 19579 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19600,16 +19595,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19603: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19598: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19606: \$? = $ac_status" >&5 ++ echo "$as_me:19601: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19609: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19604: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19612: \$? = $ac_status" >&5 ++ echo "$as_me:19607: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_Lib=yes" + else +@@ -19620,7 +19615,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19623: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 ++echo "$as_me:19618: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then + +@@ -19652,13 +19647,13 @@ + esac + + if test "$cf_regex_func" = no ; then +- echo "$as_me:19655: checking for compile" >&5 ++ echo "$as_me:19650: checking for compile" >&5 + echo $ECHO_N "checking for compile... $ECHO_C" >&6 + if test "${ac_cv_func_compile+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19661 "configure" ++#line 19656 "configure" + #include "confdefs.h" + #define compile autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -19689,16 +19684,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19692: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19687: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19695: \$? = $ac_status" >&5 ++ echo "$as_me:19690: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19698: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19693: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19701: \$? = $ac_status" >&5 ++ echo "$as_me:19696: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_compile=yes + else +@@ -19708,13 +19703,13 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:19711: result: $ac_cv_func_compile" >&5 ++echo "$as_me:19706: result: $ac_cv_func_compile" >&5 + echo "${ECHO_T}$ac_cv_func_compile" >&6 + if test "$ac_cv_func_compile" = yes; then + cf_regex_func=compile + else + +- echo "$as_me:19717: checking for compile in -lgen" >&5 ++ echo "$as_me:19712: checking for compile in -lgen" >&5 + echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6 + if test "${ac_cv_lib_gen_compile+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19722,7 +19717,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgen $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19725 "configure" ++#line 19720 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19741,16 +19736,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19744: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19739: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19747: \$? = $ac_status" >&5 ++ echo "$as_me:19742: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19750: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19745: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19753: \$? = $ac_status" >&5 ++ echo "$as_me:19748: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gen_compile=yes + else +@@ -19761,7 +19756,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19764: result: $ac_cv_lib_gen_compile" >&5 ++echo "$as_me:19759: result: $ac_cv_lib_gen_compile" >&5 + echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6 + if test "$ac_cv_lib_gen_compile" = yes; then + +@@ -19789,11 +19784,11 @@ + fi + + if test "$cf_regex_func" = no ; then +- { echo "$as_me:19792: WARNING: cannot find regular expression library" >&5 ++ { echo "$as_me:19787: WARNING: cannot find regular expression library" >&5 + echo "$as_me: WARNING: cannot find regular expression library" >&2;} + fi + +-echo "$as_me:19796: checking for regular-expression headers" >&5 ++echo "$as_me:19791: checking for regular-expression headers" >&5 + echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6 + if test "${cf_cv_regex_hdrs+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19805,7 +19800,7 @@ + for cf_regex_hdr in regexp.h regexpr.h + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19808 "configure" ++#line 19803 "configure" + #include "confdefs.h" + #include <$cf_regex_hdr> + int +@@ -19822,16 +19817,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19825: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19820: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19828: \$? = $ac_status" >&5 ++ echo "$as_me:19823: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19831: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19826: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19834: \$? = $ac_status" >&5 ++ echo "$as_me:19829: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_regex_hdrs=$cf_regex_hdr +@@ -19848,7 +19843,7 @@ + for cf_regex_hdr in regex.h + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19851 "configure" ++#line 19846 "configure" + #include "confdefs.h" + #include + #include <$cf_regex_hdr> +@@ -19868,16 +19863,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19871: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19866: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19874: \$? = $ac_status" >&5 ++ echo "$as_me:19869: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19877: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19872: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19880: \$? = $ac_status" >&5 ++ echo "$as_me:19875: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_regex_hdrs=$cf_regex_hdr +@@ -19893,11 +19888,11 @@ + esac + + fi +-echo "$as_me:19896: result: $cf_cv_regex_hdrs" >&5 ++echo "$as_me:19891: result: $cf_cv_regex_hdrs" >&5 + echo "${ECHO_T}$cf_cv_regex_hdrs" >&6 + + case "$cf_cv_regex_hdrs" in +- (no) { echo "$as_me:19900: WARNING: no regular expression header found" >&5 ++ (no) { echo "$as_me:19895: WARNING: no regular expression header found" >&5 + echo "$as_me: WARNING: no regular expression header found" >&2;} ;; + (regex.h) + cat >>confdefs.h <<\EOF +@@ -19935,23 +19930,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:19938: checking for $ac_header" >&5 ++echo "$as_me:19933: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19944 "configure" ++#line 19939 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:19948: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:19943: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:19954: \$? = $ac_status" >&5 ++ echo "$as_me:19949: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -19970,7 +19965,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:19973: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:19968: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:19981: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19992 "configure" ++#line 19987 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:19996: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:19991: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:20002: \$? = $ac_status" >&5 ++ echo "$as_me:19997: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -20018,7 +20013,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:20021: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:20016: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:20026: checking for header declaring getopt variables" >&5 + echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6 + if test "${cf_cv_getopt_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -20038,7 +20033,7 @@ + for cf_header in stdio.h stdlib.h unistd.h getopt.h + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20041 "configure" ++#line 20036 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -20051,16 +20046,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20054: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20049: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20057: \$? = $ac_status" >&5 ++ echo "$as_me:20052: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20060: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20055: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20063: \$? = $ac_status" >&5 ++ echo "$as_me:20058: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_getopt_header=$cf_header + break +@@ -20072,7 +20067,7 @@ + done + + fi +-echo "$as_me:20075: result: $cf_cv_getopt_header" >&5 ++echo "$as_me:20070: result: $cf_cv_getopt_header" >&5 + echo "${ECHO_T}$cf_cv_getopt_header" >&6 + if test "$cf_cv_getopt_header" != none ; then + +@@ -20089,14 +20084,14 @@ + + fi + +-echo "$as_me:20092: checking if external environ is declared" >&5 ++echo "$as_me:20087: checking if external environ is declared" >&5 + echo $ECHO_N "checking if external environ is declared... $ECHO_C" >&6 + if test "${cf_cv_dcl_environ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20099 "configure" ++#line 20094 "configure" + #include "confdefs.h" + + #ifdef HAVE_STDLIB_H +@@ -20112,16 +20107,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20115: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20110: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20118: \$? = $ac_status" >&5 ++ echo "$as_me:20113: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20121: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20116: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20124: \$? = $ac_status" >&5 ++ echo "$as_me:20119: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_dcl_environ=yes + else +@@ -20132,7 +20127,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:20135: result: $cf_cv_dcl_environ" >&5 ++echo "$as_me:20130: result: $cf_cv_dcl_environ" >&5 + echo "${ECHO_T}$cf_cv_dcl_environ" >&6 + + if test "$cf_cv_dcl_environ" = no ; then +@@ -20147,14 +20142,14 @@ + + # It's possible (for near-UNIX clones) that the data doesn't exist + +-echo "$as_me:20150: checking if external environ exists" >&5 ++echo "$as_me:20145: checking if external environ exists" >&5 + echo $ECHO_N "checking if external environ exists... $ECHO_C" >&6 + if test "${cf_cv_have_environ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20157 "configure" ++#line 20152 "configure" + #include "confdefs.h" + + #undef environ +@@ -20169,16 +20164,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:20172: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20167: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20175: \$? = $ac_status" >&5 ++ echo "$as_me:20170: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:20178: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20173: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20181: \$? = $ac_status" >&5 ++ echo "$as_me:20176: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have_environ=yes + else +@@ -20189,7 +20184,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + fi +-echo "$as_me:20192: result: $cf_cv_have_environ" >&5 ++echo "$as_me:20187: result: $cf_cv_have_environ" >&5 + echo "${ECHO_T}$cf_cv_have_environ" >&6 + + if test "$cf_cv_have_environ" = yes ; then +@@ -20202,13 +20197,13 @@ + + fi + +-echo "$as_me:20205: checking for getenv" >&5 ++echo "$as_me:20200: checking for getenv" >&5 + echo $ECHO_N "checking for getenv... $ECHO_C" >&6 + if test "${ac_cv_func_getenv+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20211 "configure" ++#line 20206 "configure" + #include "confdefs.h" + #define getenv autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -20239,16 +20234,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:20242: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20237: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20245: \$? = $ac_status" >&5 ++ echo "$as_me:20240: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:20248: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20243: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20251: \$? = $ac_status" >&5 ++ echo "$as_me:20246: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_getenv=yes + else +@@ -20258,19 +20253,19 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:20261: result: $ac_cv_func_getenv" >&5 ++echo "$as_me:20256: result: $ac_cv_func_getenv" >&5 + echo "${ECHO_T}$ac_cv_func_getenv" >&6 + + for ac_func in putenv setenv strdup + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:20267: checking for $ac_func" >&5 ++echo "$as_me:20262: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20273 "configure" ++#line 20268 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -20301,16 +20296,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:20304: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20299: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20307: \$? = $ac_status" >&5 ++ echo "$as_me:20302: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:20310: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20305: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20313: \$? = $ac_status" >&5 ++ echo "$as_me:20308: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -20320,7 +20315,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:20323: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:20318: result: `eval echo '${'"$as_ac_var"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 + if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:20328: checking if getenv returns consistent values" >&5 + echo $ECHO_N "checking if getenv returns consistent values... $ECHO_C" >&6 + if test "${cf_cv_consistent_getenv+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -20340,7 +20335,7 @@ + cf_cv_consistent_getenv=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20343 "configure" ++#line 20338 "configure" + #include "confdefs.h" + + #include +@@ -20449,15 +20444,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:20452: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20447: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20455: \$? = $ac_status" >&5 ++ echo "$as_me:20450: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:20457: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20452: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20460: \$? = $ac_status" >&5 ++ echo "$as_me:20455: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_consistent_getenv=yes + else +@@ -20470,7 +20465,7 @@ + fi + + fi +-echo "$as_me:20473: result: $cf_cv_consistent_getenv" >&5 ++echo "$as_me:20468: result: $cf_cv_consistent_getenv" >&5 + echo "${ECHO_T}$cf_cv_consistent_getenv" >&6 + + if test "x$cf_cv_consistent_getenv" = xno +@@ -20485,18 +20480,18 @@ + if test "x$cf_cv_consistent_getenv" = xno && \ + test "x$cf_with_trace" = xyes + then +- { echo "$as_me:20488: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5 ++ { echo "$as_me:20483: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5 + echo "$as_me: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&2;} + fi + +-echo "$as_me:20492: checking if sys/time.h works with sys/select.h" >&5 ++echo "$as_me:20487: checking if sys/time.h works with sys/select.h" >&5 + echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6 + if test "${cf_cv_sys_time_select+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20499 "configure" ++#line 20494 "configure" + #include "confdefs.h" + + #include +@@ -20516,16 +20511,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20519: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20514: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20522: \$? = $ac_status" >&5 ++ echo "$as_me:20517: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20525: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20520: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20528: \$? = $ac_status" >&5 ++ echo "$as_me:20523: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_sys_time_select=yes + else +@@ -20537,7 +20532,7 @@ + + fi + +-echo "$as_me:20540: result: $cf_cv_sys_time_select" >&5 ++echo "$as_me:20535: result: $cf_cv_sys_time_select" >&5 + echo "${ECHO_T}$cf_cv_sys_time_select" >&6 + test "$cf_cv_sys_time_select" = yes && + cat >>confdefs.h <<\EOF +@@ -20552,13 +20547,13 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_main_return="return" + +-echo "$as_me:20555: checking for an ANSI C-conforming const" >&5 ++echo "$as_me:20550: checking for an ANSI C-conforming const" >&5 + echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 + if test "${ac_cv_c_const+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20561 "configure" ++#line 20556 "configure" + #include "confdefs.h" + + int +@@ -20616,16 +20611,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20619: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20614: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20622: \$? = $ac_status" >&5 ++ echo "$as_me:20617: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20625: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20620: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20628: \$? = $ac_status" >&5 ++ echo "$as_me:20623: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_c_const=yes + else +@@ -20635,7 +20630,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:20638: result: $ac_cv_c_const" >&5 ++echo "$as_me:20633: result: $ac_cv_c_const" >&5 + echo "${ECHO_T}$ac_cv_c_const" >&6 + if test $ac_cv_c_const = no; then + +@@ -20645,7 +20640,7 @@ + + fi + +-echo "$as_me:20648: checking for inline" >&5 ++echo "$as_me:20643: checking for inline" >&5 + echo $ECHO_N "checking for inline... $ECHO_C" >&6 + if test "${ac_cv_c_inline+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -20653,7 +20648,7 @@ + ac_cv_c_inline=no + for ac_kw in inline __inline__ __inline; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20656 "configure" ++#line 20651 "configure" + #include "confdefs.h" + #ifndef __cplusplus + static $ac_kw int static_foo () {return 0; } +@@ -20662,16 +20657,16 @@ + + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20665: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20660: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20668: \$? = $ac_status" >&5 ++ echo "$as_me:20663: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20671: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20666: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20674: \$? = $ac_status" >&5 ++ echo "$as_me:20669: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_c_inline=$ac_kw; break + else +@@ -20682,7 +20677,7 @@ + done + + fi +-echo "$as_me:20685: result: $ac_cv_c_inline" >&5 ++echo "$as_me:20680: result: $ac_cv_c_inline" >&5 + echo "${ECHO_T}$ac_cv_c_inline" >&6 + case $ac_cv_c_inline in + inline | yes) ;; +@@ -20708,7 +20703,7 @@ + : + elif test "$GCC" = yes + then +- echo "$as_me:20711: checking if $CC supports options to tune inlining" >&5 ++ echo "$as_me:20706: checking if $CC supports options to tune inlining" >&5 + echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6 + if test "${cf_cv_gcc_inline+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -20717,7 +20712,7 @@ + cf_save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS --param max-inline-insns-single=1200" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20720 "configure" ++#line 20715 "configure" + #include "confdefs.h" + inline int foo(void) { return 1; } + int +@@ -20729,16 +20724,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20732: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20727: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20735: \$? = $ac_status" >&5 ++ echo "$as_me:20730: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20738: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20733: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20741: \$? = $ac_status" >&5 ++ echo "$as_me:20736: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gcc_inline=yes + else +@@ -20750,7 +20745,7 @@ + CFLAGS=$cf_save_CFLAGS + + fi +-echo "$as_me:20753: result: $cf_cv_gcc_inline" >&5 ++echo "$as_me:20748: result: $cf_cv_gcc_inline" >&5 + echo "${ECHO_T}$cf_cv_gcc_inline" >&6 + if test "$cf_cv_gcc_inline" = yes ; then + +@@ -20856,7 +20851,7 @@ + fi + fi + +-echo "$as_me:20859: checking for signal global datatype" >&5 ++echo "$as_me:20854: checking for signal global datatype" >&5 + echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6 + if test "${cf_cv_sig_atomic_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -20868,7 +20863,7 @@ + "int" + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20871 "configure" ++#line 20866 "configure" + #include "confdefs.h" + + #include +@@ -20892,16 +20887,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20895: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20890: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20898: \$? = $ac_status" >&5 ++ echo "$as_me:20893: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20901: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20896: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20904: \$? = $ac_status" >&5 ++ echo "$as_me:20899: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_sig_atomic_t=$cf_type + else +@@ -20915,7 +20910,7 @@ + + fi + +-echo "$as_me:20918: result: $cf_cv_sig_atomic_t" >&5 ++echo "$as_me:20913: result: $cf_cv_sig_atomic_t" >&5 + echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6 + test "$cf_cv_sig_atomic_t" != no && + cat >>confdefs.h <&5 ++echo "$as_me:20922: checking for type of chtype" >&5 + echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 + if test "${cf_cv_typeof_chtype+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -20934,7 +20929,7 @@ + cf_cv_typeof_chtype=long + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20937 "configure" ++#line 20932 "configure" + #include "confdefs.h" + + #define WANT_BITS 31 +@@ -20969,15 +20964,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:20972: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20967: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20975: \$? = $ac_status" >&5 ++ echo "$as_me:20970: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:20977: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20972: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20980: \$? = $ac_status" >&5 ++ echo "$as_me:20975: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_typeof_chtype=`cat cf_test.out` + else +@@ -20992,7 +20987,7 @@ + + fi + +-echo "$as_me:20995: result: $cf_cv_typeof_chtype" >&5 ++echo "$as_me:20990: result: $cf_cv_typeof_chtype" >&5 + echo "${ECHO_T}$cf_cv_typeof_chtype" >&6 + + cat >>confdefs.h <&5 ++echo "$as_me:21002: checking if unsigned literals are legal" >&5 + echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6 + if test "${cf_cv_unsigned_literals+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21014 "configure" ++#line 21009 "configure" + #include "confdefs.h" + + int +@@ -21023,16 +21018,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:21026: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21021: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21029: \$? = $ac_status" >&5 ++ echo "$as_me:21024: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:21032: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21027: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21035: \$? = $ac_status" >&5 ++ echo "$as_me:21030: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_unsigned_literals=yes + else +@@ -21044,7 +21039,7 @@ + + fi + +-echo "$as_me:21047: result: $cf_cv_unsigned_literals" >&5 ++echo "$as_me:21042: result: $cf_cv_unsigned_literals" >&5 + echo "${ECHO_T}$cf_cv_unsigned_literals" >&6 + + cf_cv_1UL="1" +@@ -21060,14 +21055,14 @@ + + ### Checks for external-data + +-echo "$as_me:21063: checking if external errno is declared" >&5 ++echo "$as_me:21058: checking if external errno is declared" >&5 + echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6 + if test "${cf_cv_dcl_errno+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21070 "configure" ++#line 21065 "configure" + #include "confdefs.h" + + #ifdef HAVE_STDLIB_H +@@ -21085,16 +21080,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:21088: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21083: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21091: \$? = $ac_status" >&5 ++ echo "$as_me:21086: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:21094: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21089: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21097: \$? = $ac_status" >&5 ++ echo "$as_me:21092: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_dcl_errno=yes + else +@@ -21105,7 +21100,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:21108: result: $cf_cv_dcl_errno" >&5 ++echo "$as_me:21103: result: $cf_cv_dcl_errno" >&5 + echo "${ECHO_T}$cf_cv_dcl_errno" >&6 + + if test "$cf_cv_dcl_errno" = no ; then +@@ -21120,14 +21115,14 @@ + + # It's possible (for near-UNIX clones) that the data doesn't exist + +-echo "$as_me:21123: checking if external errno exists" >&5 ++echo "$as_me:21118: checking if external errno exists" >&5 + echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6 + if test "${cf_cv_have_errno+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21130 "configure" ++#line 21125 "configure" + #include "confdefs.h" + + #undef errno +@@ -21142,16 +21137,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21145: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21140: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21148: \$? = $ac_status" >&5 ++ echo "$as_me:21143: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21151: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21146: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21154: \$? = $ac_status" >&5 ++ echo "$as_me:21149: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have_errno=yes + else +@@ -21162,7 +21157,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + fi +-echo "$as_me:21165: result: $cf_cv_have_errno" >&5 ++echo "$as_me:21160: result: $cf_cv_have_errno" >&5 + echo "${ECHO_T}$cf_cv_have_errno" >&6 + + if test "$cf_cv_have_errno" = yes ; then +@@ -21175,7 +21170,7 @@ + + fi + +-echo "$as_me:21178: checking if data-only library module links" >&5 ++echo "$as_me:21173: checking if data-only library module links" >&5 + echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6 + if test "${cf_cv_link_dataonly+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -21183,20 +21178,20 @@ + + rm -f conftest.a + cat >conftest.$ac_ext <&5 ++ if { (eval echo "$as_me:21184: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21192: \$? = $ac_status" >&5 ++ echo "$as_me:21187: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then + mv conftest.o data.o && \ + ( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null + fi + rm -f conftest.$ac_ext data.o + cat >conftest.$ac_ext <&5 ++ if { (eval echo "$as_me:21207: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21215: \$? = $ac_status" >&5 ++ echo "$as_me:21210: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then + mv conftest.o func.o && \ + ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null +@@ -21225,7 +21220,7 @@ + cf_cv_link_dataonly=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21228 "configure" ++#line 21223 "configure" + #include "confdefs.h" + + int main(void) +@@ -21236,15 +21231,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:21239: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21234: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21242: \$? = $ac_status" >&5 ++ echo "$as_me:21237: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:21244: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21239: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21247: \$? = $ac_status" >&5 ++ echo "$as_me:21242: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_link_dataonly=yes + else +@@ -21259,7 +21254,7 @@ + + fi + +-echo "$as_me:21262: result: $cf_cv_link_dataonly" >&5 ++echo "$as_me:21257: result: $cf_cv_link_dataonly" >&5 + echo "${ECHO_T}$cf_cv_link_dataonly" >&6 + + if test "$cf_cv_link_dataonly" = no ; then +@@ -21303,13 +21298,13 @@ + + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:21306: checking for $ac_func" >&5 ++echo "$as_me:21301: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21312 "configure" ++#line 21307 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -21340,16 +21335,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21343: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21338: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21346: \$? = $ac_status" >&5 ++ echo "$as_me:21341: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21349: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21344: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21352: \$? = $ac_status" >&5 ++ echo "$as_me:21347: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -21359,7 +21354,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:21362: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:21357: result: `eval echo '${'"$as_ac_var"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 + if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then + cat >>confdefs.h <&5 ++ { { echo "$as_me:21369: error: getopt is required for building programs" >&5 + echo "$as_me: error: getopt is required for building programs" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -21380,7 +21375,7 @@ + then + if test "x$ac_cv_func_vsnprintf" = xyes + then +- { echo "$as_me:21383: WARNING: will use vsnprintf instead of safe-sprintf option" >&5 ++ { echo "$as_me:21378: WARNING: will use vsnprintf instead of safe-sprintf option" >&5 + echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;} + else + +@@ -21393,14 +21388,14 @@ + + if test "x$with_getcap" = "xyes" ; then + +-echo "$as_me:21396: checking for terminal-capability database functions" >&5 ++echo "$as_me:21391: checking for terminal-capability database functions" >&5 + echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6 + if test "${cf_cv_cgetent+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21403 "configure" ++#line 21398 "configure" + #include "confdefs.h" + + #include +@@ -21420,16 +21415,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21423: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21418: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21426: \$? = $ac_status" >&5 ++ echo "$as_me:21421: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21429: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21424: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21432: \$? = $ac_status" >&5 ++ echo "$as_me:21427: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_cgetent=yes + else +@@ -21440,7 +21435,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + fi +-echo "$as_me:21443: result: $cf_cv_cgetent" >&5 ++echo "$as_me:21438: result: $cf_cv_cgetent" >&5 + echo "${ECHO_T}$cf_cv_cgetent" >&6 + + if test "$cf_cv_cgetent" = yes +@@ -21450,14 +21445,14 @@ + #define HAVE_BSD_CGETENT 1 + EOF + +-echo "$as_me:21453: checking if cgetent uses const parameter" >&5 ++echo "$as_me:21448: checking if cgetent uses const parameter" >&5 + echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6 + if test "${cf_cv_cgetent_const+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21460 "configure" ++#line 21455 "configure" + #include "confdefs.h" + + #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers" +@@ -21480,16 +21475,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21483: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21478: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21486: \$? = $ac_status" >&5 ++ echo "$as_me:21481: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21489: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21484: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21492: \$? = $ac_status" >&5 ++ echo "$as_me:21487: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_cgetent_const=yes + else +@@ -21500,7 +21495,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + fi +-echo "$as_me:21503: result: $cf_cv_cgetent_const" >&5 ++echo "$as_me:21498: result: $cf_cv_cgetent_const" >&5 + echo "${ECHO_T}$cf_cv_cgetent_const" >&6 + if test "$cf_cv_cgetent_const" = yes + then +@@ -21514,14 +21509,14 @@ + + fi + +-echo "$as_me:21517: checking for isascii" >&5 ++echo "$as_me:21512: checking for isascii" >&5 + echo $ECHO_N "checking for isascii... $ECHO_C" >&6 + if test "${cf_cv_have_isascii+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21524 "configure" ++#line 21519 "configure" + #include "confdefs.h" + #include + int +@@ -21533,16 +21528,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21536: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21531: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21539: \$? = $ac_status" >&5 ++ echo "$as_me:21534: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21542: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21537: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21545: \$? = $ac_status" >&5 ++ echo "$as_me:21540: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have_isascii=yes + else +@@ -21553,7 +21548,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + fi +-echo "$as_me:21556: result: $cf_cv_have_isascii" >&5 ++echo "$as_me:21551: result: $cf_cv_have_isascii" >&5 + echo "${ECHO_T}$cf_cv_have_isascii" >&6 + test "$cf_cv_have_isascii" = yes && + cat >>confdefs.h <<\EOF +@@ -21561,10 +21556,10 @@ + EOF + + if test "$ac_cv_func_sigaction" = yes; then +-echo "$as_me:21564: checking whether sigaction needs _POSIX_SOURCE" >&5 ++echo "$as_me:21559: checking whether sigaction needs _POSIX_SOURCE" >&5 + echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21567 "configure" ++#line 21562 "configure" + #include "confdefs.h" + + #include +@@ -21578,16 +21573,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:21581: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21576: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21584: \$? = $ac_status" >&5 ++ echo "$as_me:21579: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:21587: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21582: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21590: \$? = $ac_status" >&5 ++ echo "$as_me:21585: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + sigact_bad=no + else +@@ -21595,7 +21590,7 @@ + cat "conftest.$ac_ext" >&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21598 "configure" ++#line 21593 "configure" + #include "confdefs.h" + + #define _POSIX_SOURCE +@@ -21610,16 +21605,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:21613: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21608: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21616: \$? = $ac_status" >&5 ++ echo "$as_me:21611: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:21619: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21614: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21622: \$? = $ac_status" >&5 ++ echo "$as_me:21617: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + sigact_bad=yes + +@@ -21635,11 +21630,11 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +-echo "$as_me:21638: result: $sigact_bad" >&5 ++echo "$as_me:21633: result: $sigact_bad" >&5 + echo "${ECHO_T}$sigact_bad" >&6 + fi + +-echo "$as_me:21642: checking if nanosleep really works" >&5 ++echo "$as_me:21637: checking if nanosleep really works" >&5 + echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6 + if test "${cf_cv_func_nanosleep+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -21649,7 +21644,7 @@ + cf_cv_func_nanosleep=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21652 "configure" ++#line 21647 "configure" + #include "confdefs.h" + + #include +@@ -21674,15 +21669,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:21677: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21672: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21680: \$? = $ac_status" >&5 ++ echo "$as_me:21675: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:21682: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21677: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21685: \$? = $ac_status" >&5 ++ echo "$as_me:21680: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_nanosleep=yes + else +@@ -21694,7 +21689,7 @@ + rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" + fi + fi +-echo "$as_me:21697: result: $cf_cv_func_nanosleep" >&5 ++echo "$as_me:21692: result: $cf_cv_func_nanosleep" >&5 + echo "${ECHO_T}$cf_cv_func_nanosleep" >&6 + + test "$cf_cv_func_nanosleep" = "yes" && +@@ -21711,23 +21706,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:21714: checking for $ac_header" >&5 ++echo "$as_me:21709: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21720 "configure" ++#line 21715 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:21724: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:21719: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:21730: \$? = $ac_status" >&5 ++ echo "$as_me:21725: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -21746,7 +21741,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:21749: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:21744: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++ echo "$as_me:21761: checking whether termios.h needs _POSIX_SOURCE" >&5 + echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21769 "configure" ++#line 21764 "configure" + #include "confdefs.h" + #include + int +@@ -21778,16 +21773,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:21781: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21776: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21784: \$? = $ac_status" >&5 ++ echo "$as_me:21779: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:21787: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21782: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21790: \$? = $ac_status" >&5 ++ echo "$as_me:21785: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + termios_bad=no + else +@@ -21795,7 +21790,7 @@ + cat "conftest.$ac_ext" >&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21798 "configure" ++#line 21793 "configure" + #include "confdefs.h" + + #define _POSIX_SOURCE +@@ -21809,16 +21804,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:21812: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21807: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21815: \$? = $ac_status" >&5 ++ echo "$as_me:21810: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:21818: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21813: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21821: \$? = $ac_status" >&5 ++ echo "$as_me:21816: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + termios_bad=unknown + else +@@ -21834,19 +21829,19 @@ + + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +- echo "$as_me:21837: result: $termios_bad" >&5 ++ echo "$as_me:21832: result: $termios_bad" >&5 + echo "${ECHO_T}$termios_bad" >&6 + fi + fi + +-echo "$as_me:21842: checking for tcgetattr" >&5 ++echo "$as_me:21837: checking for tcgetattr" >&5 + echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6 + if test "${cf_cv_have_tcgetattr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21849 "configure" ++#line 21844 "configure" + #include "confdefs.h" + + #include +@@ -21874,16 +21869,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21877: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21872: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21880: \$? = $ac_status" >&5 ++ echo "$as_me:21875: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21883: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21878: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21886: \$? = $ac_status" >&5 ++ echo "$as_me:21881: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have_tcgetattr=yes + else +@@ -21893,21 +21888,21 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:21896: result: $cf_cv_have_tcgetattr" >&5 ++echo "$as_me:21891: result: $cf_cv_have_tcgetattr" >&5 + echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6 + test "$cf_cv_have_tcgetattr" = yes && + cat >>confdefs.h <<\EOF + #define HAVE_TCGETATTR 1 + EOF + +-echo "$as_me:21903: checking for vsscanf function or workaround" >&5 ++echo "$as_me:21898: checking for vsscanf function or workaround" >&5 + echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6 + if test "${cf_cv_func_vsscanf+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21910 "configure" ++#line 21905 "configure" + #include "confdefs.h" + + #include +@@ -21923,16 +21918,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21926: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21921: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21929: \$? = $ac_status" >&5 ++ echo "$as_me:21924: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21932: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21927: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21935: \$? = $ac_status" >&5 ++ echo "$as_me:21930: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_vsscanf=vsscanf + else +@@ -21940,7 +21935,7 @@ + cat "conftest.$ac_ext" >&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21943 "configure" ++#line 21938 "configure" + #include "confdefs.h" + + #include +@@ -21962,16 +21957,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21965: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21960: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21968: \$? = $ac_status" >&5 ++ echo "$as_me:21963: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21971: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21966: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21974: \$? = $ac_status" >&5 ++ echo "$as_me:21969: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_vsscanf=vfscanf + else +@@ -21979,7 +21974,7 @@ + cat "conftest.$ac_ext" >&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21982 "configure" ++#line 21977 "configure" + #include "confdefs.h" + + #include +@@ -22001,16 +21996,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22004: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21999: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22007: \$? = $ac_status" >&5 ++ echo "$as_me:22002: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22010: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22005: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22013: \$? = $ac_status" >&5 ++ echo "$as_me:22008: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_vsscanf=_doscan + else +@@ -22025,7 +22020,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:22028: result: $cf_cv_func_vsscanf" >&5 ++echo "$as_me:22023: result: $cf_cv_func_vsscanf" >&5 + echo "${ECHO_T}$cf_cv_func_vsscanf" >&6 + + case "$cf_cv_func_vsscanf" in +@@ -22051,23 +22046,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:22054: checking for $ac_header" >&5 ++echo "$as_me:22049: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22060 "configure" ++#line 22055 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:22064: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:22059: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:22070: \$? = $ac_status" >&5 ++ echo "$as_me:22065: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -22086,7 +22081,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:22089: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:22084: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:22094: checking for working mkstemp" >&5 + echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 + if test "${cf_cv_func_mkstemp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -22107,7 +22102,7 @@ + cf_cv_func_mkstemp=maybe + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22110 "configure" ++#line 22105 "configure" + #include "confdefs.h" + + #include +@@ -22148,15 +22143,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:22151: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22146: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22154: \$? = $ac_status" >&5 ++ echo "$as_me:22149: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:22156: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22151: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22159: \$? = $ac_status" >&5 ++ echo "$as_me:22154: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_mkstemp=yes + +@@ -22171,16 +22166,16 @@ + fi + + fi +-echo "$as_me:22174: result: $cf_cv_func_mkstemp" >&5 ++echo "$as_me:22169: result: $cf_cv_func_mkstemp" >&5 + echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 + if test "x$cf_cv_func_mkstemp" = xmaybe ; then +- echo "$as_me:22177: checking for mkstemp" >&5 ++ echo "$as_me:22172: checking for mkstemp" >&5 + echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 + if test "${ac_cv_func_mkstemp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22183 "configure" ++#line 22178 "configure" + #include "confdefs.h" + #define mkstemp autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -22211,16 +22206,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22214: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22209: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22217: \$? = $ac_status" >&5 ++ echo "$as_me:22212: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22220: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22215: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22223: \$? = $ac_status" >&5 ++ echo "$as_me:22218: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_mkstemp=yes + else +@@ -22230,7 +22225,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:22233: result: $ac_cv_func_mkstemp" >&5 ++echo "$as_me:22228: result: $ac_cv_func_mkstemp" >&5 + echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 + + fi +@@ -22251,21 +22246,21 @@ + fi + + if test "x$cross_compiling" = xyes ; then +- { echo "$as_me:22254: WARNING: cross compiling: assume setvbuf params not reversed" >&5 ++ { echo "$as_me:22249: WARNING: cross compiling: assume setvbuf params not reversed" >&5 + echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;} + else +- echo "$as_me:22257: checking whether setvbuf arguments are reversed" >&5 ++ echo "$as_me:22252: checking whether setvbuf arguments are reversed" >&5 + echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6 + if test "${ac_cv_func_setvbuf_reversed+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:22263: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:22258: error: cannot run test program while cross compiling" >&5 + echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22268 "configure" ++#line 22263 "configure" + #include "confdefs.h" + #include + /* If setvbuf has the reversed format, exit 0. */ +@@ -22282,15 +22277,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:22285: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22280: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22288: \$? = $ac_status" >&5 ++ echo "$as_me:22283: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:22290: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22285: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22293: \$? = $ac_status" >&5 ++ echo "$as_me:22288: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_setvbuf_reversed=yes + else +@@ -22303,7 +22298,7 @@ + fi + rm -f core ./core.* ./*.core + fi +-echo "$as_me:22306: result: $ac_cv_func_setvbuf_reversed" >&5 ++echo "$as_me:22301: result: $ac_cv_func_setvbuf_reversed" >&5 + echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6 + if test $ac_cv_func_setvbuf_reversed = yes; then + +@@ -22314,13 +22309,13 @@ + fi + + fi +-echo "$as_me:22317: checking for intptr_t" >&5 ++echo "$as_me:22312: checking for intptr_t" >&5 + echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6 + if test "${ac_cv_type_intptr_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22323 "configure" ++#line 22318 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -22335,16 +22330,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:22338: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:22333: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:22341: \$? = $ac_status" >&5 ++ echo "$as_me:22336: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:22344: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22339: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22347: \$? = $ac_status" >&5 ++ echo "$as_me:22342: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_intptr_t=yes + else +@@ -22354,7 +22349,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:22357: result: $ac_cv_type_intptr_t" >&5 ++echo "$as_me:22352: result: $ac_cv_type_intptr_t" >&5 + echo "${ECHO_T}$ac_cv_type_intptr_t" >&6 + if test "$ac_cv_type_intptr_t" = yes; then + : +@@ -22366,13 +22361,13 @@ + + fi + +-echo "$as_me:22369: checking for ssize_t" >&5 ++echo "$as_me:22364: checking for ssize_t" >&5 + echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6 + if test "${ac_cv_type_ssize_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22375 "configure" ++#line 22370 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -22387,16 +22382,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:22390: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:22385: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:22393: \$? = $ac_status" >&5 ++ echo "$as_me:22388: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:22396: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22391: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22399: \$? = $ac_status" >&5 ++ echo "$as_me:22394: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_ssize_t=yes + else +@@ -22406,7 +22401,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:22409: result: $ac_cv_type_ssize_t" >&5 ++echo "$as_me:22404: result: $ac_cv_type_ssize_t" >&5 + echo "${ECHO_T}$ac_cv_type_ssize_t" >&6 + if test "$ac_cv_type_ssize_t" = yes; then + : +@@ -22418,14 +22413,14 @@ + + fi + +-echo "$as_me:22421: checking for type sigaction_t" >&5 ++echo "$as_me:22416: checking for type sigaction_t" >&5 + echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6 + if test "${cf_cv_type_sigaction+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22428 "configure" ++#line 22423 "configure" + #include "confdefs.h" + + #include +@@ -22438,16 +22433,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:22441: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:22436: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:22444: \$? = $ac_status" >&5 ++ echo "$as_me:22439: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:22447: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22442: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22450: \$? = $ac_status" >&5 ++ echo "$as_me:22445: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_type_sigaction=yes + else +@@ -22458,14 +22453,14 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi + +-echo "$as_me:22461: result: $cf_cv_type_sigaction" >&5 ++echo "$as_me:22456: result: $cf_cv_type_sigaction" >&5 + echo "${ECHO_T}$cf_cv_type_sigaction" >&6 + test "$cf_cv_type_sigaction" = yes && + cat >>confdefs.h <<\EOF + #define HAVE_TYPE_SIGACTION 1 + EOF + +-echo "$as_me:22468: checking declaration of size-change" >&5 ++echo "$as_me:22463: checking declaration of size-change" >&5 + echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6 + if test "${cf_cv_sizechange+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -22486,7 +22481,7 @@ + + fi + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22489 "configure" ++#line 22484 "configure" + #include "confdefs.h" + #include + #ifdef HAVE_TERMIOS_H +@@ -22536,16 +22531,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:22539: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:22534: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:22542: \$? = $ac_status" >&5 ++ echo "$as_me:22537: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:22545: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22540: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22548: \$? = $ac_status" >&5 ++ echo "$as_me:22543: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_sizechange=yes + else +@@ -22564,7 +22559,7 @@ + done + + fi +-echo "$as_me:22567: result: $cf_cv_sizechange" >&5 ++echo "$as_me:22562: result: $cf_cv_sizechange" >&5 + echo "${ECHO_T}$cf_cv_sizechange" >&6 + if test "$cf_cv_sizechange" != no ; then + +@@ -22582,13 +22577,13 @@ + esac + fi + +-echo "$as_me:22585: checking for memmove" >&5 ++echo "$as_me:22580: checking for memmove" >&5 + echo $ECHO_N "checking for memmove... $ECHO_C" >&6 + if test "${ac_cv_func_memmove+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22591 "configure" ++#line 22586 "configure" + #include "confdefs.h" + #define memmove autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -22619,16 +22614,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22622: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22617: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22625: \$? = $ac_status" >&5 ++ echo "$as_me:22620: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22628: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22623: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22631: \$? = $ac_status" >&5 ++ echo "$as_me:22626: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_memmove=yes + else +@@ -22638,19 +22633,19 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:22641: result: $ac_cv_func_memmove" >&5 ++echo "$as_me:22636: result: $ac_cv_func_memmove" >&5 + echo "${ECHO_T}$ac_cv_func_memmove" >&6 + if test "$ac_cv_func_memmove" = yes; then + : + else + +-echo "$as_me:22647: checking for bcopy" >&5 ++echo "$as_me:22642: checking for bcopy" >&5 + echo $ECHO_N "checking for bcopy... $ECHO_C" >&6 + if test "${ac_cv_func_bcopy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22653 "configure" ++#line 22648 "configure" + #include "confdefs.h" + #define bcopy autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -22681,16 +22676,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22684: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22679: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22687: \$? = $ac_status" >&5 ++ echo "$as_me:22682: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22690: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22685: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22693: \$? = $ac_status" >&5 ++ echo "$as_me:22688: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_bcopy=yes + else +@@ -22700,11 +22695,11 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:22703: result: $ac_cv_func_bcopy" >&5 ++echo "$as_me:22698: result: $ac_cv_func_bcopy" >&5 + echo "${ECHO_T}$ac_cv_func_bcopy" >&6 + if test "$ac_cv_func_bcopy" = yes; then + +- echo "$as_me:22707: checking if bcopy does overlapping moves" >&5 ++ echo "$as_me:22702: checking if bcopy does overlapping moves" >&5 + echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6 + if test "${cf_cv_good_bcopy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -22714,7 +22709,7 @@ + cf_cv_good_bcopy=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22717 "configure" ++#line 22712 "configure" + #include "confdefs.h" + + int main(void) { +@@ -22728,15 +22723,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:22731: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22726: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22734: \$? = $ac_status" >&5 ++ echo "$as_me:22729: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:22736: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22731: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22739: \$? = $ac_status" >&5 ++ echo "$as_me:22734: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_good_bcopy=yes + else +@@ -22749,7 +22744,7 @@ + fi + + fi +-echo "$as_me:22752: result: $cf_cv_good_bcopy" >&5 ++echo "$as_me:22747: result: $cf_cv_good_bcopy" >&5 + echo "${ECHO_T}$cf_cv_good_bcopy" >&6 + + else +@@ -22776,13 +22771,13 @@ + for ac_func in posix_openpt + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:22779: checking for $ac_func" >&5 ++echo "$as_me:22774: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22785 "configure" ++#line 22780 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -22813,16 +22808,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22816: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22811: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22819: \$? = $ac_status" >&5 ++ echo "$as_me:22814: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22822: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22817: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22825: \$? = $ac_status" >&5 ++ echo "$as_me:22820: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -22832,7 +22827,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:22835: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:22830: result: `eval echo '${'"$as_ac_var"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 + if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:22840: checking if poll really works" >&5 + echo $ECHO_N "checking if poll really works... $ECHO_C" >&6 + if test "${cf_cv_working_poll+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -22852,7 +22847,7 @@ + cf_cv_working_poll=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22855 "configure" ++#line 22850 "configure" + #include "confdefs.h" + + #include +@@ -22904,15 +22899,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:22907: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22902: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22910: \$? = $ac_status" >&5 ++ echo "$as_me:22905: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:22912: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22907: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22915: \$? = $ac_status" >&5 ++ echo "$as_me:22910: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_working_poll=yes + else +@@ -22924,21 +22919,21 @@ + rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" + fi + fi +-echo "$as_me:22927: result: $cf_cv_working_poll" >&5 ++echo "$as_me:22922: result: $cf_cv_working_poll" >&5 + echo "${ECHO_T}$cf_cv_working_poll" >&6 + test "$cf_cv_working_poll" = "yes" && + cat >>confdefs.h <<\EOF + #define HAVE_WORKING_POLL 1 + EOF + +-echo "$as_me:22934: checking for va_copy" >&5 ++echo "$as_me:22929: checking for va_copy" >&5 + echo $ECHO_N "checking for va_copy... $ECHO_C" >&6 + if test "${cf_cv_have_va_copy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22941 "configure" ++#line 22936 "configure" + #include "confdefs.h" + + #include +@@ -22955,16 +22950,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22958: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22953: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22961: \$? = $ac_status" >&5 ++ echo "$as_me:22956: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22964: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22959: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22967: \$? = $ac_status" >&5 ++ echo "$as_me:22962: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have_va_copy=yes + else +@@ -22974,7 +22969,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:22977: result: $cf_cv_have_va_copy" >&5 ++echo "$as_me:22972: result: $cf_cv_have_va_copy" >&5 + echo "${ECHO_T}$cf_cv_have_va_copy" >&6 + + if test "$cf_cv_have_va_copy" = yes; +@@ -22986,14 +22981,14 @@ + + else # !cf_cv_have_va_copy + +-echo "$as_me:22989: checking for __va_copy" >&5 ++echo "$as_me:22984: checking for __va_copy" >&5 + echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6 + if test "${cf_cv_have___va_copy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22996 "configure" ++#line 22991 "configure" + #include "confdefs.h" + + #include +@@ -23010,16 +23005,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23013: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23008: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23016: \$? = $ac_status" >&5 ++ echo "$as_me:23011: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23019: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23014: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23022: \$? = $ac_status" >&5 ++ echo "$as_me:23017: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have___va_copy=yes + else +@@ -23029,7 +23024,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:23032: result: $cf_cv_have___va_copy" >&5 ++echo "$as_me:23027: result: $cf_cv_have___va_copy" >&5 + echo "${ECHO_T}$cf_cv_have___va_copy" >&6 + + if test "$cf_cv_have___va_copy" = yes +@@ -23041,14 +23036,14 @@ + + else # !cf_cv_have___va_copy + +-echo "$as_me:23044: checking for __builtin_va_copy" >&5 ++echo "$as_me:23039: checking for __builtin_va_copy" >&5 + echo $ECHO_N "checking for __builtin_va_copy... $ECHO_C" >&6 + if test "${cf_cv_have___builtin_va_copy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23051 "configure" ++#line 23046 "configure" + #include "confdefs.h" + + #include +@@ -23065,16 +23060,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23068: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23063: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23071: \$? = $ac_status" >&5 ++ echo "$as_me:23066: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23074: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23069: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23077: \$? = $ac_status" >&5 ++ echo "$as_me:23072: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have___builtin_va_copy=yes + else +@@ -23084,7 +23079,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:23087: result: $cf_cv_have___builtin_va_copy" >&5 ++echo "$as_me:23082: result: $cf_cv_have___builtin_va_copy" >&5 + echo "${ECHO_T}$cf_cv_have___builtin_va_copy" >&6 + + test "$cf_cv_have___builtin_va_copy" = yes && +@@ -23102,14 +23097,14 @@ + ;; + + (*) +- echo "$as_me:23105: checking if we can simply copy va_list" >&5 ++ echo "$as_me:23100: checking if we can simply copy va_list" >&5 + echo $ECHO_N "checking if we can simply copy va_list... $ECHO_C" >&6 + if test "${cf_cv_pointer_va_list+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23112 "configure" ++#line 23107 "configure" + #include "confdefs.h" + + #include +@@ -23126,16 +23121,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23129: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23124: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23132: \$? = $ac_status" >&5 ++ echo "$as_me:23127: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23135: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23130: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23138: \$? = $ac_status" >&5 ++ echo "$as_me:23133: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_pointer_va_list=yes + else +@@ -23145,19 +23140,19 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:23148: result: $cf_cv_pointer_va_list" >&5 ++echo "$as_me:23143: result: $cf_cv_pointer_va_list" >&5 + echo "${ECHO_T}$cf_cv_pointer_va_list" >&6 + + if test "$cf_cv_pointer_va_list" = no + then +- echo "$as_me:23153: checking if we can copy va_list indirectly" >&5 ++ echo "$as_me:23148: checking if we can copy va_list indirectly" >&5 + echo $ECHO_N "checking if we can copy va_list indirectly... $ECHO_C" >&6 + if test "${cf_cv_array_va_list+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23160 "configure" ++#line 23155 "configure" + #include "confdefs.h" + + #include +@@ -23174,16 +23169,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23177: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23172: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23180: \$? = $ac_status" >&5 ++ echo "$as_me:23175: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23183: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23178: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23186: \$? = $ac_status" >&5 ++ echo "$as_me:23181: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_array_va_list=yes + else +@@ -23193,7 +23188,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:23196: result: $cf_cv_array_va_list" >&5 ++echo "$as_me:23191: result: $cf_cv_array_va_list" >&5 + echo "${ECHO_T}$cf_cv_array_va_list" >&6 + test "$cf_cv_array_va_list" = yes && + cat >>confdefs.h <<\EOF +@@ -23204,13 +23199,13 @@ + ;; + esac + +-echo "$as_me:23207: checking for pid_t" >&5 ++echo "$as_me:23202: checking for pid_t" >&5 + echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 + if test "${ac_cv_type_pid_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23213 "configure" ++#line 23208 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -23225,16 +23220,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:23228: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:23223: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:23231: \$? = $ac_status" >&5 ++ echo "$as_me:23226: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:23234: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23229: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23237: \$? = $ac_status" >&5 ++ echo "$as_me:23232: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_pid_t=yes + else +@@ -23244,7 +23239,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:23247: result: $ac_cv_type_pid_t" >&5 ++echo "$as_me:23242: result: $ac_cv_type_pid_t" >&5 + echo "${ECHO_T}$ac_cv_type_pid_t" >&6 + if test "$ac_cv_type_pid_t" = yes; then + : +@@ -23259,23 +23254,23 @@ + for ac_header in unistd.h vfork.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:23262: checking for $ac_header" >&5 ++echo "$as_me:23257: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23268 "configure" ++#line 23263 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:23272: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:23267: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:23278: \$? = $ac_status" >&5 ++ echo "$as_me:23273: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -23294,7 +23289,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:23297: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:23292: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:23305: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23316 "configure" ++#line 23311 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -23344,16 +23339,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23347: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23342: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23350: \$? = $ac_status" >&5 ++ echo "$as_me:23345: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23353: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23348: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23356: \$? = $ac_status" >&5 ++ echo "$as_me:23351: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -23363,7 +23358,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:23366: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:23361: result: `eval echo '${'"$as_ac_var"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 + if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then + cat >>confdefs.h <&5 ++ echo "$as_me:23373: checking for working fork" >&5 + echo $ECHO_N "checking for working fork... $ECHO_C" >&6 + if test "${ac_cv_func_fork_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -23398,15 +23393,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:23401: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23396: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23404: \$? = $ac_status" >&5 ++ echo "$as_me:23399: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:23406: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23401: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23409: \$? = $ac_status" >&5 ++ echo "$as_me:23404: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_fork_works=yes + else +@@ -23418,7 +23413,7 @@ + rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" + fi + fi +-echo "$as_me:23421: result: $ac_cv_func_fork_works" >&5 ++echo "$as_me:23416: result: $ac_cv_func_fork_works" >&5 + echo "${ECHO_T}$ac_cv_func_fork_works" >&6 + + fi +@@ -23432,12 +23427,12 @@ + ac_cv_func_fork_works=yes + ;; + esac +- { echo "$as_me:23435: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 ++ { echo "$as_me:23430: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 + echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;} + fi + ac_cv_func_vfork_works=$ac_cv_func_vfork + if test "x$ac_cv_func_vfork" = xyes; then +- echo "$as_me:23440: checking for working vfork" >&5 ++ echo "$as_me:23435: checking for working vfork" >&5 + echo $ECHO_N "checking for working vfork... $ECHO_C" >&6 + if test "${ac_cv_func_vfork_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -23446,7 +23441,7 @@ + ac_cv_func_vfork_works=cross + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23449 "configure" ++#line 23444 "configure" + #include "confdefs.h" + /* Thanks to Paul Eggert for this test. */ + #include +@@ -23543,15 +23538,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:23546: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23541: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23549: \$? = $ac_status" >&5 ++ echo "$as_me:23544: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:23551: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23546: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23554: \$? = $ac_status" >&5 ++ echo "$as_me:23549: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_vfork_works=yes + else +@@ -23563,13 +23558,13 @@ + rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" + fi + fi +-echo "$as_me:23566: result: $ac_cv_func_vfork_works" >&5 ++echo "$as_me:23561: result: $ac_cv_func_vfork_works" >&5 + echo "${ECHO_T}$ac_cv_func_vfork_works" >&6 + + fi; + if test "x$ac_cv_func_fork_works" = xcross; then + ac_cv_func_vfork_works=ac_cv_func_vfork +- { echo "$as_me:23572: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 ++ { echo "$as_me:23567: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 + echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;} + fi + +@@ -23594,7 +23589,7 @@ + + fi + +-echo "$as_me:23597: checking if fopen accepts explicit binary mode" >&5 ++echo "$as_me:23592: checking if fopen accepts explicit binary mode" >&5 + echo $ECHO_N "checking if fopen accepts explicit binary mode... $ECHO_C" >&6 + if test "${cf_cv_fopen_bin_r+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -23604,7 +23599,7 @@ + cf_cv_fopen_bin_r=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23607 "configure" ++#line 23602 "configure" + #include "confdefs.h" + + #include +@@ -23637,15 +23632,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:23640: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23635: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23643: \$? = $ac_status" >&5 ++ echo "$as_me:23638: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:23645: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23640: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23648: \$? = $ac_status" >&5 ++ echo "$as_me:23643: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_fopen_bin_r=yes + else +@@ -23658,7 +23653,7 @@ + fi + + fi +-echo "$as_me:23661: result: $cf_cv_fopen_bin_r" >&5 ++echo "$as_me:23656: result: $cf_cv_fopen_bin_r" >&5 + echo "${ECHO_T}$cf_cv_fopen_bin_r" >&6 + test "x$cf_cv_fopen_bin_r" != xno && + cat >>confdefs.h <<\EOF +@@ -23667,7 +23662,7 @@ + + # special check for test/ditto.c + +-echo "$as_me:23670: checking for openpty in -lutil" >&5 ++echo "$as_me:23665: checking for openpty in -lutil" >&5 + echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6 + if test "${ac_cv_lib_util_openpty+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -23675,7 +23670,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lutil $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23678 "configure" ++#line 23673 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -23694,16 +23689,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23697: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23692: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23700: \$? = $ac_status" >&5 ++ echo "$as_me:23695: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23703: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23698: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23706: \$? = $ac_status" >&5 ++ echo "$as_me:23701: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_util_openpty=yes + else +@@ -23714,7 +23709,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:23717: result: $ac_cv_lib_util_openpty" >&5 ++echo "$as_me:23712: result: $ac_cv_lib_util_openpty" >&5 + echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6 + if test "$ac_cv_lib_util_openpty" = yes; then + cf_cv_lib_util=yes +@@ -23722,7 +23717,7 @@ + cf_cv_lib_util=no + fi + +-echo "$as_me:23725: checking for openpty header" >&5 ++echo "$as_me:23720: checking for openpty header" >&5 + echo $ECHO_N "checking for openpty header... $ECHO_C" >&6 + if test "${cf_cv_func_openpty+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -23749,7 +23744,7 @@ + for cf_header in pty.h libutil.h util.h + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23752 "configure" ++#line 23747 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -23766,16 +23761,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23769: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23764: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23772: \$? = $ac_status" >&5 ++ echo "$as_me:23767: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23775: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23770: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23778: \$? = $ac_status" >&5 ++ echo "$as_me:23773: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_func_openpty=$cf_header +@@ -23793,7 +23788,7 @@ + LIBS="$cf_save_LIBS" + + fi +-echo "$as_me:23796: result: $cf_cv_func_openpty" >&5 ++echo "$as_me:23791: result: $cf_cv_func_openpty" >&5 + echo "${ECHO_T}$cf_cv_func_openpty" >&6 + + if test "$cf_cv_func_openpty" != no ; then +@@ -23866,7 +23861,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23869 "configure" ++#line 23864 "configure" + #include "confdefs.h" + #include + int +@@ -23878,16 +23873,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:23881: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:23876: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:23884: \$? = $ac_status" >&5 ++ echo "$as_me:23879: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:23887: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23882: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23890: \$? = $ac_status" >&5 ++ echo "$as_me:23885: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -23904,7 +23899,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:23907: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:23902: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -23940,7 +23935,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me:-configure}:23943: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:23938: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -23951,7 +23946,7 @@ + else + case "$with_hashed_db" in + (./*|../*|/*) +- { echo "$as_me:23954: WARNING: no such directory $with_hashed_db" >&5 ++ { echo "$as_me:23949: WARNING: no such directory $with_hashed_db" >&5 + echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;} + ;; + (*) +@@ -24023,7 +24018,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24026 "configure" ++#line 24021 "configure" + #include "confdefs.h" + #include + int +@@ -24035,16 +24030,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:24038: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24033: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24041: \$? = $ac_status" >&5 ++ echo "$as_me:24036: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:24044: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24039: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24047: \$? = $ac_status" >&5 ++ echo "$as_me:24042: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -24061,7 +24056,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:24064: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:24059: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -24141,7 +24136,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me:-configure}:24144: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:24139: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -24158,23 +24153,23 @@ + fi + esac + +-echo "$as_me:24161: checking for db.h" >&5 ++echo "$as_me:24156: checking for db.h" >&5 + echo $ECHO_N "checking for db.h... $ECHO_C" >&6 + if test "${ac_cv_header_db_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24167 "configure" ++#line 24162 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:24171: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:24166: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:24177: \$? = $ac_status" >&5 ++ echo "$as_me:24172: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -24193,11 +24188,11 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:24196: result: $ac_cv_header_db_h" >&5 ++echo "$as_me:24191: result: $ac_cv_header_db_h" >&5 + echo "${ECHO_T}$ac_cv_header_db_h" >&6 + if test "$ac_cv_header_db_h" = yes; then + +-echo "$as_me:24200: checking for version of db" >&5 ++echo "$as_me:24195: checking for version of db" >&5 + echo $ECHO_N "checking for version of db... $ECHO_C" >&6 + if test "${cf_cv_hashed_db_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -24208,10 +24203,10 @@ + for cf_db_version in 1 2 3 4 5 6 + do + +-echo "${as_me:-configure}:24211: testing checking for db version $cf_db_version ..." 1>&5 ++echo "${as_me:-configure}:24206: testing checking for db version $cf_db_version ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24214 "configure" ++#line 24209 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -24241,16 +24236,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:24244: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24239: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24247: \$? = $ac_status" >&5 ++ echo "$as_me:24242: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:24250: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24245: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24253: \$? = $ac_status" >&5 ++ echo "$as_me:24248: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_hashed_db_version=$cf_db_version +@@ -24264,16 +24259,16 @@ + done + + fi +-echo "$as_me:24267: result: $cf_cv_hashed_db_version" >&5 ++echo "$as_me:24262: result: $cf_cv_hashed_db_version" >&5 + echo "${ECHO_T}$cf_cv_hashed_db_version" >&6 + + if test "$cf_cv_hashed_db_version" = unknown ; then +- { { echo "$as_me:24271: error: Cannot determine version of db" >&5 ++ { { echo "$as_me:24266: error: Cannot determine version of db" >&5 + echo "$as_me: error: Cannot determine version of db" >&2;} + { (exit 1); exit 1; }; } + else + +-echo "$as_me:24276: checking for db libraries" >&5 ++echo "$as_me:24271: checking for db libraries" >&5 + echo $ECHO_N "checking for db libraries... $ECHO_C" >&6 + if test "${cf_cv_hashed_db_libs+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -24303,10 +24298,10 @@ + + fi + +-echo "${as_me:-configure}:24306: testing checking for library $cf_db_libs ..." 1>&5 ++echo "${as_me:-configure}:24301: testing checking for library $cf_db_libs ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24309 "configure" ++#line 24304 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -24361,16 +24356,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:24364: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24359: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:24367: \$? = $ac_status" >&5 ++ echo "$as_me:24362: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:24370: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24365: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24373: \$? = $ac_status" >&5 ++ echo "$as_me:24368: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + if test -n "$cf_db_libs" ; then +@@ -24390,11 +24385,11 @@ + done + + fi +-echo "$as_me:24393: result: $cf_cv_hashed_db_libs" >&5 ++echo "$as_me:24388: result: $cf_cv_hashed_db_libs" >&5 + echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6 + + if test "$cf_cv_hashed_db_libs" = unknown ; then +- { { echo "$as_me:24397: error: Cannot determine library for db" >&5 ++ { { echo "$as_me:24392: error: Cannot determine library for db" >&5 + echo "$as_me: error: Cannot determine library for db" >&2;} + { (exit 1); exit 1; }; } + elif test "$cf_cv_hashed_db_libs" != default ; then +@@ -24420,7 +24415,7 @@ + + else + +- { { echo "$as_me:24423: error: Cannot find db.h" >&5 ++ { { echo "$as_me:24418: error: Cannot find db.h" >&5 + echo "$as_me: error: Cannot find db.h" >&2;} + { (exit 1); exit 1; }; } + +@@ -24435,7 +24430,7 @@ + + # Just in case, check if the C compiler has a bool type. + +-echo "$as_me:24438: checking if we should include stdbool.h" >&5 ++echo "$as_me:24433: checking if we should include stdbool.h" >&5 + echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 + + if test "${cf_cv_header_stdbool_h+set}" = set; then +@@ -24443,7 +24438,7 @@ + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24446 "configure" ++#line 24441 "configure" + #include "confdefs.h" + + int +@@ -24455,23 +24450,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:24458: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24453: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24461: \$? = $ac_status" >&5 ++ echo "$as_me:24456: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:24464: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24459: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24467: \$? = $ac_status" >&5 ++ echo "$as_me:24462: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_header_stdbool_h=0 + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24474 "configure" ++#line 24469 "configure" + #include "confdefs.h" + + #ifndef __BEOS__ +@@ -24487,16 +24482,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:24490: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24485: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24493: \$? = $ac_status" >&5 ++ echo "$as_me:24488: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:24496: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24491: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24499: \$? = $ac_status" >&5 ++ echo "$as_me:24494: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_header_stdbool_h=1 + else +@@ -24510,13 +24505,13 @@ + fi + + if test "$cf_cv_header_stdbool_h" = 1 +-then echo "$as_me:24513: result: yes" >&5 ++then echo "$as_me:24508: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +-else echo "$as_me:24515: result: no" >&5 ++else echo "$as_me:24510: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:24519: checking for builtin bool type" >&5 ++echo "$as_me:24514: checking for builtin bool type" >&5 + echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 + + if test "${cf_cv_cc_bool_type+set}" = set; then +@@ -24524,7 +24519,7 @@ + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24527 "configure" ++#line 24522 "configure" + #include "confdefs.h" + + #include +@@ -24539,16 +24534,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:24542: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24537: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24545: \$? = $ac_status" >&5 ++ echo "$as_me:24540: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:24548: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24543: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24551: \$? = $ac_status" >&5 ++ echo "$as_me:24546: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_cc_bool_type=1 + else +@@ -24561,9 +24556,9 @@ + fi + + if test "$cf_cv_cc_bool_type" = 1 +-then echo "$as_me:24564: result: yes" >&5 ++then echo "$as_me:24559: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +-else echo "$as_me:24566: result: no" >&5 ++else echo "$as_me:24561: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -24580,10 +24575,10 @@ + + cf_save="$LIBS" + LIBS="$LIBS $CXXLIBS" +- echo "$as_me:24583: checking if we already have C++ library" >&5 ++ echo "$as_me:24578: checking if we already have C++ library" >&5 + echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24586 "configure" ++#line 24581 "configure" + #include "confdefs.h" + + #include +@@ -24597,16 +24592,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:24600: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24595: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:24603: \$? = $ac_status" >&5 ++ echo "$as_me:24598: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:24606: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24601: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24609: \$? = $ac_status" >&5 ++ echo "$as_me:24604: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_have_libstdcpp=yes + else +@@ -24615,7 +24610,7 @@ + cf_have_libstdcpp=no + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +- echo "$as_me:24618: result: $cf_have_libstdcpp" >&5 ++ echo "$as_me:24613: result: $cf_have_libstdcpp" >&5 + echo "${ECHO_T}$cf_have_libstdcpp" >&6 + LIBS="$cf_save" + +@@ -24634,7 +24629,7 @@ + ;; + esac + +- echo "$as_me:24637: checking for library $cf_stdcpp_libname" >&5 ++ echo "$as_me:24632: checking for library $cf_stdcpp_libname" >&5 + echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6 + if test "${cf_cv_libstdcpp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -24660,7 +24655,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24663 "configure" ++#line 24658 "configure" + #include "confdefs.h" + + #include +@@ -24674,16 +24669,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:24677: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24672: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:24680: \$? = $ac_status" >&5 ++ echo "$as_me:24675: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:24683: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24678: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24686: \$? = $ac_status" >&5 ++ echo "$as_me:24681: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_libstdcpp=yes + else +@@ -24695,7 +24690,7 @@ + LIBS="$cf_save" + + fi +-echo "$as_me:24698: result: $cf_cv_libstdcpp" >&5 ++echo "$as_me:24693: result: $cf_cv_libstdcpp" >&5 + echo "${ECHO_T}$cf_cv_libstdcpp" >&6 + test "$cf_cv_libstdcpp" = yes && { + cf_add_libs="$CXXLIBS" +@@ -24717,7 +24712,7 @@ + fi + fi + +- echo "$as_me:24720: checking whether $CXX understands -c and -o together" >&5 ++ echo "$as_me:24715: checking whether $CXX understands -c and -o together" >&5 + echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6 + if test "${cf_cv_prog_CXX_c_o+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -24732,15 +24727,15 @@ + # We do the test twice because some compilers refuse to overwrite an + # existing .o file with -o, though they will create one. + ac_try='$CXX $CXXFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5' +-if { (eval echo "$as_me:24735: \"$ac_try\"") >&5 ++if { (eval echo "$as_me:24730: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24738: \$? = $ac_status" >&5 ++ echo "$as_me:24733: \$? = $ac_status" >&5 + (exit "$ac_status"); } && +- test -f conftest2.$ac_objext && { (eval echo "$as_me:24740: \"$ac_try\"") >&5 ++ test -f conftest2.$ac_objext && { (eval echo "$as_me:24735: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24743: \$? = $ac_status" >&5 ++ echo "$as_me:24738: \$? = $ac_status" >&5 + (exit "$ac_status"); }; + then + eval cf_cv_prog_CXX_c_o=yes +@@ -24751,10 +24746,10 @@ + + fi + if test "$cf_cv_prog_CXX_c_o" = yes; then +- echo "$as_me:24754: result: yes" >&5 ++ echo "$as_me:24749: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:24757: result: no" >&5 ++ echo "$as_me:24752: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -24774,7 +24769,7 @@ + ;; + esac + if test "$GXX" = yes; then +- echo "$as_me:24777: checking for lib$cf_gpp_libname" >&5 ++ echo "$as_me:24772: checking for lib$cf_gpp_libname" >&5 + echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6 + cf_save="$LIBS" + +@@ -24795,7 +24790,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24798 "configure" ++#line 24793 "configure" + #include "confdefs.h" + + #include <$cf_gpp_libname/builtin.h> +@@ -24809,16 +24804,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:24812: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24807: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:24815: \$? = $ac_status" >&5 ++ echo "$as_me:24810: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:24818: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24813: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24821: \$? = $ac_status" >&5 ++ echo "$as_me:24816: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cxx_library=yes + +@@ -24855,7 +24850,7 @@ + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24858 "configure" ++#line 24853 "configure" + #include "confdefs.h" + + #include +@@ -24869,16 +24864,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:24872: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24867: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:24875: \$? = $ac_status" >&5 ++ echo "$as_me:24870: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:24878: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24873: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24881: \$? = $ac_status" >&5 ++ echo "$as_me:24876: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cxx_library=yes + +@@ -24911,7 +24906,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS="$cf_save" +- echo "$as_me:24914: result: $cf_cxx_library" >&5 ++ echo "$as_me:24909: result: $cf_cxx_library" >&5 + echo "${ECHO_T}$cf_cxx_library" >&6 + fi + +@@ -24927,7 +24922,7 @@ + ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + ac_main_return="return" +-echo "$as_me:24930: checking how to run the C++ preprocessor" >&5 ++echo "$as_me:24925: checking how to run the C++ preprocessor" >&5 + echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 + if test -z "$CXXCPP"; then + if test "${ac_cv_prog_CXXCPP+set}" = set; then +@@ -24944,18 +24939,18 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24947 "configure" ++#line 24942 "configure" + #include "confdefs.h" + #include + Syntax error + _ACEOF +-if { (eval echo "$as_me:24952: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:24947: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:24958: \$? = $ac_status" >&5 ++ echo "$as_me:24953: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -24978,17 +24973,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24981 "configure" ++#line 24976 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:24985: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:24980: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:24991: \$? = $ac_status" >&5 ++ echo "$as_me:24986: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -25025,7 +25020,7 @@ + else + ac_cv_prog_CXXCPP=$CXXCPP + fi +-echo "$as_me:25028: result: $CXXCPP" >&5 ++echo "$as_me:25023: result: $CXXCPP" >&5 + echo "${ECHO_T}$CXXCPP" >&6 + ac_preproc_ok=false + for ac_cxx_preproc_warn_flag in '' yes +@@ -25035,18 +25030,18 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25038 "configure" ++#line 25033 "configure" + #include "confdefs.h" + #include + Syntax error + _ACEOF +-if { (eval echo "$as_me:25043: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:25038: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:25049: \$? = $ac_status" >&5 ++ echo "$as_me:25044: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -25069,17 +25064,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25072 "configure" ++#line 25067 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:25076: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:25071: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:25082: \$? = $ac_status" >&5 ++ echo "$as_me:25077: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -25107,7 +25102,7 @@ + if $ac_preproc_ok; then + : + else +- { { echo "$as_me:25110: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 ++ { { echo "$as_me:25105: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 + echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -25122,23 +25117,23 @@ + for ac_header in typeinfo + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:25125: checking for $ac_header" >&5 ++echo "$as_me:25120: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25131 "configure" ++#line 25126 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:25135: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:25130: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:25141: \$? = $ac_status" >&5 ++ echo "$as_me:25136: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -25157,7 +25152,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:25160: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:25155: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:25168: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25179 "configure" ++#line 25174 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:25183: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:25178: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:25189: \$? = $ac_status" >&5 ++ echo "$as_me:25184: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -25205,7 +25200,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:25208: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:25203: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++ echo "$as_me:25214: checking if iostream uses std-namespace" >&5 + echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25222 "configure" ++#line 25217 "configure" + #include "confdefs.h" + + #include +@@ -25236,16 +25231,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25239: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25234: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25242: \$? = $ac_status" >&5 ++ echo "$as_me:25237: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25245: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25240: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25248: \$? = $ac_status" >&5 ++ echo "$as_me:25243: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_iostream_namespace=yes + else +@@ -25254,7 +25249,7 @@ + cf_iostream_namespace=no + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +- echo "$as_me:25257: result: $cf_iostream_namespace" >&5 ++ echo "$as_me:25252: result: $cf_iostream_namespace" >&5 + echo "${ECHO_T}$cf_iostream_namespace" >&6 + if test "$cf_iostream_namespace" = yes ; then + +@@ -25265,7 +25260,7 @@ + fi + fi + +-echo "$as_me:25268: checking if we should include stdbool.h" >&5 ++echo "$as_me:25263: checking if we should include stdbool.h" >&5 + echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 + + if test "${cf_cv_header_stdbool_h+set}" = set; then +@@ -25273,7 +25268,7 @@ + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25276 "configure" ++#line 25271 "configure" + #include "confdefs.h" + + int +@@ -25285,23 +25280,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25288: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25283: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25291: \$? = $ac_status" >&5 ++ echo "$as_me:25286: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25294: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25289: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25297: \$? = $ac_status" >&5 ++ echo "$as_me:25292: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_header_stdbool_h=0 + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25304 "configure" ++#line 25299 "configure" + #include "confdefs.h" + + #ifndef __BEOS__ +@@ -25317,16 +25312,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25320: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25315: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25323: \$? = $ac_status" >&5 ++ echo "$as_me:25318: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25326: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25321: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25329: \$? = $ac_status" >&5 ++ echo "$as_me:25324: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_header_stdbool_h=1 + else +@@ -25340,13 +25335,13 @@ + fi + + if test "$cf_cv_header_stdbool_h" = 1 +-then echo "$as_me:25343: result: yes" >&5 ++then echo "$as_me:25338: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +-else echo "$as_me:25345: result: no" >&5 ++else echo "$as_me:25340: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:25349: checking for builtin bool type" >&5 ++echo "$as_me:25344: checking for builtin bool type" >&5 + echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 + + if test "${cf_cv_builtin_bool+set}" = set; then +@@ -25354,7 +25349,7 @@ + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25357 "configure" ++#line 25352 "configure" + #include "confdefs.h" + + #include +@@ -25369,16 +25364,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25372: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25367: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25375: \$? = $ac_status" >&5 ++ echo "$as_me:25370: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25378: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25373: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25381: \$? = $ac_status" >&5 ++ echo "$as_me:25376: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_builtin_bool=1 + else +@@ -25391,19 +25386,19 @@ + fi + + if test "$cf_cv_builtin_bool" = 1 +-then echo "$as_me:25394: result: yes" >&5 ++then echo "$as_me:25389: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +-else echo "$as_me:25396: result: no" >&5 ++else echo "$as_me:25391: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:25400: checking for bool" >&5 ++echo "$as_me:25395: checking for bool" >&5 + echo $ECHO_N "checking for bool... $ECHO_C" >&6 + if test "${ac_cv_type_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25406 "configure" ++#line 25401 "configure" + #include "confdefs.h" + + #include +@@ -25439,16 +25434,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25442: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25437: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25445: \$? = $ac_status" >&5 ++ echo "$as_me:25440: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25448: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25443: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25451: \$? = $ac_status" >&5 ++ echo "$as_me:25446: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_bool=yes + else +@@ -25458,10 +25453,10 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:25461: result: $ac_cv_type_bool" >&5 ++echo "$as_me:25456: result: $ac_cv_type_bool" >&5 + echo "${ECHO_T}$ac_cv_type_bool" >&6 + +-echo "$as_me:25464: checking size of bool" >&5 ++echo "$as_me:25459: checking size of bool" >&5 + echo $ECHO_N "checking size of bool... $ECHO_C" >&6 + if test "${ac_cv_sizeof_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -25470,7 +25465,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25473 "configure" ++#line 25468 "configure" + #include "confdefs.h" + + #include +@@ -25503,21 +25498,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25506: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25501: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25509: \$? = $ac_status" >&5 ++ echo "$as_me:25504: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25512: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25507: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25515: \$? = $ac_status" >&5 ++ echo "$as_me:25510: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25520 "configure" ++#line 25515 "configure" + #include "confdefs.h" + + #include +@@ -25550,16 +25545,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25553: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25548: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25556: \$? = $ac_status" >&5 ++ echo "$as_me:25551: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25559: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25554: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25562: \$? = $ac_status" >&5 ++ echo "$as_me:25557: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid; break + else +@@ -25575,7 +25570,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25578 "configure" ++#line 25573 "configure" + #include "confdefs.h" + + #include +@@ -25608,16 +25603,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25611: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25606: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25614: \$? = $ac_status" >&5 ++ echo "$as_me:25609: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25617: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25612: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25620: \$? = $ac_status" >&5 ++ echo "$as_me:25615: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=$ac_mid; break + else +@@ -25633,7 +25628,7 @@ + while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25636 "configure" ++#line 25631 "configure" + #include "confdefs.h" + + #include +@@ -25666,16 +25661,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25669: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25664: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25672: \$? = $ac_status" >&5 ++ echo "$as_me:25667: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25675: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25670: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25678: \$? = $ac_status" >&5 ++ echo "$as_me:25673: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid + else +@@ -25688,12 +25683,12 @@ + ac_cv_sizeof_bool=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:25691: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:25686: error: cannot run test program while cross compiling" >&5 + echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25696 "configure" ++#line 25691 "configure" + #include "confdefs.h" + + #include +@@ -25730,15 +25725,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:25733: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:25728: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:25736: \$? = $ac_status" >&5 ++ echo "$as_me:25731: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:25738: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25733: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25741: \$? = $ac_status" >&5 ++ echo "$as_me:25736: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sizeof_bool=`cat conftest.val` + else +@@ -25754,13 +25749,13 @@ + ac_cv_sizeof_bool=0 + fi + fi +-echo "$as_me:25757: result: $ac_cv_sizeof_bool" >&5 ++echo "$as_me:25752: result: $ac_cv_sizeof_bool" >&5 + echo "${ECHO_T}$ac_cv_sizeof_bool" >&6 + cat >>confdefs.h <&5 ++echo "$as_me:25758: checking for type of bool" >&5 + echo $ECHO_N "checking for type of bool... $ECHO_C" >&6 + if test "${cf_cv_type_of_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -25779,7 +25774,7 @@ + + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25782 "configure" ++#line 25777 "configure" + #include "confdefs.h" + + #include +@@ -25821,15 +25816,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:25824: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:25819: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:25827: \$? = $ac_status" >&5 ++ echo "$as_me:25822: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:25829: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25824: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25832: \$? = $ac_status" >&5 ++ echo "$as_me:25827: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_type_of_bool=`cat cf_test.out` + if test -z "$cf_cv_type_of_bool"; then +@@ -25846,19 +25841,19 @@ + rm -f cf_test.out + + fi +-echo "$as_me:25849: result: $cf_cv_type_of_bool" >&5 ++echo "$as_me:25844: result: $cf_cv_type_of_bool" >&5 + echo "${ECHO_T}$cf_cv_type_of_bool" >&6 + + if test "$cf_cv_type_of_bool" = unknown ; then + case .$NCURSES_BOOL in + (.auto|.) NCURSES_BOOL=unsigned;; + esac +- { echo "$as_me:25856: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 ++ { echo "$as_me:25851: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} + cf_cv_type_of_bool=$NCURSES_BOOL + fi + +-echo "$as_me:25861: checking for special defines needed for etip.h" >&5 ++echo "$as_me:25856: checking for special defines needed for etip.h" >&5 + echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6 + cf_save_CXXFLAGS="$CXXFLAGS" + cf_result="none" +@@ -25876,7 +25871,7 @@ + test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}" + test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25879 "configure" ++#line 25874 "configure" + #include "confdefs.h" + + #include +@@ -25890,16 +25885,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25893: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25888: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25896: \$? = $ac_status" >&5 ++ echo "$as_me:25891: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25899: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25894: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25902: \$? = $ac_status" >&5 ++ echo "$as_me:25897: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + test -n "$cf_math" && cat >>confdefs.h <&5 ++echo "$as_me:25918: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + CXXFLAGS="$cf_save_CXXFLAGS" + + if test -n "$CXX"; then +-echo "$as_me:25928: checking if $CXX accepts parameter initialization" >&5 ++echo "$as_me:25923: checking if $CXX accepts parameter initialization" >&5 + echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6 + if test "${cf_cv_cpp_param_init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -25942,7 +25937,7 @@ + cf_cv_cpp_param_init=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25945 "configure" ++#line 25940 "configure" + #include "confdefs.h" + + class TEST { +@@ -25961,15 +25956,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:25964: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:25959: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:25967: \$? = $ac_status" >&5 ++ echo "$as_me:25962: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:25969: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25964: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25972: \$? = $ac_status" >&5 ++ echo "$as_me:25967: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_cpp_param_init=yes + else +@@ -25988,7 +25983,7 @@ + ac_main_return="return" + + fi +-echo "$as_me:25991: result: $cf_cv_cpp_param_init" >&5 ++echo "$as_me:25986: result: $cf_cv_cpp_param_init" >&5 + echo "${ECHO_T}$cf_cv_cpp_param_init" >&6 + fi + test "$cf_cv_cpp_param_init" = yes && +@@ -25998,7 +25993,7 @@ + + if test -n "$CXX"; then + +-echo "$as_me:26001: checking if $CXX accepts static_cast" >&5 ++echo "$as_me:25996: checking if $CXX accepts static_cast" >&5 + echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6 + if test "${cf_cv_cpp_static_cast+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26012,7 +26007,7 @@ + ac_main_return="return" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26015 "configure" ++#line 26010 "configure" + #include "confdefs.h" + + class NCursesPanel +@@ -26056,16 +26051,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26059: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26054: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26062: \$? = $ac_status" >&5 ++ echo "$as_me:26057: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26065: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26060: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26068: \$? = $ac_status" >&5 ++ echo "$as_me:26063: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_cpp_static_cast=yes + else +@@ -26083,7 +26078,7 @@ + ac_main_return="return" + + fi +-echo "$as_me:26086: result: $cf_cv_cpp_static_cast" >&5 ++echo "$as_me:26081: result: $cf_cv_cpp_static_cast" >&5 + echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6 + + fi +@@ -26132,13 +26127,13 @@ + else + if test "$cf_cv_header_stdbool_h" = 1 ; then + +-echo "$as_me:26135: checking for bool" >&5 ++echo "$as_me:26130: checking for bool" >&5 + echo $ECHO_N "checking for bool... $ECHO_C" >&6 + if test "${ac_cv_type_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26141 "configure" ++#line 26136 "configure" + #include "confdefs.h" + + #include +@@ -26174,16 +26169,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26177: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26172: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26180: \$? = $ac_status" >&5 ++ echo "$as_me:26175: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26183: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26178: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26186: \$? = $ac_status" >&5 ++ echo "$as_me:26181: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_bool=yes + else +@@ -26193,10 +26188,10 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:26196: result: $ac_cv_type_bool" >&5 ++echo "$as_me:26191: result: $ac_cv_type_bool" >&5 + echo "${ECHO_T}$ac_cv_type_bool" >&6 + +-echo "$as_me:26199: checking size of bool" >&5 ++echo "$as_me:26194: checking size of bool" >&5 + echo $ECHO_N "checking size of bool... $ECHO_C" >&6 + if test "${ac_cv_sizeof_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26205,7 +26200,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26208 "configure" ++#line 26203 "configure" + #include "confdefs.h" + + #include +@@ -26238,21 +26233,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26241: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26236: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26244: \$? = $ac_status" >&5 ++ echo "$as_me:26239: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26247: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26242: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26250: \$? = $ac_status" >&5 ++ echo "$as_me:26245: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26255 "configure" ++#line 26250 "configure" + #include "confdefs.h" + + #include +@@ -26285,16 +26280,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26288: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26283: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26291: \$? = $ac_status" >&5 ++ echo "$as_me:26286: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26294: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26289: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26297: \$? = $ac_status" >&5 ++ echo "$as_me:26292: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid; break + else +@@ -26310,7 +26305,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26313 "configure" ++#line 26308 "configure" + #include "confdefs.h" + + #include +@@ -26343,16 +26338,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26346: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26341: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26349: \$? = $ac_status" >&5 ++ echo "$as_me:26344: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26352: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26347: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26355: \$? = $ac_status" >&5 ++ echo "$as_me:26350: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=$ac_mid; break + else +@@ -26368,7 +26363,7 @@ + while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26371 "configure" ++#line 26366 "configure" + #include "confdefs.h" + + #include +@@ -26401,16 +26396,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26404: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26399: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26407: \$? = $ac_status" >&5 ++ echo "$as_me:26402: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26410: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26405: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26413: \$? = $ac_status" >&5 ++ echo "$as_me:26408: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid + else +@@ -26423,12 +26418,12 @@ + ac_cv_sizeof_bool=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:26426: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:26421: error: cannot run test program while cross compiling" >&5 + echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26431 "configure" ++#line 26426 "configure" + #include "confdefs.h" + + #include +@@ -26465,15 +26460,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:26468: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:26463: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:26471: \$? = $ac_status" >&5 ++ echo "$as_me:26466: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:26473: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26468: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26476: \$? = $ac_status" >&5 ++ echo "$as_me:26471: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sizeof_bool=`cat conftest.val` + else +@@ -26489,13 +26484,13 @@ + ac_cv_sizeof_bool=0 + fi + fi +-echo "$as_me:26492: result: $ac_cv_sizeof_bool" >&5 ++echo "$as_me:26487: result: $ac_cv_sizeof_bool" >&5 + echo "${ECHO_T}$ac_cv_sizeof_bool" >&6 + cat >>confdefs.h <&5 ++echo "$as_me:26493: checking for type of bool" >&5 + echo $ECHO_N "checking for type of bool... $ECHO_C" >&6 + if test "${cf_cv_type_of_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26514,7 +26509,7 @@ + + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26517 "configure" ++#line 26512 "configure" + #include "confdefs.h" + + #include +@@ -26556,15 +26551,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:26559: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:26554: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:26562: \$? = $ac_status" >&5 ++ echo "$as_me:26557: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:26564: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26559: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26567: \$? = $ac_status" >&5 ++ echo "$as_me:26562: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_type_of_bool=`cat cf_test.out` + if test -z "$cf_cv_type_of_bool"; then +@@ -26581,26 +26576,26 @@ + rm -f cf_test.out + + fi +-echo "$as_me:26584: result: $cf_cv_type_of_bool" >&5 ++echo "$as_me:26579: result: $cf_cv_type_of_bool" >&5 + echo "${ECHO_T}$cf_cv_type_of_bool" >&6 + + if test "$cf_cv_type_of_bool" = unknown ; then + case .$NCURSES_BOOL in + (.auto|.) NCURSES_BOOL=unsigned;; + esac +- { echo "$as_me:26591: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 ++ { echo "$as_me:26586: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} + cf_cv_type_of_bool=$NCURSES_BOOL + fi + + else +- echo "$as_me:26597: checking for fallback type of bool" >&5 ++ echo "$as_me:26592: checking for fallback type of bool" >&5 + echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6 + case "$host_cpu" in + (i?86) cf_cv_type_of_bool=char ;; + (*) cf_cv_type_of_bool=int ;; + esac +- echo "$as_me:26603: result: $cf_cv_type_of_bool" >&5 ++ echo "$as_me:26598: result: $cf_cv_type_of_bool" >&5 + echo "${ECHO_T}$cf_cv_type_of_bool" >&6 + fi + fi +@@ -26629,7 +26624,7 @@ + + if test "$cf_with_ada" != "no" ; then + if test "$with_libtool" != "no"; then +- { echo "$as_me:26632: WARNING: libtool does not support Ada - disabling feature" >&5 ++ { echo "$as_me:26627: WARNING: libtool does not support Ada - disabling feature" >&5 + echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;} + cf_with_ada=no + fi +@@ -26646,7 +26641,7 @@ + unset cf_TEMP_gnat + # Extract the first word of "$cf_prog_gnat", so it can be a program name with args. + set dummy $cf_prog_gnat; ac_word=$2 +-echo "$as_me:26649: checking for $ac_word" >&5 ++echo "$as_me:26644: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26663,7 +26658,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word" +- echo "$as_me:26666: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:26661: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -26675,10 +26670,10 @@ + cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat + + if test -n "$cf_TEMP_gnat"; then +- echo "$as_me:26678: result: $cf_TEMP_gnat" >&5 ++ echo "$as_me:26673: result: $cf_TEMP_gnat" >&5 + echo "${ECHO_T}$cf_TEMP_gnat" >&6 + else +- echo "$as_me:26681: result: no" >&5 ++ echo "$as_me:26676: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -26688,7 +26683,7 @@ + unset cf_cv_gnat_version + unset cf_TEMP_gnat + +-echo "$as_me:26691: checking for $cf_prog_gnat version" >&5 ++echo "$as_me:26686: checking for $cf_prog_gnat version" >&5 + echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6 + if test "${cf_cv_gnat_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26699,7 +26694,7 @@ + sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` + + fi +-echo "$as_me:26702: result: $cf_cv_gnat_version" >&5 ++echo "$as_me:26697: result: $cf_cv_gnat_version" >&5 + echo "${ECHO_T}$cf_cv_gnat_version" >&6 + test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no + eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version +@@ -26728,7 +26723,7 @@ + cd conftest.src + for cf_gprconfig in Ada C + do +- echo "$as_me:26731: checking for gprconfig name for $cf_gprconfig" >&5 ++ echo "$as_me:26726: checking for gprconfig name for $cf_gprconfig" >&5 + echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6 + if test "$cf_gprconfig" = C + then +@@ -26747,10 +26742,10 @@ + if test -n "$cf_gprconfig_value" + then + eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value" +- echo "$as_me:26750: result: $cf_gprconfig_value" >&5 ++ echo "$as_me:26745: result: $cf_gprconfig_value" >&5 + echo "${ECHO_T}$cf_gprconfig_value" >&6 + else +- echo "$as_me:26753: result: missing" >&5 ++ echo "$as_me:26748: result: missing" >&5 + echo "${ECHO_T}missing" >&6 + cf_ada_config="#" + break +@@ -26763,7 +26758,7 @@ + if test "x$cf_ada_config" != "x#" + then + +-echo "$as_me:26766: checking for gnat version" >&5 ++echo "$as_me:26761: checking for gnat version" >&5 + echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 + if test "${cf_cv_gnat_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26774,7 +26769,7 @@ + sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` + + fi +-echo "$as_me:26777: result: $cf_cv_gnat_version" >&5 ++echo "$as_me:26772: result: $cf_cv_gnat_version" >&5 + echo "${ECHO_T}$cf_cv_gnat_version" >&6 + test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no + +@@ -26783,7 +26778,7 @@ + cf_cv_prog_gnat_correct=yes + ;; + (*) +- { echo "$as_me:26786: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 ++ { echo "$as_me:26781: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 + echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} + cf_cv_prog_gnat_correct=no + ;; +@@ -26791,7 +26786,7 @@ + + # Extract the first word of "m4", so it can be a program name with args. + set dummy m4; ac_word=$2 +-echo "$as_me:26794: checking for $ac_word" >&5 ++echo "$as_me:26789: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_M4_exists+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26806,7 +26801,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_M4_exists="yes" +-echo "$as_me:26809: found $ac_dir/$ac_word" >&5 ++echo "$as_me:26804: found $ac_dir/$ac_word" >&5 + break + done + +@@ -26815,20 +26810,20 @@ + fi + M4_exists=$ac_cv_prog_M4_exists + if test -n "$M4_exists"; then +- echo "$as_me:26818: result: $M4_exists" >&5 ++ echo "$as_me:26813: result: $M4_exists" >&5 + echo "${ECHO_T}$M4_exists" >&6 + else +- echo "$as_me:26821: result: no" >&5 ++ echo "$as_me:26816: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + if test "$ac_cv_prog_M4_exists" = no; then + cf_cv_prog_gnat_correct=no +- { echo "$as_me:26827: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 ++ { echo "$as_me:26822: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 + echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;} + fi + if test "$cf_cv_prog_gnat_correct" = yes; then +- echo "$as_me:26831: checking if GNAT works" >&5 ++ echo "$as_me:26826: checking if GNAT works" >&5 + echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 + + rm -rf ./conftest* ./*~conftest* +@@ -26856,7 +26851,7 @@ + fi + rm -rf ./conftest* ./*~conftest* + +- echo "$as_me:26859: result: $cf_cv_prog_gnat_correct" >&5 ++ echo "$as_me:26854: result: $cf_cv_prog_gnat_correct" >&5 + echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 + fi + else +@@ -26868,7 +26863,7 @@ + + ADAFLAGS="$ADAFLAGS -gnatpn" + +- echo "$as_me:26871: checking optimization options for ADAFLAGS" >&5 ++ echo "$as_me:26866: checking optimization options for ADAFLAGS" >&5 + echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 + case "$CFLAGS" in + (*-g*) +@@ -26885,10 +26880,10 @@ + + ;; + esac +- echo "$as_me:26888: result: $ADAFLAGS" >&5 ++ echo "$as_me:26883: result: $ADAFLAGS" >&5 + echo "${ECHO_T}$ADAFLAGS" >&6 + +-echo "$as_me:26891: checking if GNATPREP supports -T option" >&5 ++echo "$as_me:26886: checking if GNATPREP supports -T option" >&5 + echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6 + if test "${cf_cv_gnatprep_opt_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26898,11 +26893,11 @@ + gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes + + fi +-echo "$as_me:26901: result: $cf_cv_gnatprep_opt_t" >&5 ++echo "$as_me:26896: result: $cf_cv_gnatprep_opt_t" >&5 + echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6 + test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS" + +-echo "$as_me:26905: checking if GNAT supports generics" >&5 ++echo "$as_me:26900: checking if GNAT supports generics" >&5 + echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 + case "$cf_cv_gnat_version" in + (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9]) +@@ -26912,7 +26907,7 @@ + cf_gnat_generics=no + ;; + esac +-echo "$as_me:26915: result: $cf_gnat_generics" >&5 ++echo "$as_me:26910: result: $cf_gnat_generics" >&5 + echo "${ECHO_T}$cf_gnat_generics" >&6 + + if test "$cf_gnat_generics" = yes +@@ -26924,7 +26919,7 @@ + cf_generic_objects= + fi + +-echo "$as_me:26927: checking if GNAT supports SIGINT" >&5 ++echo "$as_me:26922: checking if GNAT supports SIGINT" >&5 + echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6 + if test "${cf_cv_gnat_sigint+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26972,7 +26967,7 @@ + rm -rf ./conftest* ./*~conftest* + + fi +-echo "$as_me:26975: result: $cf_cv_gnat_sigint" >&5 ++echo "$as_me:26970: result: $cf_cv_gnat_sigint" >&5 + echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 + + if test "$cf_cv_gnat_sigint" = yes ; then +@@ -26985,7 +26980,7 @@ + cf_gnat_projects=no + + if test "$enable_gnat_projects" != no ; then +-echo "$as_me:26988: checking if GNAT supports project files" >&5 ++echo "$as_me:26983: checking if GNAT supports project files" >&5 + echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 + case "$cf_cv_gnat_version" in + (3.[0-9]*) +@@ -27048,15 +27043,15 @@ + esac + ;; + esac +-echo "$as_me:27051: result: $cf_gnat_projects" >&5 ++echo "$as_me:27046: result: $cf_gnat_projects" >&5 + echo "${ECHO_T}$cf_gnat_projects" >&6 + fi # enable_gnat_projects + + if test "$cf_gnat_projects" = yes + then +- echo "$as_me:27057: checking if GNAT supports libraries" >&5 ++ echo "$as_me:27052: checking if GNAT supports libraries" >&5 + echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 +- echo "$as_me:27059: result: $cf_gnat_libraries" >&5 ++ echo "$as_me:27054: result: $cf_gnat_libraries" >&5 + echo "${ECHO_T}$cf_gnat_libraries" >&6 + fi + +@@ -27076,7 +27071,7 @@ + then + USE_GNAT_MAKE_GPR="" + else +- { echo "$as_me:27079: WARNING: use old makefile rules since tools are missing" >&5 ++ { echo "$as_me:27074: WARNING: use old makefile rules since tools are missing" >&5 + echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;} + fi + fi +@@ -27088,7 +27083,7 @@ + USE_GNAT_LIBRARIES="#" + fi + +-echo "$as_me:27091: checking for ada-compiler" >&5 ++echo "$as_me:27086: checking for ada-compiler" >&5 + echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6 + + # Check whether --with-ada-compiler or --without-ada-compiler was given. +@@ -27099,12 +27094,12 @@ + cf_ada_compiler=gnatmake + fi; + +-echo "$as_me:27102: result: $cf_ada_compiler" >&5 ++echo "$as_me:27097: result: $cf_ada_compiler" >&5 + echo "${ECHO_T}$cf_ada_compiler" >&6 + + cf_ada_package=terminal_interface + +-echo "$as_me:27107: checking for ada-include" >&5 ++echo "$as_me:27102: checking for ada-include" >&5 + echo $ECHO_N "checking for ada-include... $ECHO_C" >&6 + + # Check whether --with-ada-include or --without-ada-include was given. +@@ -27140,7 +27135,7 @@ + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:27143: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:27138: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -27149,10 +27144,10 @@ + fi + eval ADA_INCLUDE="$withval" + +-echo "$as_me:27152: result: $ADA_INCLUDE" >&5 ++echo "$as_me:27147: result: $ADA_INCLUDE" >&5 + echo "${ECHO_T}$ADA_INCLUDE" >&6 + +-echo "$as_me:27155: checking for ada-objects" >&5 ++echo "$as_me:27150: checking for ada-objects" >&5 + echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6 + + # Check whether --with-ada-objects or --without-ada-objects was given. +@@ -27188,7 +27183,7 @@ + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:27191: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:27186: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -27197,10 +27192,10 @@ + fi + eval ADA_OBJECTS="$withval" + +-echo "$as_me:27200: result: $ADA_OBJECTS" >&5 ++echo "$as_me:27195: result: $ADA_OBJECTS" >&5 + echo "${ECHO_T}$ADA_OBJECTS" >&6 + +-echo "$as_me:27203: checking if an Ada95 shared-library should be built" >&5 ++echo "$as_me:27198: checking if an Ada95 shared-library should be built" >&5 + echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6 + + # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given. +@@ -27210,14 +27205,14 @@ + else + with_ada_sharedlib=no + fi; +-echo "$as_me:27213: result: $with_ada_sharedlib" >&5 ++echo "$as_me:27208: result: $with_ada_sharedlib" >&5 + echo "${ECHO_T}$with_ada_sharedlib" >&6 + + if test "x$with_ada_sharedlib" != xno + then + if test "x$cf_gnat_projects" != xyes + then +- { echo "$as_me:27220: WARNING: disabling shared-library since GNAT projects are not supported" >&5 ++ { echo "$as_me:27215: WARNING: disabling shared-library since GNAT projects are not supported" >&5 + echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;} + with_ada_sharedlib=no + fi +@@ -27237,7 +27232,7 @@ + + # allow the Ada binding to be renamed + +-echo "$as_me:27240: checking for ada-libname" >&5 ++echo "$as_me:27235: checking for ada-libname" >&5 + echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6 + + # Check whether --with-ada-libname or --without-ada-libname was given. +@@ -27253,7 +27248,7 @@ + ;; + esac + +-echo "$as_me:27256: result: $ADA_LIBNAME" >&5 ++echo "$as_me:27251: result: $ADA_LIBNAME" >&5 + echo "${ECHO_T}$ADA_LIBNAME" >&6 + + fi +@@ -27264,13 +27259,13 @@ + + # do this "late" to avoid conflict with header-checks + if test "x$with_widec" = xyes ; then +- echo "$as_me:27267: checking for wchar_t" >&5 ++ echo "$as_me:27262: checking for wchar_t" >&5 + echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6 + if test "${ac_cv_type_wchar_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27273 "configure" ++#line 27268 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -27285,16 +27280,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:27288: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27283: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27291: \$? = $ac_status" >&5 ++ echo "$as_me:27286: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:27294: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27289: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27297: \$? = $ac_status" >&5 ++ echo "$as_me:27292: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_wchar_t=yes + else +@@ -27304,10 +27299,10 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:27307: result: $ac_cv_type_wchar_t" >&5 ++echo "$as_me:27302: result: $ac_cv_type_wchar_t" >&5 + echo "${ECHO_T}$ac_cv_type_wchar_t" >&6 + +-echo "$as_me:27310: checking size of wchar_t" >&5 ++echo "$as_me:27305: checking size of wchar_t" >&5 + echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6 + if test "${ac_cv_sizeof_wchar_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -27316,7 +27311,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27319 "configure" ++#line 27314 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -27328,21 +27323,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:27331: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27326: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27334: \$? = $ac_status" >&5 ++ echo "$as_me:27329: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:27337: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27332: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27340: \$? = $ac_status" >&5 ++ echo "$as_me:27335: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27345 "configure" ++#line 27340 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -27354,16 +27349,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:27357: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27352: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27360: \$? = $ac_status" >&5 ++ echo "$as_me:27355: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:27363: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27358: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27366: \$? = $ac_status" >&5 ++ echo "$as_me:27361: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid; break + else +@@ -27379,7 +27374,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27382 "configure" ++#line 27377 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -27391,16 +27386,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:27394: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27389: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27397: \$? = $ac_status" >&5 ++ echo "$as_me:27392: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:27400: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27395: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27403: \$? = $ac_status" >&5 ++ echo "$as_me:27398: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=$ac_mid; break + else +@@ -27416,7 +27411,7 @@ + while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27419 "configure" ++#line 27414 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -27428,16 +27423,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:27431: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27426: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27434: \$? = $ac_status" >&5 ++ echo "$as_me:27429: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:27437: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27432: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27440: \$? = $ac_status" >&5 ++ echo "$as_me:27435: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid + else +@@ -27450,12 +27445,12 @@ + ac_cv_sizeof_wchar_t=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:27453: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:27448: error: cannot run test program while cross compiling" >&5 + echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27458 "configure" ++#line 27453 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -27471,15 +27466,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:27474: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:27469: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:27477: \$? = $ac_status" >&5 ++ echo "$as_me:27472: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:27479: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27474: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27482: \$? = $ac_status" >&5 ++ echo "$as_me:27477: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sizeof_wchar_t=`cat conftest.val` + else +@@ -27495,7 +27490,7 @@ + ac_cv_sizeof_wchar_t=0 + fi + fi +-echo "$as_me:27498: result: $ac_cv_sizeof_wchar_t" >&5 ++echo "$as_me:27493: result: $ac_cv_sizeof_wchar_t" >&5 + echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6 + cat >>confdefs.h <&6 + +-echo "${as_me:-configure}:27511: testing test failed (assume 2) ..." 1>&5 ++echo "${as_me:-configure}:27506: testing test failed (assume 2) ..." 1>&5 + + sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp + mv confdefs.tmp confdefs.h +@@ -27526,7 +27521,7 @@ + ### chooses to split module lists into libraries. + ### + ### (see CF_LIB_RULES). +-echo "$as_me:27529: checking for library subsets" >&5 ++echo "$as_me:27524: checking for library subsets" >&5 + echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 + LIB_SUBSETS= + +@@ -27580,7 +27575,7 @@ + test "x$with_widec" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar" + test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs" + +-echo "$as_me:27583: result: $LIB_SUBSETS" >&5 ++echo "$as_me:27578: result: $LIB_SUBSETS" >&5 + echo "${ECHO_T}$LIB_SUBSETS" >&6 + + ### Construct the list of include-directories to be generated +@@ -27611,7 +27606,7 @@ + fi + + ### Build up pieces for makefile rules +-echo "$as_me:27614: checking default library suffix" >&5 ++echo "$as_me:27609: checking default library suffix" >&5 + echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -27622,10 +27617,10 @@ + (shared) DFT_ARG_SUFFIX='' ;; + esac + test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" +-echo "$as_me:27625: result: $DFT_ARG_SUFFIX" >&5 ++echo "$as_me:27620: result: $DFT_ARG_SUFFIX" >&5 + echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 + +-echo "$as_me:27628: checking default library-dependency suffix" >&5 ++echo "$as_me:27623: checking default library-dependency suffix" >&5 + echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 + + case X$DFT_LWR_MODEL in +@@ -27708,10 +27703,10 @@ + DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}" + DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}" + fi +-echo "$as_me:27711: result: $DFT_DEP_SUFFIX" >&5 ++echo "$as_me:27706: result: $DFT_DEP_SUFFIX" >&5 + echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 + +-echo "$as_me:27714: checking default object directory" >&5 ++echo "$as_me:27709: checking default object directory" >&5 + echo $ECHO_N "checking default object directory... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -27727,11 +27722,11 @@ + DFT_OBJ_SUBDIR='obj_s' ;; + esac + esac +-echo "$as_me:27730: result: $DFT_OBJ_SUBDIR" >&5 ++echo "$as_me:27725: result: $DFT_OBJ_SUBDIR" >&5 + echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 + + if test "x$cf_with_cxx" = xyes ; then +-echo "$as_me:27734: checking c++ library-dependency suffix" >&5 ++echo "$as_me:27729: checking c++ library-dependency suffix" >&5 + echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6 + if test "$with_libtool" != "no"; then + # libtool thinks it can make c++ shared libraries (perhaps only g++) +@@ -27824,7 +27819,7 @@ + fi + + fi +-echo "$as_me:27827: result: $CXX_LIB_SUFFIX" >&5 ++echo "$as_me:27822: result: $CXX_LIB_SUFFIX" >&5 + echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 + + fi +@@ -28000,19 +27995,19 @@ + + if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED" + then +- echo "$as_me:28003: checking if linker supports switching between static/dynamic" >&5 ++ echo "$as_me:27998: checking if linker supports switching between static/dynamic" >&5 + echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6 + + rm -f libconftest.a + cat >conftest.$ac_ext < + int cf_ldflags_static(FILE *fp) { return fflush(fp); } + EOF +- if { (eval echo "$as_me:28012: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:28007: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:28015: \$? = $ac_status" >&5 ++ echo "$as_me:28010: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then + ( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null + ( eval $RANLIB libconftest.a ) 2>&5 >/dev/null +@@ -28023,10 +28018,10 @@ + + LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 28026 "configure" ++#line 28021 "configure" + #include "confdefs.h" + +-#line 28029 "configure" ++#line 28024 "configure" + #include + int cf_ldflags_static(FILE *fp); + +@@ -28041,16 +28036,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:28044: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:28039: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:28047: \$? = $ac_status" >&5 ++ echo "$as_me:28042: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:28050: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:28045: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:28053: \$? = $ac_status" >&5 ++ echo "$as_me:28048: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + # some linkers simply ignore the -dynamic +@@ -28073,7 +28068,7 @@ + rm -f libconftest.* + LIBS="$cf_save_LIBS" + +- echo "$as_me:28076: result: $cf_ldflags_static" >&5 ++ echo "$as_me:28071: result: $cf_ldflags_static" >&5 + echo "${ECHO_T}$cf_ldflags_static" >&6 + + if test "$cf_ldflags_static" != yes +@@ -28089,7 +28084,7 @@ + ;; + esac + +-echo "$as_me:28092: checking where we will install curses.h" >&5 ++echo "$as_me:28087: checking where we will install curses.h" >&5 + echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 + + includesubdir= +@@ -28099,7 +28094,7 @@ + then + includesubdir="/ncurses${USE_LIB_SUFFIX}" + fi +-echo "$as_me:28102: result: ${includedir}${includesubdir}" >&5 ++echo "$as_me:28097: result: ${includedir}${includesubdir}" >&5 + echo "${ECHO_T}${includedir}${includesubdir}" >&6 + + ### Resolve a conflict between normal and wide-curses by forcing applications +@@ -28107,7 +28102,7 @@ + if test "$with_overwrite" != no ; then + if test "$NCURSES_LIBUTF8" = 1 ; then + NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)' +- { echo "$as_me:28110: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 ++ { echo "$as_me:28105: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 + echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;} + fi + fi +@@ -28135,7 +28130,7 @@ + + # pkgsrc uses these + +-echo "$as_me:28138: checking for desired basename for form library" >&5 ++echo "$as_me:28133: checking for desired basename for form library" >&5 + echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6 + + # Check whether --with-form-libname or --without-form-libname was given. +@@ -28155,10 +28150,10 @@ + ;; + esac + +-echo "$as_me:28158: result: $FORM_NAME" >&5 ++echo "$as_me:28153: result: $FORM_NAME" >&5 + echo "${ECHO_T}$FORM_NAME" >&6 + +-echo "$as_me:28161: checking for desired basename for menu library" >&5 ++echo "$as_me:28156: checking for desired basename for menu library" >&5 + echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6 + + # Check whether --with-menu-libname or --without-menu-libname was given. +@@ -28178,10 +28173,10 @@ + ;; + esac + +-echo "$as_me:28181: result: $MENU_NAME" >&5 ++echo "$as_me:28176: result: $MENU_NAME" >&5 + echo "${ECHO_T}$MENU_NAME" >&6 + +-echo "$as_me:28184: checking for desired basename for panel library" >&5 ++echo "$as_me:28179: checking for desired basename for panel library" >&5 + echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6 + + # Check whether --with-panel-libname or --without-panel-libname was given. +@@ -28201,10 +28196,10 @@ + ;; + esac + +-echo "$as_me:28204: result: $PANEL_NAME" >&5 ++echo "$as_me:28199: result: $PANEL_NAME" >&5 + echo "${ECHO_T}$PANEL_NAME" >&6 + +-echo "$as_me:28207: checking for desired basename for cxx library" >&5 ++echo "$as_me:28202: checking for desired basename for cxx library" >&5 + echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6 + + # Check whether --with-cxx-libname or --without-cxx-libname was given. +@@ -28224,13 +28219,13 @@ + ;; + esac + +-echo "$as_me:28227: result: $CXX_NAME" >&5 ++echo "$as_me:28222: result: $CXX_NAME" >&5 + echo "${ECHO_T}$CXX_NAME" >&6 + + ### Construct the list of subdirectories for which we'll customize makefiles + ### with the appropriate compile-rules. + +-echo "$as_me:28233: checking for src modules" >&5 ++echo "$as_me:28228: checking for src modules" >&5 + echo $ECHO_N "checking for src modules... $ECHO_C" >&6 + + # dependencies and linker-arguments for test-programs +@@ -28299,7 +28294,7 @@ + fi + fi + done +-echo "$as_me:28302: result: $cf_cv_src_modules" >&5 ++echo "$as_me:28297: result: $cf_cv_src_modules" >&5 + echo "${ECHO_T}$cf_cv_src_modules" >&6 + + TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" +@@ -28460,7 +28455,7 @@ + (*-D_XOPEN_SOURCE_EXTENDED*) + test -n "$verbose" && echo " moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6 + +-echo "${as_me:-configure}:28463: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 ++echo "${as_me:-configure}:28458: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 + + CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED" + CPPFLAGS=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'` +@@ -28471,7 +28466,7 @@ + + # Help to automatically enable the extended curses features when using either + # the *-config or the ".pc" files by adding defines. +-echo "$as_me:28474: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5 ++echo "$as_me:28469: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5 + echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6 + PKG_CFLAGS= + for cf_loop1 in $CPPFLAGS_after_XOPEN +@@ -28487,7 +28482,7 @@ + done + test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1" + done +-echo "$as_me:28490: result: $PKG_CFLAGS" >&5 ++echo "$as_me:28485: result: $PKG_CFLAGS" >&5 + echo "${ECHO_T}$PKG_CFLAGS" >&6 + + # AC_CHECK_SIZEOF demands a literal parameter, no variables. So we do this. +@@ -28548,7 +28543,7 @@ + cf_filter_syms=$cf_dft_filter_syms + test -n "$verbose" && echo " will map symbols to ABI=$cf_cv_abi_version" 1>&6 + +-echo "${as_me:-configure}:28551: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 ++echo "${as_me:-configure}:28546: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 + + fi + +@@ -28575,7 +28570,7 @@ + + # This is used for the *-config script and *.pc data files. + +-echo "$as_me:28578: checking for linker search path" >&5 ++echo "$as_me:28573: checking for linker search path" >&5 + echo $ECHO_N "checking for linker search path... $ECHO_C" >&6 + if test "${cf_cv_ld_searchpath+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -28623,7 +28618,7 @@ + cf_pathlist="$cf_pathlist /lib /usr/lib" + ;; + (*) +- { echo "$as_me:28626: WARNING: problem with Solaris architecture" >&5 ++ { echo "$as_me:28621: WARNING: problem with Solaris architecture" >&5 + echo "$as_me: WARNING: problem with Solaris architecture" >&2;} + ;; + esac +@@ -28664,7 +28659,7 @@ + test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib + + fi +-echo "$as_me:28667: result: $cf_cv_ld_searchpath" >&5 ++echo "$as_me:28662: result: $cf_cv_ld_searchpath" >&5 + echo "${ECHO_T}$cf_cv_ld_searchpath" >&6 + + LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'` +@@ -28754,7 +28749,7 @@ + : "${CONFIG_STATUS=./config.status}" + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ echo "$as_me:28757: creating $CONFIG_STATUS" >&5 ++{ echo "$as_me:28752: creating $CONFIG_STATUS" >&5 + echo "$as_me: creating $CONFIG_STATUS" >&6;} + cat >"$CONFIG_STATUS" <<_ACEOF + #! $SHELL +@@ -28933,7 +28928,7 @@ + echo "$ac_cs_version"; exit 0 ;; + --he | --h) + # Conflict between --help and --header +- { { echo "$as_me:28936: error: ambiguous option: $1 ++ { { echo "$as_me:28931: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&5 + echo "$as_me: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&2;} +@@ -28952,7 +28947,7 @@ + ac_need_defaults=false;; + + # This is an error. +- -*) { { echo "$as_me:28955: error: unrecognized option: $1 ++ -*) { { echo "$as_me:28950: error: unrecognized option: $1 + Try \`$0 --help' for more information." >&5 + echo "$as_me: error: unrecognized option: $1 + Try \`$0 --help' for more information." >&2;} +@@ -29078,7 +29073,7 @@ + "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; + "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; +- *) { { echo "$as_me:29081: error: invalid argument: $ac_config_target" >&5 ++ *) { { echo "$as_me:29076: error: invalid argument: $ac_config_target" >&5 + echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +@@ -29590,7 +29585,7 @@ + esac + + if test x"$ac_file" != x-; then +- { echo "$as_me:29593: creating $ac_file" >&5 ++ { echo "$as_me:29588: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi +@@ -29608,7 +29603,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:29611: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:29606: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -29621,7 +29616,7 @@ + echo "$srcdir/$f" + else + # /dev/null tree +- { { echo "$as_me:29624: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:29619: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -29637,7 +29632,7 @@ + if test -n "$ac_seen"; then + ac_used=`grep '@datarootdir@' "$ac_item"` + if test -z "$ac_used"; then +- { echo "$as_me:29640: WARNING: datarootdir was used implicitly but not set: ++ { echo "$as_me:29635: WARNING: datarootdir was used implicitly but not set: + $ac_seen" >&5 + echo "$as_me: WARNING: datarootdir was used implicitly but not set: + $ac_seen" >&2;} +@@ -29646,7 +29641,7 @@ + fi + ac_seen=`grep '${datarootdir}' "$ac_item"` + if test -n "$ac_seen"; then +- { echo "$as_me:29649: WARNING: datarootdir was used explicitly but not set: ++ { echo "$as_me:29644: WARNING: datarootdir was used explicitly but not set: + $ac_seen" >&5 + echo "$as_me: WARNING: datarootdir was used explicitly but not set: + $ac_seen" >&2;} +@@ -29683,7 +29678,7 @@ + ac_init=`${EGREP-egrep} '[ ]*'$ac_name'[ ]*=' "$ac_file"` + if test -z "$ac_init"; then + ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` +- { echo "$as_me:29686: WARNING: Variable $ac_name is used but was not set: ++ { echo "$as_me:29681: WARNING: Variable $ac_name is used but was not set: + $ac_seen" >&5 + echo "$as_me: WARNING: Variable $ac_name is used but was not set: + $ac_seen" >&2;} +@@ -29694,7 +29689,7 @@ + ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out + if test -s $tmp/out; then + ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` +- { echo "$as_me:29697: WARNING: Some variables may not be substituted: ++ { echo "$as_me:29692: WARNING: Some variables may not be substituted: + $ac_seen" >&5 + echo "$as_me: WARNING: Some variables may not be substituted: + $ac_seen" >&2;} +@@ -29743,7 +29738,7 @@ + * ) ac_file_in=$ac_file.in ;; + esac + +- test x"$ac_file" != x- && { echo "$as_me:29746: creating $ac_file" >&5 ++ test x"$ac_file" != x- && { echo "$as_me:29741: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + + # First look for the input files in the build tree, otherwise in the +@@ -29754,7 +29749,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:29757: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:29752: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -29767,7 +29762,7 @@ + echo "$srcdir/$f" + else + # /dev/null tree +- { { echo "$as_me:29770: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:29765: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -29825,7 +29820,7 @@ + rm -f $tmp/in + if test x"$ac_file" != x-; then + if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then +- { echo "$as_me:29828: $ac_file is unchanged" >&5 ++ { echo "$as_me:29823: $ac_file is unchanged" >&5 + echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +@@ -30212,7 +30207,7 @@ + (cygdll|msysdll|mingw|msvcdll) + test "x$with_shared_cxx" = xno && test -n "$verbose" && echo " overriding CXX_MODEL to SHARED" 1>&6 + +-echo "${as_me:-configure}:30215: testing overriding CXX_MODEL to SHARED ..." 1>&5 ++echo "${as_me:-configure}:30210: testing overriding CXX_MODEL to SHARED ..." 1>&5 + + with_shared_cxx=yes + ;; +Index: dist.mk +Prereq: 1.1444 +--- ncurses-6.3-20211021+/dist.mk 2021-10-20 22:43:08.000000000 +0000 ++++ ncurses-6.3-20211026/dist.mk 2021-10-26 07:49:17.000000000 +0000 +@@ -26,7 +26,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: dist.mk,v 1.1444 2021/10/20 22:43:08 tom Exp $ ++# $Id: dist.mk,v 1.1446 2021/10/26 07:49:17 tom Exp $ + # Makefile for creating ncurses distributions. + # + # This only needs to be used directly as a makefile by developers, but +@@ -38,7 +38,7 @@ + # These define the major/minor/patch versions of ncurses. + NCURSES_MAJOR = 6 + NCURSES_MINOR = 3 +-NCURSES_PATCH = 20211021 ++NCURSES_PATCH = 20211026 + + # We don't append the patch to the version, since this only applies to releases + VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) +Index: package/debian-mingw/changelog +--- ncurses-6.3-20211021+/package/debian-mingw/changelog 2021-10-20 22:43:08.000000000 +0000 ++++ ncurses-6.3-20211026/package/debian-mingw/changelog 2021-10-26 07:49:17.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20211021) unstable; urgency=low ++ncurses6 (6.3+20211026) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Wed, 20 Oct 2021 18:43:08 -0400 ++ -- Thomas E. Dickey Tue, 26 Oct 2021 03:49:17 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian-mingw64/changelog +--- ncurses-6.3-20211021+/package/debian-mingw64/changelog 2021-10-20 22:43:08.000000000 +0000 ++++ ncurses-6.3-20211026/package/debian-mingw64/changelog 2021-10-26 07:49:17.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20211021) unstable; urgency=low ++ncurses6 (6.3+20211026) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Wed, 20 Oct 2021 18:43:08 -0400 ++ -- Thomas E. Dickey Tue, 26 Oct 2021 03:49:17 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian/changelog +--- ncurses-6.3-20211021+/package/debian/changelog 2021-10-20 22:43:08.000000000 +0000 ++++ ncurses-6.3-20211026/package/debian/changelog 2021-10-26 07:49:17.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20211021) unstable; urgency=low ++ncurses6 (6.3+20211026) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Wed, 20 Oct 2021 18:43:08 -0400 ++ -- Thomas E. Dickey Tue, 26 Oct 2021 03:49:17 -0400 + + ncurses6 (5.9-20120608) unstable; urgency=low + +Index: package/mingw-ncurses.nsi +Prereq: 1.486 +--- ncurses-6.3-20211021+/package/mingw-ncurses.nsi 2021-10-20 22:43:08.000000000 +0000 ++++ ncurses-6.3-20211026/package/mingw-ncurses.nsi 2021-10-26 07:49:17.000000000 +0000 +@@ -1,4 +1,4 @@ +-; $Id: mingw-ncurses.nsi,v 1.486 2021/10/20 22:43:08 tom Exp $ ++; $Id: mingw-ncurses.nsi,v 1.488 2021/10/26 07:49:17 tom Exp $ + + ; TODO add examples + ; TODO bump ABI to 6 +@@ -10,7 +10,7 @@ + !define VERSION_MAJOR "6" + !define VERSION_MINOR "3" + !define VERSION_YYYY "2021" +-!define VERSION_MMDD "1021" ++!define VERSION_MMDD "1026" + !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} + + !define MY_ABI "5" +Index: package/mingw-ncurses.spec +--- ncurses-6.3-20211021+/package/mingw-ncurses.spec 2021-10-20 22:43:08.000000000 +0000 ++++ ncurses-6.3-20211026/package/mingw-ncurses.spec 2021-10-26 07:49:17.000000000 +0000 +@@ -3,7 +3,7 @@ + Summary: shared libraries for terminal handling + Name: mingw32-ncurses6 + Version: 6.3 +-Release: 20211021 ++Release: 20211026 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncurses.spec +--- ncurses-6.3-20211021+/package/ncurses.spec 2021-10-20 22:43:08.000000000 +0000 ++++ ncurses-6.3-20211026/package/ncurses.spec 2021-10-26 07:49:17.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: shared libraries for terminal handling + Name: ncurses6 + Version: 6.3 +-Release: 20211021 ++Release: 20211026 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncursest.spec +--- ncurses-6.3-20211021+/package/ncursest.spec 2021-10-20 22:43:08.000000000 +0000 ++++ ncurses-6.3-20211026/package/ncursest.spec 2021-10-26 07:49:17.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: Curses library with POSIX thread support. + Name: ncursest6 + Version: 6.3 +-Release: 20211021 ++Release: 20211026 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz diff --git a/system/ncurses/ncurses-6.3-20211030.patch b/system/ncurses/ncurses-6.3-20211030.patch new file mode 100644 index 000000000..4a04580eb --- /dev/null +++ b/system/ncurses/ncurses-6.3-20211030.patch @@ -0,0 +1,8846 @@ +# ncurses 6.3 - patch 20211030 - Thomas E. Dickey +# +# ------------------------------------------------------------------------------ +# +# Ncurses 6.3 is at +# ftp.gnu.org:/pub/gnu +# +# Patches for ncurses 6.3 can be found at +# ftp://ftp.invisible-island.net/ncurses/6.3 +# http://invisible-mirror.net/archives/ncurses/6.3 +# +# ------------------------------------------------------------------------------ +# ftp://ftp.invisible-island.net/ncurses/6.3/ncurses-6.3-20211030.patch.gz +# patch by Thomas E. Dickey +# created Sun Oct 31 00:48:33 UTC 2021 +# ------------------------------------------------------------------------------ +# Ada95/Makefile.in | 8 +# Ada95/aclocal.m4 | 33 +# Ada95/configure | 540 +++++---- +# Ada95/configure.in | 5 +# NEWS | 7 +# VERSION | 2 +# aclocal.m4 | 33 +# configure | 1980 ++++++++++++++++++----------------- +# configure.in | 11 +# dist.mk | 4 +# ncurses/base/lib_clreol.c | 8 +# ncurses/base/lib_freeall.c | 4 +# ncurses/base/lib_getch.c | 6 +# ncurses/base/lib_getstr.c | 4 +# ncurses/base/lib_mvwin.c | 8 +# ncurses/base/lib_newwin.c | 8 +# ncurses/base/lib_pad.c | 8 +# ncurses/base/lib_screen.c | 8 +# ncurses/base/lib_window.c | 10 +# ncurses/base/resizeterm.c | 6 +# ncurses/base/wresize.c | 8 +# ncurses/curses.priv.h | 6 +# ncurses/widechar/lib_get_wstr.c | 4 +# ncurses/widechar/lib_pecho_wchar.c | 6 +# package/debian-mingw/changelog | 4 +# package/debian-mingw64/changelog | 4 +# package/debian/changelog | 4 +# package/mingw-ncurses.nsi | 4 +# package/mingw-ncurses.spec | 2 +# package/ncurses.spec | 2 +# package/ncursest.spec | 2 +# 31 files changed, 1516 insertions(+), 1223 deletions(-) +# ------------------------------------------------------------------------------ +Index: Ada95/Makefile.in +Prereq: 1.28 +--- ncurses-6.3-20211026+/Ada95/Makefile.in 2021-07-03 18:54:54.000000000 +0000 ++++ ncurses-6.3-20211030/Ada95/Makefile.in 2021-10-23 16:00:22.000000000 +0000 +@@ -1,4 +1,4 @@ +-# $Id: Makefile.in,v 1.28 2021/07/03 18:54:54 tom Exp $ ++# $Id: Makefile.in,v 1.29 2021/10/23 16:00:22 tom Exp $ + ############################################################################## + # Copyright 2020,2021 Thomas E. Dickey # + # Copyright 1998-2010,2015 Free Software Foundation, Inc. # +@@ -31,7 +31,7 @@ + # Author: Juergen Pfeifer, 1996 + # + # Version Control +-# $Revision: 1.28 $ ++# $Revision: 1.29 $ + # + SHELL = @SHELL@ + VPATH = @srcdir@ +@@ -88,6 +88,10 @@ + -rm -f Makefile + + depend : ++ @ ++ ++check : ++ @ + + tags : + @ +Index: Ada95/aclocal.m4 +Prereq: 1.187 +--- ncurses-6.3-20211026+/Ada95/aclocal.m4 2021-10-26 20:50:11.000000000 +0000 ++++ ncurses-6.3-20211030/Ada95/aclocal.m4 2021-10-30 20:49:04.000000000 +0000 +@@ -29,7 +29,7 @@ + dnl + dnl Author: Thomas E. Dickey + dnl +-dnl $Id: aclocal.m4,v 1.187 2021/10/26 20:50:11 tom Exp $ ++dnl $Id: aclocal.m4,v 1.188 2021/10/30 20:49:04 tom Exp $ + dnl Macros used in NCURSES Ada95 auto-configuration script. + dnl + dnl These macros are maintained separately from NCURSES. The copyright on +@@ -778,6 +778,37 @@ + esac + ]) + dnl --------------------------------------------------------------------------- ++dnl CF_CHECK_LIBSSP version: 1 updated: 2021/10/30 10:40:19 ++dnl --------------- ++dnl Check if libssp is needed, e.g., to work around misconfigured libraries ++dnl used in cross-compiling to MinGW. ++AC_DEFUN([CF_CHECK_LIBSSP],[ ++AC_CACHE_CHECK(if ssp library is needed,cf_cv_need_libssp,[ ++AC_TRY_LINK([ ++#include ++#include ++],[ ++ DIR *dp = opendir("."); ++],cf_cv_need_libssp=no,[ ++ cf_save_LIBS="$LIBS" ++ LIBS="$LIBS -lssp" ++ AC_TRY_LINK([ ++#include ++#include ++ ],[ ++ DIR *dp = opendir("."); ++ ],cf_cv_need_libssp=yes, ++ cf_cv_need_libssp=maybe) ++ LIBS="$cf_save_LIBS" ++])dnl ++]) ++ ++if test "x$cf_cv_need_libssp" = xyes ++then ++ CF_ADD_LIB(ssp) ++fi ++])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_CLANG_COMPILER version: 8 updated: 2021/01/01 13:31:04 + dnl ----------------- + dnl Check if the given compiler is really clang. clang's C driver defines +Index: Ada95/configure +--- ncurses-6.3-20211026+/Ada95/configure 2021-10-26 20:50:11.000000000 +0000 ++++ ncurses-6.3-20211030/Ada95/configure 2021-10-30 20:52:59.000000000 +0000 +@@ -1,5 +1,5 @@ + #! /bin/sh +-# From configure.in Revision: 1.83 . ++# From configure.in Revision: 1.84 . + # Guess values for system-dependent variables and create Makefiles. + # Generated by Autoconf 2.52.20210509. + # +@@ -15984,15 +15984,123 @@ + ### Checks for libraries. + case $cf_cv_system_name in + (*mingw32*) ++ ++echo "$as_me:15988: checking if ssp library is needed" >&5 ++echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6 ++if test "${cf_cv_need_libssp+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ++cat >"conftest.$ac_ext" <<_ACEOF ++#line 15995 "configure" ++#include "confdefs.h" ++ ++#include ++#include ++ ++int ++main (void) ++{ ++ ++ DIR *dp = opendir("."); ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f "conftest.$ac_objext" "conftest$ac_exeext" ++if { (eval echo "$as_me:16012: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:16015: \$? = $ac_status" >&5 ++ (exit "$ac_status"); } && ++ { ac_try='test -s "conftest$ac_exeext"' ++ { (eval echo "$as_me:16018: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:16021: \$? = $ac_status" >&5 ++ (exit "$ac_status"); }; }; then ++ cf_cv_need_libssp=no ++else ++ echo "$as_me: failed program was:" >&5 ++cat "conftest.$ac_ext" >&5 ++ ++ cf_save_LIBS="$LIBS" ++ LIBS="$LIBS -lssp" ++ cat >"conftest.$ac_ext" <<_ACEOF ++#line 16031 "configure" ++#include "confdefs.h" ++ ++#include ++#include ++ ++int ++main (void) ++{ ++ ++ DIR *dp = opendir("."); ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f "conftest.$ac_objext" "conftest$ac_exeext" ++if { (eval echo "$as_me:16048: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:16051: \$? = $ac_status" >&5 ++ (exit "$ac_status"); } && ++ { ac_try='test -s "conftest$ac_exeext"' ++ { (eval echo "$as_me:16054: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:16057: \$? = $ac_status" >&5 ++ (exit "$ac_status"); }; }; then ++ cf_cv_need_libssp=yes ++else ++ echo "$as_me: failed program was:" >&5 ++cat "conftest.$ac_ext" >&5 ++cf_cv_need_libssp=maybe ++fi ++rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" ++ LIBS="$cf_save_LIBS" ++ ++fi ++rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" ++fi ++echo "$as_me:16071: result: $cf_cv_need_libssp" >&5 ++echo "${ECHO_T}$cf_cv_need_libssp" >&6 ++ ++if test "x$cf_cv_need_libssp" = xyes ++then ++ ++cf_add_libs="$LIBS" ++# reverse order ++cf_add_0lib= ++for cf_add_1lib in -lssp; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done ++# filter duplicates ++for cf_add_1lib in $cf_add_0lib; do ++ for cf_add_2lib in $cf_add_libs; do ++ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then ++ cf_add_1lib= ++ break ++ fi ++ done ++ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" ++done ++LIBS="$cf_add_libs" ++ ++fi ++ + ;; + (*) +-echo "$as_me:15989: checking for gettimeofday" >&5 ++echo "$as_me:16097: checking for gettimeofday" >&5 + echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6 + if test "${ac_cv_func_gettimeofday+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 15995 "configure" ++#line 16103 "configure" + #include "confdefs.h" + #define gettimeofday autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -16023,16 +16131,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:16026: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16134: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16029: \$? = $ac_status" >&5 ++ echo "$as_me:16137: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:16032: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16140: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16035: \$? = $ac_status" >&5 ++ echo "$as_me:16143: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_gettimeofday=yes + else +@@ -16042,7 +16150,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:16045: result: $ac_cv_func_gettimeofday" >&5 ++echo "$as_me:16153: result: $ac_cv_func_gettimeofday" >&5 + echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 + if test "$ac_cv_func_gettimeofday" = yes; then + cat >>confdefs.h <<\EOF +@@ -16051,7 +16159,7 @@ + + else + +-echo "$as_me:16054: checking for gettimeofday in -lbsd" >&5 ++echo "$as_me:16162: checking for gettimeofday in -lbsd" >&5 + echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6 + if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -16059,7 +16167,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16062 "configure" ++#line 16170 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -16078,16 +16186,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:16081: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16189: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16084: \$? = $ac_status" >&5 ++ echo "$as_me:16192: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:16087: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16195: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16090: \$? = $ac_status" >&5 ++ echo "$as_me:16198: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_bsd_gettimeofday=yes + else +@@ -16098,7 +16206,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:16101: result: $ac_cv_lib_bsd_gettimeofday" >&5 ++echo "$as_me:16209: result: $ac_cv_lib_bsd_gettimeofday" >&5 + echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6 + if test "$ac_cv_lib_bsd_gettimeofday" = yes; then + +@@ -16114,13 +16222,13 @@ + esac + + ### Checks for header files. +-echo "$as_me:16117: checking for ANSI C header files" >&5 ++echo "$as_me:16225: checking for ANSI C header files" >&5 + echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 + if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16123 "configure" ++#line 16231 "configure" + #include "confdefs.h" + #include + #include +@@ -16128,13 +16236,13 @@ + #include + + _ACEOF +-if { (eval echo "$as_me:16131: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:16239: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:16137: \$? = $ac_status" >&5 ++ echo "$as_me:16245: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -16156,7 +16264,7 @@ + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16159 "configure" ++#line 16267 "configure" + #include "confdefs.h" + #include + +@@ -16174,7 +16282,7 @@ + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16177 "configure" ++#line 16285 "configure" + #include "confdefs.h" + #include + +@@ -16195,7 +16303,7 @@ + : + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16198 "configure" ++#line 16306 "configure" + #include "confdefs.h" + #include + #if ((' ' & 0x0FF) == 0x020) +@@ -16221,15 +16329,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:16224: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16332: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16227: \$? = $ac_status" >&5 ++ echo "$as_me:16335: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:16229: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16337: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16232: \$? = $ac_status" >&5 ++ echo "$as_me:16340: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -16242,7 +16350,7 @@ + fi + fi + fi +-echo "$as_me:16245: result: $ac_cv_header_stdc" >&5 ++echo "$as_me:16353: result: $ac_cv_header_stdc" >&5 + echo "${ECHO_T}$ac_cv_header_stdc" >&6 + if test $ac_cv_header_stdc = yes; then + +@@ -16258,28 +16366,28 @@ + inttypes.h stdint.h unistd.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:16261: checking for $ac_header" >&5 ++echo "$as_me:16369: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16267 "configure" ++#line 16375 "configure" + #include "confdefs.h" + $ac_includes_default + #include <$ac_header> + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16273: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16381: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16276: \$? = $ac_status" >&5 ++ echo "$as_me:16384: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16279: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16387: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16282: \$? = $ac_status" >&5 ++ echo "$as_me:16390: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_Header=yes" + else +@@ -16289,7 +16397,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:16292: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:16400: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:16410: checking for signed char" >&5 + echo $ECHO_N "checking for signed char... $ECHO_C" >&6 + if test "${ac_cv_type_signed_char+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16308 "configure" ++#line 16416 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -16320,16 +16428,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16323: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16431: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16326: \$? = $ac_status" >&5 ++ echo "$as_me:16434: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16329: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16437: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16332: \$? = $ac_status" >&5 ++ echo "$as_me:16440: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_signed_char=yes + else +@@ -16339,10 +16447,10 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:16342: result: $ac_cv_type_signed_char" >&5 ++echo "$as_me:16450: result: $ac_cv_type_signed_char" >&5 + echo "${ECHO_T}$ac_cv_type_signed_char" >&6 + +-echo "$as_me:16345: checking size of signed char" >&5 ++echo "$as_me:16453: checking size of signed char" >&5 + echo $ECHO_N "checking size of signed char... $ECHO_C" >&6 + if test "${ac_cv_sizeof_signed_char+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -16351,7 +16459,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16354 "configure" ++#line 16462 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -16363,21 +16471,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16366: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16474: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16369: \$? = $ac_status" >&5 ++ echo "$as_me:16477: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16372: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16480: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16375: \$? = $ac_status" >&5 ++ echo "$as_me:16483: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16380 "configure" ++#line 16488 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -16389,16 +16497,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16392: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16500: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16395: \$? = $ac_status" >&5 ++ echo "$as_me:16503: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16398: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16506: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16401: \$? = $ac_status" >&5 ++ echo "$as_me:16509: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid; break + else +@@ -16414,7 +16522,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16417 "configure" ++#line 16525 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -16426,16 +16534,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16429: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16537: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16432: \$? = $ac_status" >&5 ++ echo "$as_me:16540: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16435: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16543: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16438: \$? = $ac_status" >&5 ++ echo "$as_me:16546: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=$ac_mid; break + else +@@ -16451,7 +16559,7 @@ + while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16454 "configure" ++#line 16562 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -16463,16 +16571,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16466: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16574: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16469: \$? = $ac_status" >&5 ++ echo "$as_me:16577: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16472: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16580: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16475: \$? = $ac_status" >&5 ++ echo "$as_me:16583: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid + else +@@ -16485,12 +16593,12 @@ + ac_cv_sizeof_signed_char=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:16488: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:16596: error: cannot run test program while cross compiling" >&5 + echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16493 "configure" ++#line 16601 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -16506,15 +16614,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:16509: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16617: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16512: \$? = $ac_status" >&5 ++ echo "$as_me:16620: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:16514: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16622: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16517: \$? = $ac_status" >&5 ++ echo "$as_me:16625: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sizeof_signed_char=`cat conftest.val` + else +@@ -16530,19 +16638,19 @@ + ac_cv_sizeof_signed_char=0 + fi + fi +-echo "$as_me:16533: result: $ac_cv_sizeof_signed_char" >&5 ++echo "$as_me:16641: result: $ac_cv_sizeof_signed_char" >&5 + echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 + cat >>confdefs.h <&5 ++echo "$as_me:16647: checking for ANSI C header files" >&5 + echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 + if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16545 "configure" ++#line 16653 "configure" + #include "confdefs.h" + #include + #include +@@ -16550,13 +16658,13 @@ + #include + + _ACEOF +-if { (eval echo "$as_me:16553: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:16661: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:16559: \$? = $ac_status" >&5 ++ echo "$as_me:16667: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -16578,7 +16686,7 @@ + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16581 "configure" ++#line 16689 "configure" + #include "confdefs.h" + #include + +@@ -16596,7 +16704,7 @@ + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16599 "configure" ++#line 16707 "configure" + #include "confdefs.h" + #include + +@@ -16617,7 +16725,7 @@ + : + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16620 "configure" ++#line 16728 "configure" + #include "confdefs.h" + #include + #if ((' ' & 0x0FF) == 0x020) +@@ -16643,15 +16751,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:16646: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16754: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16649: \$? = $ac_status" >&5 ++ echo "$as_me:16757: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:16651: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16759: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16654: \$? = $ac_status" >&5 ++ echo "$as_me:16762: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -16664,7 +16772,7 @@ + fi + fi + fi +-echo "$as_me:16667: result: $ac_cv_header_stdc" >&5 ++echo "$as_me:16775: result: $ac_cv_header_stdc" >&5 + echo "${ECHO_T}$ac_cv_header_stdc" >&6 + if test $ac_cv_header_stdc = yes; then + +@@ -16677,13 +16785,13 @@ + ac_header_dirent=no + for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do + as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` +-echo "$as_me:16680: checking for $ac_hdr that defines DIR" >&5 ++echo "$as_me:16788: checking for $ac_hdr that defines DIR" >&5 + echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16686 "configure" ++#line 16794 "configure" + #include "confdefs.h" + #include + #include <$ac_hdr> +@@ -16698,16 +16806,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16701: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16809: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16704: \$? = $ac_status" >&5 ++ echo "$as_me:16812: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16707: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16815: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16710: \$? = $ac_status" >&5 ++ echo "$as_me:16818: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_Header=yes" + else +@@ -16717,7 +16825,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:16720: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:16828: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++ echo "$as_me:16841: checking for opendir in -ldir" >&5 + echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 + if test "${ac_cv_lib_dir_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -16738,7 +16846,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldir $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16741 "configure" ++#line 16849 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -16757,16 +16865,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:16760: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16868: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16763: \$? = $ac_status" >&5 ++ echo "$as_me:16871: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:16766: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16874: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16769: \$? = $ac_status" >&5 ++ echo "$as_me:16877: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_dir_opendir=yes + else +@@ -16777,14 +16885,14 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:16780: result: $ac_cv_lib_dir_opendir" >&5 ++echo "$as_me:16888: result: $ac_cv_lib_dir_opendir" >&5 + echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 + if test "$ac_cv_lib_dir_opendir" = yes; then + LIBS="$LIBS -ldir" + fi + + else +- echo "$as_me:16787: checking for opendir in -lx" >&5 ++ echo "$as_me:16895: checking for opendir in -lx" >&5 + echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 + if test "${ac_cv_lib_x_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -16792,7 +16900,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lx $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16795 "configure" ++#line 16903 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -16811,16 +16919,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:16814: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16922: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16817: \$? = $ac_status" >&5 ++ echo "$as_me:16925: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:16820: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16928: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16823: \$? = $ac_status" >&5 ++ echo "$as_me:16931: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_x_opendir=yes + else +@@ -16831,7 +16939,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:16834: result: $ac_cv_lib_x_opendir" >&5 ++echo "$as_me:16942: result: $ac_cv_lib_x_opendir" >&5 + echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 + if test "$ac_cv_lib_x_opendir" = yes; then + LIBS="$LIBS -lx" +@@ -16839,13 +16947,13 @@ + + fi + +-echo "$as_me:16842: checking whether time.h and sys/time.h may both be included" >&5 ++echo "$as_me:16950: checking whether time.h and sys/time.h may both be included" >&5 + echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 + if test "${ac_cv_header_time+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16848 "configure" ++#line 16956 "configure" + #include "confdefs.h" + #include + #include +@@ -16861,16 +16969,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16864: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16972: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16867: \$? = $ac_status" >&5 ++ echo "$as_me:16975: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16870: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16978: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16873: \$? = $ac_status" >&5 ++ echo "$as_me:16981: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_header_time=yes + else +@@ -16880,7 +16988,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:16883: result: $ac_cv_header_time" >&5 ++echo "$as_me:16991: result: $ac_cv_header_time" >&5 + echo "${ECHO_T}$ac_cv_header_time" >&6 + if test $ac_cv_header_time = yes; then + +@@ -16898,13 +17006,13 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_main_return="return" + +-echo "$as_me:16901: checking for an ANSI C-conforming const" >&5 ++echo "$as_me:17009: checking for an ANSI C-conforming const" >&5 + echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 + if test "${ac_cv_c_const+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16907 "configure" ++#line 17015 "configure" + #include "confdefs.h" + + int +@@ -16962,16 +17070,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16965: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17073: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16968: \$? = $ac_status" >&5 ++ echo "$as_me:17076: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16971: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17079: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16974: \$? = $ac_status" >&5 ++ echo "$as_me:17082: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_c_const=yes + else +@@ -16981,7 +17089,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:16984: result: $ac_cv_c_const" >&5 ++echo "$as_me:17092: result: $ac_cv_c_const" >&5 + echo "${ECHO_T}$ac_cv_c_const" >&6 + if test $ac_cv_c_const = no; then + +@@ -16993,7 +17101,7 @@ + + ### Checks for external-data + +-echo "$as_me:16996: checking if data-only library module links" >&5 ++echo "$as_me:17104: checking if data-only library module links" >&5 + echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6 + if test "${cf_cv_link_dataonly+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17001,20 +17109,20 @@ + + rm -f conftest.a + cat >conftest.$ac_ext <&5 ++ if { (eval echo "$as_me:17115: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17010: \$? = $ac_status" >&5 ++ echo "$as_me:17118: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then + mv conftest.o data.o && \ + ( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null + fi + rm -f conftest.$ac_ext data.o + cat >conftest.$ac_ext <&5 ++ if { (eval echo "$as_me:17138: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17033: \$? = $ac_status" >&5 ++ echo "$as_me:17141: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then + mv conftest.o func.o && \ + ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null +@@ -17043,7 +17151,7 @@ + cf_cv_link_dataonly=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17046 "configure" ++#line 17154 "configure" + #include "confdefs.h" + + int main(void) +@@ -17054,15 +17162,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:17057: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17165: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17060: \$? = $ac_status" >&5 ++ echo "$as_me:17168: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:17062: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17170: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17065: \$? = $ac_status" >&5 ++ echo "$as_me:17173: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_link_dataonly=yes + else +@@ -17077,7 +17185,7 @@ + + fi + +-echo "$as_me:17080: result: $cf_cv_link_dataonly" >&5 ++echo "$as_me:17188: result: $cf_cv_link_dataonly" >&5 + echo "${ECHO_T}$cf_cv_link_dataonly" >&6 + + if test "$cf_cv_link_dataonly" = no ; then +@@ -17096,23 +17204,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:17099: checking for $ac_header" >&5 ++echo "$as_me:17207: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17105 "configure" ++#line 17213 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:17109: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:17217: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:17115: \$? = $ac_status" >&5 ++ echo "$as_me:17223: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -17131,7 +17239,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:17134: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:17242: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:17252: checking for working mkstemp" >&5 + echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 + if test "${cf_cv_func_mkstemp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17152,7 +17260,7 @@ + cf_cv_func_mkstemp=maybe + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17155 "configure" ++#line 17263 "configure" + #include "confdefs.h" + + #include +@@ -17193,15 +17301,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:17196: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17304: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17199: \$? = $ac_status" >&5 ++ echo "$as_me:17307: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:17201: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17309: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17204: \$? = $ac_status" >&5 ++ echo "$as_me:17312: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_mkstemp=yes + +@@ -17216,16 +17324,16 @@ + fi + + fi +-echo "$as_me:17219: result: $cf_cv_func_mkstemp" >&5 ++echo "$as_me:17327: result: $cf_cv_func_mkstemp" >&5 + echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 + if test "x$cf_cv_func_mkstemp" = xmaybe ; then +- echo "$as_me:17222: checking for mkstemp" >&5 ++ echo "$as_me:17330: checking for mkstemp" >&5 + echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 + if test "${ac_cv_func_mkstemp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17228 "configure" ++#line 17336 "configure" + #include "confdefs.h" + #define mkstemp autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -17256,16 +17364,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:17259: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17367: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17262: \$? = $ac_status" >&5 ++ echo "$as_me:17370: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:17265: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17373: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17268: \$? = $ac_status" >&5 ++ echo "$as_me:17376: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_mkstemp=yes + else +@@ -17275,7 +17383,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:17278: result: $ac_cv_func_mkstemp" >&5 ++echo "$as_me:17386: result: $ac_cv_func_mkstemp" >&5 + echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 + + fi +@@ -17304,7 +17412,7 @@ + unset cf_TEMP_gnat + # Extract the first word of "$cf_prog_gnat", so it can be a program name with args. + set dummy $cf_prog_gnat; ac_word=$2 +-echo "$as_me:17307: checking for $ac_word" >&5 ++echo "$as_me:17415: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17321,7 +17429,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word" +- echo "$as_me:17324: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:17432: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -17333,10 +17441,10 @@ + cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat + + if test -n "$cf_TEMP_gnat"; then +- echo "$as_me:17336: result: $cf_TEMP_gnat" >&5 ++ echo "$as_me:17444: result: $cf_TEMP_gnat" >&5 + echo "${ECHO_T}$cf_TEMP_gnat" >&6 + else +- echo "$as_me:17339: result: no" >&5 ++ echo "$as_me:17447: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -17346,7 +17454,7 @@ + unset cf_cv_gnat_version + unset cf_TEMP_gnat + +-echo "$as_me:17349: checking for $cf_prog_gnat version" >&5 ++echo "$as_me:17457: checking for $cf_prog_gnat version" >&5 + echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6 + if test "${cf_cv_gnat_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17357,7 +17465,7 @@ + sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` + + fi +-echo "$as_me:17360: result: $cf_cv_gnat_version" >&5 ++echo "$as_me:17468: result: $cf_cv_gnat_version" >&5 + echo "${ECHO_T}$cf_cv_gnat_version" >&6 + test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no + eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version +@@ -17386,7 +17494,7 @@ + cd conftest.src + for cf_gprconfig in Ada C + do +- echo "$as_me:17389: checking for gprconfig name for $cf_gprconfig" >&5 ++ echo "$as_me:17497: checking for gprconfig name for $cf_gprconfig" >&5 + echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6 + if test "$cf_gprconfig" = C + then +@@ -17405,10 +17513,10 @@ + if test -n "$cf_gprconfig_value" + then + eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value" +- echo "$as_me:17408: result: $cf_gprconfig_value" >&5 ++ echo "$as_me:17516: result: $cf_gprconfig_value" >&5 + echo "${ECHO_T}$cf_gprconfig_value" >&6 + else +- echo "$as_me:17411: result: missing" >&5 ++ echo "$as_me:17519: result: missing" >&5 + echo "${ECHO_T}missing" >&6 + cf_ada_config="#" + break +@@ -17421,7 +17529,7 @@ + if test "x$cf_ada_config" != "x#" + then + +-echo "$as_me:17424: checking for gnat version" >&5 ++echo "$as_me:17532: checking for gnat version" >&5 + echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 + if test "${cf_cv_gnat_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17432,7 +17540,7 @@ + sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` + + fi +-echo "$as_me:17435: result: $cf_cv_gnat_version" >&5 ++echo "$as_me:17543: result: $cf_cv_gnat_version" >&5 + echo "${ECHO_T}$cf_cv_gnat_version" >&6 + test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no + +@@ -17441,7 +17549,7 @@ + cf_cv_prog_gnat_correct=yes + ;; + (*) +- { echo "$as_me:17444: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 ++ { echo "$as_me:17552: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 + echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} + cf_cv_prog_gnat_correct=no + ;; +@@ -17449,7 +17557,7 @@ + + # Extract the first word of "m4", so it can be a program name with args. + set dummy m4; ac_word=$2 +-echo "$as_me:17452: checking for $ac_word" >&5 ++echo "$as_me:17560: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_M4_exists+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17464,7 +17572,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_M4_exists="yes" +-echo "$as_me:17467: found $ac_dir/$ac_word" >&5 ++echo "$as_me:17575: found $ac_dir/$ac_word" >&5 + break + done + +@@ -17473,20 +17581,20 @@ + fi + M4_exists=$ac_cv_prog_M4_exists + if test -n "$M4_exists"; then +- echo "$as_me:17476: result: $M4_exists" >&5 ++ echo "$as_me:17584: result: $M4_exists" >&5 + echo "${ECHO_T}$M4_exists" >&6 + else +- echo "$as_me:17479: result: no" >&5 ++ echo "$as_me:17587: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + if test "$ac_cv_prog_M4_exists" = no; then + cf_cv_prog_gnat_correct=no +- { echo "$as_me:17485: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 ++ { echo "$as_me:17593: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 + echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;} + fi + if test "$cf_cv_prog_gnat_correct" = yes; then +- echo "$as_me:17489: checking if GNAT works" >&5 ++ echo "$as_me:17597: checking if GNAT works" >&5 + echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 + + rm -rf ./conftest* ./*~conftest* +@@ -17514,7 +17622,7 @@ + fi + rm -rf ./conftest* ./*~conftest* + +- echo "$as_me:17517: result: $cf_cv_prog_gnat_correct" >&5 ++ echo "$as_me:17625: result: $cf_cv_prog_gnat_correct" >&5 + echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 + fi + else +@@ -17524,7 +17632,7 @@ + + if test "$cf_cv_prog_gnat_correct" = yes; then + +- echo "$as_me:17527: checking optimization options for ADAFLAGS" >&5 ++ echo "$as_me:17635: checking optimization options for ADAFLAGS" >&5 + echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 + case "$CFLAGS" in + (*-g*) +@@ -17541,10 +17649,10 @@ + + ;; + esac +- echo "$as_me:17544: result: $ADAFLAGS" >&5 ++ echo "$as_me:17652: result: $ADAFLAGS" >&5 + echo "${ECHO_T}$ADAFLAGS" >&6 + +-echo "$as_me:17547: checking if GNATPREP supports -T option" >&5 ++echo "$as_me:17655: checking if GNATPREP supports -T option" >&5 + echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6 + if test "${cf_cv_gnatprep_opt_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17554,11 +17662,11 @@ + gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes + + fi +-echo "$as_me:17557: result: $cf_cv_gnatprep_opt_t" >&5 ++echo "$as_me:17665: result: $cf_cv_gnatprep_opt_t" >&5 + echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6 + test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS" + +-echo "$as_me:17561: checking if GNAT supports generics" >&5 ++echo "$as_me:17669: checking if GNAT supports generics" >&5 + echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 + case "$cf_cv_gnat_version" in + (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9]) +@@ -17568,7 +17676,7 @@ + cf_gnat_generics=no + ;; + esac +-echo "$as_me:17571: result: $cf_gnat_generics" >&5 ++echo "$as_me:17679: result: $cf_gnat_generics" >&5 + echo "${ECHO_T}$cf_gnat_generics" >&6 + + if test "$cf_gnat_generics" = yes +@@ -17580,7 +17688,7 @@ + cf_generic_objects= + fi + +-echo "$as_me:17583: checking if GNAT supports SIGINT" >&5 ++echo "$as_me:17691: checking if GNAT supports SIGINT" >&5 + echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6 + if test "${cf_cv_gnat_sigint+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17628,7 +17736,7 @@ + rm -rf ./conftest* ./*~conftest* + + fi +-echo "$as_me:17631: result: $cf_cv_gnat_sigint" >&5 ++echo "$as_me:17739: result: $cf_cv_gnat_sigint" >&5 + echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 + + if test "$cf_cv_gnat_sigint" = yes ; then +@@ -17641,7 +17749,7 @@ + cf_gnat_projects=no + + if test "$enable_gnat_projects" != no ; then +-echo "$as_me:17644: checking if GNAT supports project files" >&5 ++echo "$as_me:17752: checking if GNAT supports project files" >&5 + echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 + case "$cf_cv_gnat_version" in + (3.[0-9]*) +@@ -17704,15 +17812,15 @@ + esac + ;; + esac +-echo "$as_me:17707: result: $cf_gnat_projects" >&5 ++echo "$as_me:17815: result: $cf_gnat_projects" >&5 + echo "${ECHO_T}$cf_gnat_projects" >&6 + fi # enable_gnat_projects + + if test "$cf_gnat_projects" = yes + then +- echo "$as_me:17713: checking if GNAT supports libraries" >&5 ++ echo "$as_me:17821: checking if GNAT supports libraries" >&5 + echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 +- echo "$as_me:17715: result: $cf_gnat_libraries" >&5 ++ echo "$as_me:17823: result: $cf_gnat_libraries" >&5 + echo "${ECHO_T}$cf_gnat_libraries" >&6 + fi + +@@ -17732,7 +17840,7 @@ + then + USE_GNAT_MAKE_GPR="" + else +- { echo "$as_me:17735: WARNING: use old makefile rules since tools are missing" >&5 ++ { echo "$as_me:17843: WARNING: use old makefile rules since tools are missing" >&5 + echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;} + fi + fi +@@ -17744,7 +17852,7 @@ + USE_GNAT_LIBRARIES="#" + fi + +-echo "$as_me:17747: checking for ada-compiler" >&5 ++echo "$as_me:17855: checking for ada-compiler" >&5 + echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6 + + # Check whether --with-ada-compiler or --without-ada-compiler was given. +@@ -17755,12 +17863,12 @@ + cf_ada_compiler=gnatmake + fi; + +-echo "$as_me:17758: result: $cf_ada_compiler" >&5 ++echo "$as_me:17866: result: $cf_ada_compiler" >&5 + echo "${ECHO_T}$cf_ada_compiler" >&6 + + cf_ada_package=terminal_interface + +-echo "$as_me:17763: checking for ada-include" >&5 ++echo "$as_me:17871: checking for ada-include" >&5 + echo $ECHO_N "checking for ada-include... $ECHO_C" >&6 + + # Check whether --with-ada-include or --without-ada-include was given. +@@ -17796,7 +17904,7 @@ + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:17799: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:17907: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -17805,10 +17913,10 @@ + fi + eval ADA_INCLUDE="$withval" + +-echo "$as_me:17808: result: $ADA_INCLUDE" >&5 ++echo "$as_me:17916: result: $ADA_INCLUDE" >&5 + echo "${ECHO_T}$ADA_INCLUDE" >&6 + +-echo "$as_me:17811: checking for ada-objects" >&5 ++echo "$as_me:17919: checking for ada-objects" >&5 + echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6 + + # Check whether --with-ada-objects or --without-ada-objects was given. +@@ -17844,7 +17952,7 @@ + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:17847: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:17955: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -17853,10 +17961,10 @@ + fi + eval ADA_OBJECTS="$withval" + +-echo "$as_me:17856: result: $ADA_OBJECTS" >&5 ++echo "$as_me:17964: result: $ADA_OBJECTS" >&5 + echo "${ECHO_T}$ADA_OBJECTS" >&6 + +-echo "$as_me:17859: checking if an Ada95 shared-library should be built" >&5 ++echo "$as_me:17967: checking if an Ada95 shared-library should be built" >&5 + echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6 + + # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given. +@@ -17866,14 +17974,14 @@ + else + with_ada_sharedlib=no + fi; +-echo "$as_me:17869: result: $with_ada_sharedlib" >&5 ++echo "$as_me:17977: result: $with_ada_sharedlib" >&5 + echo "${ECHO_T}$with_ada_sharedlib" >&6 + + if test "x$with_ada_sharedlib" != xno + then + if test "x$cf_gnat_projects" != xyes + then +- { echo "$as_me:17876: WARNING: disabling shared-library since GNAT projects are not supported" >&5 ++ { echo "$as_me:17984: WARNING: disabling shared-library since GNAT projects are not supported" >&5 + echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;} + with_ada_sharedlib=no + fi +@@ -17893,7 +18001,7 @@ + + # allow the Ada binding to be renamed + +-echo "$as_me:17896: checking for ada-libname" >&5 ++echo "$as_me:18004: checking for ada-libname" >&5 + echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6 + + # Check whether --with-ada-libname or --without-ada-libname was given. +@@ -17909,16 +18017,16 @@ + ;; + esac + +-echo "$as_me:17912: result: $ADA_LIBNAME" >&5 ++echo "$as_me:18020: result: $ADA_LIBNAME" >&5 + echo "${ECHO_T}$ADA_LIBNAME" >&6 + + else +- { { echo "$as_me:17916: error: No usable Ada compiler found" >&5 ++ { { echo "$as_me:18024: error: No usable Ada compiler found" >&5 + echo "$as_me: error: No usable Ada compiler found" >&2;} + { (exit 1); exit 1; }; } + fi + else +- { { echo "$as_me:17921: error: The Ada compiler is needed for this package" >&5 ++ { { echo "$as_me:18029: error: The Ada compiler is needed for this package" >&5 + echo "$as_me: error: The Ada compiler is needed for this package" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -17958,7 +18066,7 @@ + fi + + ### Build up pieces for makefile rules +-echo "$as_me:17961: checking default library suffix" >&5 ++echo "$as_me:18069: checking default library suffix" >&5 + echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -17969,10 +18077,10 @@ + (shared) DFT_ARG_SUFFIX='' ;; + esac + test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" +-echo "$as_me:17972: result: $DFT_ARG_SUFFIX" >&5 ++echo "$as_me:18080: result: $DFT_ARG_SUFFIX" >&5 + echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 + +-echo "$as_me:17975: checking default library-dependency suffix" >&5 ++echo "$as_me:18083: checking default library-dependency suffix" >&5 + echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 + + case X$DFT_LWR_MODEL in +@@ -18055,10 +18163,10 @@ + DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}" + DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}" + fi +-echo "$as_me:18058: result: $DFT_DEP_SUFFIX" >&5 ++echo "$as_me:18166: result: $DFT_DEP_SUFFIX" >&5 + echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 + +-echo "$as_me:18061: checking default object directory" >&5 ++echo "$as_me:18169: checking default object directory" >&5 + echo $ECHO_N "checking default object directory... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -18074,7 +18182,7 @@ + DFT_OBJ_SUBDIR='obj_s' ;; + esac + esac +-echo "$as_me:18077: result: $DFT_OBJ_SUBDIR" >&5 ++echo "$as_me:18185: result: $DFT_OBJ_SUBDIR" >&5 + echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 + + ### Set up low-level terminfo dependencies for makefiles. +@@ -18216,7 +18324,7 @@ + : "${CONFIG_STATUS=./config.status}" + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ echo "$as_me:18219: creating $CONFIG_STATUS" >&5 ++{ echo "$as_me:18327: creating $CONFIG_STATUS" >&5 + echo "$as_me: creating $CONFIG_STATUS" >&6;} + cat >"$CONFIG_STATUS" <<_ACEOF + #! $SHELL +@@ -18395,7 +18503,7 @@ + echo "$ac_cs_version"; exit 0 ;; + --he | --h) + # Conflict between --help and --header +- { { echo "$as_me:18398: error: ambiguous option: $1 ++ { { echo "$as_me:18506: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&5 + echo "$as_me: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&2;} +@@ -18414,7 +18522,7 @@ + ac_need_defaults=false;; + + # This is an error. +- -*) { { echo "$as_me:18417: error: unrecognized option: $1 ++ -*) { { echo "$as_me:18525: error: unrecognized option: $1 + Try \`$0 --help' for more information." >&5 + echo "$as_me: error: unrecognized option: $1 + Try \`$0 --help' for more information." >&2;} +@@ -18488,7 +18596,7 @@ + "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; + "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; +- *) { { echo "$as_me:18491: error: invalid argument: $ac_config_target" >&5 ++ *) { { echo "$as_me:18599: error: invalid argument: $ac_config_target" >&5 + echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +@@ -18848,7 +18956,7 @@ + esac + + if test x"$ac_file" != x-; then +- { echo "$as_me:18851: creating $ac_file" >&5 ++ { echo "$as_me:18959: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi +@@ -18866,7 +18974,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:18869: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:18977: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -18879,7 +18987,7 @@ + echo "$srcdir/$f" + else + # /dev/null tree +- { { echo "$as_me:18882: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:18990: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -18895,7 +19003,7 @@ + if test -n "$ac_seen"; then + ac_used=`grep '@datarootdir@' "$ac_item"` + if test -z "$ac_used"; then +- { echo "$as_me:18898: WARNING: datarootdir was used implicitly but not set: ++ { echo "$as_me:19006: WARNING: datarootdir was used implicitly but not set: + $ac_seen" >&5 + echo "$as_me: WARNING: datarootdir was used implicitly but not set: + $ac_seen" >&2;} +@@ -18904,7 +19012,7 @@ + fi + ac_seen=`grep '${datarootdir}' "$ac_item"` + if test -n "$ac_seen"; then +- { echo "$as_me:18907: WARNING: datarootdir was used explicitly but not set: ++ { echo "$as_me:19015: WARNING: datarootdir was used explicitly but not set: + $ac_seen" >&5 + echo "$as_me: WARNING: datarootdir was used explicitly but not set: + $ac_seen" >&2;} +@@ -18941,7 +19049,7 @@ + ac_init=`${EGREP-egrep} '[ ]*'$ac_name'[ ]*=' "$ac_file"` + if test -z "$ac_init"; then + ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` +- { echo "$as_me:18944: WARNING: Variable $ac_name is used but was not set: ++ { echo "$as_me:19052: WARNING: Variable $ac_name is used but was not set: + $ac_seen" >&5 + echo "$as_me: WARNING: Variable $ac_name is used but was not set: + $ac_seen" >&2;} +@@ -18952,7 +19060,7 @@ + ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out + if test -s $tmp/out; then + ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` +- { echo "$as_me:18955: WARNING: Some variables may not be substituted: ++ { echo "$as_me:19063: WARNING: Some variables may not be substituted: + $ac_seen" >&5 + echo "$as_me: WARNING: Some variables may not be substituted: + $ac_seen" >&2;} +@@ -19001,7 +19109,7 @@ + * ) ac_file_in=$ac_file.in ;; + esac + +- test x"$ac_file" != x- && { echo "$as_me:19004: creating $ac_file" >&5 ++ test x"$ac_file" != x- && { echo "$as_me:19112: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + + # First look for the input files in the build tree, otherwise in the +@@ -19012,7 +19120,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:19015: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:19123: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -19025,7 +19133,7 @@ + echo "$srcdir/$f" + else + # /dev/null tree +- { { echo "$as_me:19028: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:19136: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -19083,7 +19191,7 @@ + rm -f $tmp/in + if test x"$ac_file" != x-; then + if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then +- { echo "$as_me:19086: $ac_file is unchanged" >&5 ++ { echo "$as_me:19194: $ac_file is unchanged" >&5 + echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +Index: Ada95/configure.in +Prereq: 1.83 +--- ncurses-6.3-20211026+/Ada95/configure.in 2021-07-03 20:23:24.000000000 +0000 ++++ ncurses-6.3-20211030/Ada95/configure.in 2021-10-30 20:47:52.000000000 +0000 +@@ -29,7 +29,7 @@ + dnl + dnl Author: Thomas E. Dickey + dnl +-dnl $Id: configure.in,v 1.83 2021/07/03 20:23:24 tom Exp $ ++dnl $Id: configure.in,v 1.84 2021/10/30 20:47:52 tom Exp $ + dnl Process this file with autoconf to produce a configure script. + dnl + dnl For additional information, see +@@ -38,7 +38,7 @@ + dnl + dnl --------------------------------------------------------------------------- + AC_PREREQ(2.52.20210509) +-AC_REVISION($Revision: 1.83 $) ++AC_REVISION($Revision: 1.84 $) + AC_INIT(gen/gen.c) + AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) + +@@ -419,6 +419,7 @@ + ### Checks for libraries. + case $cf_cv_system_name in + (*mingw32*) ++ CF_CHECK_LIBSSP + ;; + (*) + AC_CHECK_FUNC(gettimeofday, +Index: NEWS +Prereq: 1.3735 +--- ncurses-6.3-20211026+/NEWS 2021-10-26 08:34:43.000000000 +0000 ++++ ncurses-6.3-20211030/NEWS 2021-10-31 00:31:12.000000000 +0000 +@@ -26,7 +26,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: NEWS,v 1.3735 2021/10/26 08:34:43 tom Exp $ ++-- $Id: NEWS,v 1.3738 2021/10/31 00:31:12 tom Exp $ + ------------------------------------------------------------------------------- + + This is a log of changes that ncurses has gone through since Zeyd started +@@ -46,6 +46,11 @@ + Changes through 1.9.9e did not credit all contributions; + it is not possible to add this information. + ++20211030 ++ + simplify some references to WINDOWS._flags using macros. ++ + add a "check" rule in Ada95 makefile, to help with test-packages. ++ + build-fix for cross-compiling to MingW, conditionally add -lssp ++ + 20211026 + + corrected regex needed for older pkg-config used in Solaris 10. + + amend configure option's auto-search to account for systems where +Index: VERSION +--- ncurses-6.3-20211026+/VERSION 2021-10-26 07:49:17.000000000 +0000 ++++ ncurses-6.3-20211030/VERSION 2021-10-30 08:33:19.000000000 +0000 +@@ -1 +1 @@ +-5:0:10 6.3 20211026 ++5:0:10 6.3 20211030 +Index: aclocal.m4 +Prereq: 1.990 +--- ncurses-6.3-20211026+/aclocal.m4 2021-10-26 20:50:11.000000000 +0000 ++++ ncurses-6.3-20211030/aclocal.m4 2021-10-30 14:46:08.000000000 +0000 +@@ -29,7 +29,7 @@ + dnl + dnl Author: Thomas E. Dickey 1995-on + dnl +-dnl $Id: aclocal.m4,v 1.990 2021/10/26 20:50:11 tom Exp $ ++dnl $Id: aclocal.m4,v 1.991 2021/10/30 14:46:08 tom Exp $ + dnl Macros used in NCURSES auto-configuration script. + dnl + dnl These macros are maintained separately from NCURSES. The copyright on +@@ -1347,6 +1347,37 @@ + fi + ])])dnl + dnl --------------------------------------------------------------------------- ++dnl CF_CHECK_LIBSSP version: 1 updated: 2021/10/30 10:40:19 ++dnl --------------- ++dnl Check if libssp is needed, e.g., to work around misconfigured libraries ++dnl used in cross-compiling to MinGW. ++AC_DEFUN([CF_CHECK_LIBSSP],[ ++AC_CACHE_CHECK(if ssp library is needed,cf_cv_need_libssp,[ ++AC_TRY_LINK([ ++#include ++#include ++],[ ++ DIR *dp = opendir("."); ++],cf_cv_need_libssp=no,[ ++ cf_save_LIBS="$LIBS" ++ LIBS="$LIBS -lssp" ++ AC_TRY_LINK([ ++#include ++#include ++ ],[ ++ DIR *dp = opendir("."); ++ ],cf_cv_need_libssp=yes, ++ cf_cv_need_libssp=maybe) ++ LIBS="$cf_save_LIBS" ++])dnl ++]) ++ ++if test "x$cf_cv_need_libssp" = xyes ++then ++ CF_ADD_LIB(ssp) ++fi ++])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_CHECK_LIBTOOL_VERSION version: 2 updated: 2021/05/01 16:24:34 + dnl ------------------------ + dnl Show the version of libtool +Index: configure +--- ncurses-6.3-20211026+/configure 2021-10-26 20:51:25.000000000 +0000 ++++ ncurses-6.3-20211030/configure 2021-10-30 14:46:35.000000000 +0000 +@@ -1,5 +1,5 @@ + #! /bin/sh +-# From configure.in Revision: 1.736 . ++# From configure.in Revision: 1.737 . + # Guess values for system-dependent variables and create Makefiles. + # Generated by Autoconf 2.52.20210509. + # +@@ -18590,21 +18590,129 @@ + ### Checks for libraries. + case "$cf_cv_system_name" in + (*mingw32*|*mingw64*) ++ # Note: WINVER may be a problem with Windows 10 + if test "x$with_exp_win32" = xyes ; then +- CPPFLAGS="$CPPFLAGS -DWINVER=0x0600 -DWIN32_LEAN_AND_MEAN" ++ CPPFLAGS="$CPPFLAGS -DWINVER=0x0600 -DWIN32_LEAN_AND_MEAN" + else +- CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN" ++ CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN" + fi +- # Note: WINVER may be a problem with Windows 10 ++ ++echo "$as_me:18600: checking if ssp library is needed" >&5 ++echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6 ++if test "${cf_cv_need_libssp+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ++cat >"conftest.$ac_ext" <<_ACEOF ++#line 18607 "configure" ++#include "confdefs.h" ++ ++#include ++#include ++ ++int ++main (void) ++{ ++ ++ DIR *dp = opendir("."); ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f "conftest.$ac_objext" "conftest$ac_exeext" ++if { (eval echo "$as_me:18624: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:18627: \$? = $ac_status" >&5 ++ (exit "$ac_status"); } && ++ { ac_try='test -s "conftest$ac_exeext"' ++ { (eval echo "$as_me:18630: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:18633: \$? = $ac_status" >&5 ++ (exit "$ac_status"); }; }; then ++ cf_cv_need_libssp=no ++else ++ echo "$as_me: failed program was:" >&5 ++cat "conftest.$ac_ext" >&5 ++ ++ cf_save_LIBS="$LIBS" ++ LIBS="$LIBS -lssp" ++ cat >"conftest.$ac_ext" <<_ACEOF ++#line 18643 "configure" ++#include "confdefs.h" ++ ++#include ++#include ++ ++int ++main (void) ++{ ++ ++ DIR *dp = opendir("."); ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f "conftest.$ac_objext" "conftest$ac_exeext" ++if { (eval echo "$as_me:18660: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:18663: \$? = $ac_status" >&5 ++ (exit "$ac_status"); } && ++ { ac_try='test -s "conftest$ac_exeext"' ++ { (eval echo "$as_me:18666: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:18669: \$? = $ac_status" >&5 ++ (exit "$ac_status"); }; }; then ++ cf_cv_need_libssp=yes ++else ++ echo "$as_me: failed program was:" >&5 ++cat "conftest.$ac_ext" >&5 ++cf_cv_need_libssp=maybe ++fi ++rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" ++ LIBS="$cf_save_LIBS" ++ ++fi ++rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" ++fi ++echo "$as_me:18683: result: $cf_cv_need_libssp" >&5 ++echo "${ECHO_T}$cf_cv_need_libssp" >&6 ++ ++if test "x$cf_cv_need_libssp" = xyes ++then ++ ++cf_add_libs="$LIBS" ++# reverse order ++cf_add_0lib= ++for cf_add_1lib in -lssp; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done ++# filter duplicates ++for cf_add_1lib in $cf_add_0lib; do ++ for cf_add_2lib in $cf_add_libs; do ++ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then ++ cf_add_1lib= ++ break ++ fi ++ done ++ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" ++done ++LIBS="$cf_add_libs" ++ ++fi ++ + ;; + (*) +-echo "$as_me:18601: checking for gettimeofday" >&5 ++echo "$as_me:18709: checking for gettimeofday" >&5 + echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6 + if test "${ac_cv_func_gettimeofday+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18607 "configure" ++#line 18715 "configure" + #include "confdefs.h" + #define gettimeofday autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -18635,16 +18743,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:18638: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18746: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18641: \$? = $ac_status" >&5 ++ echo "$as_me:18749: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:18644: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18752: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18647: \$? = $ac_status" >&5 ++ echo "$as_me:18755: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_gettimeofday=yes + else +@@ -18654,7 +18762,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:18657: result: $ac_cv_func_gettimeofday" >&5 ++echo "$as_me:18765: result: $ac_cv_func_gettimeofday" >&5 + echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 + if test "$ac_cv_func_gettimeofday" = yes; then + +@@ -18664,7 +18772,7 @@ + + else + +-echo "$as_me:18667: checking for gettimeofday in -lbsd" >&5 ++echo "$as_me:18775: checking for gettimeofday in -lbsd" >&5 + echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6 + if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -18672,7 +18780,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18675 "configure" ++#line 18783 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -18691,16 +18799,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:18694: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18802: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18697: \$? = $ac_status" >&5 ++ echo "$as_me:18805: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:18700: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18808: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18703: \$? = $ac_status" >&5 ++ echo "$as_me:18811: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_bsd_gettimeofday=yes + else +@@ -18711,7 +18819,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:18714: result: $ac_cv_lib_bsd_gettimeofday" >&5 ++echo "$as_me:18822: result: $ac_cv_lib_bsd_gettimeofday" >&5 + echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6 + if test "$ac_cv_lib_bsd_gettimeofday" = yes; then + +@@ -18741,14 +18849,14 @@ + ;; + esac + +-echo "$as_me:18744: checking if -lm needed for math functions" >&5 ++echo "$as_me:18852: checking if -lm needed for math functions" >&5 + echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6 + if test "${cf_cv_need_libm+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18751 "configure" ++#line 18859 "configure" + #include "confdefs.h" + + #include +@@ -18764,16 +18872,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:18767: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18875: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18770: \$? = $ac_status" >&5 ++ echo "$as_me:18878: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:18773: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18881: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18776: \$? = $ac_status" >&5 ++ echo "$as_me:18884: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_need_libm=no + else +@@ -18783,7 +18891,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:18786: result: $cf_cv_need_libm" >&5 ++echo "$as_me:18894: result: $cf_cv_need_libm" >&5 + echo "${ECHO_T}$cf_cv_need_libm" >&6 + if test "$cf_cv_need_libm" = yes + then +@@ -18791,13 +18899,13 @@ + fi + + ### Checks for header files. +-echo "$as_me:18794: checking for ANSI C header files" >&5 ++echo "$as_me:18902: checking for ANSI C header files" >&5 + echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 + if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18800 "configure" ++#line 18908 "configure" + #include "confdefs.h" + #include + #include +@@ -18805,13 +18913,13 @@ + #include + + _ACEOF +-if { (eval echo "$as_me:18808: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:18916: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:18814: \$? = $ac_status" >&5 ++ echo "$as_me:18922: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -18833,7 +18941,7 @@ + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18836 "configure" ++#line 18944 "configure" + #include "confdefs.h" + #include + +@@ -18851,7 +18959,7 @@ + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18854 "configure" ++#line 18962 "configure" + #include "confdefs.h" + #include + +@@ -18872,7 +18980,7 @@ + : + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18875 "configure" ++#line 18983 "configure" + #include "confdefs.h" + #include + #if ((' ' & 0x0FF) == 0x020) +@@ -18898,15 +19006,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:18901: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19009: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18904: \$? = $ac_status" >&5 ++ echo "$as_me:19012: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:18906: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19014: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18909: \$? = $ac_status" >&5 ++ echo "$as_me:19017: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -18919,7 +19027,7 @@ + fi + fi + fi +-echo "$as_me:18922: result: $ac_cv_header_stdc" >&5 ++echo "$as_me:19030: result: $ac_cv_header_stdc" >&5 + echo "${ECHO_T}$ac_cv_header_stdc" >&6 + if test $ac_cv_header_stdc = yes; then + +@@ -18932,13 +19040,13 @@ + ac_header_dirent=no + for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do + as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` +-echo "$as_me:18935: checking for $ac_hdr that defines DIR" >&5 ++echo "$as_me:19043: checking for $ac_hdr that defines DIR" >&5 + echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18941 "configure" ++#line 19049 "configure" + #include "confdefs.h" + #include + #include <$ac_hdr> +@@ -18953,16 +19061,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:18956: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19064: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:18959: \$? = $ac_status" >&5 ++ echo "$as_me:19067: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:18962: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19070: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18965: \$? = $ac_status" >&5 ++ echo "$as_me:19073: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_Header=yes" + else +@@ -18972,7 +19080,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:18975: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:19083: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++ echo "$as_me:19096: checking for opendir in -ldir" >&5 + echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 + if test "${ac_cv_lib_dir_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -18993,7 +19101,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldir $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18996 "configure" ++#line 19104 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19012,16 +19120,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19015: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19123: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19018: \$? = $ac_status" >&5 ++ echo "$as_me:19126: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19021: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19129: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19024: \$? = $ac_status" >&5 ++ echo "$as_me:19132: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_dir_opendir=yes + else +@@ -19032,14 +19140,14 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19035: result: $ac_cv_lib_dir_opendir" >&5 ++echo "$as_me:19143: result: $ac_cv_lib_dir_opendir" >&5 + echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 + if test "$ac_cv_lib_dir_opendir" = yes; then + LIBS="$LIBS -ldir" + fi + + else +- echo "$as_me:19042: checking for opendir in -lx" >&5 ++ echo "$as_me:19150: checking for opendir in -lx" >&5 + echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 + if test "${ac_cv_lib_x_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19047,7 +19155,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lx $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19050 "configure" ++#line 19158 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19066,16 +19174,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19069: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19177: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19072: \$? = $ac_status" >&5 ++ echo "$as_me:19180: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19075: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19183: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19078: \$? = $ac_status" >&5 ++ echo "$as_me:19186: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_x_opendir=yes + else +@@ -19086,7 +19194,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19089: result: $ac_cv_lib_x_opendir" >&5 ++echo "$as_me:19197: result: $ac_cv_lib_x_opendir" >&5 + echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 + if test "$ac_cv_lib_x_opendir" = yes; then + LIBS="$LIBS -lx" +@@ -19094,13 +19202,13 @@ + + fi + +-echo "$as_me:19097: checking whether time.h and sys/time.h may both be included" >&5 ++echo "$as_me:19205: checking whether time.h and sys/time.h may both be included" >&5 + echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 + if test "${ac_cv_header_time+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19103 "configure" ++#line 19211 "configure" + #include "confdefs.h" + #include + #include +@@ -19116,16 +19224,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:19119: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19227: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19122: \$? = $ac_status" >&5 ++ echo "$as_me:19230: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:19125: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19233: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19128: \$? = $ac_status" >&5 ++ echo "$as_me:19236: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_header_time=yes + else +@@ -19135,7 +19243,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:19138: result: $ac_cv_header_time" >&5 ++echo "$as_me:19246: result: $ac_cv_header_time" >&5 + echo "${ECHO_T}$ac_cv_header_time" >&6 + if test $ac_cv_header_time = yes; then + +@@ -19150,7 +19258,7 @@ + case "$host_os" in + (mingw*) + # -lsystre -ltre -lintl -liconv +- echo "$as_me:19153: checking for regcomp in -lsystre" >&5 ++ echo "$as_me:19261: checking for regcomp in -lsystre" >&5 + echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6 + if test "${ac_cv_lib_systre_regcomp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19158,7 +19266,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lsystre $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19161 "configure" ++#line 19269 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19177,16 +19285,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19180: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19288: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19183: \$? = $ac_status" >&5 ++ echo "$as_me:19291: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19186: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19294: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19189: \$? = $ac_status" >&5 ++ echo "$as_me:19297: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_systre_regcomp=yes + else +@@ -19197,11 +19305,11 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19200: result: $ac_cv_lib_systre_regcomp" >&5 ++echo "$as_me:19308: result: $ac_cv_lib_systre_regcomp" >&5 + echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6 + if test "$ac_cv_lib_systre_regcomp" = yes; then + +- echo "$as_me:19204: checking for libiconv_open in -liconv" >&5 ++ echo "$as_me:19312: checking for libiconv_open in -liconv" >&5 + echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6 + if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19209,7 +19317,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-liconv $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19212 "configure" ++#line 19320 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19228,16 +19336,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19231: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19339: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19234: \$? = $ac_status" >&5 ++ echo "$as_me:19342: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19237: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19345: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19240: \$? = $ac_status" >&5 ++ echo "$as_me:19348: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_iconv_libiconv_open=yes + else +@@ -19248,7 +19356,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19251: result: $ac_cv_lib_iconv_libiconv_open" >&5 ++echo "$as_me:19359: result: $ac_cv_lib_iconv_libiconv_open" >&5 + echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6 + if test "$ac_cv_lib_iconv_libiconv_open" = yes; then + +@@ -19270,7 +19378,7 @@ + + fi + +- echo "$as_me:19273: checking for libintl_gettext in -lintl" >&5 ++ echo "$as_me:19381: checking for libintl_gettext in -lintl" >&5 + echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6 + if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19278,7 +19386,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19281 "configure" ++#line 19389 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19297,16 +19405,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19300: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19408: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19303: \$? = $ac_status" >&5 ++ echo "$as_me:19411: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19306: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19414: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19309: \$? = $ac_status" >&5 ++ echo "$as_me:19417: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_intl_libintl_gettext=yes + else +@@ -19317,7 +19425,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19320: result: $ac_cv_lib_intl_libintl_gettext" >&5 ++echo "$as_me:19428: result: $ac_cv_lib_intl_libintl_gettext" >&5 + echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6 + if test "$ac_cv_lib_intl_libintl_gettext" = yes; then + +@@ -19339,7 +19447,7 @@ + + fi + +- echo "$as_me:19342: checking for tre_regcomp in -ltre" >&5 ++ echo "$as_me:19450: checking for tre_regcomp in -ltre" >&5 + echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6 + if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19347,7 +19455,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ltre $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19350 "configure" ++#line 19458 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19366,16 +19474,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19369: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19477: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19372: \$? = $ac_status" >&5 ++ echo "$as_me:19480: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19375: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19483: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19378: \$? = $ac_status" >&5 ++ echo "$as_me:19486: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_tre_tre_regcomp=yes + else +@@ -19386,7 +19494,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19389: result: $ac_cv_lib_tre_tre_regcomp" >&5 ++echo "$as_me:19497: result: $ac_cv_lib_tre_tre_regcomp" >&5 + echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6 + if test "$ac_cv_lib_tre_tre_regcomp" = yes; then + +@@ -19428,7 +19536,7 @@ + + else + +- echo "$as_me:19431: checking for regcomp in -lgnurx" >&5 ++ echo "$as_me:19539: checking for regcomp in -lgnurx" >&5 + echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6 + if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19436,7 +19544,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgnurx $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19439 "configure" ++#line 19547 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19455,16 +19563,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19458: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19566: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19461: \$? = $ac_status" >&5 ++ echo "$as_me:19569: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19464: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19572: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19467: \$? = $ac_status" >&5 ++ echo "$as_me:19575: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gnurx_regcomp=yes + else +@@ -19475,7 +19583,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19478: result: $ac_cv_lib_gnurx_regcomp" >&5 ++echo "$as_me:19586: result: $ac_cv_lib_gnurx_regcomp" >&5 + echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6 + if test "$ac_cv_lib_gnurx_regcomp" = yes; then + +@@ -19503,13 +19611,13 @@ + ;; + (*) + cf_regex_libs="regex re" +- echo "$as_me:19506: checking for regcomp" >&5 ++ echo "$as_me:19614: checking for regcomp" >&5 + echo $ECHO_N "checking for regcomp... $ECHO_C" >&6 + if test "${ac_cv_func_regcomp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19512 "configure" ++#line 19620 "configure" + #include "confdefs.h" + #define regcomp autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -19540,16 +19648,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19543: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19651: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19546: \$? = $ac_status" >&5 ++ echo "$as_me:19654: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19549: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19657: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19552: \$? = $ac_status" >&5 ++ echo "$as_me:19660: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_regcomp=yes + else +@@ -19559,7 +19667,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:19562: result: $ac_cv_func_regcomp" >&5 ++echo "$as_me:19670: result: $ac_cv_func_regcomp" >&5 + echo "${ECHO_T}$ac_cv_func_regcomp" >&6 + if test "$ac_cv_func_regcomp" = yes; then + cf_regex_func=regcomp +@@ -19568,7 +19676,7 @@ + for cf_regex_lib in $cf_regex_libs + do + as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh` +-echo "$as_me:19571: checking for regcomp in -l$cf_regex_lib" >&5 ++echo "$as_me:19679: checking for regcomp in -l$cf_regex_lib" >&5 + echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Lib+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19576,7 +19684,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-l$cf_regex_lib $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19579 "configure" ++#line 19687 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19595,16 +19703,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19598: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19706: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19601: \$? = $ac_status" >&5 ++ echo "$as_me:19709: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19604: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19712: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19607: \$? = $ac_status" >&5 ++ echo "$as_me:19715: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_Lib=yes" + else +@@ -19615,7 +19723,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19618: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 ++echo "$as_me:19726: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then + +@@ -19647,13 +19755,13 @@ + esac + + if test "$cf_regex_func" = no ; then +- echo "$as_me:19650: checking for compile" >&5 ++ echo "$as_me:19758: checking for compile" >&5 + echo $ECHO_N "checking for compile... $ECHO_C" >&6 + if test "${ac_cv_func_compile+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19656 "configure" ++#line 19764 "configure" + #include "confdefs.h" + #define compile autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -19684,16 +19792,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19687: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19795: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19690: \$? = $ac_status" >&5 ++ echo "$as_me:19798: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19693: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19801: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19696: \$? = $ac_status" >&5 ++ echo "$as_me:19804: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_compile=yes + else +@@ -19703,13 +19811,13 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:19706: result: $ac_cv_func_compile" >&5 ++echo "$as_me:19814: result: $ac_cv_func_compile" >&5 + echo "${ECHO_T}$ac_cv_func_compile" >&6 + if test "$ac_cv_func_compile" = yes; then + cf_regex_func=compile + else + +- echo "$as_me:19712: checking for compile in -lgen" >&5 ++ echo "$as_me:19820: checking for compile in -lgen" >&5 + echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6 + if test "${ac_cv_lib_gen_compile+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19717,7 +19825,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgen $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19720 "configure" ++#line 19828 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19736,16 +19844,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19739: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19847: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19742: \$? = $ac_status" >&5 ++ echo "$as_me:19850: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19745: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19853: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19748: \$? = $ac_status" >&5 ++ echo "$as_me:19856: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gen_compile=yes + else +@@ -19756,7 +19864,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19759: result: $ac_cv_lib_gen_compile" >&5 ++echo "$as_me:19867: result: $ac_cv_lib_gen_compile" >&5 + echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6 + if test "$ac_cv_lib_gen_compile" = yes; then + +@@ -19784,11 +19892,11 @@ + fi + + if test "$cf_regex_func" = no ; then +- { echo "$as_me:19787: WARNING: cannot find regular expression library" >&5 ++ { echo "$as_me:19895: WARNING: cannot find regular expression library" >&5 + echo "$as_me: WARNING: cannot find regular expression library" >&2;} + fi + +-echo "$as_me:19791: checking for regular-expression headers" >&5 ++echo "$as_me:19899: checking for regular-expression headers" >&5 + echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6 + if test "${cf_cv_regex_hdrs+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19800,7 +19908,7 @@ + for cf_regex_hdr in regexp.h regexpr.h + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19803 "configure" ++#line 19911 "configure" + #include "confdefs.h" + #include <$cf_regex_hdr> + int +@@ -19817,16 +19925,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19820: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19928: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19823: \$? = $ac_status" >&5 ++ echo "$as_me:19931: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19826: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19934: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19829: \$? = $ac_status" >&5 ++ echo "$as_me:19937: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_regex_hdrs=$cf_regex_hdr +@@ -19843,7 +19951,7 @@ + for cf_regex_hdr in regex.h + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19846 "configure" ++#line 19954 "configure" + #include "confdefs.h" + #include + #include <$cf_regex_hdr> +@@ -19863,16 +19971,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19866: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19974: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19869: \$? = $ac_status" >&5 ++ echo "$as_me:19977: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19872: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19980: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19875: \$? = $ac_status" >&5 ++ echo "$as_me:19983: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_regex_hdrs=$cf_regex_hdr +@@ -19888,11 +19996,11 @@ + esac + + fi +-echo "$as_me:19891: result: $cf_cv_regex_hdrs" >&5 ++echo "$as_me:19999: result: $cf_cv_regex_hdrs" >&5 + echo "${ECHO_T}$cf_cv_regex_hdrs" >&6 + + case "$cf_cv_regex_hdrs" in +- (no) { echo "$as_me:19895: WARNING: no regular expression header found" >&5 ++ (no) { echo "$as_me:20003: WARNING: no regular expression header found" >&5 + echo "$as_me: WARNING: no regular expression header found" >&2;} ;; + (regex.h) + cat >>confdefs.h <<\EOF +@@ -19930,23 +20038,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:19933: checking for $ac_header" >&5 ++echo "$as_me:20041: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19939 "configure" ++#line 20047 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:19943: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:20051: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:19949: \$? = $ac_status" >&5 ++ echo "$as_me:20057: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -19965,7 +20073,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:19968: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:20076: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:20089: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19987 "configure" ++#line 20095 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:19991: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:20099: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:19997: \$? = $ac_status" >&5 ++ echo "$as_me:20105: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -20013,7 +20121,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:20016: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:20124: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:20134: checking for header declaring getopt variables" >&5 + echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6 + if test "${cf_cv_getopt_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -20033,7 +20141,7 @@ + for cf_header in stdio.h stdlib.h unistd.h getopt.h + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20036 "configure" ++#line 20144 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -20046,16 +20154,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20049: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20157: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20052: \$? = $ac_status" >&5 ++ echo "$as_me:20160: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20055: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20163: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20058: \$? = $ac_status" >&5 ++ echo "$as_me:20166: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_getopt_header=$cf_header + break +@@ -20067,7 +20175,7 @@ + done + + fi +-echo "$as_me:20070: result: $cf_cv_getopt_header" >&5 ++echo "$as_me:20178: result: $cf_cv_getopt_header" >&5 + echo "${ECHO_T}$cf_cv_getopt_header" >&6 + if test "$cf_cv_getopt_header" != none ; then + +@@ -20084,14 +20192,14 @@ + + fi + +-echo "$as_me:20087: checking if external environ is declared" >&5 ++echo "$as_me:20195: checking if external environ is declared" >&5 + echo $ECHO_N "checking if external environ is declared... $ECHO_C" >&6 + if test "${cf_cv_dcl_environ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20094 "configure" ++#line 20202 "configure" + #include "confdefs.h" + + #ifdef HAVE_STDLIB_H +@@ -20107,16 +20215,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20110: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20218: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20113: \$? = $ac_status" >&5 ++ echo "$as_me:20221: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20116: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20224: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20119: \$? = $ac_status" >&5 ++ echo "$as_me:20227: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_dcl_environ=yes + else +@@ -20127,7 +20235,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:20130: result: $cf_cv_dcl_environ" >&5 ++echo "$as_me:20238: result: $cf_cv_dcl_environ" >&5 + echo "${ECHO_T}$cf_cv_dcl_environ" >&6 + + if test "$cf_cv_dcl_environ" = no ; then +@@ -20142,14 +20250,14 @@ + + # It's possible (for near-UNIX clones) that the data doesn't exist + +-echo "$as_me:20145: checking if external environ exists" >&5 ++echo "$as_me:20253: checking if external environ exists" >&5 + echo $ECHO_N "checking if external environ exists... $ECHO_C" >&6 + if test "${cf_cv_have_environ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20152 "configure" ++#line 20260 "configure" + #include "confdefs.h" + + #undef environ +@@ -20164,16 +20272,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:20167: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20275: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20170: \$? = $ac_status" >&5 ++ echo "$as_me:20278: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:20173: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20281: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20176: \$? = $ac_status" >&5 ++ echo "$as_me:20284: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have_environ=yes + else +@@ -20184,7 +20292,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + fi +-echo "$as_me:20187: result: $cf_cv_have_environ" >&5 ++echo "$as_me:20295: result: $cf_cv_have_environ" >&5 + echo "${ECHO_T}$cf_cv_have_environ" >&6 + + if test "$cf_cv_have_environ" = yes ; then +@@ -20197,13 +20305,13 @@ + + fi + +-echo "$as_me:20200: checking for getenv" >&5 ++echo "$as_me:20308: checking for getenv" >&5 + echo $ECHO_N "checking for getenv... $ECHO_C" >&6 + if test "${ac_cv_func_getenv+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20206 "configure" ++#line 20314 "configure" + #include "confdefs.h" + #define getenv autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -20234,16 +20342,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:20237: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20345: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20240: \$? = $ac_status" >&5 ++ echo "$as_me:20348: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:20243: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20351: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20246: \$? = $ac_status" >&5 ++ echo "$as_me:20354: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_getenv=yes + else +@@ -20253,19 +20361,19 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:20256: result: $ac_cv_func_getenv" >&5 ++echo "$as_me:20364: result: $ac_cv_func_getenv" >&5 + echo "${ECHO_T}$ac_cv_func_getenv" >&6 + + for ac_func in putenv setenv strdup + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:20262: checking for $ac_func" >&5 ++echo "$as_me:20370: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20268 "configure" ++#line 20376 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -20296,16 +20404,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:20299: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20407: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20302: \$? = $ac_status" >&5 ++ echo "$as_me:20410: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:20305: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20413: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20308: \$? = $ac_status" >&5 ++ echo "$as_me:20416: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -20315,7 +20423,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:20318: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:20426: result: `eval echo '${'"$as_ac_var"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 + if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:20436: checking if getenv returns consistent values" >&5 + echo $ECHO_N "checking if getenv returns consistent values... $ECHO_C" >&6 + if test "${cf_cv_consistent_getenv+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -20335,7 +20443,7 @@ + cf_cv_consistent_getenv=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20338 "configure" ++#line 20446 "configure" + #include "confdefs.h" + + #include +@@ -20444,15 +20552,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:20447: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20555: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20450: \$? = $ac_status" >&5 ++ echo "$as_me:20558: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:20452: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20560: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20455: \$? = $ac_status" >&5 ++ echo "$as_me:20563: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_consistent_getenv=yes + else +@@ -20465,7 +20573,7 @@ + fi + + fi +-echo "$as_me:20468: result: $cf_cv_consistent_getenv" >&5 ++echo "$as_me:20576: result: $cf_cv_consistent_getenv" >&5 + echo "${ECHO_T}$cf_cv_consistent_getenv" >&6 + + if test "x$cf_cv_consistent_getenv" = xno +@@ -20480,18 +20588,18 @@ + if test "x$cf_cv_consistent_getenv" = xno && \ + test "x$cf_with_trace" = xyes + then +- { echo "$as_me:20483: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5 ++ { echo "$as_me:20591: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5 + echo "$as_me: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&2;} + fi + +-echo "$as_me:20487: checking if sys/time.h works with sys/select.h" >&5 ++echo "$as_me:20595: checking if sys/time.h works with sys/select.h" >&5 + echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6 + if test "${cf_cv_sys_time_select+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20494 "configure" ++#line 20602 "configure" + #include "confdefs.h" + + #include +@@ -20511,16 +20619,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20514: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20622: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20517: \$? = $ac_status" >&5 ++ echo "$as_me:20625: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20520: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20628: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20523: \$? = $ac_status" >&5 ++ echo "$as_me:20631: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_sys_time_select=yes + else +@@ -20532,7 +20640,7 @@ + + fi + +-echo "$as_me:20535: result: $cf_cv_sys_time_select" >&5 ++echo "$as_me:20643: result: $cf_cv_sys_time_select" >&5 + echo "${ECHO_T}$cf_cv_sys_time_select" >&6 + test "$cf_cv_sys_time_select" = yes && + cat >>confdefs.h <<\EOF +@@ -20547,13 +20655,13 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_main_return="return" + +-echo "$as_me:20550: checking for an ANSI C-conforming const" >&5 ++echo "$as_me:20658: checking for an ANSI C-conforming const" >&5 + echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 + if test "${ac_cv_c_const+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20556 "configure" ++#line 20664 "configure" + #include "confdefs.h" + + int +@@ -20611,16 +20719,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20614: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20722: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20617: \$? = $ac_status" >&5 ++ echo "$as_me:20725: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20620: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20728: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20623: \$? = $ac_status" >&5 ++ echo "$as_me:20731: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_c_const=yes + else +@@ -20630,7 +20738,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:20633: result: $ac_cv_c_const" >&5 ++echo "$as_me:20741: result: $ac_cv_c_const" >&5 + echo "${ECHO_T}$ac_cv_c_const" >&6 + if test $ac_cv_c_const = no; then + +@@ -20640,7 +20748,7 @@ + + fi + +-echo "$as_me:20643: checking for inline" >&5 ++echo "$as_me:20751: checking for inline" >&5 + echo $ECHO_N "checking for inline... $ECHO_C" >&6 + if test "${ac_cv_c_inline+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -20648,7 +20756,7 @@ + ac_cv_c_inline=no + for ac_kw in inline __inline__ __inline; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20651 "configure" ++#line 20759 "configure" + #include "confdefs.h" + #ifndef __cplusplus + static $ac_kw int static_foo () {return 0; } +@@ -20657,16 +20765,16 @@ + + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20660: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20768: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20663: \$? = $ac_status" >&5 ++ echo "$as_me:20771: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20666: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20774: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20669: \$? = $ac_status" >&5 ++ echo "$as_me:20777: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_c_inline=$ac_kw; break + else +@@ -20677,7 +20785,7 @@ + done + + fi +-echo "$as_me:20680: result: $ac_cv_c_inline" >&5 ++echo "$as_me:20788: result: $ac_cv_c_inline" >&5 + echo "${ECHO_T}$ac_cv_c_inline" >&6 + case $ac_cv_c_inline in + inline | yes) ;; +@@ -20703,7 +20811,7 @@ + : + elif test "$GCC" = yes + then +- echo "$as_me:20706: checking if $CC supports options to tune inlining" >&5 ++ echo "$as_me:20814: checking if $CC supports options to tune inlining" >&5 + echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6 + if test "${cf_cv_gcc_inline+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -20712,7 +20820,7 @@ + cf_save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS --param max-inline-insns-single=1200" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20715 "configure" ++#line 20823 "configure" + #include "confdefs.h" + inline int foo(void) { return 1; } + int +@@ -20724,16 +20832,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20727: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20835: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20730: \$? = $ac_status" >&5 ++ echo "$as_me:20838: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20733: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20841: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20736: \$? = $ac_status" >&5 ++ echo "$as_me:20844: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gcc_inline=yes + else +@@ -20745,7 +20853,7 @@ + CFLAGS=$cf_save_CFLAGS + + fi +-echo "$as_me:20748: result: $cf_cv_gcc_inline" >&5 ++echo "$as_me:20856: result: $cf_cv_gcc_inline" >&5 + echo "${ECHO_T}$cf_cv_gcc_inline" >&6 + if test "$cf_cv_gcc_inline" = yes ; then + +@@ -20851,7 +20959,7 @@ + fi + fi + +-echo "$as_me:20854: checking for signal global datatype" >&5 ++echo "$as_me:20962: checking for signal global datatype" >&5 + echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6 + if test "${cf_cv_sig_atomic_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -20863,7 +20971,7 @@ + "int" + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20866 "configure" ++#line 20974 "configure" + #include "confdefs.h" + + #include +@@ -20887,16 +20995,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20890: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20998: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20893: \$? = $ac_status" >&5 ++ echo "$as_me:21001: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20896: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21004: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20899: \$? = $ac_status" >&5 ++ echo "$as_me:21007: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_sig_atomic_t=$cf_type + else +@@ -20910,7 +21018,7 @@ + + fi + +-echo "$as_me:20913: result: $cf_cv_sig_atomic_t" >&5 ++echo "$as_me:21021: result: $cf_cv_sig_atomic_t" >&5 + echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6 + test "$cf_cv_sig_atomic_t" != no && + cat >>confdefs.h <&5 ++echo "$as_me:21030: checking for type of chtype" >&5 + echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 + if test "${cf_cv_typeof_chtype+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -20929,7 +21037,7 @@ + cf_cv_typeof_chtype=long + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20932 "configure" ++#line 21040 "configure" + #include "confdefs.h" + + #define WANT_BITS 31 +@@ -20964,15 +21072,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:20967: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21075: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20970: \$? = $ac_status" >&5 ++ echo "$as_me:21078: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:20972: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21080: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20975: \$? = $ac_status" >&5 ++ echo "$as_me:21083: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_typeof_chtype=`cat cf_test.out` + else +@@ -20987,7 +21095,7 @@ + + fi + +-echo "$as_me:20990: result: $cf_cv_typeof_chtype" >&5 ++echo "$as_me:21098: result: $cf_cv_typeof_chtype" >&5 + echo "${ECHO_T}$cf_cv_typeof_chtype" >&6 + + cat >>confdefs.h <&5 ++echo "$as_me:21110: checking if unsigned literals are legal" >&5 + echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6 + if test "${cf_cv_unsigned_literals+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21009 "configure" ++#line 21117 "configure" + #include "confdefs.h" + + int +@@ -21018,16 +21126,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:21021: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21129: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21024: \$? = $ac_status" >&5 ++ echo "$as_me:21132: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:21027: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21135: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21030: \$? = $ac_status" >&5 ++ echo "$as_me:21138: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_unsigned_literals=yes + else +@@ -21039,7 +21147,7 @@ + + fi + +-echo "$as_me:21042: result: $cf_cv_unsigned_literals" >&5 ++echo "$as_me:21150: result: $cf_cv_unsigned_literals" >&5 + echo "${ECHO_T}$cf_cv_unsigned_literals" >&6 + + cf_cv_1UL="1" +@@ -21055,14 +21163,14 @@ + + ### Checks for external-data + +-echo "$as_me:21058: checking if external errno is declared" >&5 ++echo "$as_me:21166: checking if external errno is declared" >&5 + echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6 + if test "${cf_cv_dcl_errno+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21065 "configure" ++#line 21173 "configure" + #include "confdefs.h" + + #ifdef HAVE_STDLIB_H +@@ -21080,16 +21188,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:21083: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21191: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21086: \$? = $ac_status" >&5 ++ echo "$as_me:21194: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:21089: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21197: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21092: \$? = $ac_status" >&5 ++ echo "$as_me:21200: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_dcl_errno=yes + else +@@ -21100,7 +21208,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:21103: result: $cf_cv_dcl_errno" >&5 ++echo "$as_me:21211: result: $cf_cv_dcl_errno" >&5 + echo "${ECHO_T}$cf_cv_dcl_errno" >&6 + + if test "$cf_cv_dcl_errno" = no ; then +@@ -21115,14 +21223,14 @@ + + # It's possible (for near-UNIX clones) that the data doesn't exist + +-echo "$as_me:21118: checking if external errno exists" >&5 ++echo "$as_me:21226: checking if external errno exists" >&5 + echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6 + if test "${cf_cv_have_errno+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21125 "configure" ++#line 21233 "configure" + #include "confdefs.h" + + #undef errno +@@ -21137,16 +21245,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21140: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21248: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21143: \$? = $ac_status" >&5 ++ echo "$as_me:21251: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21146: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21254: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21149: \$? = $ac_status" >&5 ++ echo "$as_me:21257: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have_errno=yes + else +@@ -21157,7 +21265,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + fi +-echo "$as_me:21160: result: $cf_cv_have_errno" >&5 ++echo "$as_me:21268: result: $cf_cv_have_errno" >&5 + echo "${ECHO_T}$cf_cv_have_errno" >&6 + + if test "$cf_cv_have_errno" = yes ; then +@@ -21170,7 +21278,7 @@ + + fi + +-echo "$as_me:21173: checking if data-only library module links" >&5 ++echo "$as_me:21281: checking if data-only library module links" >&5 + echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6 + if test "${cf_cv_link_dataonly+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -21178,20 +21286,20 @@ + + rm -f conftest.a + cat >conftest.$ac_ext <&5 ++ if { (eval echo "$as_me:21292: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21187: \$? = $ac_status" >&5 ++ echo "$as_me:21295: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then + mv conftest.o data.o && \ + ( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null + fi + rm -f conftest.$ac_ext data.o + cat >conftest.$ac_ext <&5 ++ if { (eval echo "$as_me:21315: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21210: \$? = $ac_status" >&5 ++ echo "$as_me:21318: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then + mv conftest.o func.o && \ + ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null +@@ -21220,7 +21328,7 @@ + cf_cv_link_dataonly=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21223 "configure" ++#line 21331 "configure" + #include "confdefs.h" + + int main(void) +@@ -21231,15 +21339,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:21234: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21342: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21237: \$? = $ac_status" >&5 ++ echo "$as_me:21345: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:21239: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21347: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21242: \$? = $ac_status" >&5 ++ echo "$as_me:21350: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_link_dataonly=yes + else +@@ -21254,7 +21362,7 @@ + + fi + +-echo "$as_me:21257: result: $cf_cv_link_dataonly" >&5 ++echo "$as_me:21365: result: $cf_cv_link_dataonly" >&5 + echo "${ECHO_T}$cf_cv_link_dataonly" >&6 + + if test "$cf_cv_link_dataonly" = no ; then +@@ -21298,13 +21406,13 @@ + + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:21301: checking for $ac_func" >&5 ++echo "$as_me:21409: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21307 "configure" ++#line 21415 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -21335,16 +21443,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21338: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21446: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21341: \$? = $ac_status" >&5 ++ echo "$as_me:21449: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21344: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21452: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21347: \$? = $ac_status" >&5 ++ echo "$as_me:21455: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -21354,7 +21462,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:21357: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:21465: result: `eval echo '${'"$as_ac_var"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 + if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then + cat >>confdefs.h <&5 ++ { { echo "$as_me:21477: error: getopt is required for building programs" >&5 + echo "$as_me: error: getopt is required for building programs" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -21375,7 +21483,7 @@ + then + if test "x$ac_cv_func_vsnprintf" = xyes + then +- { echo "$as_me:21378: WARNING: will use vsnprintf instead of safe-sprintf option" >&5 ++ { echo "$as_me:21486: WARNING: will use vsnprintf instead of safe-sprintf option" >&5 + echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;} + else + +@@ -21388,14 +21496,14 @@ + + if test "x$with_getcap" = "xyes" ; then + +-echo "$as_me:21391: checking for terminal-capability database functions" >&5 ++echo "$as_me:21499: checking for terminal-capability database functions" >&5 + echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6 + if test "${cf_cv_cgetent+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21398 "configure" ++#line 21506 "configure" + #include "confdefs.h" + + #include +@@ -21415,16 +21523,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21418: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21526: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21421: \$? = $ac_status" >&5 ++ echo "$as_me:21529: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21424: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21532: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21427: \$? = $ac_status" >&5 ++ echo "$as_me:21535: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_cgetent=yes + else +@@ -21435,7 +21543,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + fi +-echo "$as_me:21438: result: $cf_cv_cgetent" >&5 ++echo "$as_me:21546: result: $cf_cv_cgetent" >&5 + echo "${ECHO_T}$cf_cv_cgetent" >&6 + + if test "$cf_cv_cgetent" = yes +@@ -21445,14 +21553,14 @@ + #define HAVE_BSD_CGETENT 1 + EOF + +-echo "$as_me:21448: checking if cgetent uses const parameter" >&5 ++echo "$as_me:21556: checking if cgetent uses const parameter" >&5 + echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6 + if test "${cf_cv_cgetent_const+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21455 "configure" ++#line 21563 "configure" + #include "confdefs.h" + + #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers" +@@ -21475,16 +21583,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21478: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21586: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21481: \$? = $ac_status" >&5 ++ echo "$as_me:21589: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21484: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21592: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21487: \$? = $ac_status" >&5 ++ echo "$as_me:21595: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_cgetent_const=yes + else +@@ -21495,7 +21603,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + fi +-echo "$as_me:21498: result: $cf_cv_cgetent_const" >&5 ++echo "$as_me:21606: result: $cf_cv_cgetent_const" >&5 + echo "${ECHO_T}$cf_cv_cgetent_const" >&6 + if test "$cf_cv_cgetent_const" = yes + then +@@ -21509,14 +21617,14 @@ + + fi + +-echo "$as_me:21512: checking for isascii" >&5 ++echo "$as_me:21620: checking for isascii" >&5 + echo $ECHO_N "checking for isascii... $ECHO_C" >&6 + if test "${cf_cv_have_isascii+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21519 "configure" ++#line 21627 "configure" + #include "confdefs.h" + #include + int +@@ -21528,16 +21636,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21531: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21639: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21534: \$? = $ac_status" >&5 ++ echo "$as_me:21642: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21537: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21645: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21540: \$? = $ac_status" >&5 ++ echo "$as_me:21648: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have_isascii=yes + else +@@ -21548,7 +21656,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + fi +-echo "$as_me:21551: result: $cf_cv_have_isascii" >&5 ++echo "$as_me:21659: result: $cf_cv_have_isascii" >&5 + echo "${ECHO_T}$cf_cv_have_isascii" >&6 + test "$cf_cv_have_isascii" = yes && + cat >>confdefs.h <<\EOF +@@ -21556,10 +21664,10 @@ + EOF + + if test "$ac_cv_func_sigaction" = yes; then +-echo "$as_me:21559: checking whether sigaction needs _POSIX_SOURCE" >&5 ++echo "$as_me:21667: checking whether sigaction needs _POSIX_SOURCE" >&5 + echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21562 "configure" ++#line 21670 "configure" + #include "confdefs.h" + + #include +@@ -21573,16 +21681,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:21576: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21684: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21579: \$? = $ac_status" >&5 ++ echo "$as_me:21687: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:21582: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21690: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21585: \$? = $ac_status" >&5 ++ echo "$as_me:21693: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + sigact_bad=no + else +@@ -21590,7 +21698,7 @@ + cat "conftest.$ac_ext" >&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21593 "configure" ++#line 21701 "configure" + #include "confdefs.h" + + #define _POSIX_SOURCE +@@ -21605,16 +21713,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:21608: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21716: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21611: \$? = $ac_status" >&5 ++ echo "$as_me:21719: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:21614: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21722: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21617: \$? = $ac_status" >&5 ++ echo "$as_me:21725: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + sigact_bad=yes + +@@ -21630,11 +21738,11 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +-echo "$as_me:21633: result: $sigact_bad" >&5 ++echo "$as_me:21741: result: $sigact_bad" >&5 + echo "${ECHO_T}$sigact_bad" >&6 + fi + +-echo "$as_me:21637: checking if nanosleep really works" >&5 ++echo "$as_me:21745: checking if nanosleep really works" >&5 + echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6 + if test "${cf_cv_func_nanosleep+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -21644,7 +21752,7 @@ + cf_cv_func_nanosleep=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21647 "configure" ++#line 21755 "configure" + #include "confdefs.h" + + #include +@@ -21669,15 +21777,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:21672: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21780: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21675: \$? = $ac_status" >&5 ++ echo "$as_me:21783: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:21677: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21785: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21680: \$? = $ac_status" >&5 ++ echo "$as_me:21788: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_nanosleep=yes + else +@@ -21689,7 +21797,7 @@ + rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" + fi + fi +-echo "$as_me:21692: result: $cf_cv_func_nanosleep" >&5 ++echo "$as_me:21800: result: $cf_cv_func_nanosleep" >&5 + echo "${ECHO_T}$cf_cv_func_nanosleep" >&6 + + test "$cf_cv_func_nanosleep" = "yes" && +@@ -21706,23 +21814,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:21709: checking for $ac_header" >&5 ++echo "$as_me:21817: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21715 "configure" ++#line 21823 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:21719: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:21827: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:21725: \$? = $ac_status" >&5 ++ echo "$as_me:21833: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -21741,7 +21849,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:21744: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:21852: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++ echo "$as_me:21869: checking whether termios.h needs _POSIX_SOURCE" >&5 + echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21764 "configure" ++#line 21872 "configure" + #include "confdefs.h" + #include + int +@@ -21773,16 +21881,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:21776: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21884: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21779: \$? = $ac_status" >&5 ++ echo "$as_me:21887: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:21782: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21890: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21785: \$? = $ac_status" >&5 ++ echo "$as_me:21893: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + termios_bad=no + else +@@ -21790,7 +21898,7 @@ + cat "conftest.$ac_ext" >&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21793 "configure" ++#line 21901 "configure" + #include "confdefs.h" + + #define _POSIX_SOURCE +@@ -21804,16 +21912,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:21807: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21915: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21810: \$? = $ac_status" >&5 ++ echo "$as_me:21918: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:21813: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21921: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21816: \$? = $ac_status" >&5 ++ echo "$as_me:21924: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + termios_bad=unknown + else +@@ -21829,19 +21937,19 @@ + + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +- echo "$as_me:21832: result: $termios_bad" >&5 ++ echo "$as_me:21940: result: $termios_bad" >&5 + echo "${ECHO_T}$termios_bad" >&6 + fi + fi + +-echo "$as_me:21837: checking for tcgetattr" >&5 ++echo "$as_me:21945: checking for tcgetattr" >&5 + echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6 + if test "${cf_cv_have_tcgetattr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21844 "configure" ++#line 21952 "configure" + #include "confdefs.h" + + #include +@@ -21869,16 +21977,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21872: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21980: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21875: \$? = $ac_status" >&5 ++ echo "$as_me:21983: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21878: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21986: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21881: \$? = $ac_status" >&5 ++ echo "$as_me:21989: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have_tcgetattr=yes + else +@@ -21888,21 +21996,21 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:21891: result: $cf_cv_have_tcgetattr" >&5 ++echo "$as_me:21999: result: $cf_cv_have_tcgetattr" >&5 + echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6 + test "$cf_cv_have_tcgetattr" = yes && + cat >>confdefs.h <<\EOF + #define HAVE_TCGETATTR 1 + EOF + +-echo "$as_me:21898: checking for vsscanf function or workaround" >&5 ++echo "$as_me:22006: checking for vsscanf function or workaround" >&5 + echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6 + if test "${cf_cv_func_vsscanf+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21905 "configure" ++#line 22013 "configure" + #include "confdefs.h" + + #include +@@ -21918,16 +22026,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21921: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22029: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21924: \$? = $ac_status" >&5 ++ echo "$as_me:22032: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21927: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22035: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21930: \$? = $ac_status" >&5 ++ echo "$as_me:22038: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_vsscanf=vsscanf + else +@@ -21935,7 +22043,7 @@ + cat "conftest.$ac_ext" >&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21938 "configure" ++#line 22046 "configure" + #include "confdefs.h" + + #include +@@ -21957,16 +22065,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21960: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22068: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21963: \$? = $ac_status" >&5 ++ echo "$as_me:22071: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21966: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22074: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21969: \$? = $ac_status" >&5 ++ echo "$as_me:22077: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_vsscanf=vfscanf + else +@@ -21974,7 +22082,7 @@ + cat "conftest.$ac_ext" >&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21977 "configure" ++#line 22085 "configure" + #include "confdefs.h" + + #include +@@ -21996,16 +22104,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21999: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22107: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22002: \$? = $ac_status" >&5 ++ echo "$as_me:22110: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22005: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22113: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22008: \$? = $ac_status" >&5 ++ echo "$as_me:22116: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_vsscanf=_doscan + else +@@ -22020,7 +22128,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:22023: result: $cf_cv_func_vsscanf" >&5 ++echo "$as_me:22131: result: $cf_cv_func_vsscanf" >&5 + echo "${ECHO_T}$cf_cv_func_vsscanf" >&6 + + case "$cf_cv_func_vsscanf" in +@@ -22046,23 +22154,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:22049: checking for $ac_header" >&5 ++echo "$as_me:22157: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22055 "configure" ++#line 22163 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:22059: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:22167: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:22065: \$? = $ac_status" >&5 ++ echo "$as_me:22173: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -22081,7 +22189,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:22084: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:22192: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:22202: checking for working mkstemp" >&5 + echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 + if test "${cf_cv_func_mkstemp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -22102,7 +22210,7 @@ + cf_cv_func_mkstemp=maybe + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22105 "configure" ++#line 22213 "configure" + #include "confdefs.h" + + #include +@@ -22143,15 +22251,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:22146: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22254: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22149: \$? = $ac_status" >&5 ++ echo "$as_me:22257: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:22151: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22259: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22154: \$? = $ac_status" >&5 ++ echo "$as_me:22262: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_mkstemp=yes + +@@ -22166,16 +22274,16 @@ + fi + + fi +-echo "$as_me:22169: result: $cf_cv_func_mkstemp" >&5 ++echo "$as_me:22277: result: $cf_cv_func_mkstemp" >&5 + echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 + if test "x$cf_cv_func_mkstemp" = xmaybe ; then +- echo "$as_me:22172: checking for mkstemp" >&5 ++ echo "$as_me:22280: checking for mkstemp" >&5 + echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 + if test "${ac_cv_func_mkstemp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22178 "configure" ++#line 22286 "configure" + #include "confdefs.h" + #define mkstemp autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -22206,16 +22314,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22209: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22317: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22212: \$? = $ac_status" >&5 ++ echo "$as_me:22320: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22215: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22323: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22218: \$? = $ac_status" >&5 ++ echo "$as_me:22326: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_mkstemp=yes + else +@@ -22225,7 +22333,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:22228: result: $ac_cv_func_mkstemp" >&5 ++echo "$as_me:22336: result: $ac_cv_func_mkstemp" >&5 + echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 + + fi +@@ -22246,21 +22354,21 @@ + fi + + if test "x$cross_compiling" = xyes ; then +- { echo "$as_me:22249: WARNING: cross compiling: assume setvbuf params not reversed" >&5 ++ { echo "$as_me:22357: WARNING: cross compiling: assume setvbuf params not reversed" >&5 + echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;} + else +- echo "$as_me:22252: checking whether setvbuf arguments are reversed" >&5 ++ echo "$as_me:22360: checking whether setvbuf arguments are reversed" >&5 + echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6 + if test "${ac_cv_func_setvbuf_reversed+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:22258: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:22366: error: cannot run test program while cross compiling" >&5 + echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22263 "configure" ++#line 22371 "configure" + #include "confdefs.h" + #include + /* If setvbuf has the reversed format, exit 0. */ +@@ -22277,15 +22385,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:22280: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22388: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22283: \$? = $ac_status" >&5 ++ echo "$as_me:22391: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:22285: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22393: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22288: \$? = $ac_status" >&5 ++ echo "$as_me:22396: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_setvbuf_reversed=yes + else +@@ -22298,7 +22406,7 @@ + fi + rm -f core ./core.* ./*.core + fi +-echo "$as_me:22301: result: $ac_cv_func_setvbuf_reversed" >&5 ++echo "$as_me:22409: result: $ac_cv_func_setvbuf_reversed" >&5 + echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6 + if test $ac_cv_func_setvbuf_reversed = yes; then + +@@ -22309,13 +22417,13 @@ + fi + + fi +-echo "$as_me:22312: checking for intptr_t" >&5 ++echo "$as_me:22420: checking for intptr_t" >&5 + echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6 + if test "${ac_cv_type_intptr_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22318 "configure" ++#line 22426 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -22330,16 +22438,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:22333: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:22441: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:22336: \$? = $ac_status" >&5 ++ echo "$as_me:22444: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:22339: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22447: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22342: \$? = $ac_status" >&5 ++ echo "$as_me:22450: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_intptr_t=yes + else +@@ -22349,7 +22457,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:22352: result: $ac_cv_type_intptr_t" >&5 ++echo "$as_me:22460: result: $ac_cv_type_intptr_t" >&5 + echo "${ECHO_T}$ac_cv_type_intptr_t" >&6 + if test "$ac_cv_type_intptr_t" = yes; then + : +@@ -22361,13 +22469,13 @@ + + fi + +-echo "$as_me:22364: checking for ssize_t" >&5 ++echo "$as_me:22472: checking for ssize_t" >&5 + echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6 + if test "${ac_cv_type_ssize_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22370 "configure" ++#line 22478 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -22382,16 +22490,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:22385: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:22493: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:22388: \$? = $ac_status" >&5 ++ echo "$as_me:22496: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:22391: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22499: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22394: \$? = $ac_status" >&5 ++ echo "$as_me:22502: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_ssize_t=yes + else +@@ -22401,7 +22509,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:22404: result: $ac_cv_type_ssize_t" >&5 ++echo "$as_me:22512: result: $ac_cv_type_ssize_t" >&5 + echo "${ECHO_T}$ac_cv_type_ssize_t" >&6 + if test "$ac_cv_type_ssize_t" = yes; then + : +@@ -22413,14 +22521,14 @@ + + fi + +-echo "$as_me:22416: checking for type sigaction_t" >&5 ++echo "$as_me:22524: checking for type sigaction_t" >&5 + echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6 + if test "${cf_cv_type_sigaction+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22423 "configure" ++#line 22531 "configure" + #include "confdefs.h" + + #include +@@ -22433,16 +22541,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:22436: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:22544: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:22439: \$? = $ac_status" >&5 ++ echo "$as_me:22547: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:22442: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22550: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22445: \$? = $ac_status" >&5 ++ echo "$as_me:22553: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_type_sigaction=yes + else +@@ -22453,14 +22561,14 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi + +-echo "$as_me:22456: result: $cf_cv_type_sigaction" >&5 ++echo "$as_me:22564: result: $cf_cv_type_sigaction" >&5 + echo "${ECHO_T}$cf_cv_type_sigaction" >&6 + test "$cf_cv_type_sigaction" = yes && + cat >>confdefs.h <<\EOF + #define HAVE_TYPE_SIGACTION 1 + EOF + +-echo "$as_me:22463: checking declaration of size-change" >&5 ++echo "$as_me:22571: checking declaration of size-change" >&5 + echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6 + if test "${cf_cv_sizechange+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -22481,7 +22589,7 @@ + + fi + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22484 "configure" ++#line 22592 "configure" + #include "confdefs.h" + #include + #ifdef HAVE_TERMIOS_H +@@ -22531,16 +22639,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:22534: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:22642: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:22537: \$? = $ac_status" >&5 ++ echo "$as_me:22645: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:22540: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22648: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22543: \$? = $ac_status" >&5 ++ echo "$as_me:22651: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_sizechange=yes + else +@@ -22559,7 +22667,7 @@ + done + + fi +-echo "$as_me:22562: result: $cf_cv_sizechange" >&5 ++echo "$as_me:22670: result: $cf_cv_sizechange" >&5 + echo "${ECHO_T}$cf_cv_sizechange" >&6 + if test "$cf_cv_sizechange" != no ; then + +@@ -22577,13 +22685,13 @@ + esac + fi + +-echo "$as_me:22580: checking for memmove" >&5 ++echo "$as_me:22688: checking for memmove" >&5 + echo $ECHO_N "checking for memmove... $ECHO_C" >&6 + if test "${ac_cv_func_memmove+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22586 "configure" ++#line 22694 "configure" + #include "confdefs.h" + #define memmove autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -22614,16 +22722,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22617: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22725: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22620: \$? = $ac_status" >&5 ++ echo "$as_me:22728: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22623: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22731: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22626: \$? = $ac_status" >&5 ++ echo "$as_me:22734: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_memmove=yes + else +@@ -22633,19 +22741,19 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:22636: result: $ac_cv_func_memmove" >&5 ++echo "$as_me:22744: result: $ac_cv_func_memmove" >&5 + echo "${ECHO_T}$ac_cv_func_memmove" >&6 + if test "$ac_cv_func_memmove" = yes; then + : + else + +-echo "$as_me:22642: checking for bcopy" >&5 ++echo "$as_me:22750: checking for bcopy" >&5 + echo $ECHO_N "checking for bcopy... $ECHO_C" >&6 + if test "${ac_cv_func_bcopy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22648 "configure" ++#line 22756 "configure" + #include "confdefs.h" + #define bcopy autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -22676,16 +22784,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22679: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22787: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22682: \$? = $ac_status" >&5 ++ echo "$as_me:22790: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22685: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22793: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22688: \$? = $ac_status" >&5 ++ echo "$as_me:22796: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_bcopy=yes + else +@@ -22695,11 +22803,11 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:22698: result: $ac_cv_func_bcopy" >&5 ++echo "$as_me:22806: result: $ac_cv_func_bcopy" >&5 + echo "${ECHO_T}$ac_cv_func_bcopy" >&6 + if test "$ac_cv_func_bcopy" = yes; then + +- echo "$as_me:22702: checking if bcopy does overlapping moves" >&5 ++ echo "$as_me:22810: checking if bcopy does overlapping moves" >&5 + echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6 + if test "${cf_cv_good_bcopy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -22709,7 +22817,7 @@ + cf_cv_good_bcopy=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22712 "configure" ++#line 22820 "configure" + #include "confdefs.h" + + int main(void) { +@@ -22723,15 +22831,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:22726: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22834: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22729: \$? = $ac_status" >&5 ++ echo "$as_me:22837: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:22731: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22839: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22734: \$? = $ac_status" >&5 ++ echo "$as_me:22842: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_good_bcopy=yes + else +@@ -22744,7 +22852,7 @@ + fi + + fi +-echo "$as_me:22747: result: $cf_cv_good_bcopy" >&5 ++echo "$as_me:22855: result: $cf_cv_good_bcopy" >&5 + echo "${ECHO_T}$cf_cv_good_bcopy" >&6 + + else +@@ -22771,13 +22879,13 @@ + for ac_func in posix_openpt + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:22774: checking for $ac_func" >&5 ++echo "$as_me:22882: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22780 "configure" ++#line 22888 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -22808,16 +22916,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22811: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22919: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22814: \$? = $ac_status" >&5 ++ echo "$as_me:22922: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22817: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22925: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22820: \$? = $ac_status" >&5 ++ echo "$as_me:22928: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -22827,7 +22935,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:22830: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:22938: result: `eval echo '${'"$as_ac_var"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 + if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:22948: checking if poll really works" >&5 + echo $ECHO_N "checking if poll really works... $ECHO_C" >&6 + if test "${cf_cv_working_poll+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -22847,7 +22955,7 @@ + cf_cv_working_poll=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22850 "configure" ++#line 22958 "configure" + #include "confdefs.h" + + #include +@@ -22899,15 +23007,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:22902: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23010: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22905: \$? = $ac_status" >&5 ++ echo "$as_me:23013: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:22907: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23015: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22910: \$? = $ac_status" >&5 ++ echo "$as_me:23018: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_working_poll=yes + else +@@ -22919,21 +23027,21 @@ + rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" + fi + fi +-echo "$as_me:22922: result: $cf_cv_working_poll" >&5 ++echo "$as_me:23030: result: $cf_cv_working_poll" >&5 + echo "${ECHO_T}$cf_cv_working_poll" >&6 + test "$cf_cv_working_poll" = "yes" && + cat >>confdefs.h <<\EOF + #define HAVE_WORKING_POLL 1 + EOF + +-echo "$as_me:22929: checking for va_copy" >&5 ++echo "$as_me:23037: checking for va_copy" >&5 + echo $ECHO_N "checking for va_copy... $ECHO_C" >&6 + if test "${cf_cv_have_va_copy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22936 "configure" ++#line 23044 "configure" + #include "confdefs.h" + + #include +@@ -22950,16 +23058,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22953: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23061: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22956: \$? = $ac_status" >&5 ++ echo "$as_me:23064: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22959: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23067: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22962: \$? = $ac_status" >&5 ++ echo "$as_me:23070: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have_va_copy=yes + else +@@ -22969,7 +23077,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:22972: result: $cf_cv_have_va_copy" >&5 ++echo "$as_me:23080: result: $cf_cv_have_va_copy" >&5 + echo "${ECHO_T}$cf_cv_have_va_copy" >&6 + + if test "$cf_cv_have_va_copy" = yes; +@@ -22981,14 +23089,14 @@ + + else # !cf_cv_have_va_copy + +-echo "$as_me:22984: checking for __va_copy" >&5 ++echo "$as_me:23092: checking for __va_copy" >&5 + echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6 + if test "${cf_cv_have___va_copy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22991 "configure" ++#line 23099 "configure" + #include "confdefs.h" + + #include +@@ -23005,16 +23113,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23008: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23116: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23011: \$? = $ac_status" >&5 ++ echo "$as_me:23119: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23014: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23122: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23017: \$? = $ac_status" >&5 ++ echo "$as_me:23125: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have___va_copy=yes + else +@@ -23024,7 +23132,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:23027: result: $cf_cv_have___va_copy" >&5 ++echo "$as_me:23135: result: $cf_cv_have___va_copy" >&5 + echo "${ECHO_T}$cf_cv_have___va_copy" >&6 + + if test "$cf_cv_have___va_copy" = yes +@@ -23036,14 +23144,14 @@ + + else # !cf_cv_have___va_copy + +-echo "$as_me:23039: checking for __builtin_va_copy" >&5 ++echo "$as_me:23147: checking for __builtin_va_copy" >&5 + echo $ECHO_N "checking for __builtin_va_copy... $ECHO_C" >&6 + if test "${cf_cv_have___builtin_va_copy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23046 "configure" ++#line 23154 "configure" + #include "confdefs.h" + + #include +@@ -23060,16 +23168,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23063: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23171: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23066: \$? = $ac_status" >&5 ++ echo "$as_me:23174: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23069: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23177: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23072: \$? = $ac_status" >&5 ++ echo "$as_me:23180: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have___builtin_va_copy=yes + else +@@ -23079,7 +23187,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:23082: result: $cf_cv_have___builtin_va_copy" >&5 ++echo "$as_me:23190: result: $cf_cv_have___builtin_va_copy" >&5 + echo "${ECHO_T}$cf_cv_have___builtin_va_copy" >&6 + + test "$cf_cv_have___builtin_va_copy" = yes && +@@ -23097,14 +23205,14 @@ + ;; + + (*) +- echo "$as_me:23100: checking if we can simply copy va_list" >&5 ++ echo "$as_me:23208: checking if we can simply copy va_list" >&5 + echo $ECHO_N "checking if we can simply copy va_list... $ECHO_C" >&6 + if test "${cf_cv_pointer_va_list+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23107 "configure" ++#line 23215 "configure" + #include "confdefs.h" + + #include +@@ -23121,16 +23229,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23124: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23232: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23127: \$? = $ac_status" >&5 ++ echo "$as_me:23235: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23130: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23238: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23133: \$? = $ac_status" >&5 ++ echo "$as_me:23241: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_pointer_va_list=yes + else +@@ -23140,19 +23248,19 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:23143: result: $cf_cv_pointer_va_list" >&5 ++echo "$as_me:23251: result: $cf_cv_pointer_va_list" >&5 + echo "${ECHO_T}$cf_cv_pointer_va_list" >&6 + + if test "$cf_cv_pointer_va_list" = no + then +- echo "$as_me:23148: checking if we can copy va_list indirectly" >&5 ++ echo "$as_me:23256: checking if we can copy va_list indirectly" >&5 + echo $ECHO_N "checking if we can copy va_list indirectly... $ECHO_C" >&6 + if test "${cf_cv_array_va_list+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23155 "configure" ++#line 23263 "configure" + #include "confdefs.h" + + #include +@@ -23169,16 +23277,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23172: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23280: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23175: \$? = $ac_status" >&5 ++ echo "$as_me:23283: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23178: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23286: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23181: \$? = $ac_status" >&5 ++ echo "$as_me:23289: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_array_va_list=yes + else +@@ -23188,7 +23296,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:23191: result: $cf_cv_array_va_list" >&5 ++echo "$as_me:23299: result: $cf_cv_array_va_list" >&5 + echo "${ECHO_T}$cf_cv_array_va_list" >&6 + test "$cf_cv_array_va_list" = yes && + cat >>confdefs.h <<\EOF +@@ -23199,13 +23307,13 @@ + ;; + esac + +-echo "$as_me:23202: checking for pid_t" >&5 ++echo "$as_me:23310: checking for pid_t" >&5 + echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 + if test "${ac_cv_type_pid_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23208 "configure" ++#line 23316 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -23220,16 +23328,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:23223: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:23331: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:23226: \$? = $ac_status" >&5 ++ echo "$as_me:23334: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:23229: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23337: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23232: \$? = $ac_status" >&5 ++ echo "$as_me:23340: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_pid_t=yes + else +@@ -23239,7 +23347,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:23242: result: $ac_cv_type_pid_t" >&5 ++echo "$as_me:23350: result: $ac_cv_type_pid_t" >&5 + echo "${ECHO_T}$ac_cv_type_pid_t" >&6 + if test "$ac_cv_type_pid_t" = yes; then + : +@@ -23254,23 +23362,23 @@ + for ac_header in unistd.h vfork.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:23257: checking for $ac_header" >&5 ++echo "$as_me:23365: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23263 "configure" ++#line 23371 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:23267: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:23375: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:23273: \$? = $ac_status" >&5 ++ echo "$as_me:23381: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -23289,7 +23397,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:23292: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:23400: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:23413: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23311 "configure" ++#line 23419 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -23339,16 +23447,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23342: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23450: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23345: \$? = $ac_status" >&5 ++ echo "$as_me:23453: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23348: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23456: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23351: \$? = $ac_status" >&5 ++ echo "$as_me:23459: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -23358,7 +23466,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:23361: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:23469: result: `eval echo '${'"$as_ac_var"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 + if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then + cat >>confdefs.h <&5 ++ echo "$as_me:23481: checking for working fork" >&5 + echo $ECHO_N "checking for working fork... $ECHO_C" >&6 + if test "${ac_cv_func_fork_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -23393,15 +23501,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:23396: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23504: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23399: \$? = $ac_status" >&5 ++ echo "$as_me:23507: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:23401: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23509: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23404: \$? = $ac_status" >&5 ++ echo "$as_me:23512: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_fork_works=yes + else +@@ -23413,7 +23521,7 @@ + rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" + fi + fi +-echo "$as_me:23416: result: $ac_cv_func_fork_works" >&5 ++echo "$as_me:23524: result: $ac_cv_func_fork_works" >&5 + echo "${ECHO_T}$ac_cv_func_fork_works" >&6 + + fi +@@ -23427,12 +23535,12 @@ + ac_cv_func_fork_works=yes + ;; + esac +- { echo "$as_me:23430: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 ++ { echo "$as_me:23538: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 + echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;} + fi + ac_cv_func_vfork_works=$ac_cv_func_vfork + if test "x$ac_cv_func_vfork" = xyes; then +- echo "$as_me:23435: checking for working vfork" >&5 ++ echo "$as_me:23543: checking for working vfork" >&5 + echo $ECHO_N "checking for working vfork... $ECHO_C" >&6 + if test "${ac_cv_func_vfork_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -23441,7 +23549,7 @@ + ac_cv_func_vfork_works=cross + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23444 "configure" ++#line 23552 "configure" + #include "confdefs.h" + /* Thanks to Paul Eggert for this test. */ + #include +@@ -23538,15 +23646,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:23541: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23649: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23544: \$? = $ac_status" >&5 ++ echo "$as_me:23652: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:23546: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23654: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23549: \$? = $ac_status" >&5 ++ echo "$as_me:23657: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_vfork_works=yes + else +@@ -23558,13 +23666,13 @@ + rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" + fi + fi +-echo "$as_me:23561: result: $ac_cv_func_vfork_works" >&5 ++echo "$as_me:23669: result: $ac_cv_func_vfork_works" >&5 + echo "${ECHO_T}$ac_cv_func_vfork_works" >&6 + + fi; + if test "x$ac_cv_func_fork_works" = xcross; then + ac_cv_func_vfork_works=ac_cv_func_vfork +- { echo "$as_me:23567: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 ++ { echo "$as_me:23675: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 + echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;} + fi + +@@ -23589,7 +23697,7 @@ + + fi + +-echo "$as_me:23592: checking if fopen accepts explicit binary mode" >&5 ++echo "$as_me:23700: checking if fopen accepts explicit binary mode" >&5 + echo $ECHO_N "checking if fopen accepts explicit binary mode... $ECHO_C" >&6 + if test "${cf_cv_fopen_bin_r+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -23599,7 +23707,7 @@ + cf_cv_fopen_bin_r=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23602 "configure" ++#line 23710 "configure" + #include "confdefs.h" + + #include +@@ -23632,15 +23740,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:23635: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23743: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23638: \$? = $ac_status" >&5 ++ echo "$as_me:23746: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:23640: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23748: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23643: \$? = $ac_status" >&5 ++ echo "$as_me:23751: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_fopen_bin_r=yes + else +@@ -23653,7 +23761,7 @@ + fi + + fi +-echo "$as_me:23656: result: $cf_cv_fopen_bin_r" >&5 ++echo "$as_me:23764: result: $cf_cv_fopen_bin_r" >&5 + echo "${ECHO_T}$cf_cv_fopen_bin_r" >&6 + test "x$cf_cv_fopen_bin_r" != xno && + cat >>confdefs.h <<\EOF +@@ -23662,7 +23770,7 @@ + + # special check for test/ditto.c + +-echo "$as_me:23665: checking for openpty in -lutil" >&5 ++echo "$as_me:23773: checking for openpty in -lutil" >&5 + echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6 + if test "${ac_cv_lib_util_openpty+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -23670,7 +23778,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lutil $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23673 "configure" ++#line 23781 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -23689,16 +23797,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23692: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23800: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23695: \$? = $ac_status" >&5 ++ echo "$as_me:23803: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23698: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23806: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23701: \$? = $ac_status" >&5 ++ echo "$as_me:23809: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_util_openpty=yes + else +@@ -23709,7 +23817,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:23712: result: $ac_cv_lib_util_openpty" >&5 ++echo "$as_me:23820: result: $ac_cv_lib_util_openpty" >&5 + echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6 + if test "$ac_cv_lib_util_openpty" = yes; then + cf_cv_lib_util=yes +@@ -23717,7 +23825,7 @@ + cf_cv_lib_util=no + fi + +-echo "$as_me:23720: checking for openpty header" >&5 ++echo "$as_me:23828: checking for openpty header" >&5 + echo $ECHO_N "checking for openpty header... $ECHO_C" >&6 + if test "${cf_cv_func_openpty+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -23744,7 +23852,7 @@ + for cf_header in pty.h libutil.h util.h + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23747 "configure" ++#line 23855 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -23761,16 +23869,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23764: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23872: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23767: \$? = $ac_status" >&5 ++ echo "$as_me:23875: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23770: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23878: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23773: \$? = $ac_status" >&5 ++ echo "$as_me:23881: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_func_openpty=$cf_header +@@ -23788,7 +23896,7 @@ + LIBS="$cf_save_LIBS" + + fi +-echo "$as_me:23791: result: $cf_cv_func_openpty" >&5 ++echo "$as_me:23899: result: $cf_cv_func_openpty" >&5 + echo "${ECHO_T}$cf_cv_func_openpty" >&6 + + if test "$cf_cv_func_openpty" != no ; then +@@ -23861,7 +23969,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23864 "configure" ++#line 23972 "configure" + #include "confdefs.h" + #include + int +@@ -23873,16 +23981,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:23876: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:23984: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:23879: \$? = $ac_status" >&5 ++ echo "$as_me:23987: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:23882: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23990: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23885: \$? = $ac_status" >&5 ++ echo "$as_me:23993: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -23899,7 +24007,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:23902: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:24010: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -23935,7 +24043,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me:-configure}:23938: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:24046: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -23946,7 +24054,7 @@ + else + case "$with_hashed_db" in + (./*|../*|/*) +- { echo "$as_me:23949: WARNING: no such directory $with_hashed_db" >&5 ++ { echo "$as_me:24057: WARNING: no such directory $with_hashed_db" >&5 + echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;} + ;; + (*) +@@ -24018,7 +24126,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24021 "configure" ++#line 24129 "configure" + #include "confdefs.h" + #include + int +@@ -24030,16 +24138,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:24033: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24141: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24036: \$? = $ac_status" >&5 ++ echo "$as_me:24144: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:24039: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24147: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24042: \$? = $ac_status" >&5 ++ echo "$as_me:24150: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -24056,7 +24164,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:24059: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:24167: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -24136,7 +24244,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me:-configure}:24139: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:24247: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -24153,23 +24261,23 @@ + fi + esac + +-echo "$as_me:24156: checking for db.h" >&5 ++echo "$as_me:24264: checking for db.h" >&5 + echo $ECHO_N "checking for db.h... $ECHO_C" >&6 + if test "${ac_cv_header_db_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24162 "configure" ++#line 24270 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:24166: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:24274: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:24172: \$? = $ac_status" >&5 ++ echo "$as_me:24280: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -24188,11 +24296,11 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:24191: result: $ac_cv_header_db_h" >&5 ++echo "$as_me:24299: result: $ac_cv_header_db_h" >&5 + echo "${ECHO_T}$ac_cv_header_db_h" >&6 + if test "$ac_cv_header_db_h" = yes; then + +-echo "$as_me:24195: checking for version of db" >&5 ++echo "$as_me:24303: checking for version of db" >&5 + echo $ECHO_N "checking for version of db... $ECHO_C" >&6 + if test "${cf_cv_hashed_db_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -24203,10 +24311,10 @@ + for cf_db_version in 1 2 3 4 5 6 + do + +-echo "${as_me:-configure}:24206: testing checking for db version $cf_db_version ..." 1>&5 ++echo "${as_me:-configure}:24314: testing checking for db version $cf_db_version ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24209 "configure" ++#line 24317 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -24236,16 +24344,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:24239: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24347: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24242: \$? = $ac_status" >&5 ++ echo "$as_me:24350: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:24245: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24353: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24248: \$? = $ac_status" >&5 ++ echo "$as_me:24356: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_hashed_db_version=$cf_db_version +@@ -24259,16 +24367,16 @@ + done + + fi +-echo "$as_me:24262: result: $cf_cv_hashed_db_version" >&5 ++echo "$as_me:24370: result: $cf_cv_hashed_db_version" >&5 + echo "${ECHO_T}$cf_cv_hashed_db_version" >&6 + + if test "$cf_cv_hashed_db_version" = unknown ; then +- { { echo "$as_me:24266: error: Cannot determine version of db" >&5 ++ { { echo "$as_me:24374: error: Cannot determine version of db" >&5 + echo "$as_me: error: Cannot determine version of db" >&2;} + { (exit 1); exit 1; }; } + else + +-echo "$as_me:24271: checking for db libraries" >&5 ++echo "$as_me:24379: checking for db libraries" >&5 + echo $ECHO_N "checking for db libraries... $ECHO_C" >&6 + if test "${cf_cv_hashed_db_libs+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -24298,10 +24406,10 @@ + + fi + +-echo "${as_me:-configure}:24301: testing checking for library $cf_db_libs ..." 1>&5 ++echo "${as_me:-configure}:24409: testing checking for library $cf_db_libs ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24304 "configure" ++#line 24412 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -24356,16 +24464,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:24359: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24467: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:24362: \$? = $ac_status" >&5 ++ echo "$as_me:24470: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:24365: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24473: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24368: \$? = $ac_status" >&5 ++ echo "$as_me:24476: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + if test -n "$cf_db_libs" ; then +@@ -24385,11 +24493,11 @@ + done + + fi +-echo "$as_me:24388: result: $cf_cv_hashed_db_libs" >&5 ++echo "$as_me:24496: result: $cf_cv_hashed_db_libs" >&5 + echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6 + + if test "$cf_cv_hashed_db_libs" = unknown ; then +- { { echo "$as_me:24392: error: Cannot determine library for db" >&5 ++ { { echo "$as_me:24500: error: Cannot determine library for db" >&5 + echo "$as_me: error: Cannot determine library for db" >&2;} + { (exit 1); exit 1; }; } + elif test "$cf_cv_hashed_db_libs" != default ; then +@@ -24415,7 +24523,7 @@ + + else + +- { { echo "$as_me:24418: error: Cannot find db.h" >&5 ++ { { echo "$as_me:24526: error: Cannot find db.h" >&5 + echo "$as_me: error: Cannot find db.h" >&2;} + { (exit 1); exit 1; }; } + +@@ -24430,7 +24538,7 @@ + + # Just in case, check if the C compiler has a bool type. + +-echo "$as_me:24433: checking if we should include stdbool.h" >&5 ++echo "$as_me:24541: checking if we should include stdbool.h" >&5 + echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 + + if test "${cf_cv_header_stdbool_h+set}" = set; then +@@ -24438,7 +24546,7 @@ + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24441 "configure" ++#line 24549 "configure" + #include "confdefs.h" + + int +@@ -24450,23 +24558,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:24453: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24561: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24456: \$? = $ac_status" >&5 ++ echo "$as_me:24564: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:24459: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24567: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24462: \$? = $ac_status" >&5 ++ echo "$as_me:24570: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_header_stdbool_h=0 + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24469 "configure" ++#line 24577 "configure" + #include "confdefs.h" + + #ifndef __BEOS__ +@@ -24482,16 +24590,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:24485: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24593: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24488: \$? = $ac_status" >&5 ++ echo "$as_me:24596: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:24491: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24599: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24494: \$? = $ac_status" >&5 ++ echo "$as_me:24602: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_header_stdbool_h=1 + else +@@ -24505,13 +24613,13 @@ + fi + + if test "$cf_cv_header_stdbool_h" = 1 +-then echo "$as_me:24508: result: yes" >&5 ++then echo "$as_me:24616: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +-else echo "$as_me:24510: result: no" >&5 ++else echo "$as_me:24618: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:24514: checking for builtin bool type" >&5 ++echo "$as_me:24622: checking for builtin bool type" >&5 + echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 + + if test "${cf_cv_cc_bool_type+set}" = set; then +@@ -24519,7 +24627,7 @@ + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24522 "configure" ++#line 24630 "configure" + #include "confdefs.h" + + #include +@@ -24534,16 +24642,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:24537: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24645: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24540: \$? = $ac_status" >&5 ++ echo "$as_me:24648: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:24543: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24651: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24546: \$? = $ac_status" >&5 ++ echo "$as_me:24654: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_cc_bool_type=1 + else +@@ -24556,9 +24664,9 @@ + fi + + if test "$cf_cv_cc_bool_type" = 1 +-then echo "$as_me:24559: result: yes" >&5 ++then echo "$as_me:24667: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +-else echo "$as_me:24561: result: no" >&5 ++else echo "$as_me:24669: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -24575,10 +24683,10 @@ + + cf_save="$LIBS" + LIBS="$LIBS $CXXLIBS" +- echo "$as_me:24578: checking if we already have C++ library" >&5 ++ echo "$as_me:24686: checking if we already have C++ library" >&5 + echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24581 "configure" ++#line 24689 "configure" + #include "confdefs.h" + + #include +@@ -24592,16 +24700,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:24595: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24703: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:24598: \$? = $ac_status" >&5 ++ echo "$as_me:24706: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:24601: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24709: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24604: \$? = $ac_status" >&5 ++ echo "$as_me:24712: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_have_libstdcpp=yes + else +@@ -24610,7 +24718,7 @@ + cf_have_libstdcpp=no + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +- echo "$as_me:24613: result: $cf_have_libstdcpp" >&5 ++ echo "$as_me:24721: result: $cf_have_libstdcpp" >&5 + echo "${ECHO_T}$cf_have_libstdcpp" >&6 + LIBS="$cf_save" + +@@ -24629,7 +24737,7 @@ + ;; + esac + +- echo "$as_me:24632: checking for library $cf_stdcpp_libname" >&5 ++ echo "$as_me:24740: checking for library $cf_stdcpp_libname" >&5 + echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6 + if test "${cf_cv_libstdcpp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -24655,7 +24763,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24658 "configure" ++#line 24766 "configure" + #include "confdefs.h" + + #include +@@ -24669,16 +24777,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:24672: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24780: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:24675: \$? = $ac_status" >&5 ++ echo "$as_me:24783: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:24678: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24786: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24681: \$? = $ac_status" >&5 ++ echo "$as_me:24789: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_libstdcpp=yes + else +@@ -24690,7 +24798,7 @@ + LIBS="$cf_save" + + fi +-echo "$as_me:24693: result: $cf_cv_libstdcpp" >&5 ++echo "$as_me:24801: result: $cf_cv_libstdcpp" >&5 + echo "${ECHO_T}$cf_cv_libstdcpp" >&6 + test "$cf_cv_libstdcpp" = yes && { + cf_add_libs="$CXXLIBS" +@@ -24712,7 +24820,7 @@ + fi + fi + +- echo "$as_me:24715: checking whether $CXX understands -c and -o together" >&5 ++ echo "$as_me:24823: checking whether $CXX understands -c and -o together" >&5 + echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6 + if test "${cf_cv_prog_CXX_c_o+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -24727,15 +24835,15 @@ + # We do the test twice because some compilers refuse to overwrite an + # existing .o file with -o, though they will create one. + ac_try='$CXX $CXXFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5' +-if { (eval echo "$as_me:24730: \"$ac_try\"") >&5 ++if { (eval echo "$as_me:24838: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24733: \$? = $ac_status" >&5 ++ echo "$as_me:24841: \$? = $ac_status" >&5 + (exit "$ac_status"); } && +- test -f conftest2.$ac_objext && { (eval echo "$as_me:24735: \"$ac_try\"") >&5 ++ test -f conftest2.$ac_objext && { (eval echo "$as_me:24843: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24738: \$? = $ac_status" >&5 ++ echo "$as_me:24846: \$? = $ac_status" >&5 + (exit "$ac_status"); }; + then + eval cf_cv_prog_CXX_c_o=yes +@@ -24746,10 +24854,10 @@ + + fi + if test "$cf_cv_prog_CXX_c_o" = yes; then +- echo "$as_me:24749: result: yes" >&5 ++ echo "$as_me:24857: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:24752: result: no" >&5 ++ echo "$as_me:24860: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -24769,7 +24877,7 @@ + ;; + esac + if test "$GXX" = yes; then +- echo "$as_me:24772: checking for lib$cf_gpp_libname" >&5 ++ echo "$as_me:24880: checking for lib$cf_gpp_libname" >&5 + echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6 + cf_save="$LIBS" + +@@ -24790,7 +24898,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24793 "configure" ++#line 24901 "configure" + #include "confdefs.h" + + #include <$cf_gpp_libname/builtin.h> +@@ -24804,16 +24912,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:24807: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24915: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:24810: \$? = $ac_status" >&5 ++ echo "$as_me:24918: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:24813: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24921: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24816: \$? = $ac_status" >&5 ++ echo "$as_me:24924: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cxx_library=yes + +@@ -24850,7 +24958,7 @@ + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24853 "configure" ++#line 24961 "configure" + #include "confdefs.h" + + #include +@@ -24864,16 +24972,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:24867: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24975: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:24870: \$? = $ac_status" >&5 ++ echo "$as_me:24978: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:24873: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24981: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24876: \$? = $ac_status" >&5 ++ echo "$as_me:24984: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cxx_library=yes + +@@ -24906,7 +25014,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS="$cf_save" +- echo "$as_me:24909: result: $cf_cxx_library" >&5 ++ echo "$as_me:25017: result: $cf_cxx_library" >&5 + echo "${ECHO_T}$cf_cxx_library" >&6 + fi + +@@ -24922,7 +25030,7 @@ + ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + ac_main_return="return" +-echo "$as_me:24925: checking how to run the C++ preprocessor" >&5 ++echo "$as_me:25033: checking how to run the C++ preprocessor" >&5 + echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 + if test -z "$CXXCPP"; then + if test "${ac_cv_prog_CXXCPP+set}" = set; then +@@ -24939,18 +25047,18 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24942 "configure" ++#line 25050 "configure" + #include "confdefs.h" + #include + Syntax error + _ACEOF +-if { (eval echo "$as_me:24947: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:25055: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:24953: \$? = $ac_status" >&5 ++ echo "$as_me:25061: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -24973,17 +25081,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24976 "configure" ++#line 25084 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:24980: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:25088: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:24986: \$? = $ac_status" >&5 ++ echo "$as_me:25094: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -25020,7 +25128,7 @@ + else + ac_cv_prog_CXXCPP=$CXXCPP + fi +-echo "$as_me:25023: result: $CXXCPP" >&5 ++echo "$as_me:25131: result: $CXXCPP" >&5 + echo "${ECHO_T}$CXXCPP" >&6 + ac_preproc_ok=false + for ac_cxx_preproc_warn_flag in '' yes +@@ -25030,18 +25138,18 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25033 "configure" ++#line 25141 "configure" + #include "confdefs.h" + #include + Syntax error + _ACEOF +-if { (eval echo "$as_me:25038: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:25146: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:25044: \$? = $ac_status" >&5 ++ echo "$as_me:25152: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -25064,17 +25172,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25067 "configure" ++#line 25175 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:25071: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:25179: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:25077: \$? = $ac_status" >&5 ++ echo "$as_me:25185: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -25102,7 +25210,7 @@ + if $ac_preproc_ok; then + : + else +- { { echo "$as_me:25105: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 ++ { { echo "$as_me:25213: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 + echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -25117,23 +25225,23 @@ + for ac_header in typeinfo + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:25120: checking for $ac_header" >&5 ++echo "$as_me:25228: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25126 "configure" ++#line 25234 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:25130: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:25238: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:25136: \$? = $ac_status" >&5 ++ echo "$as_me:25244: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -25152,7 +25260,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:25155: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:25263: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:25276: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25174 "configure" ++#line 25282 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:25178: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:25286: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:25184: \$? = $ac_status" >&5 ++ echo "$as_me:25292: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -25200,7 +25308,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:25203: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:25311: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++ echo "$as_me:25322: checking if iostream uses std-namespace" >&5 + echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25217 "configure" ++#line 25325 "configure" + #include "confdefs.h" + + #include +@@ -25231,16 +25339,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25234: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25342: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25237: \$? = $ac_status" >&5 ++ echo "$as_me:25345: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25240: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25348: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25243: \$? = $ac_status" >&5 ++ echo "$as_me:25351: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_iostream_namespace=yes + else +@@ -25249,7 +25357,7 @@ + cf_iostream_namespace=no + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +- echo "$as_me:25252: result: $cf_iostream_namespace" >&5 ++ echo "$as_me:25360: result: $cf_iostream_namespace" >&5 + echo "${ECHO_T}$cf_iostream_namespace" >&6 + if test "$cf_iostream_namespace" = yes ; then + +@@ -25260,7 +25368,7 @@ + fi + fi + +-echo "$as_me:25263: checking if we should include stdbool.h" >&5 ++echo "$as_me:25371: checking if we should include stdbool.h" >&5 + echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 + + if test "${cf_cv_header_stdbool_h+set}" = set; then +@@ -25268,7 +25376,7 @@ + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25271 "configure" ++#line 25379 "configure" + #include "confdefs.h" + + int +@@ -25280,23 +25388,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25283: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25391: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25286: \$? = $ac_status" >&5 ++ echo "$as_me:25394: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25289: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25397: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25292: \$? = $ac_status" >&5 ++ echo "$as_me:25400: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_header_stdbool_h=0 + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25299 "configure" ++#line 25407 "configure" + #include "confdefs.h" + + #ifndef __BEOS__ +@@ -25312,16 +25420,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25315: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25423: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25318: \$? = $ac_status" >&5 ++ echo "$as_me:25426: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25321: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25429: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25324: \$? = $ac_status" >&5 ++ echo "$as_me:25432: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_header_stdbool_h=1 + else +@@ -25335,13 +25443,13 @@ + fi + + if test "$cf_cv_header_stdbool_h" = 1 +-then echo "$as_me:25338: result: yes" >&5 ++then echo "$as_me:25446: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +-else echo "$as_me:25340: result: no" >&5 ++else echo "$as_me:25448: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:25344: checking for builtin bool type" >&5 ++echo "$as_me:25452: checking for builtin bool type" >&5 + echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 + + if test "${cf_cv_builtin_bool+set}" = set; then +@@ -25349,7 +25457,7 @@ + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25352 "configure" ++#line 25460 "configure" + #include "confdefs.h" + + #include +@@ -25364,16 +25472,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25367: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25475: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25370: \$? = $ac_status" >&5 ++ echo "$as_me:25478: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25373: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25481: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25376: \$? = $ac_status" >&5 ++ echo "$as_me:25484: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_builtin_bool=1 + else +@@ -25386,19 +25494,19 @@ + fi + + if test "$cf_cv_builtin_bool" = 1 +-then echo "$as_me:25389: result: yes" >&5 ++then echo "$as_me:25497: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +-else echo "$as_me:25391: result: no" >&5 ++else echo "$as_me:25499: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:25395: checking for bool" >&5 ++echo "$as_me:25503: checking for bool" >&5 + echo $ECHO_N "checking for bool... $ECHO_C" >&6 + if test "${ac_cv_type_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25401 "configure" ++#line 25509 "configure" + #include "confdefs.h" + + #include +@@ -25434,16 +25542,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25437: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25545: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25440: \$? = $ac_status" >&5 ++ echo "$as_me:25548: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25443: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25551: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25446: \$? = $ac_status" >&5 ++ echo "$as_me:25554: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_bool=yes + else +@@ -25453,10 +25561,10 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:25456: result: $ac_cv_type_bool" >&5 ++echo "$as_me:25564: result: $ac_cv_type_bool" >&5 + echo "${ECHO_T}$ac_cv_type_bool" >&6 + +-echo "$as_me:25459: checking size of bool" >&5 ++echo "$as_me:25567: checking size of bool" >&5 + echo $ECHO_N "checking size of bool... $ECHO_C" >&6 + if test "${ac_cv_sizeof_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -25465,7 +25573,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25468 "configure" ++#line 25576 "configure" + #include "confdefs.h" + + #include +@@ -25498,21 +25606,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25501: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25609: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25504: \$? = $ac_status" >&5 ++ echo "$as_me:25612: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25507: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25615: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25510: \$? = $ac_status" >&5 ++ echo "$as_me:25618: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25515 "configure" ++#line 25623 "configure" + #include "confdefs.h" + + #include +@@ -25545,16 +25653,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25548: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25656: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25551: \$? = $ac_status" >&5 ++ echo "$as_me:25659: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25554: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25662: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25557: \$? = $ac_status" >&5 ++ echo "$as_me:25665: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid; break + else +@@ -25570,7 +25678,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25573 "configure" ++#line 25681 "configure" + #include "confdefs.h" + + #include +@@ -25603,16 +25711,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25606: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25714: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25609: \$? = $ac_status" >&5 ++ echo "$as_me:25717: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25612: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25720: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25615: \$? = $ac_status" >&5 ++ echo "$as_me:25723: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=$ac_mid; break + else +@@ -25628,7 +25736,7 @@ + while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25631 "configure" ++#line 25739 "configure" + #include "confdefs.h" + + #include +@@ -25661,16 +25769,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25664: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25772: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25667: \$? = $ac_status" >&5 ++ echo "$as_me:25775: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25670: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25778: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25673: \$? = $ac_status" >&5 ++ echo "$as_me:25781: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid + else +@@ -25683,12 +25791,12 @@ + ac_cv_sizeof_bool=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:25686: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:25794: error: cannot run test program while cross compiling" >&5 + echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25691 "configure" ++#line 25799 "configure" + #include "confdefs.h" + + #include +@@ -25725,15 +25833,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:25728: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:25836: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:25731: \$? = $ac_status" >&5 ++ echo "$as_me:25839: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:25733: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25841: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25736: \$? = $ac_status" >&5 ++ echo "$as_me:25844: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sizeof_bool=`cat conftest.val` + else +@@ -25749,13 +25857,13 @@ + ac_cv_sizeof_bool=0 + fi + fi +-echo "$as_me:25752: result: $ac_cv_sizeof_bool" >&5 ++echo "$as_me:25860: result: $ac_cv_sizeof_bool" >&5 + echo "${ECHO_T}$ac_cv_sizeof_bool" >&6 + cat >>confdefs.h <&5 ++echo "$as_me:25866: checking for type of bool" >&5 + echo $ECHO_N "checking for type of bool... $ECHO_C" >&6 + if test "${cf_cv_type_of_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -25774,7 +25882,7 @@ + + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25777 "configure" ++#line 25885 "configure" + #include "confdefs.h" + + #include +@@ -25816,15 +25924,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:25819: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:25927: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:25822: \$? = $ac_status" >&5 ++ echo "$as_me:25930: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:25824: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25932: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25827: \$? = $ac_status" >&5 ++ echo "$as_me:25935: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_type_of_bool=`cat cf_test.out` + if test -z "$cf_cv_type_of_bool"; then +@@ -25841,19 +25949,19 @@ + rm -f cf_test.out + + fi +-echo "$as_me:25844: result: $cf_cv_type_of_bool" >&5 ++echo "$as_me:25952: result: $cf_cv_type_of_bool" >&5 + echo "${ECHO_T}$cf_cv_type_of_bool" >&6 + + if test "$cf_cv_type_of_bool" = unknown ; then + case .$NCURSES_BOOL in + (.auto|.) NCURSES_BOOL=unsigned;; + esac +- { echo "$as_me:25851: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 ++ { echo "$as_me:25959: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} + cf_cv_type_of_bool=$NCURSES_BOOL + fi + +-echo "$as_me:25856: checking for special defines needed for etip.h" >&5 ++echo "$as_me:25964: checking for special defines needed for etip.h" >&5 + echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6 + cf_save_CXXFLAGS="$CXXFLAGS" + cf_result="none" +@@ -25871,7 +25979,7 @@ + test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}" + test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25874 "configure" ++#line 25982 "configure" + #include "confdefs.h" + + #include +@@ -25885,16 +25993,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25888: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25996: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25891: \$? = $ac_status" >&5 ++ echo "$as_me:25999: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25894: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26002: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25897: \$? = $ac_status" >&5 ++ echo "$as_me:26005: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + test -n "$cf_math" && cat >>confdefs.h <&5 ++echo "$as_me:26026: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + CXXFLAGS="$cf_save_CXXFLAGS" + + if test -n "$CXX"; then +-echo "$as_me:25923: checking if $CXX accepts parameter initialization" >&5 ++echo "$as_me:26031: checking if $CXX accepts parameter initialization" >&5 + echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6 + if test "${cf_cv_cpp_param_init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -25937,7 +26045,7 @@ + cf_cv_cpp_param_init=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25940 "configure" ++#line 26048 "configure" + #include "confdefs.h" + + class TEST { +@@ -25956,15 +26064,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:25959: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:26067: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:25962: \$? = $ac_status" >&5 ++ echo "$as_me:26070: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:25964: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26072: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25967: \$? = $ac_status" >&5 ++ echo "$as_me:26075: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_cpp_param_init=yes + else +@@ -25983,7 +26091,7 @@ + ac_main_return="return" + + fi +-echo "$as_me:25986: result: $cf_cv_cpp_param_init" >&5 ++echo "$as_me:26094: result: $cf_cv_cpp_param_init" >&5 + echo "${ECHO_T}$cf_cv_cpp_param_init" >&6 + fi + test "$cf_cv_cpp_param_init" = yes && +@@ -25993,7 +26101,7 @@ + + if test -n "$CXX"; then + +-echo "$as_me:25996: checking if $CXX accepts static_cast" >&5 ++echo "$as_me:26104: checking if $CXX accepts static_cast" >&5 + echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6 + if test "${cf_cv_cpp_static_cast+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26007,7 +26115,7 @@ + ac_main_return="return" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26010 "configure" ++#line 26118 "configure" + #include "confdefs.h" + + class NCursesPanel +@@ -26051,16 +26159,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26054: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26162: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26057: \$? = $ac_status" >&5 ++ echo "$as_me:26165: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26060: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26168: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26063: \$? = $ac_status" >&5 ++ echo "$as_me:26171: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_cpp_static_cast=yes + else +@@ -26078,7 +26186,7 @@ + ac_main_return="return" + + fi +-echo "$as_me:26081: result: $cf_cv_cpp_static_cast" >&5 ++echo "$as_me:26189: result: $cf_cv_cpp_static_cast" >&5 + echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6 + + fi +@@ -26127,13 +26235,13 @@ + else + if test "$cf_cv_header_stdbool_h" = 1 ; then + +-echo "$as_me:26130: checking for bool" >&5 ++echo "$as_me:26238: checking for bool" >&5 + echo $ECHO_N "checking for bool... $ECHO_C" >&6 + if test "${ac_cv_type_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26136 "configure" ++#line 26244 "configure" + #include "confdefs.h" + + #include +@@ -26169,16 +26277,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26172: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26280: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26175: \$? = $ac_status" >&5 ++ echo "$as_me:26283: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26178: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26286: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26181: \$? = $ac_status" >&5 ++ echo "$as_me:26289: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_bool=yes + else +@@ -26188,10 +26296,10 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:26191: result: $ac_cv_type_bool" >&5 ++echo "$as_me:26299: result: $ac_cv_type_bool" >&5 + echo "${ECHO_T}$ac_cv_type_bool" >&6 + +-echo "$as_me:26194: checking size of bool" >&5 ++echo "$as_me:26302: checking size of bool" >&5 + echo $ECHO_N "checking size of bool... $ECHO_C" >&6 + if test "${ac_cv_sizeof_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26200,7 +26308,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26203 "configure" ++#line 26311 "configure" + #include "confdefs.h" + + #include +@@ -26233,21 +26341,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26236: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26344: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26239: \$? = $ac_status" >&5 ++ echo "$as_me:26347: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26242: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26350: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26245: \$? = $ac_status" >&5 ++ echo "$as_me:26353: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26250 "configure" ++#line 26358 "configure" + #include "confdefs.h" + + #include +@@ -26280,16 +26388,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26283: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26391: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26286: \$? = $ac_status" >&5 ++ echo "$as_me:26394: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26289: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26397: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26292: \$? = $ac_status" >&5 ++ echo "$as_me:26400: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid; break + else +@@ -26305,7 +26413,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26308 "configure" ++#line 26416 "configure" + #include "confdefs.h" + + #include +@@ -26338,16 +26446,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26341: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26449: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26344: \$? = $ac_status" >&5 ++ echo "$as_me:26452: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26347: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26455: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26350: \$? = $ac_status" >&5 ++ echo "$as_me:26458: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=$ac_mid; break + else +@@ -26363,7 +26471,7 @@ + while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26366 "configure" ++#line 26474 "configure" + #include "confdefs.h" + + #include +@@ -26396,16 +26504,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26399: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26507: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26402: \$? = $ac_status" >&5 ++ echo "$as_me:26510: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26405: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26513: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26408: \$? = $ac_status" >&5 ++ echo "$as_me:26516: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid + else +@@ -26418,12 +26526,12 @@ + ac_cv_sizeof_bool=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:26421: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:26529: error: cannot run test program while cross compiling" >&5 + echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26426 "configure" ++#line 26534 "configure" + #include "confdefs.h" + + #include +@@ -26460,15 +26568,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:26463: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:26571: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:26466: \$? = $ac_status" >&5 ++ echo "$as_me:26574: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:26468: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26576: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26471: \$? = $ac_status" >&5 ++ echo "$as_me:26579: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sizeof_bool=`cat conftest.val` + else +@@ -26484,13 +26592,13 @@ + ac_cv_sizeof_bool=0 + fi + fi +-echo "$as_me:26487: result: $ac_cv_sizeof_bool" >&5 ++echo "$as_me:26595: result: $ac_cv_sizeof_bool" >&5 + echo "${ECHO_T}$ac_cv_sizeof_bool" >&6 + cat >>confdefs.h <&5 ++echo "$as_me:26601: checking for type of bool" >&5 + echo $ECHO_N "checking for type of bool... $ECHO_C" >&6 + if test "${cf_cv_type_of_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26509,7 +26617,7 @@ + + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26512 "configure" ++#line 26620 "configure" + #include "confdefs.h" + + #include +@@ -26551,15 +26659,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:26554: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:26662: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:26557: \$? = $ac_status" >&5 ++ echo "$as_me:26665: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:26559: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26667: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26562: \$? = $ac_status" >&5 ++ echo "$as_me:26670: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_type_of_bool=`cat cf_test.out` + if test -z "$cf_cv_type_of_bool"; then +@@ -26576,26 +26684,26 @@ + rm -f cf_test.out + + fi +-echo "$as_me:26579: result: $cf_cv_type_of_bool" >&5 ++echo "$as_me:26687: result: $cf_cv_type_of_bool" >&5 + echo "${ECHO_T}$cf_cv_type_of_bool" >&6 + + if test "$cf_cv_type_of_bool" = unknown ; then + case .$NCURSES_BOOL in + (.auto|.) NCURSES_BOOL=unsigned;; + esac +- { echo "$as_me:26586: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 ++ { echo "$as_me:26694: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} + cf_cv_type_of_bool=$NCURSES_BOOL + fi + + else +- echo "$as_me:26592: checking for fallback type of bool" >&5 ++ echo "$as_me:26700: checking for fallback type of bool" >&5 + echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6 + case "$host_cpu" in + (i?86) cf_cv_type_of_bool=char ;; + (*) cf_cv_type_of_bool=int ;; + esac +- echo "$as_me:26598: result: $cf_cv_type_of_bool" >&5 ++ echo "$as_me:26706: result: $cf_cv_type_of_bool" >&5 + echo "${ECHO_T}$cf_cv_type_of_bool" >&6 + fi + fi +@@ -26624,7 +26732,7 @@ + + if test "$cf_with_ada" != "no" ; then + if test "$with_libtool" != "no"; then +- { echo "$as_me:26627: WARNING: libtool does not support Ada - disabling feature" >&5 ++ { echo "$as_me:26735: WARNING: libtool does not support Ada - disabling feature" >&5 + echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;} + cf_with_ada=no + fi +@@ -26641,7 +26749,7 @@ + unset cf_TEMP_gnat + # Extract the first word of "$cf_prog_gnat", so it can be a program name with args. + set dummy $cf_prog_gnat; ac_word=$2 +-echo "$as_me:26644: checking for $ac_word" >&5 ++echo "$as_me:26752: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26658,7 +26766,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word" +- echo "$as_me:26661: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:26769: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -26670,10 +26778,10 @@ + cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat + + if test -n "$cf_TEMP_gnat"; then +- echo "$as_me:26673: result: $cf_TEMP_gnat" >&5 ++ echo "$as_me:26781: result: $cf_TEMP_gnat" >&5 + echo "${ECHO_T}$cf_TEMP_gnat" >&6 + else +- echo "$as_me:26676: result: no" >&5 ++ echo "$as_me:26784: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -26683,7 +26791,7 @@ + unset cf_cv_gnat_version + unset cf_TEMP_gnat + +-echo "$as_me:26686: checking for $cf_prog_gnat version" >&5 ++echo "$as_me:26794: checking for $cf_prog_gnat version" >&5 + echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6 + if test "${cf_cv_gnat_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26694,7 +26802,7 @@ + sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` + + fi +-echo "$as_me:26697: result: $cf_cv_gnat_version" >&5 ++echo "$as_me:26805: result: $cf_cv_gnat_version" >&5 + echo "${ECHO_T}$cf_cv_gnat_version" >&6 + test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no + eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version +@@ -26723,7 +26831,7 @@ + cd conftest.src + for cf_gprconfig in Ada C + do +- echo "$as_me:26726: checking for gprconfig name for $cf_gprconfig" >&5 ++ echo "$as_me:26834: checking for gprconfig name for $cf_gprconfig" >&5 + echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6 + if test "$cf_gprconfig" = C + then +@@ -26742,10 +26850,10 @@ + if test -n "$cf_gprconfig_value" + then + eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value" +- echo "$as_me:26745: result: $cf_gprconfig_value" >&5 ++ echo "$as_me:26853: result: $cf_gprconfig_value" >&5 + echo "${ECHO_T}$cf_gprconfig_value" >&6 + else +- echo "$as_me:26748: result: missing" >&5 ++ echo "$as_me:26856: result: missing" >&5 + echo "${ECHO_T}missing" >&6 + cf_ada_config="#" + break +@@ -26758,7 +26866,7 @@ + if test "x$cf_ada_config" != "x#" + then + +-echo "$as_me:26761: checking for gnat version" >&5 ++echo "$as_me:26869: checking for gnat version" >&5 + echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 + if test "${cf_cv_gnat_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26769,7 +26877,7 @@ + sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` + + fi +-echo "$as_me:26772: result: $cf_cv_gnat_version" >&5 ++echo "$as_me:26880: result: $cf_cv_gnat_version" >&5 + echo "${ECHO_T}$cf_cv_gnat_version" >&6 + test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no + +@@ -26778,7 +26886,7 @@ + cf_cv_prog_gnat_correct=yes + ;; + (*) +- { echo "$as_me:26781: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 ++ { echo "$as_me:26889: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 + echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} + cf_cv_prog_gnat_correct=no + ;; +@@ -26786,7 +26894,7 @@ + + # Extract the first word of "m4", so it can be a program name with args. + set dummy m4; ac_word=$2 +-echo "$as_me:26789: checking for $ac_word" >&5 ++echo "$as_me:26897: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_M4_exists+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26801,7 +26909,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_M4_exists="yes" +-echo "$as_me:26804: found $ac_dir/$ac_word" >&5 ++echo "$as_me:26912: found $ac_dir/$ac_word" >&5 + break + done + +@@ -26810,20 +26918,20 @@ + fi + M4_exists=$ac_cv_prog_M4_exists + if test -n "$M4_exists"; then +- echo "$as_me:26813: result: $M4_exists" >&5 ++ echo "$as_me:26921: result: $M4_exists" >&5 + echo "${ECHO_T}$M4_exists" >&6 + else +- echo "$as_me:26816: result: no" >&5 ++ echo "$as_me:26924: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + if test "$ac_cv_prog_M4_exists" = no; then + cf_cv_prog_gnat_correct=no +- { echo "$as_me:26822: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 ++ { echo "$as_me:26930: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 + echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;} + fi + if test "$cf_cv_prog_gnat_correct" = yes; then +- echo "$as_me:26826: checking if GNAT works" >&5 ++ echo "$as_me:26934: checking if GNAT works" >&5 + echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 + + rm -rf ./conftest* ./*~conftest* +@@ -26851,7 +26959,7 @@ + fi + rm -rf ./conftest* ./*~conftest* + +- echo "$as_me:26854: result: $cf_cv_prog_gnat_correct" >&5 ++ echo "$as_me:26962: result: $cf_cv_prog_gnat_correct" >&5 + echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 + fi + else +@@ -26863,7 +26971,7 @@ + + ADAFLAGS="$ADAFLAGS -gnatpn" + +- echo "$as_me:26866: checking optimization options for ADAFLAGS" >&5 ++ echo "$as_me:26974: checking optimization options for ADAFLAGS" >&5 + echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 + case "$CFLAGS" in + (*-g*) +@@ -26880,10 +26988,10 @@ + + ;; + esac +- echo "$as_me:26883: result: $ADAFLAGS" >&5 ++ echo "$as_me:26991: result: $ADAFLAGS" >&5 + echo "${ECHO_T}$ADAFLAGS" >&6 + +-echo "$as_me:26886: checking if GNATPREP supports -T option" >&5 ++echo "$as_me:26994: checking if GNATPREP supports -T option" >&5 + echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6 + if test "${cf_cv_gnatprep_opt_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26893,11 +27001,11 @@ + gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes + + fi +-echo "$as_me:26896: result: $cf_cv_gnatprep_opt_t" >&5 ++echo "$as_me:27004: result: $cf_cv_gnatprep_opt_t" >&5 + echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6 + test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS" + +-echo "$as_me:26900: checking if GNAT supports generics" >&5 ++echo "$as_me:27008: checking if GNAT supports generics" >&5 + echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 + case "$cf_cv_gnat_version" in + (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9]) +@@ -26907,7 +27015,7 @@ + cf_gnat_generics=no + ;; + esac +-echo "$as_me:26910: result: $cf_gnat_generics" >&5 ++echo "$as_me:27018: result: $cf_gnat_generics" >&5 + echo "${ECHO_T}$cf_gnat_generics" >&6 + + if test "$cf_gnat_generics" = yes +@@ -26919,7 +27027,7 @@ + cf_generic_objects= + fi + +-echo "$as_me:26922: checking if GNAT supports SIGINT" >&5 ++echo "$as_me:27030: checking if GNAT supports SIGINT" >&5 + echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6 + if test "${cf_cv_gnat_sigint+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26967,7 +27075,7 @@ + rm -rf ./conftest* ./*~conftest* + + fi +-echo "$as_me:26970: result: $cf_cv_gnat_sigint" >&5 ++echo "$as_me:27078: result: $cf_cv_gnat_sigint" >&5 + echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 + + if test "$cf_cv_gnat_sigint" = yes ; then +@@ -26980,7 +27088,7 @@ + cf_gnat_projects=no + + if test "$enable_gnat_projects" != no ; then +-echo "$as_me:26983: checking if GNAT supports project files" >&5 ++echo "$as_me:27091: checking if GNAT supports project files" >&5 + echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 + case "$cf_cv_gnat_version" in + (3.[0-9]*) +@@ -27043,15 +27151,15 @@ + esac + ;; + esac +-echo "$as_me:27046: result: $cf_gnat_projects" >&5 ++echo "$as_me:27154: result: $cf_gnat_projects" >&5 + echo "${ECHO_T}$cf_gnat_projects" >&6 + fi # enable_gnat_projects + + if test "$cf_gnat_projects" = yes + then +- echo "$as_me:27052: checking if GNAT supports libraries" >&5 ++ echo "$as_me:27160: checking if GNAT supports libraries" >&5 + echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 +- echo "$as_me:27054: result: $cf_gnat_libraries" >&5 ++ echo "$as_me:27162: result: $cf_gnat_libraries" >&5 + echo "${ECHO_T}$cf_gnat_libraries" >&6 + fi + +@@ -27071,7 +27179,7 @@ + then + USE_GNAT_MAKE_GPR="" + else +- { echo "$as_me:27074: WARNING: use old makefile rules since tools are missing" >&5 ++ { echo "$as_me:27182: WARNING: use old makefile rules since tools are missing" >&5 + echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;} + fi + fi +@@ -27083,7 +27191,7 @@ + USE_GNAT_LIBRARIES="#" + fi + +-echo "$as_me:27086: checking for ada-compiler" >&5 ++echo "$as_me:27194: checking for ada-compiler" >&5 + echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6 + + # Check whether --with-ada-compiler or --without-ada-compiler was given. +@@ -27094,12 +27202,12 @@ + cf_ada_compiler=gnatmake + fi; + +-echo "$as_me:27097: result: $cf_ada_compiler" >&5 ++echo "$as_me:27205: result: $cf_ada_compiler" >&5 + echo "${ECHO_T}$cf_ada_compiler" >&6 + + cf_ada_package=terminal_interface + +-echo "$as_me:27102: checking for ada-include" >&5 ++echo "$as_me:27210: checking for ada-include" >&5 + echo $ECHO_N "checking for ada-include... $ECHO_C" >&6 + + # Check whether --with-ada-include or --without-ada-include was given. +@@ -27135,7 +27243,7 @@ + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:27138: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:27246: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -27144,10 +27252,10 @@ + fi + eval ADA_INCLUDE="$withval" + +-echo "$as_me:27147: result: $ADA_INCLUDE" >&5 ++echo "$as_me:27255: result: $ADA_INCLUDE" >&5 + echo "${ECHO_T}$ADA_INCLUDE" >&6 + +-echo "$as_me:27150: checking for ada-objects" >&5 ++echo "$as_me:27258: checking for ada-objects" >&5 + echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6 + + # Check whether --with-ada-objects or --without-ada-objects was given. +@@ -27183,7 +27291,7 @@ + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:27186: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:27294: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -27192,10 +27300,10 @@ + fi + eval ADA_OBJECTS="$withval" + +-echo "$as_me:27195: result: $ADA_OBJECTS" >&5 ++echo "$as_me:27303: result: $ADA_OBJECTS" >&5 + echo "${ECHO_T}$ADA_OBJECTS" >&6 + +-echo "$as_me:27198: checking if an Ada95 shared-library should be built" >&5 ++echo "$as_me:27306: checking if an Ada95 shared-library should be built" >&5 + echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6 + + # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given. +@@ -27205,14 +27313,14 @@ + else + with_ada_sharedlib=no + fi; +-echo "$as_me:27208: result: $with_ada_sharedlib" >&5 ++echo "$as_me:27316: result: $with_ada_sharedlib" >&5 + echo "${ECHO_T}$with_ada_sharedlib" >&6 + + if test "x$with_ada_sharedlib" != xno + then + if test "x$cf_gnat_projects" != xyes + then +- { echo "$as_me:27215: WARNING: disabling shared-library since GNAT projects are not supported" >&5 ++ { echo "$as_me:27323: WARNING: disabling shared-library since GNAT projects are not supported" >&5 + echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;} + with_ada_sharedlib=no + fi +@@ -27232,7 +27340,7 @@ + + # allow the Ada binding to be renamed + +-echo "$as_me:27235: checking for ada-libname" >&5 ++echo "$as_me:27343: checking for ada-libname" >&5 + echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6 + + # Check whether --with-ada-libname or --without-ada-libname was given. +@@ -27248,7 +27356,7 @@ + ;; + esac + +-echo "$as_me:27251: result: $ADA_LIBNAME" >&5 ++echo "$as_me:27359: result: $ADA_LIBNAME" >&5 + echo "${ECHO_T}$ADA_LIBNAME" >&6 + + fi +@@ -27259,13 +27367,13 @@ + + # do this "late" to avoid conflict with header-checks + if test "x$with_widec" = xyes ; then +- echo "$as_me:27262: checking for wchar_t" >&5 ++ echo "$as_me:27370: checking for wchar_t" >&5 + echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6 + if test "${ac_cv_type_wchar_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27268 "configure" ++#line 27376 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -27280,16 +27388,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:27283: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27391: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27286: \$? = $ac_status" >&5 ++ echo "$as_me:27394: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:27289: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27397: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27292: \$? = $ac_status" >&5 ++ echo "$as_me:27400: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_wchar_t=yes + else +@@ -27299,10 +27407,10 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:27302: result: $ac_cv_type_wchar_t" >&5 ++echo "$as_me:27410: result: $ac_cv_type_wchar_t" >&5 + echo "${ECHO_T}$ac_cv_type_wchar_t" >&6 + +-echo "$as_me:27305: checking size of wchar_t" >&5 ++echo "$as_me:27413: checking size of wchar_t" >&5 + echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6 + if test "${ac_cv_sizeof_wchar_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -27311,7 +27419,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27314 "configure" ++#line 27422 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -27323,21 +27431,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:27326: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27434: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27329: \$? = $ac_status" >&5 ++ echo "$as_me:27437: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:27332: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27440: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27335: \$? = $ac_status" >&5 ++ echo "$as_me:27443: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27340 "configure" ++#line 27448 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -27349,16 +27457,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:27352: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27460: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27355: \$? = $ac_status" >&5 ++ echo "$as_me:27463: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:27358: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27466: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27361: \$? = $ac_status" >&5 ++ echo "$as_me:27469: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid; break + else +@@ -27374,7 +27482,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27377 "configure" ++#line 27485 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -27386,16 +27494,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:27389: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27497: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27392: \$? = $ac_status" >&5 ++ echo "$as_me:27500: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:27395: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27503: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27398: \$? = $ac_status" >&5 ++ echo "$as_me:27506: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=$ac_mid; break + else +@@ -27411,7 +27519,7 @@ + while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27414 "configure" ++#line 27522 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -27423,16 +27531,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:27426: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27534: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27429: \$? = $ac_status" >&5 ++ echo "$as_me:27537: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:27432: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27540: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27435: \$? = $ac_status" >&5 ++ echo "$as_me:27543: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid + else +@@ -27445,12 +27553,12 @@ + ac_cv_sizeof_wchar_t=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:27448: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:27556: error: cannot run test program while cross compiling" >&5 + echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27453 "configure" ++#line 27561 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -27466,15 +27574,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:27469: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:27577: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:27472: \$? = $ac_status" >&5 ++ echo "$as_me:27580: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:27474: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27582: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27477: \$? = $ac_status" >&5 ++ echo "$as_me:27585: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sizeof_wchar_t=`cat conftest.val` + else +@@ -27490,7 +27598,7 @@ + ac_cv_sizeof_wchar_t=0 + fi + fi +-echo "$as_me:27493: result: $ac_cv_sizeof_wchar_t" >&5 ++echo "$as_me:27601: result: $ac_cv_sizeof_wchar_t" >&5 + echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6 + cat >>confdefs.h <&6 + +-echo "${as_me:-configure}:27506: testing test failed (assume 2) ..." 1>&5 ++echo "${as_me:-configure}:27614: testing test failed (assume 2) ..." 1>&5 + + sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp + mv confdefs.tmp confdefs.h +@@ -27521,7 +27629,7 @@ + ### chooses to split module lists into libraries. + ### + ### (see CF_LIB_RULES). +-echo "$as_me:27524: checking for library subsets" >&5 ++echo "$as_me:27632: checking for library subsets" >&5 + echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 + LIB_SUBSETS= + +@@ -27575,7 +27683,7 @@ + test "x$with_widec" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar" + test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs" + +-echo "$as_me:27578: result: $LIB_SUBSETS" >&5 ++echo "$as_me:27686: result: $LIB_SUBSETS" >&5 + echo "${ECHO_T}$LIB_SUBSETS" >&6 + + ### Construct the list of include-directories to be generated +@@ -27606,7 +27714,7 @@ + fi + + ### Build up pieces for makefile rules +-echo "$as_me:27609: checking default library suffix" >&5 ++echo "$as_me:27717: checking default library suffix" >&5 + echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -27617,10 +27725,10 @@ + (shared) DFT_ARG_SUFFIX='' ;; + esac + test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" +-echo "$as_me:27620: result: $DFT_ARG_SUFFIX" >&5 ++echo "$as_me:27728: result: $DFT_ARG_SUFFIX" >&5 + echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 + +-echo "$as_me:27623: checking default library-dependency suffix" >&5 ++echo "$as_me:27731: checking default library-dependency suffix" >&5 + echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 + + case X$DFT_LWR_MODEL in +@@ -27703,10 +27811,10 @@ + DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}" + DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}" + fi +-echo "$as_me:27706: result: $DFT_DEP_SUFFIX" >&5 ++echo "$as_me:27814: result: $DFT_DEP_SUFFIX" >&5 + echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 + +-echo "$as_me:27709: checking default object directory" >&5 ++echo "$as_me:27817: checking default object directory" >&5 + echo $ECHO_N "checking default object directory... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -27722,11 +27830,11 @@ + DFT_OBJ_SUBDIR='obj_s' ;; + esac + esac +-echo "$as_me:27725: result: $DFT_OBJ_SUBDIR" >&5 ++echo "$as_me:27833: result: $DFT_OBJ_SUBDIR" >&5 + echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 + + if test "x$cf_with_cxx" = xyes ; then +-echo "$as_me:27729: checking c++ library-dependency suffix" >&5 ++echo "$as_me:27837: checking c++ library-dependency suffix" >&5 + echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6 + if test "$with_libtool" != "no"; then + # libtool thinks it can make c++ shared libraries (perhaps only g++) +@@ -27819,7 +27927,7 @@ + fi + + fi +-echo "$as_me:27822: result: $CXX_LIB_SUFFIX" >&5 ++echo "$as_me:27930: result: $CXX_LIB_SUFFIX" >&5 + echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 + + fi +@@ -27995,19 +28103,19 @@ + + if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED" + then +- echo "$as_me:27998: checking if linker supports switching between static/dynamic" >&5 ++ echo "$as_me:28106: checking if linker supports switching between static/dynamic" >&5 + echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6 + + rm -f libconftest.a + cat >conftest.$ac_ext < + int cf_ldflags_static(FILE *fp) { return fflush(fp); } + EOF +- if { (eval echo "$as_me:28007: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:28115: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:28010: \$? = $ac_status" >&5 ++ echo "$as_me:28118: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then + ( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null + ( eval $RANLIB libconftest.a ) 2>&5 >/dev/null +@@ -28018,10 +28126,10 @@ + + LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 28021 "configure" ++#line 28129 "configure" + #include "confdefs.h" + +-#line 28024 "configure" ++#line 28132 "configure" + #include + int cf_ldflags_static(FILE *fp); + +@@ -28036,16 +28144,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:28039: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:28147: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:28042: \$? = $ac_status" >&5 ++ echo "$as_me:28150: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:28045: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:28153: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:28048: \$? = $ac_status" >&5 ++ echo "$as_me:28156: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + # some linkers simply ignore the -dynamic +@@ -28068,7 +28176,7 @@ + rm -f libconftest.* + LIBS="$cf_save_LIBS" + +- echo "$as_me:28071: result: $cf_ldflags_static" >&5 ++ echo "$as_me:28179: result: $cf_ldflags_static" >&5 + echo "${ECHO_T}$cf_ldflags_static" >&6 + + if test "$cf_ldflags_static" != yes +@@ -28084,7 +28192,7 @@ + ;; + esac + +-echo "$as_me:28087: checking where we will install curses.h" >&5 ++echo "$as_me:28195: checking where we will install curses.h" >&5 + echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 + + includesubdir= +@@ -28094,7 +28202,7 @@ + then + includesubdir="/ncurses${USE_LIB_SUFFIX}" + fi +-echo "$as_me:28097: result: ${includedir}${includesubdir}" >&5 ++echo "$as_me:28205: result: ${includedir}${includesubdir}" >&5 + echo "${ECHO_T}${includedir}${includesubdir}" >&6 + + ### Resolve a conflict between normal and wide-curses by forcing applications +@@ -28102,7 +28210,7 @@ + if test "$with_overwrite" != no ; then + if test "$NCURSES_LIBUTF8" = 1 ; then + NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)' +- { echo "$as_me:28105: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 ++ { echo "$as_me:28213: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 + echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;} + fi + fi +@@ -28130,7 +28238,7 @@ + + # pkgsrc uses these + +-echo "$as_me:28133: checking for desired basename for form library" >&5 ++echo "$as_me:28241: checking for desired basename for form library" >&5 + echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6 + + # Check whether --with-form-libname or --without-form-libname was given. +@@ -28150,10 +28258,10 @@ + ;; + esac + +-echo "$as_me:28153: result: $FORM_NAME" >&5 ++echo "$as_me:28261: result: $FORM_NAME" >&5 + echo "${ECHO_T}$FORM_NAME" >&6 + +-echo "$as_me:28156: checking for desired basename for menu library" >&5 ++echo "$as_me:28264: checking for desired basename for menu library" >&5 + echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6 + + # Check whether --with-menu-libname or --without-menu-libname was given. +@@ -28173,10 +28281,10 @@ + ;; + esac + +-echo "$as_me:28176: result: $MENU_NAME" >&5 ++echo "$as_me:28284: result: $MENU_NAME" >&5 + echo "${ECHO_T}$MENU_NAME" >&6 + +-echo "$as_me:28179: checking for desired basename for panel library" >&5 ++echo "$as_me:28287: checking for desired basename for panel library" >&5 + echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6 + + # Check whether --with-panel-libname or --without-panel-libname was given. +@@ -28196,10 +28304,10 @@ + ;; + esac + +-echo "$as_me:28199: result: $PANEL_NAME" >&5 ++echo "$as_me:28307: result: $PANEL_NAME" >&5 + echo "${ECHO_T}$PANEL_NAME" >&6 + +-echo "$as_me:28202: checking for desired basename for cxx library" >&5 ++echo "$as_me:28310: checking for desired basename for cxx library" >&5 + echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6 + + # Check whether --with-cxx-libname or --without-cxx-libname was given. +@@ -28219,13 +28327,13 @@ + ;; + esac + +-echo "$as_me:28222: result: $CXX_NAME" >&5 ++echo "$as_me:28330: result: $CXX_NAME" >&5 + echo "${ECHO_T}$CXX_NAME" >&6 + + ### Construct the list of subdirectories for which we'll customize makefiles + ### with the appropriate compile-rules. + +-echo "$as_me:28228: checking for src modules" >&5 ++echo "$as_me:28336: checking for src modules" >&5 + echo $ECHO_N "checking for src modules... $ECHO_C" >&6 + + # dependencies and linker-arguments for test-programs +@@ -28294,7 +28402,7 @@ + fi + fi + done +-echo "$as_me:28297: result: $cf_cv_src_modules" >&5 ++echo "$as_me:28405: result: $cf_cv_src_modules" >&5 + echo "${ECHO_T}$cf_cv_src_modules" >&6 + + TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" +@@ -28455,7 +28563,7 @@ + (*-D_XOPEN_SOURCE_EXTENDED*) + test -n "$verbose" && echo " moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6 + +-echo "${as_me:-configure}:28458: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 ++echo "${as_me:-configure}:28566: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 + + CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED" + CPPFLAGS=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'` +@@ -28466,7 +28574,7 @@ + + # Help to automatically enable the extended curses features when using either + # the *-config or the ".pc" files by adding defines. +-echo "$as_me:28469: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5 ++echo "$as_me:28577: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5 + echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6 + PKG_CFLAGS= + for cf_loop1 in $CPPFLAGS_after_XOPEN +@@ -28482,7 +28590,7 @@ + done + test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1" + done +-echo "$as_me:28485: result: $PKG_CFLAGS" >&5 ++echo "$as_me:28593: result: $PKG_CFLAGS" >&5 + echo "${ECHO_T}$PKG_CFLAGS" >&6 + + # AC_CHECK_SIZEOF demands a literal parameter, no variables. So we do this. +@@ -28543,7 +28651,7 @@ + cf_filter_syms=$cf_dft_filter_syms + test -n "$verbose" && echo " will map symbols to ABI=$cf_cv_abi_version" 1>&6 + +-echo "${as_me:-configure}:28546: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 ++echo "${as_me:-configure}:28654: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 + + fi + +@@ -28570,7 +28678,7 @@ + + # This is used for the *-config script and *.pc data files. + +-echo "$as_me:28573: checking for linker search path" >&5 ++echo "$as_me:28681: checking for linker search path" >&5 + echo $ECHO_N "checking for linker search path... $ECHO_C" >&6 + if test "${cf_cv_ld_searchpath+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -28618,7 +28726,7 @@ + cf_pathlist="$cf_pathlist /lib /usr/lib" + ;; + (*) +- { echo "$as_me:28621: WARNING: problem with Solaris architecture" >&5 ++ { echo "$as_me:28729: WARNING: problem with Solaris architecture" >&5 + echo "$as_me: WARNING: problem with Solaris architecture" >&2;} + ;; + esac +@@ -28659,7 +28767,7 @@ + test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib + + fi +-echo "$as_me:28662: result: $cf_cv_ld_searchpath" >&5 ++echo "$as_me:28770: result: $cf_cv_ld_searchpath" >&5 + echo "${ECHO_T}$cf_cv_ld_searchpath" >&6 + + LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'` +@@ -28749,7 +28857,7 @@ + : "${CONFIG_STATUS=./config.status}" + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ echo "$as_me:28752: creating $CONFIG_STATUS" >&5 ++{ echo "$as_me:28860: creating $CONFIG_STATUS" >&5 + echo "$as_me: creating $CONFIG_STATUS" >&6;} + cat >"$CONFIG_STATUS" <<_ACEOF + #! $SHELL +@@ -28928,7 +29036,7 @@ + echo "$ac_cs_version"; exit 0 ;; + --he | --h) + # Conflict between --help and --header +- { { echo "$as_me:28931: error: ambiguous option: $1 ++ { { echo "$as_me:29039: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&5 + echo "$as_me: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&2;} +@@ -28947,7 +29055,7 @@ + ac_need_defaults=false;; + + # This is an error. +- -*) { { echo "$as_me:28950: error: unrecognized option: $1 ++ -*) { { echo "$as_me:29058: error: unrecognized option: $1 + Try \`$0 --help' for more information." >&5 + echo "$as_me: error: unrecognized option: $1 + Try \`$0 --help' for more information." >&2;} +@@ -29073,7 +29181,7 @@ + "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; + "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; +- *) { { echo "$as_me:29076: error: invalid argument: $ac_config_target" >&5 ++ *) { { echo "$as_me:29184: error: invalid argument: $ac_config_target" >&5 + echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +@@ -29585,7 +29693,7 @@ + esac + + if test x"$ac_file" != x-; then +- { echo "$as_me:29588: creating $ac_file" >&5 ++ { echo "$as_me:29696: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi +@@ -29603,7 +29711,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:29606: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:29714: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -29616,7 +29724,7 @@ + echo "$srcdir/$f" + else + # /dev/null tree +- { { echo "$as_me:29619: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:29727: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -29632,7 +29740,7 @@ + if test -n "$ac_seen"; then + ac_used=`grep '@datarootdir@' "$ac_item"` + if test -z "$ac_used"; then +- { echo "$as_me:29635: WARNING: datarootdir was used implicitly but not set: ++ { echo "$as_me:29743: WARNING: datarootdir was used implicitly but not set: + $ac_seen" >&5 + echo "$as_me: WARNING: datarootdir was used implicitly but not set: + $ac_seen" >&2;} +@@ -29641,7 +29749,7 @@ + fi + ac_seen=`grep '${datarootdir}' "$ac_item"` + if test -n "$ac_seen"; then +- { echo "$as_me:29644: WARNING: datarootdir was used explicitly but not set: ++ { echo "$as_me:29752: WARNING: datarootdir was used explicitly but not set: + $ac_seen" >&5 + echo "$as_me: WARNING: datarootdir was used explicitly but not set: + $ac_seen" >&2;} +@@ -29678,7 +29786,7 @@ + ac_init=`${EGREP-egrep} '[ ]*'$ac_name'[ ]*=' "$ac_file"` + if test -z "$ac_init"; then + ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` +- { echo "$as_me:29681: WARNING: Variable $ac_name is used but was not set: ++ { echo "$as_me:29789: WARNING: Variable $ac_name is used but was not set: + $ac_seen" >&5 + echo "$as_me: WARNING: Variable $ac_name is used but was not set: + $ac_seen" >&2;} +@@ -29689,7 +29797,7 @@ + ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out + if test -s $tmp/out; then + ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` +- { echo "$as_me:29692: WARNING: Some variables may not be substituted: ++ { echo "$as_me:29800: WARNING: Some variables may not be substituted: + $ac_seen" >&5 + echo "$as_me: WARNING: Some variables may not be substituted: + $ac_seen" >&2;} +@@ -29738,7 +29846,7 @@ + * ) ac_file_in=$ac_file.in ;; + esac + +- test x"$ac_file" != x- && { echo "$as_me:29741: creating $ac_file" >&5 ++ test x"$ac_file" != x- && { echo "$as_me:29849: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + + # First look for the input files in the build tree, otherwise in the +@@ -29749,7 +29857,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:29752: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:29860: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -29762,7 +29870,7 @@ + echo "$srcdir/$f" + else + # /dev/null tree +- { { echo "$as_me:29765: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:29873: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -29820,7 +29928,7 @@ + rm -f $tmp/in + if test x"$ac_file" != x-; then + if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then +- { echo "$as_me:29823: $ac_file is unchanged" >&5 ++ { echo "$as_me:29931: $ac_file is unchanged" >&5 + echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +@@ -30207,7 +30315,7 @@ + (cygdll|msysdll|mingw|msvcdll) + test "x$with_shared_cxx" = xno && test -n "$verbose" && echo " overriding CXX_MODEL to SHARED" 1>&6 + +-echo "${as_me:-configure}:30210: testing overriding CXX_MODEL to SHARED ..." 1>&5 ++echo "${as_me:-configure}:30318: testing overriding CXX_MODEL to SHARED ..." 1>&5 + + with_shared_cxx=yes + ;; +Index: configure.in +Prereq: 1.736 +--- ncurses-6.3-20211026+/configure.in 2021-07-18 22:17:57.000000000 +0000 ++++ ncurses-6.3-20211030/configure.in 2021-10-30 14:14:11.000000000 +0000 +@@ -29,7 +29,7 @@ + dnl + dnl Author: Thomas E. Dickey 1995-on + dnl +-dnl $Id: configure.in,v 1.736 2021/07/18 22:17:57 tom Exp $ ++dnl $Id: configure.in,v 1.737 2021/10/30 14:14:11 tom Exp $ + dnl Process this file with autoconf to produce a configure script. + dnl + dnl For additional information, see +@@ -38,7 +38,7 @@ + dnl + dnl --------------------------------------------------------------------------- + AC_PREREQ(2.52.20210101) +-AC_REVISION($Revision: 1.736 $) ++AC_REVISION($Revision: 1.737 $) + AC_INIT(ncurses/base/lib_initscr.c) + AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) + +@@ -1696,12 +1696,13 @@ + ### Checks for libraries. + case "$cf_cv_system_name" in + (*mingw32*|*mingw64*) ++ # Note: WINVER may be a problem with Windows 10 + if test "x$with_exp_win32" = xyes ; then +- CPPFLAGS="$CPPFLAGS -DWINVER=0x0600 -DWIN32_LEAN_AND_MEAN" ++ CPPFLAGS="$CPPFLAGS -DWINVER=0x0600 -DWIN32_LEAN_AND_MEAN" + else +- CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN" ++ CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN" + fi +- # Note: WINVER may be a problem with Windows 10 ++ CF_CHECK_LIBSSP + ;; + (*) + AC_CHECK_FUNC(gettimeofday, +Index: dist.mk +Prereq: 1.1446 +--- ncurses-6.3-20211026+/dist.mk 2021-10-26 07:49:17.000000000 +0000 ++++ ncurses-6.3-20211030/dist.mk 2021-10-30 08:33:19.000000000 +0000 +@@ -26,7 +26,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: dist.mk,v 1.1446 2021/10/26 07:49:17 tom Exp $ ++# $Id: dist.mk,v 1.1447 2021/10/30 08:33:19 tom Exp $ + # Makefile for creating ncurses distributions. + # + # This only needs to be used directly as a makefile by developers, but +@@ -38,7 +38,7 @@ + # These define the major/minor/patch versions of ncurses. + NCURSES_MAJOR = 6 + NCURSES_MINOR = 3 +-NCURSES_PATCH = 20211026 ++NCURSES_PATCH = 20211030 + + # We don't append the patch to the version, since this only applies to releases + VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) +Index: ncurses/base/lib_clreol.c +Prereq: 1.23 +--- ncurses-6.3-20211026+/ncurses/base/lib_clreol.c 2020-02-02 23:34:34.000000000 +0000 ++++ ncurses-6.3-20211030/ncurses/base/lib_clreol.c 2021-10-23 19:06:01.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2020 Thomas E. Dickey * ++ * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 1998-2001,2009 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -41,7 +41,7 @@ + + #include + +-MODULE_ID("$Id: lib_clreol.c,v 1.23 2020/02/02 23:34:34 tom Exp $") ++MODULE_ID("$Id: lib_clreol.c,v 1.24 2021/10/23 19:06:01 tom Exp $") + + NCURSES_EXPORT(int) + wclrtoeol(WINDOW *win) +@@ -61,7 +61,7 @@ + * If we have just wrapped the cursor, the clear applies to the + * new line, unless we are at the lower right corner. + */ +- if ((win->_flags & _WRAPPED) != 0 ++ if (IS_WRAPPED(win) != 0 + && y < win->_maxy) { + win->_flags &= ~_WRAPPED; + } +@@ -70,7 +70,7 @@ + * There's no point in clearing if we're not on a legal + * position, either. + */ +- if ((win->_flags & _WRAPPED) != 0 ++ if (IS_WRAPPED(win) + || y > win->_maxy + || x > win->_maxx) + returnCode(ERR); +Index: ncurses/base/lib_freeall.c +Prereq: 1.74 +--- ncurses-6.3-20211026+/ncurses/base/lib_freeall.c 2021-03-20 22:57:53.000000000 +0000 ++++ ncurses-6.3-20211030/ncurses/base/lib_freeall.c 2021-10-23 18:53:46.000000000 +0000 +@@ -40,7 +40,7 @@ + extern int malloc_errfd; /* FIXME */ + #endif + +-MODULE_ID("$Id: lib_freeall.c,v 1.74 2021/03/20 22:57:53 tom Exp $") ++MODULE_ID("$Id: lib_freeall.c,v 1.75 2021/10/23 18:53:46 tom Exp $") + + /* + * Free all ncurses data. This is used for testing only (there's no practical +@@ -92,7 +92,7 @@ + #endif + + if ((p != q) +- && (q_win->_flags & _SUBWIN) ++ && IS_SUBWIN(q_win) + && (p_win == q_win->_parent)) { + found = TRUE; + break; +Index: ncurses/base/lib_getch.c +Prereq: 1.142 +--- ncurses-6.3-20211026+/ncurses/base/lib_getch.c 2021-09-04 10:52:55.000000000 +0000 ++++ ncurses-6.3-20211030/ncurses/base/lib_getch.c 2021-10-23 17:06:20.000000000 +0000 +@@ -44,7 +44,7 @@ + #define NEED_KEY_EVENT + #include + +-MODULE_ID("$Id: lib_getch.c,v 1.142 2021/09/04 10:52:55 tom Exp $") ++MODULE_ID("$Id: lib_getch.c,v 1.143 2021/10/23 17:06:20 tom Exp $") + + #include + +@@ -404,7 +404,7 @@ + } else + #endif + if ((is_wintouched(win) || (win->_flags & _HASMOVED)) +- && !(win->_flags & _ISPAD)) { ++ && !IS_PAD(win)) { + wrefresh(win); + } + } +@@ -639,7 +639,7 @@ + * However, we provide the same visual result as Solaris, moving the + * cursor to the left. + */ +- if (sp->_echo && !(win->_flags & _ISPAD)) { ++ if (sp->_echo && !IS_PAD(win)) { + chtype backup = (chtype) ((ch == KEY_BACKSPACE) ? '\b' : ch); + if (backup < KEY_MIN) + wechochar(win, backup); +Index: ncurses/base/lib_getstr.c +Prereq: 1.37 +--- ncurses-6.3-20211026+/ncurses/base/lib_getstr.c 2021-09-04 10:29:15.000000000 +0000 ++++ ncurses-6.3-20211030/ncurses/base/lib_getstr.c 2021-10-23 19:02:39.000000000 +0000 +@@ -42,7 +42,7 @@ + #define NEED_KEY_EVENT + #include + +-MODULE_ID("$Id: lib_getstr.c,v 1.37 2021/09/04 10:29:15 tom Exp $") ++MODULE_ID("$Id: lib_getstr.c,v 1.38 2021/10/23 19:02:39 tom Exp $") + + /* + * This wipes out the last character, no matter whether it was a tab, control +@@ -161,7 +161,7 @@ + waddch(win, (chtype) ' '); + str = WipeOut(win, y, x, oldstr, str, oldecho); + continue; +- } else if (win->_flags & _WRAPPED) { ++ } else if (IS_WRAPPED(win)) { + /* + * If the last waddch forced a wrap & + * scroll, adjust our reference point +Index: ncurses/base/lib_mvwin.c +Prereq: 1.19 +--- ncurses-6.3-20211026+/ncurses/base/lib_mvwin.c 2020-02-02 23:34:34.000000000 +0000 ++++ ncurses-6.3-20211030/ncurses/base/lib_mvwin.c 2021-10-23 18:57:41.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2020 Thomas E. Dickey * ++ * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 1998-2009,2010 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -43,7 +43,7 @@ + + #include + +-MODULE_ID("$Id: lib_mvwin.c,v 1.19 2020/02/02 23:34:34 tom Exp $") ++MODULE_ID("$Id: lib_mvwin.c,v 1.20 2021/10/23 18:57:41 tom Exp $") + + NCURSES_EXPORT(int) + mvwin(WINDOW *win, int by, int bx) +@@ -54,7 +54,7 @@ + + T((T_CALLED("mvwin(%p,%d,%d)"), (void *) win, by, bx)); + +- if (!win || (win->_flags & _ISPAD)) ++ if (!win || IS_PAD(win)) + returnCode(ERR); + + /* +@@ -63,7 +63,7 @@ + */ + #if 0 + /* Copying subwindows is allowed, but it is expensive... */ +- if (win->_flags & _SUBWIN) { ++ if (IS_SUBWIN(win)) { + int err = ERR; + WINDOW *parent = win->_parent; + if (parent) { /* Now comes the complicated and costly part, you should really +Index: ncurses/base/lib_newwin.c +Prereq: 1.75 +--- ncurses-6.3-20211026+/ncurses/base/lib_newwin.c 2020-02-02 23:34:34.000000000 +0000 ++++ ncurses-6.3-20211030/ncurses/base/lib_newwin.c 2021-10-23 18:53:38.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2020 Thomas E. Dickey * ++ * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 1998-2016,2017 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -44,7 +44,7 @@ + #include + #include + +-MODULE_ID("$Id: lib_newwin.c,v 1.75 2020/02/02 23:34:34 tom Exp $") ++MODULE_ID("$Id: lib_newwin.c,v 1.76 2021/10/23 18:53:38 tom Exp $") + + #define window_is(name) ((sp)->_##name == win) + +@@ -114,7 +114,7 @@ + else + q->next = p->next; + +- if (!(win->_flags & _SUBWIN)) { ++ if (!IS_SUBWIN(win)) { + int i; + + for (i = 0; i <= win->_maxy; i++) +@@ -219,7 +219,7 @@ + if (num_columns == 0) + num_columns = orig->_maxx + 1 - begx; + +- if (orig->_flags & _ISPAD) ++ if (IS_PAD(orig)) + flags |= _ISPAD; + + win = NCURSES_SP_NAME(_nc_makenew) (NCURSES_SP_ARGx num_lines, num_columns, +Index: ncurses/base/lib_pad.c +Prereq: 1.49 +--- ncurses-6.3-20211026+/ncurses/base/lib_pad.c 2021-09-04 10:52:55.000000000 +0000 ++++ ncurses-6.3-20211030/ncurses/base/lib_pad.c 2021-10-23 22:57:27.000000000 +0000 +@@ -43,7 +43,7 @@ + + #include + +-MODULE_ID("$Id: lib_pad.c,v 1.49 2021/09/04 10:52:55 tom Exp $") ++MODULE_ID("$Id: lib_pad.c,v 1.50 2021/10/23 22:57:27 tom Exp $") + + NCURSES_EXPORT(WINDOW *) + NCURSES_SP_NAME(newpad) (NCURSES_SP_DCLx int l, int c) +@@ -90,7 +90,7 @@ + T((T_CALLED("subpad(%d, %d)"), l, c)); + + if (orig) { +- if (!(orig->_flags & _ISPAD) ++ if (!IS_PAD(orig) + || ((win = derwin(orig, l, c, begy, begx)) == NULL)) + returnWin(0); + } +@@ -146,7 +146,7 @@ + if (win == 0) + returnCode(ERR); + +- if (!(win->_flags & _ISPAD)) ++ if (!IS_PAD(win)) + returnCode(ERR); + + sp = _nc_screen_of(win); +@@ -334,7 +334,7 @@ + if (pad == 0) + returnCode(ERR); + +- if (!(pad->_flags & _ISPAD)) ++ if (!IS_PAD(pad)) + returnCode(wechochar(pad, ch)); + + waddch(pad, ch); +Index: ncurses/base/lib_screen.c +Prereq: 1.103 +--- ncurses-6.3-20211026+/ncurses/base/lib_screen.c 2021-10-18 22:40:48.000000000 +0000 ++++ ncurses-6.3-20211030/ncurses/base/lib_screen.c 2021-10-23 17:12:16.000000000 +0000 +@@ -42,7 +42,7 @@ + #define CUR SP_TERMTYPE + #endif + +-MODULE_ID("$Id: lib_screen.c,v 1.103 2021/10/18 22:40:48 tom Exp $") ++MODULE_ID("$Id: lib_screen.c,v 1.104 2021/10/23 17:12:16 tom Exp $") + + #define MAX_SIZE 0x3fff /* 16k is big enough for a window or pad */ + +@@ -542,7 +542,7 @@ + returnWin(0); + } + +- if (tmp._flags & _ISPAD) { ++ if (IS_PAD(&tmp)) { + nwin = NCURSES_SP_NAME(newpad) (NCURSES_SP_ARGx + tmp._maxy + 1, + tmp._maxx + 1); +@@ -587,7 +587,7 @@ + nwin->_regtop = tmp._regtop; + nwin->_regbottom = tmp._regbottom; + +- if (tmp._flags & _ISPAD) ++ if (IS_PAD(&tmp)) + nwin->_pad = tmp._pad; + + if (old_format) { +@@ -824,7 +824,7 @@ + attr_t attr; + + *buffer = '\0'; +- if (!strncmp(name, "_pad.", (size_t) 5) && !(win->_flags & _ISPAD)) { ++ if (!strncmp(name, "_pad.", (size_t) 5) && !IS_PAD(win)) { + continue; + } + switch (scr_params[y].type) { +Index: ncurses/base/lib_window.c +Prereq: 1.31 +--- ncurses-6.3-20211026+/ncurses/base/lib_window.c 2020-02-02 23:34:34.000000000 +0000 ++++ ncurses-6.3-20211030/ncurses/base/lib_window.c 2021-10-23 23:06:24.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2020 Thomas E. Dickey * ++ * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 1998-2010,2016 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -40,7 +40,7 @@ + + #include + +-MODULE_ID("$Id: lib_window.c,v 1.31 2020/02/02 23:34:34 tom Exp $") ++MODULE_ID("$Id: lib_window.c,v 1.32 2021/10/23 23:06:24 tom Exp $") + + NCURSES_EXPORT(void) + _nc_synchook(WINDOW *win) +@@ -130,7 +130,7 @@ + { + T((T_CALLED("wsyncdown(%p)"), (void *) win)); + +- if (win && win->_parent) { ++ if (win != NULL && win->_parent != NULL) { + WINDOW *pp = win->_parent; + int y; + +@@ -187,7 +187,7 @@ + SCREEN *sp = _nc_screen_of(win); + #endif + _nc_lock_global(curses); +- if (win->_flags & _ISPAD) { ++ if (IS_PAD(win)) { + nwin = NCURSES_SP_NAME(newpad) (NCURSES_SP_ARGx + win->_maxy + 1, + win->_maxx + 1); +@@ -238,7 +238,7 @@ + nwin->_regtop = win->_regtop; + nwin->_regbottom = win->_regbottom; + +- if (win->_flags & _ISPAD) ++ if (IS_PAD(win)) + nwin->_pad = win->_pad; + + linesize = (unsigned) (win->_maxx + 1) * sizeof(NCURSES_CH_T); +Index: ncurses/base/resizeterm.c +Prereq: 1.51 +--- ncurses-6.3-20211026+/ncurses/base/resizeterm.c 2021-09-04 10:54:35.000000000 +0000 ++++ ncurses-6.3-20211030/ncurses/base/resizeterm.c 2021-10-23 17:12:33.000000000 +0000 +@@ -46,7 +46,7 @@ + #define CUR SP_TERMTYPE + #endif + +-MODULE_ID("$Id: resizeterm.c,v 1.51 2021/09/04 10:54:35 tom Exp $") ++MODULE_ID("$Id: resizeterm.c,v 1.52 2021/10/23 17:12:33 tom Exp $") + + /* + * If we're trying to be reentrant, do not want any local statics. +@@ -293,7 +293,7 @@ + for (each_window(SP_PARM, wp)) { + WINDOW *win = &(wp->win); + +- if (!(win->_flags & _ISPAD)) { ++ if (!IS_PAD(win)) { + if (child_depth(win) == depth) { + found = TRUE; + if (adjust_window(win, ToLines, ToCols, +@@ -328,7 +328,7 @@ + for (each_window(SP_PARM, wp)) { + WINDOW *win = &(wp->win); + +- if (!(win->_flags & _ISPAD)) { ++ if (!IS_PAD(win)) { + if (parent_depth(win) == depth) { + found = TRUE; + if (adjust_window(win, ToLines, ToCols, +Index: ncurses/base/wresize.c +Prereq: 1.41 +--- ncurses-6.3-20211026+/ncurses/base/wresize.c 2020-04-18 21:01:00.000000000 +0000 ++++ ncurses-6.3-20211030/ncurses/base/wresize.c 2021-10-23 18:54:16.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2019,2020 Thomas E. Dickey * ++ * Copyright 2019-2020,2021 Thomas E. Dickey * + * Copyright 1998-2010,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -34,7 +34,7 @@ + + #include + +-MODULE_ID("$Id: wresize.c,v 1.41 2020/04/18 21:01:00 tom Exp $") ++MODULE_ID("$Id: wresize.c,v 1.42 2021/10/23 18:54:16 tom Exp $") + + static int + cleanup_lines(struct ldat *data, int length) +@@ -135,7 +135,7 @@ + && ToCols == size_x) + returnCode(OK); + +- if ((win->_flags & _SUBWIN)) { ++ if (IS_SUBWIN(win)) { + /* + * Check if the new limits will fit into the parent window's size. If + * not, do not resize. We could adjust the location of the subwindow, +@@ -169,7 +169,7 @@ + int end = ToCols; + NCURSES_CH_T *s; + +- if (!(win->_flags & _SUBWIN)) { ++ if (!IS_SUBWIN(win)) { + if (row <= size_y) { + if (ToCols != size_x) { + s = typeMalloc(NCURSES_CH_T, (unsigned) ToCols + 1); +Index: ncurses/curses.priv.h +Prereq: 1.646 +--- ncurses-6.3-20211026+/ncurses/curses.priv.h 2021-09-24 16:09:35.000000000 +0000 ++++ ncurses-6.3-20211030/ncurses/curses.priv.h 2021-10-23 16:13:16.000000000 +0000 +@@ -35,7 +35,7 @@ + ****************************************************************************/ + + /* +- * $Id: curses.priv.h,v 1.646 2021/09/24 16:09:35 tom Exp $ ++ * $Id: curses.priv.h,v 1.647 2021/10/23 16:13:16 tom Exp $ + * + * curses.priv.h + * +@@ -575,6 +575,10 @@ + + #endif + ++#define IS_SUBWIN(w) ((w)->_flags & _SUBWIN) ++#define IS_PAD(w) ((w)->_flags & _ISPAD) ++#define IS_WRAPPED(w) ((w)->_flags & _WRAPPED) ++ + #define HasHardTabs() (NonEmpty(clear_all_tabs) && NonEmpty(set_tab)) + + #define TR_MUTEX(data) _tracef("%s@%d: me:%08lX COUNT:%2u/%2d/%6d/%2d/%s%9u: " #data, \ +Index: ncurses/widechar/lib_get_wstr.c +Prereq: 1.19 +--- ncurses-6.3-20211026+/ncurses/widechar/lib_get_wstr.c 2021-09-04 10:29:59.000000000 +0000 ++++ ncurses-6.3-20211030/ncurses/widechar/lib_get_wstr.c 2021-10-23 19:02:59.000000000 +0000 +@@ -40,7 +40,7 @@ + + #include + +-MODULE_ID("$Id: lib_get_wstr.c,v 1.19 2021/09/04 10:29:59 tom Exp $") ++MODULE_ID("$Id: lib_get_wstr.c,v 1.20 2021/10/23 19:02:59 tom Exp $") + + static int + wadd_wint(WINDOW *win, wint_t *src) +@@ -183,7 +183,7 @@ + waddch(win, (chtype) ' '); + tmpstr = WipeOut(win, y, x, oldstr, tmpstr, oldecho); + continue; +- } else if (win->_flags & _WRAPPED) { ++ } else if (IS_WRAPPED(win)) { + /* + * If the last waddch forced a wrap & scroll, adjust our + * reference point for erasures. +Index: ncurses/widechar/lib_pecho_wchar.c +Prereq: 1.3 +--- ncurses-6.3-20211026+/ncurses/widechar/lib_pecho_wchar.c 2020-02-02 23:34:34.000000000 +0000 ++++ ncurses-6.3-20211030/ncurses/widechar/lib_pecho_wchar.c 2021-10-23 17:07:56.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2020 Thomas E. Dickey * ++ * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 2004,2009 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -33,7 +33,7 @@ + + #include + +-MODULE_ID("$Id: lib_pecho_wchar.c,v 1.3 2020/02/02 23:34:34 tom Exp $") ++MODULE_ID("$Id: lib_pecho_wchar.c,v 1.4 2021/10/23 17:07:56 tom Exp $") + + NCURSES_EXPORT(int) + pecho_wchar(WINDOW *pad, const cchar_t *wch) +@@ -43,7 +43,7 @@ + if (pad == 0) + returnCode(ERR); + +- if (!(pad->_flags & _ISPAD)) ++ if (!IS_PAD(pad)) + returnCode(wecho_wchar(pad, wch)); + + wadd_wch(pad, wch); +Index: package/debian-mingw/changelog +--- ncurses-6.3-20211026+/package/debian-mingw/changelog 2021-10-26 07:49:17.000000000 +0000 ++++ ncurses-6.3-20211030/package/debian-mingw/changelog 2021-10-30 08:33:19.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20211026) unstable; urgency=low ++ncurses6 (6.3+20211030) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Tue, 26 Oct 2021 03:49:17 -0400 ++ -- Thomas E. Dickey Sat, 30 Oct 2021 04:33:19 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian-mingw64/changelog +--- ncurses-6.3-20211026+/package/debian-mingw64/changelog 2021-10-26 07:49:17.000000000 +0000 ++++ ncurses-6.3-20211030/package/debian-mingw64/changelog 2021-10-30 08:33:19.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20211026) unstable; urgency=low ++ncurses6 (6.3+20211030) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Tue, 26 Oct 2021 03:49:17 -0400 ++ -- Thomas E. Dickey Sat, 30 Oct 2021 04:33:19 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian/changelog +--- ncurses-6.3-20211026+/package/debian/changelog 2021-10-26 07:49:17.000000000 +0000 ++++ ncurses-6.3-20211030/package/debian/changelog 2021-10-30 08:33:19.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20211026) unstable; urgency=low ++ncurses6 (6.3+20211030) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Tue, 26 Oct 2021 03:49:17 -0400 ++ -- Thomas E. Dickey Sat, 30 Oct 2021 04:33:19 -0400 + + ncurses6 (5.9-20120608) unstable; urgency=low + +Index: package/mingw-ncurses.nsi +Prereq: 1.488 +--- ncurses-6.3-20211026+/package/mingw-ncurses.nsi 2021-10-26 07:49:17.000000000 +0000 ++++ ncurses-6.3-20211030/package/mingw-ncurses.nsi 2021-10-30 08:33:19.000000000 +0000 +@@ -1,4 +1,4 @@ +-; $Id: mingw-ncurses.nsi,v 1.488 2021/10/26 07:49:17 tom Exp $ ++; $Id: mingw-ncurses.nsi,v 1.489 2021/10/30 08:33:19 tom Exp $ + + ; TODO add examples + ; TODO bump ABI to 6 +@@ -10,7 +10,7 @@ + !define VERSION_MAJOR "6" + !define VERSION_MINOR "3" + !define VERSION_YYYY "2021" +-!define VERSION_MMDD "1026" ++!define VERSION_MMDD "1030" + !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} + + !define MY_ABI "5" +Index: package/mingw-ncurses.spec +--- ncurses-6.3-20211026+/package/mingw-ncurses.spec 2021-10-26 07:49:17.000000000 +0000 ++++ ncurses-6.3-20211030/package/mingw-ncurses.spec 2021-10-30 08:33:19.000000000 +0000 +@@ -3,7 +3,7 @@ + Summary: shared libraries for terminal handling + Name: mingw32-ncurses6 + Version: 6.3 +-Release: 20211026 ++Release: 20211030 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncurses.spec +--- ncurses-6.3-20211026+/package/ncurses.spec 2021-10-26 07:49:17.000000000 +0000 ++++ ncurses-6.3-20211030/package/ncurses.spec 2021-10-30 08:33:19.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: shared libraries for terminal handling + Name: ncurses6 + Version: 6.3 +-Release: 20211026 ++Release: 20211030 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncursest.spec +--- ncurses-6.3-20211026+/package/ncursest.spec 2021-10-26 07:49:17.000000000 +0000 ++++ ncurses-6.3-20211030/package/ncursest.spec 2021-10-30 08:33:19.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: Curses library with POSIX thread support. + Name: ncursest6 + Version: 6.3 +-Release: 20211026 ++Release: 20211030 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz diff --git a/system/ncurses/ncurses-6.3-20211106.patch b/system/ncurses/ncurses-6.3-20211106.patch new file mode 100644 index 000000000..894a742d3 --- /dev/null +++ b/system/ncurses/ncurses-6.3-20211106.patch @@ -0,0 +1,404 @@ +# ncurses 6.3 - patch 20211106 - Thomas E. Dickey +# +# ------------------------------------------------------------------------------ +# +# Ncurses 6.3 is at +# ftp://ftp.invisible-island.net/ncurses/ +# https://invisible-mirror.net/archives/ncurses/ +# +# Patches for ncurses 6.3 can be found at +# ftp://ftp.invisible-island.net/ncurses//6.3 +# https://invisible-mirror.net/archives/ncurses//6.3 +# +# ------------------------------------------------------------------------------ +# ftp://ftp.invisible-island.net/ncurses//6.3/ncurses-6.3-20211106.patch.gz +# patch by Thomas E. Dickey +# created Sun Nov 7 00:20:43 UTC 2021 +# ------------------------------------------------------------------------------ +# NEWS | 10 +++++++++- +# VERSION | 2 +- +# dist.mk | 4 ++-- +# misc/Makefile.in | 4 ++-- +# ncurses/base/lib_delwin.c | 33 ++++++++++++++++++++------------- +# ncurses/base/lib_freeall.c | 5 ++++- +# ncurses/base/lib_refresh.c | 22 +++++++++++++++------- +# ncurses/tinfo/lib_cur_term.c | 7 +++++-- +# package/debian-mingw/changelog | 4 ++-- +# package/debian-mingw64/changelog | 4 ++-- +# package/debian/changelog | 4 ++-- +# package/mingw-ncurses.nsi | 4 ++-- +# package/mingw-ncurses.spec | 2 +- +# package/ncurses.spec | 2 +- +# package/ncursest.spec | 2 +- +# panel/p_new.c | 4 ++-- +# 16 files changed, 71 insertions(+), 42 deletions(-) +# ------------------------------------------------------------------------------ +Index: NEWS +Prereq: 1.3738 +--- ncurses-6.3-20211030+/NEWS 2021-10-31 00:31:12.000000000 +0000 ++++ ncurses-6.3-20211106/NEWS 2021-11-06 23:43:40.000000000 +0000 +@@ -26,7 +26,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: NEWS,v 1.3738 2021/10/31 00:31:12 tom Exp $ ++-- $Id: NEWS,v 1.3741 2021/11/06 23:43:40 tom Exp $ + ------------------------------------------------------------------------------- + + This is a log of changes that ncurses has gone through since Zeyd started +@@ -46,6 +46,14 @@ + Changes through 1.9.9e did not credit all contributions; + it is not possible to add this information. + ++20211106 ++ + improve check in misc/Makefile.in for empty $PKG_CONFIG_LIBDIR ++ + modify wnoutrefresh to call pnoutrefresh if its parameter is a pad, ++ rather than treating it as an error, and modify new_panel to permit ++ its window-parameter to be a pad (report by Giorgos Xou). ++ + fix a memory-leak in del_curterm (prompted by discussion with Bram ++ Moolenaar, cf: 20210821). ++ + 20211030 + + simplify some references to WINDOWS._flags using macros. + + add a "check" rule in Ada95 makefile, to help with test-packages. +Index: VERSION +--- ncurses-6.3-20211030+/VERSION 2021-10-30 08:33:19.000000000 +0000 ++++ ncurses-6.3-20211106/VERSION 2021-11-06 08:19:47.000000000 +0000 +@@ -1 +1 @@ +-5:0:10 6.3 20211030 ++5:0:10 6.3 20211106 +Index: dist.mk +Prereq: 1.1447 +--- ncurses-6.3-20211030+/dist.mk 2021-10-30 08:33:19.000000000 +0000 ++++ ncurses-6.3-20211106/dist.mk 2021-11-06 08:19:47.000000000 +0000 +@@ -26,7 +26,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: dist.mk,v 1.1447 2021/10/30 08:33:19 tom Exp $ ++# $Id: dist.mk,v 1.1448 2021/11/06 08:19:47 tom Exp $ + # Makefile for creating ncurses distributions. + # + # This only needs to be used directly as a makefile by developers, but +@@ -38,7 +38,7 @@ + # These define the major/minor/patch versions of ncurses. + NCURSES_MAJOR = 6 + NCURSES_MINOR = 3 +-NCURSES_PATCH = 20211030 ++NCURSES_PATCH = 20211106 + + # We don't append the patch to the version, since this only applies to releases + VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) +Index: misc/Makefile.in +Prereq: 1.78 +--- ncurses-6.3-20211030+/misc/Makefile.in 2021-07-03 19:07:50.000000000 +0000 ++++ ncurses-6.3-20211106/misc/Makefile.in 2021-11-06 23:36:12.000000000 +0000 +@@ -1,4 +1,4 @@ +-# $Id: Makefile.in,v 1.78 2021/07/03 19:07:50 tom Exp $ ++# $Id: Makefile.in,v 1.79 2021/11/06 23:36:12 tom Exp $ + ############################################################################## + # Copyright 2018-2020,2021 Thomas E. Dickey # + # Copyright 1998-2016,2017 Free Software Foundation, Inc. # +@@ -147,7 +147,7 @@ + # directory during this rule: + @MAKE_PC_FILES@install \ + @MAKE_PC_FILES@install.libs :: pc-files +-@MAKE_PC_FILES@ @$(SHELL) -c 'case "x$(DESTDIR)$(PKG_CONFIG_LIBDIR)" in \ ++@MAKE_PC_FILES@ @$(SHELL) -c 'case "x$(PKG_CONFIG_LIBDIR)" in \ + @MAKE_PC_FILES@ x/*) \ + @MAKE_PC_FILES@ mkdir -p $(DESTDIR)$(PKG_CONFIG_LIBDIR); \ + @MAKE_PC_FILES@ for name in $(PC_FILES); do \ +Index: ncurses/base/lib_delwin.c +Prereq: 1.21 +--- ncurses-6.3-20211030+/ncurses/base/lib_delwin.c 2020-02-02 23:34:34.000000000 +0000 ++++ ncurses-6.3-20211106/ncurses/base/lib_delwin.c 2021-11-06 21:54:14.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2020 Thomas E. Dickey * ++ * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 1998-2008,2009 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -43,24 +43,28 @@ + + #include + +-MODULE_ID("$Id: lib_delwin.c,v 1.21 2020/02/02 23:34:34 tom Exp $") ++MODULE_ID("$Id: lib_delwin.c,v 1.22 2021/11/06 21:54:14 tom Exp $") + + static bool + cannot_delete(WINDOW *win) + { + WINDOWLIST *p; + bool result = TRUE; ++ if (IS_PAD(win)) { ++ result = FALSE; ++ } else { + #ifdef USE_SP_WINDOWLIST +- SCREEN *sp = _nc_screen_of(win); ++ SCREEN *sp = _nc_screen_of(win); + #endif + +- for (each_window(SP_PARM, p)) { +- if (&(p->win) == win) { +- result = FALSE; +- } else if ((p->win._flags & _SUBWIN) != 0 +- && p->win._parent == win) { +- result = TRUE; +- break; ++ for (each_window(SP_PARM, p)) { ++ if (&(p->win) == win) { ++ result = FALSE; ++ } else if (IS_SUBWIN(&(p->win)) ++ && p->win._parent == win) { ++ result = TRUE; ++ break; ++ } + } + } + return result; +@@ -77,15 +81,18 @@ + if (win == 0 + || cannot_delete(win)) { + result = ERR; ++ } else if (IS_PAD(win)) { ++ win->_parent = NULL; ++ result = OK; + } else { + #if NCURSES_SP_FUNCS + SCREEN *sp = _nc_screen_of(win); + #endif +- if (win->_flags & _SUBWIN) ++ if (IS_SUBWIN(win)) { + touchwin(win->_parent); +- else if (CurScreen(SP_PARM) != 0) ++ } else if (CurScreen(SP_PARM) != 0) { + touchwin(CurScreen(SP_PARM)); +- ++ } + result = _nc_freewin(win); + } + _nc_unlock_global(curses); +Index: ncurses/base/lib_freeall.c +Prereq: 1.75 +--- ncurses-6.3-20211030+/ncurses/base/lib_freeall.c 2021-10-23 18:53:46.000000000 +0000 ++++ ncurses-6.3-20211106/ncurses/base/lib_freeall.c 2021-11-06 21:52:49.000000000 +0000 +@@ -40,7 +40,7 @@ + extern int malloc_errfd; /* FIXME */ + #endif + +-MODULE_ID("$Id: lib_freeall.c,v 1.75 2021/10/23 18:53:46 tom Exp $") ++MODULE_ID("$Id: lib_freeall.c,v 1.76 2021/11/06 21:52:49 tom Exp $") + + /* + * Free all ncurses data. This is used for testing only (there's no practical +@@ -78,6 +78,9 @@ + WINDOW *p_win = &(p->win); + bool found = FALSE; + ++ if (IS_PAD(p_win)) ++ continue; ++ + #ifndef USE_SP_WINDOWLIST + if (p->screen != SP_PARM) + continue; +Index: ncurses/base/lib_refresh.c +Prereq: 1.46 +--- ncurses-6.3-20211030+/ncurses/base/lib_refresh.c 2020-02-02 23:34:34.000000000 +0000 ++++ ncurses-6.3-20211106/ncurses/base/lib_refresh.c 2021-11-06 22:22:03.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2020 Thomas E. Dickey * ++ * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 1998-2010,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -43,7 +43,7 @@ + + #include + +-MODULE_ID("$Id: lib_refresh.c,v 1.46 2020/02/02 23:34:34 tom Exp $") ++MODULE_ID("$Id: lib_refresh.c,v 1.47 2021/11/06 22:22:03 tom Exp $") + + NCURSES_EXPORT(int) + wrefresh(WINDOW *win) +@@ -92,13 +92,21 @@ + + T((T_CALLED("wnoutrefresh(%p)"), (void *) win)); + +- /* +- * This function will break badly if we try to refresh a pad. +- */ +- if ((win == 0) +- || (win->_flags & _ISPAD)) ++ if (win == NULL) + returnCode(ERR); + ++ /* ++ * Handle pads as a special case. ++ */ ++ if (IS_PAD(win)) { ++ returnCode(pnoutrefresh(win, ++ win->_pad._pad_y, ++ win->_pad._pad_x, ++ win->_pad._pad_top, ++ win->_pad._pad_left, ++ win->_pad._pad_bottom, ++ win->_pad._pad_right)); ++ } + #ifdef TRACE + if (USE_TRACEF(TRACE_UPDATE)) { + _tracedump("...win", win); +Index: ncurses/tinfo/lib_cur_term.c +Prereq: 1.43 +--- ncurses-6.3-20211030+/ncurses/tinfo/lib_cur_term.c 2020-10-24 18:54:32.000000000 +0000 ++++ ncurses-6.3-20211106/ncurses/tinfo/lib_cur_term.c 2021-11-06 19:04:21.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2020 Thomas E. Dickey * ++ * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 1998-2016,2017 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -41,7 +41,7 @@ + #include /* ospeed */ + #include /* VALID_STRING */ + +-MODULE_ID("$Id: lib_cur_term.c,v 1.43 2020/10/24 18:54:32 tom Exp $") ++MODULE_ID("$Id: lib_cur_term.c,v 1.44 2021/11/06 19:04:21 tom Exp $") + + #undef CUR + #define CUR TerminalType(termp). +@@ -167,10 +167,13 @@ + /* discard memory used in tgetent's cache for this terminal */ + _nc_tgetent_leak(termp); + #endif ++ free(termp->tparm_state.fmt_buff); ++ free(termp->tparm_state.out_buff); + free(termp); + + rc = OK; + } ++ + returnCode(rc); + } + +Index: package/debian-mingw/changelog +--- ncurses-6.3-20211030+/package/debian-mingw/changelog 2021-10-30 08:33:19.000000000 +0000 ++++ ncurses-6.3-20211106/package/debian-mingw/changelog 2021-11-06 08:19:47.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20211030) unstable; urgency=low ++ncurses6 (6.3+20211106) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sat, 30 Oct 2021 04:33:19 -0400 ++ -- Thomas E. Dickey Sat, 06 Nov 2021 04:19:47 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian-mingw64/changelog +--- ncurses-6.3-20211030+/package/debian-mingw64/changelog 2021-10-30 08:33:19.000000000 +0000 ++++ ncurses-6.3-20211106/package/debian-mingw64/changelog 2021-11-06 08:19:47.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20211030) unstable; urgency=low ++ncurses6 (6.3+20211106) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sat, 30 Oct 2021 04:33:19 -0400 ++ -- Thomas E. Dickey Sat, 06 Nov 2021 04:19:47 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian/changelog +--- ncurses-6.3-20211030+/package/debian/changelog 2021-10-30 08:33:19.000000000 +0000 ++++ ncurses-6.3-20211106/package/debian/changelog 2021-11-06 08:19:47.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20211030) unstable; urgency=low ++ncurses6 (6.3+20211106) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sat, 30 Oct 2021 04:33:19 -0400 ++ -- Thomas E. Dickey Sat, 06 Nov 2021 04:19:47 -0400 + + ncurses6 (5.9-20120608) unstable; urgency=low + +Index: package/mingw-ncurses.nsi +Prereq: 1.489 +--- ncurses-6.3-20211030+/package/mingw-ncurses.nsi 2021-10-30 08:33:19.000000000 +0000 ++++ ncurses-6.3-20211106/package/mingw-ncurses.nsi 2021-11-06 08:19:47.000000000 +0000 +@@ -1,4 +1,4 @@ +-; $Id: mingw-ncurses.nsi,v 1.489 2021/10/30 08:33:19 tom Exp $ ++; $Id: mingw-ncurses.nsi,v 1.490 2021/11/06 08:19:47 tom Exp $ + + ; TODO add examples + ; TODO bump ABI to 6 +@@ -10,7 +10,7 @@ + !define VERSION_MAJOR "6" + !define VERSION_MINOR "3" + !define VERSION_YYYY "2021" +-!define VERSION_MMDD "1030" ++!define VERSION_MMDD "1106" + !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} + + !define MY_ABI "5" +Index: package/mingw-ncurses.spec +--- ncurses-6.3-20211030+/package/mingw-ncurses.spec 2021-10-30 08:33:19.000000000 +0000 ++++ ncurses-6.3-20211106/package/mingw-ncurses.spec 2021-11-06 08:19:47.000000000 +0000 +@@ -3,7 +3,7 @@ + Summary: shared libraries for terminal handling + Name: mingw32-ncurses6 + Version: 6.3 +-Release: 20211030 ++Release: 20211106 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncurses.spec +--- ncurses-6.3-20211030+/package/ncurses.spec 2021-10-30 08:33:19.000000000 +0000 ++++ ncurses-6.3-20211106/package/ncurses.spec 2021-11-06 08:19:47.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: shared libraries for terminal handling + Name: ncurses6 + Version: 6.3 +-Release: 20211030 ++Release: 20211106 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncursest.spec +--- ncurses-6.3-20211030+/package/ncursest.spec 2021-10-30 08:33:19.000000000 +0000 ++++ ncurses-6.3-20211106/package/ncursest.spec 2021-11-06 08:19:47.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: Curses library with POSIX thread support. + Name: ncursest6 + Version: 6.3 +-Release: 20211030 ++Release: 20211106 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: panel/p_new.c +Prereq: 1.23 +--- ncurses-6.3-20211030+/panel/p_new.c 2021-06-17 21:20:30.000000000 +0000 ++++ ncurses-6.3-20211106/panel/p_new.c 2021-10-23 15:12:06.000000000 +0000 +@@ -39,7 +39,7 @@ + */ + #include "panel.priv.h" + +-MODULE_ID("$Id: p_new.c,v 1.23 2021/06/17 21:20:30 tom Exp $") ++MODULE_ID("$Id: p_new.c,v 1.24 2021/10/23 15:12:06 tom Exp $") + + #ifdef TRACE + static char *stdscr_id; +@@ -117,7 +117,7 @@ + (void)root_panel(NCURSES_SP_ARG); + assert(_nc_stdscr_pseudo_panel); + +- if (!(win->_flags & _ISPAD) && (pan = AllocPanel("new_panel"))) ++ if ((pan = AllocPanel("new_panel")) != NULL) + { + pan->win = win; + pan->above = (PANEL *)0; diff --git a/system/ncurses/ncurses-6.3-20211113.patch b/system/ncurses/ncurses-6.3-20211113.patch new file mode 100644 index 000000000..50eb01e12 --- /dev/null +++ b/system/ncurses/ncurses-6.3-20211113.patch @@ -0,0 +1,23164 @@ +# ncurses 6.3 - patch 20211113 - Thomas E. Dickey +# +# ------------------------------------------------------------------------------ +# +# Ncurses 6.3 is at +# ftp://ftp.invisible-island.net/ncurses/ +# https://invisible-mirror.net/archives/ncurses/ +# https://ftp.gnu.org/gnu/ncurses/ +# +# Patches for ncurses 6.3 can be found at +# ftp://ftp.invisible-island.net/ncurses//6.3 +# https://invisible-mirror.net/archives/ncurses//6.3 +# +# ------------------------------------------------------------------------------ +# ftp://ftp.invisible-island.net/ncurses//6.3/ncurses-6.3-20211113.patch.gz +# patch by Thomas E. Dickey +# created Sun Nov 14 01:21:10 UTC 2021 +# ------------------------------------------------------------------------------ +# Ada95/aclocal.m4 | 17 +# Ada95/configure | 2399 ++++++++++---------- +# NEWS | 9 +# VERSION | 2 +# aclocal.m4 | 17 +# configure | 4271 ++++++++++++++++++------------------- +# dist.mk | 4 +# man/clear.1 | 8 +# misc/terminfo.src | 36 +# package/debian-mingw/changelog | 4 +# package/debian-mingw64/changelog | 4 +# package/debian/changelog | 4 +# package/mingw-ncurses.nsi | 4 +# package/mingw-ncurses.spec | 2 +# package/ncurses.spec | 2 +# package/ncursest.spec | 2 +# 16 files changed, 3414 insertions(+), 3371 deletions(-) +# ------------------------------------------------------------------------------ +Index: Ada95/aclocal.m4 +Prereq: 1.188 +--- ncurses-6.3-20211106+/Ada95/aclocal.m4 2021-10-30 20:49:04.000000000 +0000 ++++ ncurses-6.3-20211113/Ada95/aclocal.m4 2021-11-07 15:35:59.000000000 +0000 +@@ -29,7 +29,7 @@ + dnl + dnl Author: Thomas E. Dickey + dnl +-dnl $Id: aclocal.m4,v 1.188 2021/10/30 20:49:04 tom Exp $ ++dnl $Id: aclocal.m4,v 1.189 2021/11/07 15:35:59 tom Exp $ + dnl Macros used in NCURSES Ada95 auto-configuration script. + dnl + dnl These macros are maintained separately from NCURSES. The copyright on +@@ -4802,7 +4802,7 @@ + AC_SUBST($3)dnl + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_WITH_PKG_CONFIG_LIBDIR version: 16 updated: 2021/10/26 16:50:11 ++dnl CF_WITH_PKG_CONFIG_LIBDIR version: 17 updated: 2021/11/07 10:30:15 + dnl ------------------------- + dnl Allow the choice of the pkg-config library directory to be overridden. + dnl +@@ -4842,12 +4842,15 @@ + if test "x$PKG_CONFIG" != xnone + then + # works for pkg-config since version 0.24 (2009) +- cf_pkg_program=`echo "$PKG_CONFIG" | sed -e 's,^.*/,,'` +- cf_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null | tr : ' '` +- + # works for pkgconf since version 0.8.3 (2012) +- test -z "$cf_search_path" && \ +- cf_search_path=`pkgconf --variable=pc_path pkgconf 2>/dev/null | tr : ' '` ++ for cf_pkg_program in \ ++ `echo "$PKG_CONFIG" | sed -e 's,^.*/,,'` \ ++ pkg-config \ ++ pkgconf ++ do ++ cf_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null | tr : ' '` ++ test -n "$cf_search_path" && break ++ done + + # works for pkg-config since import in 2005 of original 2001 HP code. + test -z "$cf_search_path" && \ +Index: Ada95/configure +--- ncurses-6.3-20211106+/Ada95/configure 2021-10-30 20:52:59.000000000 +0000 ++++ ncurses-6.3-20211113/Ada95/configure 2021-11-07 15:36:29.000000000 +0000 +@@ -3304,12 +3304,15 @@ + if test "x$PKG_CONFIG" != xnone + then + # works for pkg-config since version 0.24 (2009) +- cf_pkg_program=`echo "$PKG_CONFIG" | sed -e 's,^.*/,,'` +- cf_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null | tr : ' '` +- + # works for pkgconf since version 0.8.3 (2012) +- test -z "$cf_search_path" && \ +- cf_search_path=`pkgconf --variable=pc_path pkgconf 2>/dev/null | tr : ' '` ++ for cf_pkg_program in \ ++ `echo "$PKG_CONFIG" | sed -e 's,^.*/,,'` \ ++ pkg-config \ ++ pkgconf ++ do ++ cf_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null | tr : ' '` ++ test -n "$cf_search_path" && break ++ done + + # works for pkg-config since import in 2005 of original 2001 HP code. + test -z "$cf_search_path" && \ +@@ -3323,7 +3326,7 @@ + "` + fi + +- echo "$as_me:3326: result: $cf_search_path" >&5 ++ echo "$as_me:3329: result: $cf_search_path" >&5 + echo "${ECHO_T}$cf_search_path" >&6 + + ;; +@@ -3331,7 +3334,7 @@ + ;; + esac + +-echo "$as_me:3334: checking for first directory" >&5 ++echo "$as_me:3337: checking for first directory" >&5 + echo $ECHO_N "checking for first directory... $ECHO_C" >&6 + cf_pkg_config_path=none + for cf_config in $cf_search_path +@@ -3342,7 +3345,7 @@ + break + fi + done +-echo "$as_me:3345: result: $cf_pkg_config_path" >&5 ++echo "$as_me:3348: result: $cf_pkg_config_path" >&5 + echo "${ECHO_T}$cf_pkg_config_path" >&6 + + if test "x$cf_pkg_config_path" != xnone ; then +@@ -3352,7 +3355,7 @@ + + if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path" + then +- echo "$as_me:3355: checking for workaround" >&5 ++ echo "$as_me:3358: checking for workaround" >&5 + echo $ECHO_N "checking for workaround... $ECHO_C" >&6 + if test "$prefix" = "NONE" ; then + cf_prefix="$ac_default_prefix" +@@ -3375,11 +3378,11 @@ + esac + done + test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup +- echo "$as_me:3378: result: $PKG_CONFIG_LIBDIR" >&5 ++ echo "$as_me:3381: result: $PKG_CONFIG_LIBDIR" >&5 + echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 + fi + +-echo "$as_me:3382: checking if you want to build test-programs" >&5 ++echo "$as_me:3385: checking if you want to build test-programs" >&5 + echo $ECHO_N "checking if you want to build test-programs... $ECHO_C" >&6 + + # Check whether --with-tests or --without-tests was given. +@@ -3389,10 +3392,10 @@ + else + cf_with_tests=yes + fi; +-echo "$as_me:3392: result: $cf_with_tests" >&5 ++echo "$as_me:3395: result: $cf_with_tests" >&5 + echo "${ECHO_T}$cf_with_tests" >&6 + +-echo "$as_me:3395: checking if we should assume mixed-case filenames" >&5 ++echo "$as_me:3398: checking if we should assume mixed-case filenames" >&5 + echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6 + + # Check whether --enable-mixed-case or --disable-mixed-case was given. +@@ -3402,11 +3405,11 @@ + else + enable_mixedcase=auto + fi; +-echo "$as_me:3405: result: $enable_mixedcase" >&5 ++echo "$as_me:3408: result: $enable_mixedcase" >&5 + echo "${ECHO_T}$enable_mixedcase" >&6 + if test "$enable_mixedcase" = "auto" ; then + +-echo "$as_me:3409: checking if filesystem supports mixed-case filenames" >&5 ++echo "$as_me:3412: checking if filesystem supports mixed-case filenames" >&5 + echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6 + if test "${cf_cv_mixedcase+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3433,7 +3436,7 @@ + fi + + fi +-echo "$as_me:3436: result: $cf_cv_mixedcase" >&5 ++echo "$as_me:3439: result: $cf_cv_mixedcase" >&5 + echo "${ECHO_T}$cf_cv_mixedcase" >&6 + test "$cf_cv_mixedcase" = yes && + cat >>confdefs.h <<\EOF +@@ -3451,7 +3454,7 @@ + fi + + # do this after mixed-case option (tags/TAGS is not as important as tic). +-echo "$as_me:3454: checking whether ${MAKE-make} sets \${MAKE}" >&5 ++echo "$as_me:3457: checking whether ${MAKE-make} sets \${MAKE}" >&5 + echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 + set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` + if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then +@@ -3471,16 +3474,16 @@ + rm -f conftest.make + fi + if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then +- echo "$as_me:3474: result: yes" >&5 ++ echo "$as_me:3477: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + SET_MAKE= + else +- echo "$as_me:3478: result: no" >&5 ++ echo "$as_me:3481: result: no" >&5 + echo "${ECHO_T}no" >&6 + SET_MAKE="MAKE=${MAKE-make}" + fi + +-echo "$as_me:3483: checking for \".PHONY\" make-support" >&5 ++echo "$as_me:3486: checking for \".PHONY\" make-support" >&5 + echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6 + if test "${cf_cv_make_PHONY+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3535,7 +3538,7 @@ + rm -rf conftest* + + fi +-echo "$as_me:3538: result: $cf_cv_make_PHONY" >&5 ++echo "$as_me:3541: result: $cf_cv_make_PHONY" >&5 + echo "${ECHO_T}$cf_cv_make_PHONY" >&6 + MAKE_NO_PHONY="#" + MAKE_PHONY="#" +@@ -3546,7 +3549,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:3549: checking for $ac_word" >&5 ++echo "$as_me:3552: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_CTAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3561,7 +3564,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_CTAGS="$ac_prog" +-echo "$as_me:3564: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3567: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3569,10 +3572,10 @@ + fi + CTAGS=$ac_cv_prog_CTAGS + if test -n "$CTAGS"; then +- echo "$as_me:3572: result: $CTAGS" >&5 ++ echo "$as_me:3575: result: $CTAGS" >&5 + echo "${ECHO_T}$CTAGS" >&6 + else +- echo "$as_me:3575: result: no" >&5 ++ echo "$as_me:3578: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3583,7 +3586,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:3586: checking for $ac_word" >&5 ++echo "$as_me:3589: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ETAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3598,7 +3601,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ETAGS="$ac_prog" +-echo "$as_me:3601: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3604: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3606,10 +3609,10 @@ + fi + ETAGS=$ac_cv_prog_ETAGS + if test -n "$ETAGS"; then +- echo "$as_me:3609: result: $ETAGS" >&5 ++ echo "$as_me:3612: result: $ETAGS" >&5 + echo "${ECHO_T}$ETAGS" >&6 + else +- echo "$as_me:3612: result: no" >&5 ++ echo "$as_me:3615: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3618,7 +3621,7 @@ + + # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args. + set dummy ${CTAGS:-ctags}; ac_word=$2 +-echo "$as_me:3621: checking for $ac_word" >&5 ++echo "$as_me:3624: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3633,7 +3636,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_MAKE_LOWER_TAGS="yes" +-echo "$as_me:3636: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3639: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3642,17 +3645,17 @@ + fi + MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS + if test -n "$MAKE_LOWER_TAGS"; then +- echo "$as_me:3645: result: $MAKE_LOWER_TAGS" >&5 ++ echo "$as_me:3648: result: $MAKE_LOWER_TAGS" >&5 + echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 + else +- echo "$as_me:3648: result: no" >&5 ++ echo "$as_me:3651: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + if test "$cf_cv_mixedcase" = yes ; then + # Extract the first word of "${ETAGS:-etags}", so it can be a program name with args. + set dummy ${ETAGS:-etags}; ac_word=$2 +-echo "$as_me:3655: checking for $ac_word" >&5 ++echo "$as_me:3658: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3667,7 +3670,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_MAKE_UPPER_TAGS="yes" +-echo "$as_me:3670: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3673: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3676,10 +3679,10 @@ + fi + MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS + if test -n "$MAKE_UPPER_TAGS"; then +- echo "$as_me:3679: result: $MAKE_UPPER_TAGS" >&5 ++ echo "$as_me:3682: result: $MAKE_UPPER_TAGS" >&5 + echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 + else +- echo "$as_me:3682: result: no" >&5 ++ echo "$as_me:3685: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3699,7 +3702,7 @@ + MAKE_LOWER_TAGS="#" + fi + +-echo "$as_me:3702: checking for makeflags variable" >&5 ++echo "$as_me:3705: checking for makeflags variable" >&5 + echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6 + if test "${cf_cv_makeflags+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3729,7 +3732,7 @@ + ;; + (*) + +-echo "${as_me:-configure}:3732: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 ++echo "${as_me:-configure}:3735: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 + + ;; + esac +@@ -3737,13 +3740,13 @@ + rm -f cf_makeflags.tmp + + fi +-echo "$as_me:3740: result: $cf_cv_makeflags" >&5 ++echo "$as_me:3743: result: $cf_cv_makeflags" >&5 + echo "${ECHO_T}$cf_cv_makeflags" >&6 + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. + set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +-echo "$as_me:3746: checking for $ac_word" >&5 ++echo "$as_me:3749: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3758,7 +3761,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" +-echo "$as_me:3761: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3764: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3766,10 +3769,10 @@ + fi + RANLIB=$ac_cv_prog_RANLIB + if test -n "$RANLIB"; then +- echo "$as_me:3769: result: $RANLIB" >&5 ++ echo "$as_me:3772: result: $RANLIB" >&5 + echo "${ECHO_T}$RANLIB" >&6 + else +- echo "$as_me:3772: result: no" >&5 ++ echo "$as_me:3775: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3778,7 +3781,7 @@ + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. + set dummy ranlib; ac_word=$2 +-echo "$as_me:3781: checking for $ac_word" >&5 ++echo "$as_me:3784: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3793,7 +3796,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_RANLIB="ranlib" +-echo "$as_me:3796: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3799: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3802,10 +3805,10 @@ + fi + ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB + if test -n "$ac_ct_RANLIB"; then +- echo "$as_me:3805: result: $ac_ct_RANLIB" >&5 ++ echo "$as_me:3808: result: $ac_ct_RANLIB" >&5 + echo "${ECHO_T}$ac_ct_RANLIB" >&6 + else +- echo "$as_me:3808: result: no" >&5 ++ echo "$as_me:3811: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3817,7 +3820,7 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. + set dummy ${ac_tool_prefix}ld; ac_word=$2 +-echo "$as_me:3820: checking for $ac_word" >&5 ++echo "$as_me:3823: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3832,7 +3835,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_LD="${ac_tool_prefix}ld" +-echo "$as_me:3835: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3838: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3840,10 +3843,10 @@ + fi + LD=$ac_cv_prog_LD + if test -n "$LD"; then +- echo "$as_me:3843: result: $LD" >&5 ++ echo "$as_me:3846: result: $LD" >&5 + echo "${ECHO_T}$LD" >&6 + else +- echo "$as_me:3846: result: no" >&5 ++ echo "$as_me:3849: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3852,7 +3855,7 @@ + ac_ct_LD=$LD + # Extract the first word of "ld", so it can be a program name with args. + set dummy ld; ac_word=$2 +-echo "$as_me:3855: checking for $ac_word" >&5 ++echo "$as_me:3858: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3867,7 +3870,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_LD="ld" +-echo "$as_me:3870: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3873: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3876,10 +3879,10 @@ + fi + ac_ct_LD=$ac_cv_prog_ac_ct_LD + if test -n "$ac_ct_LD"; then +- echo "$as_me:3879: result: $ac_ct_LD" >&5 ++ echo "$as_me:3882: result: $ac_ct_LD" >&5 + echo "${ECHO_T}$ac_ct_LD" >&6 + else +- echo "$as_me:3882: result: no" >&5 ++ echo "$as_me:3885: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3891,7 +3894,7 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. + set dummy ${ac_tool_prefix}ar; ac_word=$2 +-echo "$as_me:3894: checking for $ac_word" >&5 ++echo "$as_me:3897: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3906,7 +3909,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_AR="${ac_tool_prefix}ar" +-echo "$as_me:3909: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3912: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3914,10 +3917,10 @@ + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +- echo "$as_me:3917: result: $AR" >&5 ++ echo "$as_me:3920: result: $AR" >&5 + echo "${ECHO_T}$AR" >&6 + else +- echo "$as_me:3920: result: no" >&5 ++ echo "$as_me:3923: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3926,7 +3929,7 @@ + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. + set dummy ar; ac_word=$2 +-echo "$as_me:3929: checking for $ac_word" >&5 ++echo "$as_me:3932: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3941,7 +3944,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_AR="ar" +-echo "$as_me:3944: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3947: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3950,10 +3953,10 @@ + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +- echo "$as_me:3953: result: $ac_ct_AR" >&5 ++ echo "$as_me:3956: result: $ac_ct_AR" >&5 + echo "${ECHO_T}$ac_ct_AR" >&6 + else +- echo "$as_me:3956: result: no" >&5 ++ echo "$as_me:3959: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3965,7 +3968,7 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. + set dummy ${ac_tool_prefix}ar; ac_word=$2 +-echo "$as_me:3968: checking for $ac_word" >&5 ++echo "$as_me:3971: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3980,7 +3983,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_AR="${ac_tool_prefix}ar" +-echo "$as_me:3983: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3986: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3988,10 +3991,10 @@ + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +- echo "$as_me:3991: result: $AR" >&5 ++ echo "$as_me:3994: result: $AR" >&5 + echo "${ECHO_T}$AR" >&6 + else +- echo "$as_me:3994: result: no" >&5 ++ echo "$as_me:3997: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4000,7 +4003,7 @@ + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. + set dummy ar; ac_word=$2 +-echo "$as_me:4003: checking for $ac_word" >&5 ++echo "$as_me:4006: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4015,7 +4018,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_AR="ar" +-echo "$as_me:4018: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4021: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4024,10 +4027,10 @@ + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +- echo "$as_me:4027: result: $ac_ct_AR" >&5 ++ echo "$as_me:4030: result: $ac_ct_AR" >&5 + echo "${ECHO_T}$ac_ct_AR" >&6 + else +- echo "$as_me:4030: result: no" >&5 ++ echo "$as_me:4033: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4036,7 +4039,7 @@ + AR="$ac_cv_prog_AR" + fi + +-echo "$as_me:4039: checking for options to update archives" >&5 ++echo "$as_me:4042: checking for options to update archives" >&5 + echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6 + if test "${cf_cv_ar_flags+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4073,13 +4076,13 @@ + rm -f conftest.a + + cat >"conftest.$ac_ext" <&5 ++ if { (eval echo "$as_me:4082: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4082: \$? = $ac_status" >&5 ++ echo "$as_me:4085: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then + echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5 + $AR $ARFLAGS "$cf_ar_flags" conftest.a "conftest.$ac_cv_objext" 2>&5 1>/dev/null +@@ -4090,7 +4093,7 @@ + else + test -n "$verbose" && echo " cannot compile test-program" 1>&6 + +-echo "${as_me:-configure}:4093: testing cannot compile test-program ..." 1>&5 ++echo "${as_me:-configure}:4096: testing cannot compile test-program ..." 1>&5 + + break + fi +@@ -4100,7 +4103,7 @@ + esac + + fi +-echo "$as_me:4103: result: $cf_cv_ar_flags" >&5 ++echo "$as_me:4106: result: $cf_cv_ar_flags" >&5 + echo "${ECHO_T}$cf_cv_ar_flags" >&6 + + if test -n "$ARFLAGS" ; then +@@ -4111,17 +4114,17 @@ + ARFLAGS=$cf_cv_ar_flags + fi + +- echo "$as_me:4114: checking for PATH separator" >&5 ++ echo "$as_me:4117: checking for PATH separator" >&5 + echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6 + case "$cf_cv_system_name" in + (os2*) PATH_SEPARATOR=';' ;; + (*) ${PATH_SEPARATOR:=':'} ;; + esac + +- echo "$as_me:4121: result: $PATH_SEPARATOR" >&5 ++ echo "$as_me:4124: result: $PATH_SEPARATOR" >&5 + echo "${ECHO_T}$PATH_SEPARATOR" >&6 + +-echo "$as_me:4124: checking if you have specified an install-prefix" >&5 ++echo "$as_me:4127: checking if you have specified an install-prefix" >&5 + echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6 + + # Check whether --with-install-prefix or --without-install-prefix was given. +@@ -4134,7 +4137,7 @@ + ;; + esac + fi; +-echo "$as_me:4137: result: $DESTDIR" >&5 ++echo "$as_me:4140: result: $DESTDIR" >&5 + echo "${ECHO_T}$DESTDIR" >&6 + + ############################################################################### +@@ -4162,7 +4165,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:4165: checking for $ac_word" >&5 ++echo "$as_me:4168: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_BUILD_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4177,7 +4180,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_BUILD_CC="$ac_prog" +-echo "$as_me:4180: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4183: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4185,10 +4188,10 @@ + fi + BUILD_CC=$ac_cv_prog_BUILD_CC + if test -n "$BUILD_CC"; then +- echo "$as_me:4188: result: $BUILD_CC" >&5 ++ echo "$as_me:4191: result: $BUILD_CC" >&5 + echo "${ECHO_T}$BUILD_CC" >&6 + else +- echo "$as_me:4191: result: no" >&5 ++ echo "$as_me:4194: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4197,12 +4200,12 @@ + test -n "$BUILD_CC" || BUILD_CC="none" + + fi; +- echo "$as_me:4200: checking for native build C compiler" >&5 ++ echo "$as_me:4203: checking for native build C compiler" >&5 + echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6 +- echo "$as_me:4202: result: $BUILD_CC" >&5 ++ echo "$as_me:4205: result: $BUILD_CC" >&5 + echo "${ECHO_T}$BUILD_CC" >&6 + +- echo "$as_me:4205: checking for native build C preprocessor" >&5 ++ echo "$as_me:4208: checking for native build C preprocessor" >&5 + echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6 + + # Check whether --with-build-cpp or --without-build-cpp was given. +@@ -4212,10 +4215,10 @@ + else + BUILD_CPP='${BUILD_CC} -E' + fi; +- echo "$as_me:4215: result: $BUILD_CPP" >&5 ++ echo "$as_me:4218: result: $BUILD_CPP" >&5 + echo "${ECHO_T}$BUILD_CPP" >&6 + +- echo "$as_me:4218: checking for native build C flags" >&5 ++ echo "$as_me:4221: checking for native build C flags" >&5 + echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6 + + # Check whether --with-build-cflags or --without-build-cflags was given. +@@ -4223,10 +4226,10 @@ + withval="$with_build_cflags" + BUILD_CFLAGS="$withval" + fi; +- echo "$as_me:4226: result: $BUILD_CFLAGS" >&5 ++ echo "$as_me:4229: result: $BUILD_CFLAGS" >&5 + echo "${ECHO_T}$BUILD_CFLAGS" >&6 + +- echo "$as_me:4229: checking for native build C preprocessor-flags" >&5 ++ echo "$as_me:4232: checking for native build C preprocessor-flags" >&5 + echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6 + + # Check whether --with-build-cppflags or --without-build-cppflags was given. +@@ -4234,10 +4237,10 @@ + withval="$with_build_cppflags" + BUILD_CPPFLAGS="$withval" + fi; +- echo "$as_me:4237: result: $BUILD_CPPFLAGS" >&5 ++ echo "$as_me:4240: result: $BUILD_CPPFLAGS" >&5 + echo "${ECHO_T}$BUILD_CPPFLAGS" >&6 + +- echo "$as_me:4240: checking for native build linker-flags" >&5 ++ echo "$as_me:4243: checking for native build linker-flags" >&5 + echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6 + + # Check whether --with-build-ldflags or --without-build-ldflags was given. +@@ -4245,10 +4248,10 @@ + withval="$with_build_ldflags" + BUILD_LDFLAGS="$withval" + fi; +- echo "$as_me:4248: result: $BUILD_LDFLAGS" >&5 ++ echo "$as_me:4251: result: $BUILD_LDFLAGS" >&5 + echo "${ECHO_T}$BUILD_LDFLAGS" >&6 + +- echo "$as_me:4251: checking for native build linker-libraries" >&5 ++ echo "$as_me:4254: checking for native build linker-libraries" >&5 + echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6 + + # Check whether --with-build-libs or --without-build-libs was given. +@@ -4256,7 +4259,7 @@ + withval="$with_build_libs" + BUILD_LIBS="$withval" + fi; +- echo "$as_me:4259: result: $BUILD_LIBS" >&5 ++ echo "$as_me:4262: result: $BUILD_LIBS" >&5 + echo "${ECHO_T}$BUILD_LIBS" >&6 + + # this assumes we're on Unix. +@@ -4266,7 +4269,7 @@ + : ${BUILD_CC:='${CC}'} + + if { test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}'; } ; then +- { { echo "$as_me:4269: error: Cross-build requires two compilers. ++ { { echo "$as_me:4272: error: Cross-build requires two compilers. + Use --with-build-cc to specify the native compiler." >&5 + echo "$as_me: error: Cross-build requires two compilers. + Use --with-build-cc to specify the native compiler." >&2;} +@@ -4291,7 +4294,7 @@ + ### shared, for example. + cf_list_models="" + +-echo "$as_me:4294: checking if you want to build shared C-objects" >&5 ++echo "$as_me:4297: checking if you want to build shared C-objects" >&5 + echo $ECHO_N "checking if you want to build shared C-objects... $ECHO_C" >&6 + + # Check whether --with-shared or --without-shared was given. +@@ -4301,27 +4304,27 @@ + else + with_shared=no + fi; +-echo "$as_me:4304: result: $with_shared" >&5 ++echo "$as_me:4307: result: $with_shared" >&5 + echo "${ECHO_T}$with_shared" >&6 + test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared" + +-echo "$as_me:4308: checking for specified models" >&5 ++echo "$as_me:4311: checking for specified models" >&5 + echo $ECHO_N "checking for specified models... $ECHO_C" >&6 + test -z "$cf_list_models" && cf_list_models=normal +-echo "$as_me:4311: result: $cf_list_models" >&5 ++echo "$as_me:4314: result: $cf_list_models" >&5 + echo "${ECHO_T}$cf_list_models" >&6 + + ### Use the first model as the default, and save its suffix for use in building + ### up test-applications. +-echo "$as_me:4316: checking for default model" >&5 ++echo "$as_me:4319: checking for default model" >&5 + echo $ECHO_N "checking for default model... $ECHO_C" >&6 + DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'` +-echo "$as_me:4319: result: $DFT_LWR_MODEL" >&5 ++echo "$as_me:4322: result: $DFT_LWR_MODEL" >&5 + echo "${ECHO_T}$DFT_LWR_MODEL" >&6 + + DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + +-echo "$as_me:4324: checking for specific curses-directory" >&5 ++echo "$as_me:4327: checking for specific curses-directory" >&5 + echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6 + + # Check whether --with-curses-dir or --without-curses-dir was given. +@@ -4331,7 +4334,7 @@ + else + cf_cv_curses_dir=no + fi; +-echo "$as_me:4334: result: $cf_cv_curses_dir" >&5 ++echo "$as_me:4337: result: $cf_cv_curses_dir" >&5 + echo "${ECHO_T}$cf_cv_curses_dir" >&6 + + if test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" +@@ -4362,7 +4365,7 @@ + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:4365: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:4368: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -4398,7 +4401,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 4401 "configure" ++#line 4404 "configure" + #include "confdefs.h" + #include + int +@@ -4410,16 +4413,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:4413: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4416: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4416: \$? = $ac_status" >&5 ++ echo "$as_me:4419: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:4419: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4422: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4422: \$? = $ac_status" >&5 ++ echo "$as_me:4425: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -4436,7 +4439,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:4439: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:4442: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -4472,7 +4475,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me:-configure}:4475: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:4478: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -4487,13 +4490,13 @@ + cf_have_ncuconfig=no + + if test "x${PKG_CONFIG:=none}" != xnone; then +- echo "$as_me:4490: checking pkg-config for $cf_ncuconfig_root" >&5 ++ echo "$as_me:4493: checking pkg-config for $cf_ncuconfig_root" >&5 + echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6 + if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then +- echo "$as_me:4493: result: yes" >&5 ++ echo "$as_me:4496: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + +- echo "$as_me:4496: checking if the $cf_ncuconfig_root package files work" >&5 ++ echo "$as_me:4499: checking if the $cf_ncuconfig_root package files work" >&5 + echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 + cf_have_ncuconfig=unknown + +@@ -4626,7 +4629,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 4629 "configure" ++#line 4632 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -4638,37 +4641,37 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:4641: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:4644: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:4644: \$? = $ac_status" >&5 ++ echo "$as_me:4647: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:4647: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4650: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4650: \$? = $ac_status" >&5 ++ echo "$as_me:4653: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + if test "$cross_compiling" = yes; then + cf_test_ncuconfig=maybe + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 4656 "configure" ++#line 4659 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int main(void) + { const char *xx = curses_version(); return (xx == 0); } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:4663: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:4666: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:4666: \$? = $ac_status" >&5 ++ echo "$as_me:4669: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:4668: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4671: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4671: \$? = $ac_status" >&5 ++ echo "$as_me:4674: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_test_ncuconfig=yes + else +@@ -4842,7 +4845,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 4845 "configure" ++#line 4848 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -4854,37 +4857,37 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:4857: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:4860: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:4860: \$? = $ac_status" >&5 ++ echo "$as_me:4863: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:4863: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4866: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4866: \$? = $ac_status" >&5 ++ echo "$as_me:4869: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + if test "$cross_compiling" = yes; then + cf_have_ncuconfig=maybe + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 4872 "configure" ++#line 4875 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int main(void) + { const char *xx = curses_version(); return (xx == 0); } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:4879: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:4882: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:4882: \$? = $ac_status" >&5 ++ echo "$as_me:4885: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:4884: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4887: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4887: \$? = $ac_status" >&5 ++ echo "$as_me:4890: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_have_ncuconfig=yes + else +@@ -4901,7 +4904,7 @@ + cf_have_ncuconfig=no + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +- echo "$as_me:4904: result: $cf_have_ncuconfig" >&5 ++ echo "$as_me:4907: result: $cf_have_ncuconfig" >&5 + echo "${ECHO_T}$cf_have_ncuconfig" >&6 + test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes + if test "$cf_have_ncuconfig" != "yes" +@@ -4917,7 +4920,7 @@ + + NCURSES_CONFIG_PKG=$cf_ncuconfig_root + +-echo "$as_me:4920: checking for terminfo header" >&5 ++echo "$as_me:4923: checking for terminfo header" >&5 + echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 + if test "${cf_cv_term_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4935,7 +4938,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 4938 "configure" ++#line 4941 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -4950,16 +4953,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:4953: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4956: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4956: \$? = $ac_status" >&5 ++ echo "$as_me:4959: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:4959: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4962: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4962: \$? = $ac_status" >&5 ++ echo "$as_me:4965: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_term_header="$cf_test" +@@ -4975,7 +4978,7 @@ + done + + fi +-echo "$as_me:4978: result: $cf_cv_term_header" >&5 ++echo "$as_me:4981: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -5010,7 +5013,7 @@ + fi + + else +- echo "$as_me:5013: result: no" >&5 ++ echo "$as_me:5016: result: no" >&5 + echo "${ECHO_T}no" >&6 + NCURSES_CONFIG_PKG=none + fi +@@ -5026,7 +5029,7 @@ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-echo "$as_me:5029: checking for $ac_word" >&5 ++echo "$as_me:5032: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5041,7 +5044,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" +-echo "$as_me:5044: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5047: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5049,10 +5052,10 @@ + fi + NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG + if test -n "$NCURSES_CONFIG"; then +- echo "$as_me:5052: result: $NCURSES_CONFIG" >&5 ++ echo "$as_me:5055: result: $NCURSES_CONFIG" >&5 + echo "${ECHO_T}$NCURSES_CONFIG" >&6 + else +- echo "$as_me:5055: result: no" >&5 ++ echo "$as_me:5058: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5065,7 +5068,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:5068: checking for $ac_word" >&5 ++echo "$as_me:5071: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5080,7 +5083,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" +-echo "$as_me:5083: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5086: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5088,10 +5091,10 @@ + fi + ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG + if test -n "$ac_ct_NCURSES_CONFIG"; then +- echo "$as_me:5091: result: $ac_ct_NCURSES_CONFIG" >&5 ++ echo "$as_me:5094: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 + else +- echo "$as_me:5094: result: no" >&5 ++ echo "$as_me:5097: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5248,7 +5251,7 @@ + + # even with config script, some packages use no-override for curses.h + +-echo "$as_me:5251: checking if we have identified curses headers" >&5 ++echo "$as_me:5254: checking if we have identified curses headers" >&5 + echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 + if test "${cf_cv_ncurses_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5260,7 +5263,7 @@ + curses.h ncurses/curses.h + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 5263 "configure" ++#line 5266 "configure" + #include "confdefs.h" + #include <${cf_header}> + int +@@ -5272,16 +5275,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:5275: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5278: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5278: \$? = $ac_status" >&5 ++ echo "$as_me:5281: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:5281: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5284: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5284: \$? = $ac_status" >&5 ++ echo "$as_me:5287: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_header=$cf_header; break + else +@@ -5292,11 +5295,11 @@ + done + + fi +-echo "$as_me:5295: result: $cf_cv_ncurses_header" >&5 ++echo "$as_me:5298: result: $cf_cv_ncurses_header" >&5 + echo "${ECHO_T}$cf_cv_ncurses_header" >&6 + + if test "$cf_cv_ncurses_header" = none ; then +- { { echo "$as_me:5299: error: No curses header-files found" >&5 ++ { { echo "$as_me:5302: error: No curses header-files found" >&5 + echo "$as_me: error: No curses header-files found" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -5306,23 +5309,23 @@ + for ac_header in $cf_cv_ncurses_header + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:5309: checking for $ac_header" >&5 ++echo "$as_me:5312: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 5315 "configure" ++#line 5318 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:5319: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:5322: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:5325: \$? = $ac_status" >&5 ++ echo "$as_me:5328: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -5341,7 +5344,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:5344: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:5347: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF +-#line 5400 "configure" ++#line 5403 "configure" + #include "confdefs.h" + #include + int +@@ -5409,16 +5412,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:5412: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5415: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5415: \$? = $ac_status" >&5 ++ echo "$as_me:5418: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:5418: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5421: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5421: \$? = $ac_status" >&5 ++ echo "$as_me:5424: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -5435,7 +5438,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:5438: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:5441: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -5454,7 +5457,7 @@ + + } + +-echo "$as_me:5457: checking for $cf_ncuhdr_root header in include-path" >&5 ++echo "$as_me:5460: checking for $cf_ncuhdr_root header in include-path" >&5 + echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 + if test "${cf_cv_ncurses_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5466,7 +5469,7 @@ + do + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 5469 "configure" ++#line 5472 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -5490,16 +5493,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:5493: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5496: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5496: \$? = $ac_status" >&5 ++ echo "$as_me:5499: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:5499: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5502: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5502: \$? = $ac_status" >&5 ++ echo "$as_me:5505: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_h=$cf_header + +@@ -5514,14 +5517,14 @@ + done + + fi +-echo "$as_me:5517: result: $cf_cv_ncurses_h" >&5 ++echo "$as_me:5520: result: $cf_cv_ncurses_h" >&5 + echo "${ECHO_T}$cf_cv_ncurses_h" >&6 + + if test "$cf_cv_ncurses_h" != no ; then + cf_cv_ncurses_header=$cf_cv_ncurses_h + else + +-echo "$as_me:5524: checking for $cf_ncuhdr_root include-path" >&5 ++echo "$as_me:5527: checking for $cf_ncuhdr_root include-path" >&5 + echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 + if test "${cf_cv_ncurses_h2+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5642,7 +5645,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 5645 "configure" ++#line 5648 "configure" + #include "confdefs.h" + #include + int +@@ -5654,16 +5657,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:5657: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5660: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5660: \$? = $ac_status" >&5 ++ echo "$as_me:5663: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:5663: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5666: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5666: \$? = $ac_status" >&5 ++ echo "$as_me:5669: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -5680,7 +5683,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:5683: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:5686: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -5703,7 +5706,7 @@ + do + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 5706 "configure" ++#line 5709 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -5727,16 +5730,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:5730: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5733: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5733: \$? = $ac_status" >&5 ++ echo "$as_me:5736: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:5736: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5739: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5739: \$? = $ac_status" >&5 ++ echo "$as_me:5742: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_h2=$cf_header + +@@ -5757,12 +5760,12 @@ + CPPFLAGS="$cf_save2_CPPFLAGS" + test "$cf_cv_ncurses_h2" != no && break + done +- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5760: error: not found" >&5 ++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5763: error: not found" >&5 + echo "$as_me: error: not found" >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:5765: result: $cf_cv_ncurses_h2" >&5 ++echo "$as_me:5768: result: $cf_cv_ncurses_h2" >&5 + echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 + + cf_1st_incdir=`echo "$cf_cv_ncurses_h2" | sed -e 's%/[^/]*$%%'` +@@ -5798,7 +5801,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 5801 "configure" ++#line 5804 "configure" + #include "confdefs.h" + #include + int +@@ -5810,16 +5813,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:5813: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5816: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5816: \$? = $ac_status" >&5 ++ echo "$as_me:5819: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:5819: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5822: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5822: \$? = $ac_status" >&5 ++ echo "$as_me:5825: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -5836,7 +5839,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:5839: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:5842: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -5884,7 +5887,7 @@ + ;; + esac + +-echo "$as_me:5887: checking for terminfo header" >&5 ++echo "$as_me:5890: checking for terminfo header" >&5 + echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 + if test "${cf_cv_term_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5902,7 +5905,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 5905 "configure" ++#line 5908 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -5917,16 +5920,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:5920: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5923: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5923: \$? = $ac_status" >&5 ++ echo "$as_me:5926: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:5926: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5929: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5929: \$? = $ac_status" >&5 ++ echo "$as_me:5932: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_term_header="$cf_test" +@@ -5942,7 +5945,7 @@ + done + + fi +-echo "$as_me:5945: result: $cf_cv_term_header" >&5 ++echo "$as_me:5948: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -5980,7 +5983,7 @@ + #define NCURSES 1 + EOF + +-echo "$as_me:5983: checking for ncurses version" >&5 ++echo "$as_me:5986: checking for ncurses version" >&5 + echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 + if test "${cf_cv_ncurses_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6006,10 +6009,10 @@ + #endif + EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" +- { (eval echo "$as_me:6009: \"$cf_try\"") >&5 ++ { (eval echo "$as_me:6012: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? +- echo "$as_me:6012: \$? = $ac_status" >&5 ++ echo "$as_me:6015: \$? = $ac_status" >&5 + (exit "$ac_status"); } + if test -f conftest.out ; then + cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` +@@ -6019,7 +6022,7 @@ + + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6022 "configure" ++#line 6025 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -6044,15 +6047,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:6047: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6050: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6050: \$? = $ac_status" >&5 ++ echo "$as_me:6053: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:6052: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6055: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6055: \$? = $ac_status" >&5 ++ echo "$as_me:6058: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_ncurses_version=`cat $cf_tempfile` +@@ -6066,7 +6069,7 @@ + rm -f "$cf_tempfile" + + fi +-echo "$as_me:6069: result: $cf_cv_ncurses_version" >&5 ++echo "$as_me:6072: result: $cf_cv_ncurses_version" >&5 + echo "${ECHO_T}$cf_cv_ncurses_version" >&6 + test "$cf_cv_ncurses_version" = no || + cat >>confdefs.h <<\EOF +@@ -6079,7 +6082,7 @@ + # to link gpm. + cf_ncurses_LIBS="" + cf_ncurses_SAVE="$LIBS" +-echo "$as_me:6082: checking for Gpm_Open in -lgpm" >&5 ++echo "$as_me:6085: checking for Gpm_Open in -lgpm" >&5 + echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 + if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6087,7 +6090,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6090 "configure" ++#line 6093 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -6106,16 +6109,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6109: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6112: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6112: \$? = $ac_status" >&5 ++ echo "$as_me:6115: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6115: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6118: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6118: \$? = $ac_status" >&5 ++ echo "$as_me:6121: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gpm_Gpm_Open=yes + else +@@ -6126,10 +6129,10 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:6129: result: $ac_cv_lib_gpm_Gpm_Open" >&5 ++echo "$as_me:6132: result: $ac_cv_lib_gpm_Gpm_Open" >&5 + echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 + if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then +- echo "$as_me:6132: checking for initscr in -lgpm" >&5 ++ echo "$as_me:6135: checking for initscr in -lgpm" >&5 + echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 + if test "${ac_cv_lib_gpm_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6137,7 +6140,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6140 "configure" ++#line 6143 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -6156,16 +6159,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6159: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6162: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6162: \$? = $ac_status" >&5 ++ echo "$as_me:6165: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6165: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6168: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6168: \$? = $ac_status" >&5 ++ echo "$as_me:6171: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gpm_initscr=yes + else +@@ -6176,7 +6179,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:6179: result: $ac_cv_lib_gpm_initscr" >&5 ++echo "$as_me:6182: result: $ac_cv_lib_gpm_initscr" >&5 + echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 + if test "$ac_cv_lib_gpm_initscr" = yes; then + LIBS="$cf_ncurses_SAVE" +@@ -6191,7 +6194,7 @@ + # This is only necessary if you are linking against an obsolete + # version of ncurses (but it should do no harm, since it is static). + if test "$cf_nculib_root" = ncurses ; then +- echo "$as_me:6194: checking for tgoto in -lmytinfo" >&5 ++ echo "$as_me:6197: checking for tgoto in -lmytinfo" >&5 + echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 + if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6199,7 +6202,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmytinfo $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6202 "configure" ++#line 6205 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -6218,16 +6221,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6221: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6224: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6224: \$? = $ac_status" >&5 ++ echo "$as_me:6227: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6227: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6230: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6230: \$? = $ac_status" >&5 ++ echo "$as_me:6233: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_mytinfo_tgoto=yes + else +@@ -6238,7 +6241,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:6241: result: $ac_cv_lib_mytinfo_tgoto" >&5 ++echo "$as_me:6244: result: $ac_cv_lib_mytinfo_tgoto" >&5 + echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 + if test "$ac_cv_lib_mytinfo_tgoto" = yes; then + cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" +@@ -6287,13 +6290,13 @@ + + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' + cf_libdir="" +- echo "$as_me:6290: checking for initscr" >&5 ++ echo "$as_me:6293: checking for initscr" >&5 + echo $ECHO_N "checking for initscr... $ECHO_C" >&6 + if test "${ac_cv_func_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6296 "configure" ++#line 6299 "configure" + #include "confdefs.h" + #define initscr autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -6324,16 +6327,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6327: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6330: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6330: \$? = $ac_status" >&5 ++ echo "$as_me:6333: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6333: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6336: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6336: \$? = $ac_status" >&5 ++ echo "$as_me:6339: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_initscr=yes + else +@@ -6343,18 +6346,18 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:6346: result: $ac_cv_func_initscr" >&5 ++echo "$as_me:6349: result: $ac_cv_func_initscr" >&5 + echo "${ECHO_T}$ac_cv_func_initscr" >&6 + if test "$ac_cv_func_initscr" = yes; then + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' + else + + cf_save_LIBS="$LIBS" +- echo "$as_me:6353: checking for initscr in -l$cf_nculib_root" >&5 ++ echo "$as_me:6356: checking for initscr in -l$cf_nculib_root" >&5 + echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 + LIBS="-l$cf_nculib_root $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6357 "configure" ++#line 6360 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -6366,25 +6369,25 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6369: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6372: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6372: \$? = $ac_status" >&5 ++ echo "$as_me:6375: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6375: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6378: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6378: \$? = $ac_status" >&5 ++ echo "$as_me:6381: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then +- echo "$as_me:6380: result: yes" >&5 ++ echo "$as_me:6383: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' + + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 +-echo "$as_me:6387: result: no" >&5 ++echo "$as_me:6390: result: no" >&5 + echo "${ECHO_T}no" >&6 + + cf_search= +@@ -6452,11 +6455,11 @@ + + for cf_libdir in $cf_search + do +- echo "$as_me:6455: checking for -l$cf_nculib_root in $cf_libdir" >&5 ++ echo "$as_me:6458: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 + LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6459 "configure" ++#line 6462 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -6468,25 +6471,25 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6471: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6474: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6474: \$? = $ac_status" >&5 ++ echo "$as_me:6477: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6477: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6480: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6480: \$? = $ac_status" >&5 ++ echo "$as_me:6483: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then +- echo "$as_me:6482: result: yes" >&5 ++ echo "$as_me:6485: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' + break + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 +-echo "$as_me:6489: result: no" >&5 ++echo "$as_me:6492: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_save_LIBS" + fi +@@ -6501,7 +6504,7 @@ + eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" + + if test "$cf_found_library" = no ; then +- { { echo "$as_me:6504: error: Cannot link $cf_nculib_root library" >&5 ++ { { echo "$as_me:6507: error: Cannot link $cf_nculib_root library" >&5 + echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -6509,7 +6512,7 @@ + fi + + if test -n "$cf_ncurses_LIBS" ; then +- echo "$as_me:6512: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 ++ echo "$as_me:6515: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 + cf_ncurses_SAVE="$LIBS" + for p in $cf_ncurses_LIBS ; do +@@ -6519,7 +6522,7 @@ + fi + done + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6522 "configure" ++#line 6525 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -6531,23 +6534,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6534: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6537: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6537: \$? = $ac_status" >&5 ++ echo "$as_me:6540: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6540: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6543: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6543: \$? = $ac_status" >&5 ++ echo "$as_me:6546: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then +- echo "$as_me:6545: result: yes" >&5 ++ echo "$as_me:6548: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 +-echo "$as_me:6550: result: no" >&5 ++echo "$as_me:6553: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_ncurses_SAVE" + fi +@@ -6565,7 +6568,7 @@ + NCURSES_CONFIG=none + fi + +-echo "$as_me:6568: checking if you want wide-character code" >&5 ++echo "$as_me:6571: checking if you want wide-character code" >&5 + echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6 + + # Check whether --enable-widec or --disable-widec was given. +@@ -6575,30 +6578,30 @@ + else + with_widec=no + fi; +-echo "$as_me:6578: result: $with_widec" >&5 ++echo "$as_me:6581: result: $with_widec" >&5 + echo "${ECHO_T}$with_widec" >&6 + if test "$with_widec" = yes ; then + + for ac_header in wchar.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:6585: checking for $ac_header" >&5 ++echo "$as_me:6588: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6591 "configure" ++#line 6594 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:6595: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:6598: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:6601: \$? = $ac_status" >&5 ++ echo "$as_me:6604: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -6617,7 +6620,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:6620: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:6623: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:6633: checking for multibyte character support" >&5 + echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6 + if test "${cf_cv_utf8_lib+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6635,7 +6638,7 @@ + + cf_save_LIBS="$LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6638 "configure" ++#line 6641 "configure" + #include "confdefs.h" + + #include +@@ -6653,16 +6656,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6656: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6659: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6659: \$? = $ac_status" >&5 ++ echo "$as_me:6662: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6662: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6665: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6665: \$? = $ac_status" >&5 ++ echo "$as_me:6668: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_utf8_lib=yes + else +@@ -6674,12 +6677,12 @@ + cf_cv_header_path_utf8= + cf_cv_library_path_utf8= + +-echo "${as_me:-configure}:6677: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:6680: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6682 "configure" ++#line 6685 "configure" + #include "confdefs.h" + + #include +@@ -6692,16 +6695,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6695: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6698: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6698: \$? = $ac_status" >&5 ++ echo "$as_me:6701: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6701: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6704: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6704: \$? = $ac_status" >&5 ++ echo "$as_me:6707: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_find_linkage_utf8=yes +@@ -6715,7 +6718,7 @@ + LIBS="-lutf8 $cf_save_LIBS" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6718 "configure" ++#line 6721 "configure" + #include "confdefs.h" + + #include +@@ -6728,16 +6731,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6731: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6734: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6734: \$? = $ac_status" >&5 ++ echo "$as_me:6737: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6737: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6740: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6740: \$? = $ac_status" >&5 ++ echo "$as_me:6743: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_find_linkage_utf8=yes +@@ -6754,9 +6757,9 @@ + + test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 + +-echo "${as_me:-configure}:6757: testing find linkage for utf8 library ..." 1>&5 ++echo "${as_me:-configure}:6760: testing find linkage for utf8 library ..." 1>&5 + +-echo "${as_me:-configure}:6759: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:6762: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_CPPFLAGS="$CPPFLAGS" + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -6847,7 +6850,7 @@ + if test -d "$cf_cv_header_path_utf8" ; then + test -n "$verbose" && echo " ... testing $cf_cv_header_path_utf8" 1>&6 + +-echo "${as_me:-configure}:6850: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:6853: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 + + CPPFLAGS="$cf_save_CPPFLAGS" + +@@ -6855,7 +6858,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6858 "configure" ++#line 6861 "configure" + #include "confdefs.h" + + #include +@@ -6868,21 +6871,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:6871: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6874: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6874: \$? = $ac_status" >&5 ++ echo "$as_me:6877: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:6877: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6880: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6880: \$? = $ac_status" >&5 ++ echo "$as_me:6883: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + test -n "$verbose" && echo " ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6 + +-echo "${as_me:-configure}:6885: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:6888: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 + + cf_cv_find_linkage_utf8=maybe + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -6900,7 +6903,7 @@ + + if test "$cf_cv_find_linkage_utf8" = maybe ; then + +-echo "${as_me:-configure}:6903: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:6906: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + cf_save_LDFLAGS="$LDFLAGS" +@@ -6975,13 +6978,13 @@ + if test -d "$cf_cv_library_path_utf8" ; then + test -n "$verbose" && echo " ... testing $cf_cv_library_path_utf8" 1>&6 + +-echo "${as_me:-configure}:6978: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:6981: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 + + CPPFLAGS="$cf_test_CPPFLAGS" + LIBS="-lutf8 $cf_save_LIBS" + LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6984 "configure" ++#line 6987 "configure" + #include "confdefs.h" + + #include +@@ -6994,21 +6997,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6997: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7000: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7000: \$? = $ac_status" >&5 ++ echo "$as_me:7003: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7003: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7006: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7006: \$? = $ac_status" >&5 ++ echo "$as_me:7009: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + test -n "$verbose" && echo " ... found utf8 library in $cf_cv_library_path_utf8" 1>&6 + +-echo "${as_me:-configure}:7011: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:7014: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 + + cf_cv_find_linkage_utf8=yes + cf_cv_library_file_utf8="-lutf8" +@@ -7050,7 +7053,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:7053: result: $cf_cv_utf8_lib" >&5 ++echo "$as_me:7056: result: $cf_cv_utf8_lib" >&5 + echo "${ECHO_T}$cf_cv_utf8_lib" >&6 + + # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between +@@ -7088,7 +7091,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7091 "configure" ++#line 7094 "configure" + #include "confdefs.h" + #include + int +@@ -7100,16 +7103,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:7103: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:7106: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7106: \$? = $ac_status" >&5 ++ echo "$as_me:7109: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:7109: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7112: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7112: \$? = $ac_status" >&5 ++ echo "$as_me:7115: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -7126,7 +7129,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:7129: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:7132: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -7162,7 +7165,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me:-configure}:7165: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:7168: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -7192,13 +7195,13 @@ + cf_have_ncuconfig=no + + if test "x${PKG_CONFIG:=none}" != xnone; then +- echo "$as_me:7195: checking pkg-config for $cf_ncuconfig_root" >&5 ++ echo "$as_me:7198: checking pkg-config for $cf_ncuconfig_root" >&5 + echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6 + if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then +- echo "$as_me:7198: result: yes" >&5 ++ echo "$as_me:7201: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + +- echo "$as_me:7201: checking if the $cf_ncuconfig_root package files work" >&5 ++ echo "$as_me:7204: checking if the $cf_ncuconfig_root package files work" >&5 + echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 + cf_have_ncuconfig=unknown + +@@ -7331,7 +7334,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7334 "configure" ++#line 7337 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -7343,37 +7346,37 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7346: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7349: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7349: \$? = $ac_status" >&5 ++ echo "$as_me:7352: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7352: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7355: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7355: \$? = $ac_status" >&5 ++ echo "$as_me:7358: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + if test "$cross_compiling" = yes; then + cf_test_ncuconfig=maybe + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7361 "configure" ++#line 7364 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int main(void) + { const char *xx = curses_version(); return (xx == 0); } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:7368: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7371: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7371: \$? = $ac_status" >&5 ++ echo "$as_me:7374: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:7373: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7376: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7376: \$? = $ac_status" >&5 ++ echo "$as_me:7379: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_test_ncuconfig=yes + else +@@ -7547,7 +7550,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7550 "configure" ++#line 7553 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -7559,37 +7562,37 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7562: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7565: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7565: \$? = $ac_status" >&5 ++ echo "$as_me:7568: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7568: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7571: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7571: \$? = $ac_status" >&5 ++ echo "$as_me:7574: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + if test "$cross_compiling" = yes; then + cf_have_ncuconfig=maybe + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7577 "configure" ++#line 7580 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int main(void) + { const char *xx = curses_version(); return (xx == 0); } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:7584: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7587: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7587: \$? = $ac_status" >&5 ++ echo "$as_me:7590: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:7589: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7592: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7592: \$? = $ac_status" >&5 ++ echo "$as_me:7595: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_have_ncuconfig=yes + else +@@ -7606,7 +7609,7 @@ + cf_have_ncuconfig=no + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +- echo "$as_me:7609: result: $cf_have_ncuconfig" >&5 ++ echo "$as_me:7612: result: $cf_have_ncuconfig" >&5 + echo "${ECHO_T}$cf_have_ncuconfig" >&6 + test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes + if test "$cf_have_ncuconfig" != "yes" +@@ -7622,7 +7625,7 @@ + + NCURSES_CONFIG_PKG=$cf_ncuconfig_root + +-echo "$as_me:7625: checking for terminfo header" >&5 ++echo "$as_me:7628: checking for terminfo header" >&5 + echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 + if test "${cf_cv_term_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7640,7 +7643,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7643 "configure" ++#line 7646 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -7655,16 +7658,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:7658: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:7661: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7661: \$? = $ac_status" >&5 ++ echo "$as_me:7664: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:7664: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7667: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7667: \$? = $ac_status" >&5 ++ echo "$as_me:7670: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_term_header="$cf_test" +@@ -7680,7 +7683,7 @@ + done + + fi +-echo "$as_me:7683: result: $cf_cv_term_header" >&5 ++echo "$as_me:7686: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -7715,7 +7718,7 @@ + fi + + else +- echo "$as_me:7718: result: no" >&5 ++ echo "$as_me:7721: result: no" >&5 + echo "${ECHO_T}no" >&6 + NCURSES_CONFIG_PKG=none + fi +@@ -7731,7 +7734,7 @@ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-echo "$as_me:7734: checking for $ac_word" >&5 ++echo "$as_me:7737: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7746,7 +7749,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" +-echo "$as_me:7749: found $ac_dir/$ac_word" >&5 ++echo "$as_me:7752: found $ac_dir/$ac_word" >&5 + break + done + +@@ -7754,10 +7757,10 @@ + fi + NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG + if test -n "$NCURSES_CONFIG"; then +- echo "$as_me:7757: result: $NCURSES_CONFIG" >&5 ++ echo "$as_me:7760: result: $NCURSES_CONFIG" >&5 + echo "${ECHO_T}$NCURSES_CONFIG" >&6 + else +- echo "$as_me:7760: result: no" >&5 ++ echo "$as_me:7763: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -7770,7 +7773,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:7773: checking for $ac_word" >&5 ++echo "$as_me:7776: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7785,7 +7788,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" +-echo "$as_me:7788: found $ac_dir/$ac_word" >&5 ++echo "$as_me:7791: found $ac_dir/$ac_word" >&5 + break + done + +@@ -7793,10 +7796,10 @@ + fi + ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG + if test -n "$ac_ct_NCURSES_CONFIG"; then +- echo "$as_me:7796: result: $ac_ct_NCURSES_CONFIG" >&5 ++ echo "$as_me:7799: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 + else +- echo "$as_me:7799: result: no" >&5 ++ echo "$as_me:7802: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -7953,7 +7956,7 @@ + + # even with config script, some packages use no-override for curses.h + +-echo "$as_me:7956: checking if we have identified curses headers" >&5 ++echo "$as_me:7959: checking if we have identified curses headers" >&5 + echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 + if test "${cf_cv_ncurses_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7965,7 +7968,7 @@ + curses.h ncursesw/curses.h + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7968 "configure" ++#line 7971 "configure" + #include "confdefs.h" + #include <${cf_header}> + int +@@ -7977,16 +7980,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:7980: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:7983: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7983: \$? = $ac_status" >&5 ++ echo "$as_me:7986: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:7986: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7989: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7989: \$? = $ac_status" >&5 ++ echo "$as_me:7992: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_header=$cf_header; break + else +@@ -7997,11 +8000,11 @@ + done + + fi +-echo "$as_me:8000: result: $cf_cv_ncurses_header" >&5 ++echo "$as_me:8003: result: $cf_cv_ncurses_header" >&5 + echo "${ECHO_T}$cf_cv_ncurses_header" >&6 + + if test "$cf_cv_ncurses_header" = none ; then +- { { echo "$as_me:8004: error: No curses header-files found" >&5 ++ { { echo "$as_me:8007: error: No curses header-files found" >&5 + echo "$as_me: error: No curses header-files found" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -8011,23 +8014,23 @@ + for ac_header in $cf_cv_ncurses_header + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:8014: checking for $ac_header" >&5 ++echo "$as_me:8017: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8020 "configure" ++#line 8023 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:8024: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:8027: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:8030: \$? = $ac_status" >&5 ++ echo "$as_me:8033: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -8046,7 +8049,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:8049: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:8052: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF +-#line 8105 "configure" ++#line 8108 "configure" + #include "confdefs.h" + #include + int +@@ -8114,16 +8117,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:8117: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8120: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8120: \$? = $ac_status" >&5 ++ echo "$as_me:8123: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:8123: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8126: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8126: \$? = $ac_status" >&5 ++ echo "$as_me:8129: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -8140,7 +8143,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:8143: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:8146: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -8159,7 +8162,7 @@ + + } + +-echo "$as_me:8162: checking for $cf_ncuhdr_root header in include-path" >&5 ++echo "$as_me:8165: checking for $cf_ncuhdr_root header in include-path" >&5 + echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 + if test "${cf_cv_ncurses_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8171,7 +8174,7 @@ + do + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8174 "configure" ++#line 8177 "configure" + #include "confdefs.h" + + #define _XOPEN_SOURCE_EXTENDED +@@ -8203,16 +8206,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:8206: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8209: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8209: \$? = $ac_status" >&5 ++ echo "$as_me:8212: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:8212: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8215: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8215: \$? = $ac_status" >&5 ++ echo "$as_me:8218: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_h=$cf_header + +@@ -8227,14 +8230,14 @@ + done + + fi +-echo "$as_me:8230: result: $cf_cv_ncurses_h" >&5 ++echo "$as_me:8233: result: $cf_cv_ncurses_h" >&5 + echo "${ECHO_T}$cf_cv_ncurses_h" >&6 + + if test "$cf_cv_ncurses_h" != no ; then + cf_cv_ncurses_header=$cf_cv_ncurses_h + else + +-echo "$as_me:8237: checking for $cf_ncuhdr_root include-path" >&5 ++echo "$as_me:8240: checking for $cf_ncuhdr_root include-path" >&5 + echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 + if test "${cf_cv_ncurses_h2+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8355,7 +8358,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8358 "configure" ++#line 8361 "configure" + #include "confdefs.h" + #include + int +@@ -8367,16 +8370,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:8370: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8373: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8373: \$? = $ac_status" >&5 ++ echo "$as_me:8376: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:8376: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8379: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8379: \$? = $ac_status" >&5 ++ echo "$as_me:8382: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -8393,7 +8396,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:8396: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:8399: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -8416,7 +8419,7 @@ + do + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8419 "configure" ++#line 8422 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -8440,16 +8443,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:8443: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8446: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8446: \$? = $ac_status" >&5 ++ echo "$as_me:8449: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:8449: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8452: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8452: \$? = $ac_status" >&5 ++ echo "$as_me:8455: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_h2=$cf_header + +@@ -8470,12 +8473,12 @@ + CPPFLAGS="$cf_save2_CPPFLAGS" + test "$cf_cv_ncurses_h2" != no && break + done +- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8473: error: not found" >&5 ++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8476: error: not found" >&5 + echo "$as_me: error: not found" >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:8478: result: $cf_cv_ncurses_h2" >&5 ++echo "$as_me:8481: result: $cf_cv_ncurses_h2" >&5 + echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 + + cf_1st_incdir=`echo "$cf_cv_ncurses_h2" | sed -e 's%/[^/]*$%%'` +@@ -8511,7 +8514,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8514 "configure" ++#line 8517 "configure" + #include "confdefs.h" + #include + int +@@ -8523,16 +8526,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:8526: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8529: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8529: \$? = $ac_status" >&5 ++ echo "$as_me:8532: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:8532: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8535: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8535: \$? = $ac_status" >&5 ++ echo "$as_me:8538: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -8549,7 +8552,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:8552: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:8555: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -8597,7 +8600,7 @@ + ;; + esac + +-echo "$as_me:8600: checking for terminfo header" >&5 ++echo "$as_me:8603: checking for terminfo header" >&5 + echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 + if test "${cf_cv_term_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8615,7 +8618,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8618 "configure" ++#line 8621 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -8630,16 +8633,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:8633: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8636: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8636: \$? = $ac_status" >&5 ++ echo "$as_me:8639: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:8639: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8642: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8642: \$? = $ac_status" >&5 ++ echo "$as_me:8645: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_term_header="$cf_test" +@@ -8655,7 +8658,7 @@ + done + + fi +-echo "$as_me:8658: result: $cf_cv_term_header" >&5 ++echo "$as_me:8661: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -8693,7 +8696,7 @@ + #define NCURSES 1 + EOF + +-echo "$as_me:8696: checking for ncurses version" >&5 ++echo "$as_me:8699: checking for ncurses version" >&5 + echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 + if test "${cf_cv_ncurses_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8719,10 +8722,10 @@ + #endif + EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" +- { (eval echo "$as_me:8722: \"$cf_try\"") >&5 ++ { (eval echo "$as_me:8725: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? +- echo "$as_me:8725: \$? = $ac_status" >&5 ++ echo "$as_me:8728: \$? = $ac_status" >&5 + (exit "$ac_status"); } + if test -f conftest.out ; then + cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` +@@ -8732,7 +8735,7 @@ + + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8735 "configure" ++#line 8738 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -8757,15 +8760,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:8760: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8763: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8763: \$? = $ac_status" >&5 ++ echo "$as_me:8766: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:8765: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8768: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8768: \$? = $ac_status" >&5 ++ echo "$as_me:8771: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_ncurses_version=`cat $cf_tempfile` +@@ -8779,7 +8782,7 @@ + rm -f "$cf_tempfile" + + fi +-echo "$as_me:8782: result: $cf_cv_ncurses_version" >&5 ++echo "$as_me:8785: result: $cf_cv_ncurses_version" >&5 + echo "${ECHO_T}$cf_cv_ncurses_version" >&6 + test "$cf_cv_ncurses_version" = no || + cat >>confdefs.h <<\EOF +@@ -8792,7 +8795,7 @@ + # to link gpm. + cf_ncurses_LIBS="" + cf_ncurses_SAVE="$LIBS" +-echo "$as_me:8795: checking for Gpm_Open in -lgpm" >&5 ++echo "$as_me:8798: checking for Gpm_Open in -lgpm" >&5 + echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 + if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8800,7 +8803,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8803 "configure" ++#line 8806 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -8819,16 +8822,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:8822: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8825: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8825: \$? = $ac_status" >&5 ++ echo "$as_me:8828: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:8828: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8831: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8831: \$? = $ac_status" >&5 ++ echo "$as_me:8834: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gpm_Gpm_Open=yes + else +@@ -8839,10 +8842,10 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:8842: result: $ac_cv_lib_gpm_Gpm_Open" >&5 ++echo "$as_me:8845: result: $ac_cv_lib_gpm_Gpm_Open" >&5 + echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 + if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then +- echo "$as_me:8845: checking for initscr in -lgpm" >&5 ++ echo "$as_me:8848: checking for initscr in -lgpm" >&5 + echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 + if test "${ac_cv_lib_gpm_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8850,7 +8853,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8853 "configure" ++#line 8856 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -8869,16 +8872,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:8872: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8875: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8875: \$? = $ac_status" >&5 ++ echo "$as_me:8878: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:8878: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8881: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8881: \$? = $ac_status" >&5 ++ echo "$as_me:8884: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gpm_initscr=yes + else +@@ -8889,7 +8892,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:8892: result: $ac_cv_lib_gpm_initscr" >&5 ++echo "$as_me:8895: result: $ac_cv_lib_gpm_initscr" >&5 + echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 + if test "$ac_cv_lib_gpm_initscr" = yes; then + LIBS="$cf_ncurses_SAVE" +@@ -8904,7 +8907,7 @@ + # This is only necessary if you are linking against an obsolete + # version of ncurses (but it should do no harm, since it is static). + if test "$cf_nculib_root" = ncurses ; then +- echo "$as_me:8907: checking for tgoto in -lmytinfo" >&5 ++ echo "$as_me:8910: checking for tgoto in -lmytinfo" >&5 + echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 + if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8912,7 +8915,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmytinfo $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8915 "configure" ++#line 8918 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -8931,16 +8934,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:8934: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8937: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8937: \$? = $ac_status" >&5 ++ echo "$as_me:8940: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:8940: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8943: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8943: \$? = $ac_status" >&5 ++ echo "$as_me:8946: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_mytinfo_tgoto=yes + else +@@ -8951,7 +8954,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:8954: result: $ac_cv_lib_mytinfo_tgoto" >&5 ++echo "$as_me:8957: result: $ac_cv_lib_mytinfo_tgoto" >&5 + echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 + if test "$ac_cv_lib_mytinfo_tgoto" = yes; then + cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" +@@ -9000,13 +9003,13 @@ + + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' + cf_libdir="" +- echo "$as_me:9003: checking for initscr" >&5 ++ echo "$as_me:9006: checking for initscr" >&5 + echo $ECHO_N "checking for initscr... $ECHO_C" >&6 + if test "${ac_cv_func_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9009 "configure" ++#line 9012 "configure" + #include "confdefs.h" + #define initscr autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -9037,16 +9040,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:9040: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9043: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9043: \$? = $ac_status" >&5 ++ echo "$as_me:9046: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:9046: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9049: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9049: \$? = $ac_status" >&5 ++ echo "$as_me:9052: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_initscr=yes + else +@@ -9056,18 +9059,18 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:9059: result: $ac_cv_func_initscr" >&5 ++echo "$as_me:9062: result: $ac_cv_func_initscr" >&5 + echo "${ECHO_T}$ac_cv_func_initscr" >&6 + if test "$ac_cv_func_initscr" = yes; then + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' + else + + cf_save_LIBS="$LIBS" +- echo "$as_me:9066: checking for initscr in -l$cf_nculib_root" >&5 ++ echo "$as_me:9069: checking for initscr in -l$cf_nculib_root" >&5 + echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 + LIBS="-l$cf_nculib_root $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9070 "configure" ++#line 9073 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -9079,25 +9082,25 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:9082: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9085: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9085: \$? = $ac_status" >&5 ++ echo "$as_me:9088: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:9088: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9091: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9091: \$? = $ac_status" >&5 ++ echo "$as_me:9094: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then +- echo "$as_me:9093: result: yes" >&5 ++ echo "$as_me:9096: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' + + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 +-echo "$as_me:9100: result: no" >&5 ++echo "$as_me:9103: result: no" >&5 + echo "${ECHO_T}no" >&6 + + cf_search= +@@ -9165,11 +9168,11 @@ + + for cf_libdir in $cf_search + do +- echo "$as_me:9168: checking for -l$cf_nculib_root in $cf_libdir" >&5 ++ echo "$as_me:9171: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 + LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9172 "configure" ++#line 9175 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -9181,25 +9184,25 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:9184: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9187: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9187: \$? = $ac_status" >&5 ++ echo "$as_me:9190: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:9190: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9193: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9193: \$? = $ac_status" >&5 ++ echo "$as_me:9196: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then +- echo "$as_me:9195: result: yes" >&5 ++ echo "$as_me:9198: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' + break + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 +-echo "$as_me:9202: result: no" >&5 ++echo "$as_me:9205: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_save_LIBS" + fi +@@ -9214,7 +9217,7 @@ + eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" + + if test "$cf_found_library" = no ; then +- { { echo "$as_me:9217: error: Cannot link $cf_nculib_root library" >&5 ++ { { echo "$as_me:9220: error: Cannot link $cf_nculib_root library" >&5 + echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -9222,7 +9225,7 @@ + fi + + if test -n "$cf_ncurses_LIBS" ; then +- echo "$as_me:9225: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 ++ echo "$as_me:9228: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 + cf_ncurses_SAVE="$LIBS" + for p in $cf_ncurses_LIBS ; do +@@ -9232,7 +9235,7 @@ + fi + done + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9235 "configure" ++#line 9238 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -9244,23 +9247,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:9247: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9250: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9250: \$? = $ac_status" >&5 ++ echo "$as_me:9253: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:9253: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9256: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9256: \$? = $ac_status" >&5 ++ echo "$as_me:9259: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then +- echo "$as_me:9258: result: yes" >&5 ++ echo "$as_me:9261: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 +-echo "$as_me:9263: result: no" >&5 ++echo "$as_me:9266: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_ncurses_SAVE" + fi +@@ -9284,13 +9287,13 @@ + cf_have_ncuconfig=no + + if test "x${PKG_CONFIG:=none}" != xnone; then +- echo "$as_me:9287: checking pkg-config for $cf_ncuconfig_root" >&5 ++ echo "$as_me:9290: checking pkg-config for $cf_ncuconfig_root" >&5 + echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6 + if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then +- echo "$as_me:9290: result: yes" >&5 ++ echo "$as_me:9293: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + +- echo "$as_me:9293: checking if the $cf_ncuconfig_root package files work" >&5 ++ echo "$as_me:9296: checking if the $cf_ncuconfig_root package files work" >&5 + echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 + cf_have_ncuconfig=unknown + +@@ -9423,7 +9426,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9426 "configure" ++#line 9429 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -9435,37 +9438,37 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:9438: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9441: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9441: \$? = $ac_status" >&5 ++ echo "$as_me:9444: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:9444: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9447: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9447: \$? = $ac_status" >&5 ++ echo "$as_me:9450: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + if test "$cross_compiling" = yes; then + cf_test_ncuconfig=maybe + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9453 "configure" ++#line 9456 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int main(void) + { const char *xx = curses_version(); return (xx == 0); } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:9460: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9463: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9463: \$? = $ac_status" >&5 ++ echo "$as_me:9466: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:9465: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9468: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9468: \$? = $ac_status" >&5 ++ echo "$as_me:9471: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_test_ncuconfig=yes + else +@@ -9639,7 +9642,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9642 "configure" ++#line 9645 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -9651,37 +9654,37 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:9654: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9657: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9657: \$? = $ac_status" >&5 ++ echo "$as_me:9660: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:9660: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9663: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9663: \$? = $ac_status" >&5 ++ echo "$as_me:9666: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + if test "$cross_compiling" = yes; then + cf_have_ncuconfig=maybe + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9669 "configure" ++#line 9672 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int main(void) + { const char *xx = curses_version(); return (xx == 0); } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:9676: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9679: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9679: \$? = $ac_status" >&5 ++ echo "$as_me:9682: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:9681: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9684: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9684: \$? = $ac_status" >&5 ++ echo "$as_me:9687: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_have_ncuconfig=yes + else +@@ -9698,7 +9701,7 @@ + cf_have_ncuconfig=no + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +- echo "$as_me:9701: result: $cf_have_ncuconfig" >&5 ++ echo "$as_me:9704: result: $cf_have_ncuconfig" >&5 + echo "${ECHO_T}$cf_have_ncuconfig" >&6 + test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes + if test "$cf_have_ncuconfig" != "yes" +@@ -9714,7 +9717,7 @@ + + NCURSES_CONFIG_PKG=$cf_ncuconfig_root + +-echo "$as_me:9717: checking for terminfo header" >&5 ++echo "$as_me:9720: checking for terminfo header" >&5 + echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 + if test "${cf_cv_term_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -9732,7 +9735,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9735 "configure" ++#line 9738 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -9747,16 +9750,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:9750: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9753: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9753: \$? = $ac_status" >&5 ++ echo "$as_me:9756: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:9756: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9759: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9759: \$? = $ac_status" >&5 ++ echo "$as_me:9762: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_term_header="$cf_test" +@@ -9772,7 +9775,7 @@ + done + + fi +-echo "$as_me:9775: result: $cf_cv_term_header" >&5 ++echo "$as_me:9778: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -9807,7 +9810,7 @@ + fi + + else +- echo "$as_me:9810: result: no" >&5 ++ echo "$as_me:9813: result: no" >&5 + echo "${ECHO_T}no" >&6 + NCURSES_CONFIG_PKG=none + fi +@@ -9823,7 +9826,7 @@ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-echo "$as_me:9826: checking for $ac_word" >&5 ++echo "$as_me:9829: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -9838,7 +9841,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" +-echo "$as_me:9841: found $ac_dir/$ac_word" >&5 ++echo "$as_me:9844: found $ac_dir/$ac_word" >&5 + break + done + +@@ -9846,10 +9849,10 @@ + fi + NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG + if test -n "$NCURSES_CONFIG"; then +- echo "$as_me:9849: result: $NCURSES_CONFIG" >&5 ++ echo "$as_me:9852: result: $NCURSES_CONFIG" >&5 + echo "${ECHO_T}$NCURSES_CONFIG" >&6 + else +- echo "$as_me:9852: result: no" >&5 ++ echo "$as_me:9855: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -9862,7 +9865,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:9865: checking for $ac_word" >&5 ++echo "$as_me:9868: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -9877,7 +9880,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" +-echo "$as_me:9880: found $ac_dir/$ac_word" >&5 ++echo "$as_me:9883: found $ac_dir/$ac_word" >&5 + break + done + +@@ -9885,10 +9888,10 @@ + fi + ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG + if test -n "$ac_ct_NCURSES_CONFIG"; then +- echo "$as_me:9888: result: $ac_ct_NCURSES_CONFIG" >&5 ++ echo "$as_me:9891: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 + else +- echo "$as_me:9891: result: no" >&5 ++ echo "$as_me:9894: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -10045,7 +10048,7 @@ + + # even with config script, some packages use no-override for curses.h + +-echo "$as_me:10048: checking if we have identified curses headers" >&5 ++echo "$as_me:10051: checking if we have identified curses headers" >&5 + echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 + if test "${cf_cv_ncurses_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10057,7 +10060,7 @@ + curses.h ncurses/curses.h + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10060 "configure" ++#line 10063 "configure" + #include "confdefs.h" + #include <${cf_header}> + int +@@ -10069,16 +10072,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10072: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10075: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10075: \$? = $ac_status" >&5 ++ echo "$as_me:10078: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10078: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10081: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10081: \$? = $ac_status" >&5 ++ echo "$as_me:10084: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_header=$cf_header; break + else +@@ -10089,11 +10092,11 @@ + done + + fi +-echo "$as_me:10092: result: $cf_cv_ncurses_header" >&5 ++echo "$as_me:10095: result: $cf_cv_ncurses_header" >&5 + echo "${ECHO_T}$cf_cv_ncurses_header" >&6 + + if test "$cf_cv_ncurses_header" = none ; then +- { { echo "$as_me:10096: error: No curses header-files found" >&5 ++ { { echo "$as_me:10099: error: No curses header-files found" >&5 + echo "$as_me: error: No curses header-files found" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -10103,23 +10106,23 @@ + for ac_header in $cf_cv_ncurses_header + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:10106: checking for $ac_header" >&5 ++echo "$as_me:10109: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10112 "configure" ++#line 10115 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:10116: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:10119: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:10122: \$? = $ac_status" >&5 ++ echo "$as_me:10125: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -10138,7 +10141,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:10141: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:10144: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF +-#line 10197 "configure" ++#line 10200 "configure" + #include "confdefs.h" + #include + int +@@ -10206,16 +10209,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10209: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10212: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10212: \$? = $ac_status" >&5 ++ echo "$as_me:10215: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10215: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10218: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10218: \$? = $ac_status" >&5 ++ echo "$as_me:10221: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -10232,7 +10235,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:10235: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:10238: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -10251,7 +10254,7 @@ + + } + +-echo "$as_me:10254: checking for $cf_ncuhdr_root header in include-path" >&5 ++echo "$as_me:10257: checking for $cf_ncuhdr_root header in include-path" >&5 + echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 + if test "${cf_cv_ncurses_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10263,7 +10266,7 @@ + do + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10266 "configure" ++#line 10269 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -10287,16 +10290,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10290: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10293: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10293: \$? = $ac_status" >&5 ++ echo "$as_me:10296: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10296: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10299: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10299: \$? = $ac_status" >&5 ++ echo "$as_me:10302: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_h=$cf_header + +@@ -10311,14 +10314,14 @@ + done + + fi +-echo "$as_me:10314: result: $cf_cv_ncurses_h" >&5 ++echo "$as_me:10317: result: $cf_cv_ncurses_h" >&5 + echo "${ECHO_T}$cf_cv_ncurses_h" >&6 + + if test "$cf_cv_ncurses_h" != no ; then + cf_cv_ncurses_header=$cf_cv_ncurses_h + else + +-echo "$as_me:10321: checking for $cf_ncuhdr_root include-path" >&5 ++echo "$as_me:10324: checking for $cf_ncuhdr_root include-path" >&5 + echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 + if test "${cf_cv_ncurses_h2+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10439,7 +10442,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10442 "configure" ++#line 10445 "configure" + #include "confdefs.h" + #include + int +@@ -10451,16 +10454,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10454: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10457: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10457: \$? = $ac_status" >&5 ++ echo "$as_me:10460: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10460: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10463: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10463: \$? = $ac_status" >&5 ++ echo "$as_me:10466: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -10477,7 +10480,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:10480: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:10483: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -10500,7 +10503,7 @@ + do + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10503 "configure" ++#line 10506 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -10524,16 +10527,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10527: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10530: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10530: \$? = $ac_status" >&5 ++ echo "$as_me:10533: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10533: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10536: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10536: \$? = $ac_status" >&5 ++ echo "$as_me:10539: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_h2=$cf_header + +@@ -10554,12 +10557,12 @@ + CPPFLAGS="$cf_save2_CPPFLAGS" + test "$cf_cv_ncurses_h2" != no && break + done +- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10557: error: not found" >&5 ++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10560: error: not found" >&5 + echo "$as_me: error: not found" >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:10562: result: $cf_cv_ncurses_h2" >&5 ++echo "$as_me:10565: result: $cf_cv_ncurses_h2" >&5 + echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 + + cf_1st_incdir=`echo "$cf_cv_ncurses_h2" | sed -e 's%/[^/]*$%%'` +@@ -10595,7 +10598,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10598 "configure" ++#line 10601 "configure" + #include "confdefs.h" + #include + int +@@ -10607,16 +10610,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10610: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10613: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10613: \$? = $ac_status" >&5 ++ echo "$as_me:10616: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10616: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10619: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10619: \$? = $ac_status" >&5 ++ echo "$as_me:10622: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -10633,7 +10636,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:10636: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:10639: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -10681,7 +10684,7 @@ + ;; + esac + +-echo "$as_me:10684: checking for terminfo header" >&5 ++echo "$as_me:10687: checking for terminfo header" >&5 + echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 + if test "${cf_cv_term_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10699,7 +10702,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10702 "configure" ++#line 10705 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -10714,16 +10717,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10717: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10720: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10720: \$? = $ac_status" >&5 ++ echo "$as_me:10723: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10723: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10726: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10726: \$? = $ac_status" >&5 ++ echo "$as_me:10729: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_term_header="$cf_test" +@@ -10739,7 +10742,7 @@ + done + + fi +-echo "$as_me:10742: result: $cf_cv_term_header" >&5 ++echo "$as_me:10745: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -10777,7 +10780,7 @@ + #define NCURSES 1 + EOF + +-echo "$as_me:10780: checking for ncurses version" >&5 ++echo "$as_me:10783: checking for ncurses version" >&5 + echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 + if test "${cf_cv_ncurses_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10803,10 +10806,10 @@ + #endif + EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" +- { (eval echo "$as_me:10806: \"$cf_try\"") >&5 ++ { (eval echo "$as_me:10809: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? +- echo "$as_me:10809: \$? = $ac_status" >&5 ++ echo "$as_me:10812: \$? = $ac_status" >&5 + (exit "$ac_status"); } + if test -f conftest.out ; then + cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` +@@ -10816,7 +10819,7 @@ + + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10819 "configure" ++#line 10822 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -10841,15 +10844,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:10844: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10847: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10847: \$? = $ac_status" >&5 ++ echo "$as_me:10850: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:10849: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10852: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10852: \$? = $ac_status" >&5 ++ echo "$as_me:10855: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_ncurses_version=`cat $cf_tempfile` +@@ -10863,7 +10866,7 @@ + rm -f "$cf_tempfile" + + fi +-echo "$as_me:10866: result: $cf_cv_ncurses_version" >&5 ++echo "$as_me:10869: result: $cf_cv_ncurses_version" >&5 + echo "${ECHO_T}$cf_cv_ncurses_version" >&6 + test "$cf_cv_ncurses_version" = no || + cat >>confdefs.h <<\EOF +@@ -10876,7 +10879,7 @@ + # to link gpm. + cf_ncurses_LIBS="" + cf_ncurses_SAVE="$LIBS" +-echo "$as_me:10879: checking for Gpm_Open in -lgpm" >&5 ++echo "$as_me:10882: checking for Gpm_Open in -lgpm" >&5 + echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 + if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10884,7 +10887,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10887 "configure" ++#line 10890 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -10903,16 +10906,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:10906: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10909: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10909: \$? = $ac_status" >&5 ++ echo "$as_me:10912: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:10912: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10915: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10915: \$? = $ac_status" >&5 ++ echo "$as_me:10918: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gpm_Gpm_Open=yes + else +@@ -10923,10 +10926,10 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:10926: result: $ac_cv_lib_gpm_Gpm_Open" >&5 ++echo "$as_me:10929: result: $ac_cv_lib_gpm_Gpm_Open" >&5 + echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 + if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then +- echo "$as_me:10929: checking for initscr in -lgpm" >&5 ++ echo "$as_me:10932: checking for initscr in -lgpm" >&5 + echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 + if test "${ac_cv_lib_gpm_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10934,7 +10937,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10937 "configure" ++#line 10940 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -10953,16 +10956,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:10956: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10959: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10959: \$? = $ac_status" >&5 ++ echo "$as_me:10962: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:10962: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10965: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10965: \$? = $ac_status" >&5 ++ echo "$as_me:10968: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gpm_initscr=yes + else +@@ -10973,7 +10976,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:10976: result: $ac_cv_lib_gpm_initscr" >&5 ++echo "$as_me:10979: result: $ac_cv_lib_gpm_initscr" >&5 + echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 + if test "$ac_cv_lib_gpm_initscr" = yes; then + LIBS="$cf_ncurses_SAVE" +@@ -10988,7 +10991,7 @@ + # This is only necessary if you are linking against an obsolete + # version of ncurses (but it should do no harm, since it is static). + if test "$cf_nculib_root" = ncurses ; then +- echo "$as_me:10991: checking for tgoto in -lmytinfo" >&5 ++ echo "$as_me:10994: checking for tgoto in -lmytinfo" >&5 + echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 + if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10996,7 +10999,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmytinfo $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10999 "configure" ++#line 11002 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -11015,16 +11018,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:11018: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11021: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11021: \$? = $ac_status" >&5 ++ echo "$as_me:11024: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:11024: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11027: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11027: \$? = $ac_status" >&5 ++ echo "$as_me:11030: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_mytinfo_tgoto=yes + else +@@ -11035,7 +11038,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:11038: result: $ac_cv_lib_mytinfo_tgoto" >&5 ++echo "$as_me:11041: result: $ac_cv_lib_mytinfo_tgoto" >&5 + echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 + if test "$ac_cv_lib_mytinfo_tgoto" = yes; then + cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" +@@ -11084,13 +11087,13 @@ + + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' + cf_libdir="" +- echo "$as_me:11087: checking for initscr" >&5 ++ echo "$as_me:11090: checking for initscr" >&5 + echo $ECHO_N "checking for initscr... $ECHO_C" >&6 + if test "${ac_cv_func_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11093 "configure" ++#line 11096 "configure" + #include "confdefs.h" + #define initscr autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -11121,16 +11124,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:11124: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11127: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11127: \$? = $ac_status" >&5 ++ echo "$as_me:11130: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:11130: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11133: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11133: \$? = $ac_status" >&5 ++ echo "$as_me:11136: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_initscr=yes + else +@@ -11140,18 +11143,18 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:11143: result: $ac_cv_func_initscr" >&5 ++echo "$as_me:11146: result: $ac_cv_func_initscr" >&5 + echo "${ECHO_T}$ac_cv_func_initscr" >&6 + if test "$ac_cv_func_initscr" = yes; then + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' + else + + cf_save_LIBS="$LIBS" +- echo "$as_me:11150: checking for initscr in -l$cf_nculib_root" >&5 ++ echo "$as_me:11153: checking for initscr in -l$cf_nculib_root" >&5 + echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 + LIBS="-l$cf_nculib_root $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11154 "configure" ++#line 11157 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -11163,25 +11166,25 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:11166: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11169: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11169: \$? = $ac_status" >&5 ++ echo "$as_me:11172: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:11172: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11175: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11175: \$? = $ac_status" >&5 ++ echo "$as_me:11178: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then +- echo "$as_me:11177: result: yes" >&5 ++ echo "$as_me:11180: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' + + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 +-echo "$as_me:11184: result: no" >&5 ++echo "$as_me:11187: result: no" >&5 + echo "${ECHO_T}no" >&6 + + cf_search= +@@ -11249,11 +11252,11 @@ + + for cf_libdir in $cf_search + do +- echo "$as_me:11252: checking for -l$cf_nculib_root in $cf_libdir" >&5 ++ echo "$as_me:11255: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 + LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11256 "configure" ++#line 11259 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -11265,25 +11268,25 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:11268: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11271: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11271: \$? = $ac_status" >&5 ++ echo "$as_me:11274: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:11274: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11277: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11277: \$? = $ac_status" >&5 ++ echo "$as_me:11280: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then +- echo "$as_me:11279: result: yes" >&5 ++ echo "$as_me:11282: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' + break + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 +-echo "$as_me:11286: result: no" >&5 ++echo "$as_me:11289: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_save_LIBS" + fi +@@ -11298,7 +11301,7 @@ + eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" + + if test "$cf_found_library" = no ; then +- { { echo "$as_me:11301: error: Cannot link $cf_nculib_root library" >&5 ++ { { echo "$as_me:11304: error: Cannot link $cf_nculib_root library" >&5 + echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -11306,7 +11309,7 @@ + fi + + if test -n "$cf_ncurses_LIBS" ; then +- echo "$as_me:11309: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 ++ echo "$as_me:11312: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 + cf_ncurses_SAVE="$LIBS" + for p in $cf_ncurses_LIBS ; do +@@ -11316,7 +11319,7 @@ + fi + done + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11319 "configure" ++#line 11322 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -11328,23 +11331,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:11331: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11334: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11334: \$? = $ac_status" >&5 ++ echo "$as_me:11337: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:11337: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11340: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11340: \$? = $ac_status" >&5 ++ echo "$as_me:11343: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then +- echo "$as_me:11342: result: yes" >&5 ++ echo "$as_me:11345: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 +-echo "$as_me:11347: result: no" >&5 ++echo "$as_me:11350: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_ncurses_SAVE" + fi +@@ -11397,10 +11400,10 @@ + AUTOCONF_$cf_name NCURSES_VERSION_$cf_name + CF_EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | fgrep AUTOCONF_$cf_name >conftest.out" +- { (eval echo "$as_me:11400: \"$cf_try\"") >&5 ++ { (eval echo "$as_me:11403: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? +- echo "$as_me:11403: \$? = $ac_status" >&5 ++ echo "$as_me:11406: \$? = $ac_status" >&5 + (exit "$ac_status"); } + if test -f conftest.out ; then + cf_result=`sed -e "s/^.*AUTOCONF_${cf_name}[ ][ ]*//" conftest.out` +@@ -11418,10 +11421,10 @@ + + cf_cv_timestamp=`date` + +-echo "$as_me:11421: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 ++echo "$as_me:11424: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 + echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6 + +-echo "$as_me:11424: checking if you want to have a library-prefix" >&5 ++echo "$as_me:11427: checking if you want to have a library-prefix" >&5 + echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6 + + # Check whether --with-lib-prefix or --without-lib-prefix was given. +@@ -11431,7 +11434,7 @@ + else + with_lib_prefix=auto + fi; +-echo "$as_me:11434: result: $with_lib_prefix" >&5 ++echo "$as_me:11437: result: $with_lib_prefix" >&5 + echo "${ECHO_T}$with_lib_prefix" >&6 + + if test "$with_lib_prefix" = auto +@@ -11469,7 +11472,7 @@ + test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT='' + fi + +-echo "$as_me:11472: checking for default loader flags" >&5 ++echo "$as_me:11475: checking for default loader flags" >&5 + echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6 + case $DFT_LWR_MODEL in + (normal) LD_MODEL='' ;; +@@ -11477,13 +11480,13 @@ + (profile) LD_MODEL='-pg';; + (shared) LD_MODEL='' ;; + esac +-echo "$as_me:11480: result: $LD_MODEL" >&5 ++echo "$as_me:11483: result: $LD_MODEL" >&5 + echo "${ECHO_T}$LD_MODEL" >&6 + + LD_RPATH_OPT= + if test "x$cf_cv_enable_rpath" != xno + then +- echo "$as_me:11486: checking for an rpath option" >&5 ++ echo "$as_me:11489: checking for an rpath option" >&5 + echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 + case "$cf_cv_system_name" in + (irix*) +@@ -11514,12 +11517,12 @@ + (*) + ;; + esac +- echo "$as_me:11517: result: $LD_RPATH_OPT" >&5 ++ echo "$as_me:11520: result: $LD_RPATH_OPT" >&5 + echo "${ECHO_T}$LD_RPATH_OPT" >&6 + + case "x$LD_RPATH_OPT" in + (x-R*) +- echo "$as_me:11522: checking if we need a space after rpath option" >&5 ++ echo "$as_me:11525: checking if we need a space after rpath option" >&5 + echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6 + cf_save_LIBS="$LIBS" + +@@ -11540,7 +11543,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11543 "configure" ++#line 11546 "configure" + #include "confdefs.h" + + int +@@ -11552,16 +11555,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:11555: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11558: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11558: \$? = $ac_status" >&5 ++ echo "$as_me:11561: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:11561: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11564: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11564: \$? = $ac_status" >&5 ++ echo "$as_me:11567: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_rpath_space=no + else +@@ -11571,7 +11574,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS="$cf_save_LIBS" +- echo "$as_me:11574: result: $cf_rpath_space" >&5 ++ echo "$as_me:11577: result: $cf_rpath_space" >&5 + echo "${ECHO_T}$cf_rpath_space" >&6 + test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " + ;; +@@ -11593,7 +11596,7 @@ + cf_ld_rpath_opt= + test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT" + +- echo "$as_me:11596: checking if release/abi version should be used for shared libs" >&5 ++ echo "$as_me:11599: checking if release/abi version should be used for shared libs" >&5 + echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6 + + # Check whether --with-shlib-version or --without-shlib-version was given. +@@ -11608,9 +11611,9 @@ + cf_cv_shlib_version=$withval + ;; + (*) +- echo "$as_me:11611: result: $withval" >&5 ++ echo "$as_me:11614: result: $withval" >&5 + echo "${ECHO_T}$withval" >&6 +- { { echo "$as_me:11613: error: option value must be one of: rel, abi, or auto" >&5 ++ { { echo "$as_me:11616: error: option value must be one of: rel, abi, or auto" >&5 + echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -11619,7 +11622,7 @@ + else + cf_cv_shlib_version=auto + fi; +- echo "$as_me:11622: result: $cf_cv_shlib_version" >&5 ++ echo "$as_me:11625: result: $cf_cv_shlib_version" >&5 + echo "${ECHO_T}$cf_cv_shlib_version" >&6 + + cf_cv_rm_so_locs=no +@@ -11642,14 +11645,14 @@ + + if test "$cf_try_fPIC" = yes + then +- echo "$as_me:11645: checking which $CC option to use" >&5 ++ echo "$as_me:11648: checking which $CC option to use" >&5 + echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6 + cf_save_CFLAGS="$CFLAGS" + for CC_SHARED_OPTS in -fPIC -fpic '' + do + CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11652 "configure" ++#line 11655 "configure" + #include "confdefs.h" + #include + int +@@ -11661,16 +11664,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11664: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11667: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11667: \$? = $ac_status" >&5 ++ echo "$as_me:11670: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11670: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11673: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11673: \$? = $ac_status" >&5 ++ echo "$as_me:11676: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -11679,7 +11682,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + done +- echo "$as_me:11682: result: $CC_SHARED_OPTS" >&5 ++ echo "$as_me:11685: result: $CC_SHARED_OPTS" >&5 + echo "${ECHO_T}$CC_SHARED_OPTS" >&6 + CFLAGS="$cf_save_CFLAGS" + fi +@@ -11750,7 +11753,7 @@ + MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@' + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi + cf_cv_shlib_version_infix=yes +- echo "$as_me:11753: checking if ld -search_paths_first works" >&5 ++ echo "$as_me:11756: checking if ld -search_paths_first works" >&5 + echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6 + if test "${cf_cv_ldflags_search_paths_first+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -11759,7 +11762,7 @@ + cf_save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -Wl,-search_paths_first" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11762 "configure" ++#line 11765 "configure" + #include "confdefs.h" + + int +@@ -11771,16 +11774,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:11774: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11777: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11777: \$? = $ac_status" >&5 ++ echo "$as_me:11780: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:11780: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11783: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11783: \$? = $ac_status" >&5 ++ echo "$as_me:11786: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ldflags_search_paths_first=yes + else +@@ -11791,7 +11794,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LDFLAGS=$cf_save_LDFLAGS + fi +-echo "$as_me:11794: result: $cf_cv_ldflags_search_paths_first" >&5 ++echo "$as_me:11797: result: $cf_cv_ldflags_search_paths_first" >&5 + echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 + if test "$cf_cv_ldflags_search_paths_first" = yes; then + LDFLAGS="$LDFLAGS -Wl,-search_paths_first" +@@ -12141,7 +12144,7 @@ + do + CFLAGS="$cf_shared_opts $cf_save_CFLAGS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12144 "configure" ++#line 12147 "configure" + #include "confdefs.h" + #include + int +@@ -12153,16 +12156,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12156: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12159: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12159: \$? = $ac_status" >&5 ++ echo "$as_me:12162: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12162: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12165: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12165: \$? = $ac_status" >&5 ++ echo "$as_me:12168: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -12199,7 +12202,7 @@ + test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes + ;; + (*) +- { echo "$as_me:12202: WARNING: ignored --with-shlib-version" >&5 ++ { echo "$as_me:12205: WARNING: ignored --with-shlib-version" >&5 + echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} + ;; + esac +@@ -12209,7 +12212,7 @@ + if test -n "$cf_try_cflags" + then + cat > conftest.$ac_ext < + int main(int argc, char *argv[]) + { +@@ -12221,18 +12224,18 @@ + for cf_opt in $cf_try_cflags + do + CFLAGS="$cf_save_CFLAGS -$cf_opt" +- echo "$as_me:12224: checking if CFLAGS option -$cf_opt works" >&5 ++ echo "$as_me:12227: checking if CFLAGS option -$cf_opt works" >&5 + echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6 +- if { (eval echo "$as_me:12226: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:12229: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12229: \$? = $ac_status" >&5 ++ echo "$as_me:12232: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- echo "$as_me:12231: result: yes" >&5 ++ echo "$as_me:12234: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + cf_save_CFLAGS="$CFLAGS" + else +- echo "$as_me:12235: result: no" >&5 ++ echo "$as_me:12238: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + done +@@ -12247,17 +12250,17 @@ + + test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6 + +-echo "${as_me:-configure}:12250: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 ++echo "${as_me:-configure}:12253: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 + + test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 + +-echo "${as_me:-configure}:12254: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 ++echo "${as_me:-configure}:12257: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 + + # The test/sample programs in the original tree link using rpath option. + # Make it optional for packagers. + if test -n "$LOCAL_LDFLAGS" + then +- echo "$as_me:12260: checking if you want to link sample programs with rpath option" >&5 ++ echo "$as_me:12263: checking if you want to link sample programs with rpath option" >&5 + echo $ECHO_N "checking if you want to link sample programs with rpath option... $ECHO_C" >&6 + + # Check whether --enable-rpath-link or --disable-rpath-link was given. +@@ -12267,7 +12270,7 @@ + else + with_rpath_link=yes + fi; +- echo "$as_me:12270: result: $with_rpath_link" >&5 ++ echo "$as_me:12273: result: $with_rpath_link" >&5 + echo "${ECHO_T}$with_rpath_link" >&6 + if test "$with_rpath_link" = no + then +@@ -12280,7 +12283,7 @@ + + ### use option --enable-broken-linker to force on use of broken-linker support + +-echo "$as_me:12283: checking if you want broken-linker support code" >&5 ++echo "$as_me:12286: checking if you want broken-linker support code" >&5 + echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6 + + # Check whether --enable-broken_linker or --disable-broken_linker was given. +@@ -12290,7 +12293,7 @@ + else + with_broken_linker=no + fi; +-echo "$as_me:12293: result: $with_broken_linker" >&5 ++echo "$as_me:12296: result: $with_broken_linker" >&5 + echo "${ECHO_T}$with_broken_linker" >&6 + + : "${BROKEN_LINKER:=0}" +@@ -12305,14 +12308,14 @@ + + # Check to define _XOPEN_SOURCE "automatically" + +-echo "$as_me:12308: checking if the POSIX test-macros are already defined" >&5 ++echo "$as_me:12311: checking if the POSIX test-macros are already defined" >&5 + echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6 + if test "${cf_cv_posix_visible+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12315 "configure" ++#line 12318 "configure" + #include "confdefs.h" + #include + int +@@ -12331,16 +12334,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12334: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12337: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12337: \$? = $ac_status" >&5 ++ echo "$as_me:12340: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12340: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12343: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12343: \$? = $ac_status" >&5 ++ echo "$as_me:12346: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_posix_visible=no + else +@@ -12351,7 +12354,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:12354: result: $cf_cv_posix_visible" >&5 ++echo "$as_me:12357: result: $cf_cv_posix_visible" >&5 + echo "${ECHO_T}$cf_cv_posix_visible" >&6 + + if test "$cf_cv_posix_visible" = no; then +@@ -12396,14 +12399,14 @@ + + cf_gnu_xopen_source=$cf_XOPEN_SOURCE + +-echo "$as_me:12399: checking if this is the GNU C library" >&5 ++echo "$as_me:12402: checking if this is the GNU C library" >&5 + echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6 + if test "${cf_cv_gnu_library+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12406 "configure" ++#line 12409 "configure" + #include "confdefs.h" + #include + int +@@ -12422,16 +12425,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12425: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12428: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12428: \$? = $ac_status" >&5 ++ echo "$as_me:12431: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12431: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12434: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12434: \$? = $ac_status" >&5 ++ echo "$as_me:12437: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_library=yes + else +@@ -12442,7 +12445,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:12445: result: $cf_cv_gnu_library" >&5 ++echo "$as_me:12448: result: $cf_cv_gnu_library" >&5 + echo "${ECHO_T}$cf_cv_gnu_library" >&6 + + if test x$cf_cv_gnu_library = xyes; then +@@ -12450,7 +12453,7 @@ + # With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE + # was changed to help a little. newlib incorporated the change about 4 + # years later. +- echo "$as_me:12453: checking if _DEFAULT_SOURCE can be used as a basis" >&5 ++ echo "$as_me:12456: checking if _DEFAULT_SOURCE can be used as a basis" >&5 + echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6 + if test "${cf_cv_gnu_library_219+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -12462,7 +12465,7 @@ + CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12465 "configure" ++#line 12468 "configure" + #include "confdefs.h" + #include + int +@@ -12481,16 +12484,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12484: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12487: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12487: \$? = $ac_status" >&5 ++ echo "$as_me:12490: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12490: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12493: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12493: \$? = $ac_status" >&5 ++ echo "$as_me:12496: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_library_219=yes + else +@@ -12502,12 +12505,12 @@ + CPPFLAGS="$cf_save" + + fi +-echo "$as_me:12505: result: $cf_cv_gnu_library_219" >&5 ++echo "$as_me:12508: result: $cf_cv_gnu_library_219" >&5 + echo "${ECHO_T}$cf_cv_gnu_library_219" >&6 + + if test "x$cf_cv_gnu_library_219" = xyes; then + cf_save="$CPPFLAGS" +- echo "$as_me:12510: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 ++ echo "$as_me:12513: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 + echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_gnu_dftsrc_219+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -12612,7 +12615,7 @@ + fi + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12615 "configure" ++#line 12618 "configure" + #include "confdefs.h" + + #include +@@ -12632,16 +12635,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12635: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12638: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12638: \$? = $ac_status" >&5 ++ echo "$as_me:12641: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12641: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12644: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12644: \$? = $ac_status" >&5 ++ echo "$as_me:12647: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_dftsrc_219=yes + else +@@ -12652,7 +12655,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:12655: result: $cf_cv_gnu_dftsrc_219" >&5 ++echo "$as_me:12658: result: $cf_cv_gnu_dftsrc_219" >&5 + echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6 + test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save" + else +@@ -12661,14 +12664,14 @@ + + if test "x$cf_cv_gnu_dftsrc_219" != xyes; then + +- echo "$as_me:12664: checking if we must define _GNU_SOURCE" >&5 ++ echo "$as_me:12667: checking if we must define _GNU_SOURCE" >&5 + echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_gnu_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12671 "configure" ++#line 12674 "configure" + #include "confdefs.h" + #include + int +@@ -12683,16 +12686,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12686: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12689: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12689: \$? = $ac_status" >&5 ++ echo "$as_me:12692: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12692: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12695: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12695: \$? = $ac_status" >&5 ++ echo "$as_me:12698: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_source=no + else +@@ -12799,7 +12802,7 @@ + fi + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12802 "configure" ++#line 12805 "configure" + #include "confdefs.h" + #include + int +@@ -12814,16 +12817,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12817: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12820: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12820: \$? = $ac_status" >&5 ++ echo "$as_me:12823: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12823: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12826: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12826: \$? = $ac_status" >&5 ++ echo "$as_me:12829: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_source=no + else +@@ -12838,12 +12841,12 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:12841: result: $cf_cv_gnu_source" >&5 ++echo "$as_me:12844: result: $cf_cv_gnu_source" >&5 + echo "${ECHO_T}$cf_cv_gnu_source" >&6 + + if test "$cf_cv_gnu_source" = yes + then +- echo "$as_me:12846: checking if we should also define _DEFAULT_SOURCE" >&5 ++ echo "$as_me:12849: checking if we should also define _DEFAULT_SOURCE" >&5 + echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_default_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -12853,7 +12856,7 @@ + CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12856 "configure" ++#line 12859 "configure" + #include "confdefs.h" + #include + int +@@ -12868,16 +12871,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12871: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12874: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12874: \$? = $ac_status" >&5 ++ echo "$as_me:12877: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12877: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12880: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12880: \$? = $ac_status" >&5 ++ echo "$as_me:12883: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_default_source=no + else +@@ -12888,7 +12891,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:12891: result: $cf_cv_default_source" >&5 ++echo "$as_me:12894: result: $cf_cv_default_source" >&5 + echo "${ECHO_T}$cf_cv_default_source" >&6 + if test "$cf_cv_default_source" = yes + then +@@ -12925,16 +12928,16 @@ + sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` + +-echo "$as_me:12928: checking if we should define _POSIX_C_SOURCE" >&5 ++echo "$as_me:12931: checking if we should define _POSIX_C_SOURCE" >&5 + echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_posix_c_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + +-echo "${as_me:-configure}:12934: testing if the symbol is already defined go no further ..." 1>&5 ++echo "${as_me:-configure}:12937: testing if the symbol is already defined go no further ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12937 "configure" ++#line 12940 "configure" + #include "confdefs.h" + #include + int +@@ -12949,16 +12952,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12952: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12955: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12955: \$? = $ac_status" >&5 ++ echo "$as_me:12958: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12958: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12961: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12961: \$? = $ac_status" >&5 ++ echo "$as_me:12964: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_posix_c_source=no + else +@@ -12979,7 +12982,7 @@ + esac + if test "$cf_want_posix_source" = yes ; then + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12982 "configure" ++#line 12985 "configure" + #include "confdefs.h" + #include + int +@@ -12994,16 +12997,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12997: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13000: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13000: \$? = $ac_status" >&5 ++ echo "$as_me:13003: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13003: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13006: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13006: \$? = $ac_status" >&5 ++ echo "$as_me:13009: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -13014,7 +13017,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi + +-echo "${as_me:-configure}:13017: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 ++echo "${as_me:-configure}:13020: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 + + CFLAGS="$cf_trim_CFLAGS" + CPPFLAGS="$cf_trim_CPPFLAGS" +@@ -13022,10 +13025,10 @@ + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" + +-echo "${as_me:-configure}:13025: testing if the second compile does not leave our definition intact error ..." 1>&5 ++echo "${as_me:-configure}:13028: testing if the second compile does not leave our definition intact error ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13028 "configure" ++#line 13031 "configure" + #include "confdefs.h" + #include + int +@@ -13040,16 +13043,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13043: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13046: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13046: \$? = $ac_status" >&5 ++ echo "$as_me:13049: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13049: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13052: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13052: \$? = $ac_status" >&5 ++ echo "$as_me:13055: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -13065,7 +13068,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:13068: result: $cf_cv_posix_c_source" >&5 ++echo "$as_me:13071: result: $cf_cv_posix_c_source" >&5 + echo "${ECHO_T}$cf_cv_posix_c_source" >&6 + + if test "$cf_cv_posix_c_source" != no ; then +@@ -13182,7 +13185,7 @@ + # OpenBSD 6.x has broken locale support, both compile-time and runtime. + # see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html + # Abusing the conformance level is a workaround. +- { echo "$as_me:13185: WARNING: this system does not provide usable locale support" >&5 ++ { echo "$as_me:13188: WARNING: this system does not provide usable locale support" >&5 + echo "$as_me: WARNING: this system does not provide usable locale support" >&2;} + cf_xopen_source="-D_BSD_SOURCE" + cf_XOPEN_SOURCE=700 +@@ -13214,14 +13217,14 @@ + ;; + (*) + +-echo "$as_me:13217: checking if we should define _XOPEN_SOURCE" >&5 ++echo "$as_me:13220: checking if we should define _XOPEN_SOURCE" >&5 + echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_xopen_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13224 "configure" ++#line 13227 "configure" + #include "confdefs.h" + + #include +@@ -13240,16 +13243,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13243: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13246: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13246: \$? = $ac_status" >&5 ++ echo "$as_me:13249: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13249: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13252: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13252: \$? = $ac_status" >&5 ++ echo "$as_me:13255: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_xopen_source=no + else +@@ -13261,7 +13264,7 @@ + CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13264 "configure" ++#line 13267 "configure" + #include "confdefs.h" + + #include +@@ -13280,16 +13283,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13283: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13286: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13286: \$? = $ac_status" >&5 ++ echo "$as_me:13289: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13289: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13292: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13292: \$? = $ac_status" >&5 ++ echo "$as_me:13295: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_xopen_source=no + else +@@ -13304,7 +13307,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:13307: result: $cf_cv_xopen_source" >&5 ++echo "$as_me:13310: result: $cf_cv_xopen_source" >&5 + echo "${ECHO_T}$cf_cv_xopen_source" >&6 + + if test "$cf_cv_xopen_source" != no ; then +@@ -13462,16 +13465,16 @@ + sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` + +-echo "$as_me:13465: checking if we should define _POSIX_C_SOURCE" >&5 ++echo "$as_me:13468: checking if we should define _POSIX_C_SOURCE" >&5 + echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_posix_c_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + +-echo "${as_me:-configure}:13471: testing if the symbol is already defined go no further ..." 1>&5 ++echo "${as_me:-configure}:13474: testing if the symbol is already defined go no further ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13474 "configure" ++#line 13477 "configure" + #include "confdefs.h" + #include + int +@@ -13486,16 +13489,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13489: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13492: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13492: \$? = $ac_status" >&5 ++ echo "$as_me:13495: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13495: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13498: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13498: \$? = $ac_status" >&5 ++ echo "$as_me:13501: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_posix_c_source=no + else +@@ -13516,7 +13519,7 @@ + esac + if test "$cf_want_posix_source" = yes ; then + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13519 "configure" ++#line 13522 "configure" + #include "confdefs.h" + #include + int +@@ -13531,16 +13534,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13534: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13537: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13537: \$? = $ac_status" >&5 ++ echo "$as_me:13540: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13540: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13543: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13543: \$? = $ac_status" >&5 ++ echo "$as_me:13546: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -13551,7 +13554,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi + +-echo "${as_me:-configure}:13554: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 ++echo "${as_me:-configure}:13557: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 + + CFLAGS="$cf_trim_CFLAGS" + CPPFLAGS="$cf_trim_CPPFLAGS" +@@ -13559,10 +13562,10 @@ + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" + +-echo "${as_me:-configure}:13562: testing if the second compile does not leave our definition intact error ..." 1>&5 ++echo "${as_me:-configure}:13565: testing if the second compile does not leave our definition intact error ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13565 "configure" ++#line 13568 "configure" + #include "confdefs.h" + #include + int +@@ -13577,16 +13580,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13580: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13583: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13583: \$? = $ac_status" >&5 ++ echo "$as_me:13586: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13586: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13589: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13589: \$? = $ac_status" >&5 ++ echo "$as_me:13592: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -13602,7 +13605,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:13605: result: $cf_cv_posix_c_source" >&5 ++echo "$as_me:13608: result: $cf_cv_posix_c_source" >&5 + echo "${ECHO_T}$cf_cv_posix_c_source" >&6 + + if test "$cf_cv_posix_c_source" != no ; then +@@ -13728,7 +13731,7 @@ + test "$CFLAGS" != "$cf_old_cflag" || break + test -n "$verbose" && echo " removing old option $cf_add_cflags from CFLAGS" 1>&6 + +-echo "${as_me:-configure}:13731: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:13734: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5 + + CFLAGS="$cf_old_cflag" + done +@@ -13740,7 +13743,7 @@ + test "$CPPFLAGS" != "$cf_old_cflag" || break + test -n "$verbose" && echo " removing old option $cf_add_cflags from CPPFLAGS" 1>&6 + +-echo "${as_me:-configure}:13743: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5 ++echo "${as_me:-configure}:13746: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5 + + CPPFLAGS="$cf_old_cflag" + done +@@ -13828,7 +13831,7 @@ + if test -n "$cf_new_cflags" ; then + test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 + +-echo "${as_me:-configure}:13831: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 ++echo "${as_me:-configure}:13834: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" +@@ -13838,7 +13841,7 @@ + if test -n "$cf_new_cppflags" ; then + test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 + +-echo "${as_me:-configure}:13841: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 ++echo "${as_me:-configure}:13844: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" +@@ -13848,7 +13851,7 @@ + if test -n "$cf_new_extra_cppflags" ; then + test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 + +-echo "${as_me:-configure}:13851: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 ++echo "${as_me:-configure}:13854: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 + + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" +@@ -13860,10 +13863,10 @@ + fi + + if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then +- echo "$as_me:13863: checking if _XOPEN_SOURCE really is set" >&5 ++ echo "$as_me:13866: checking if _XOPEN_SOURCE really is set" >&5 + echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13866 "configure" ++#line 13869 "configure" + #include "confdefs.h" + #include + int +@@ -13878,16 +13881,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13881: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13884: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13884: \$? = $ac_status" >&5 ++ echo "$as_me:13887: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13887: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13890: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13890: \$? = $ac_status" >&5 ++ echo "$as_me:13893: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_XOPEN_SOURCE_set=yes + else +@@ -13896,12 +13899,12 @@ + cf_XOPEN_SOURCE_set=no + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +- echo "$as_me:13899: result: $cf_XOPEN_SOURCE_set" >&5 ++ echo "$as_me:13902: result: $cf_XOPEN_SOURCE_set" >&5 + echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6 + if test "$cf_XOPEN_SOURCE_set" = yes + then + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13904 "configure" ++#line 13907 "configure" + #include "confdefs.h" + #include + int +@@ -13916,16 +13919,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13919: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13922: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13922: \$? = $ac_status" >&5 ++ echo "$as_me:13925: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13925: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13928: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13928: \$? = $ac_status" >&5 ++ echo "$as_me:13931: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_XOPEN_SOURCE_set_ok=yes + else +@@ -13936,19 +13939,19 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + if test "$cf_XOPEN_SOURCE_set_ok" = no + then +- { echo "$as_me:13939: WARNING: _XOPEN_SOURCE is lower than requested" >&5 ++ { echo "$as_me:13942: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} + fi + else + +-echo "$as_me:13944: checking if we should define _XOPEN_SOURCE" >&5 ++echo "$as_me:13947: checking if we should define _XOPEN_SOURCE" >&5 + echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_xopen_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13951 "configure" ++#line 13954 "configure" + #include "confdefs.h" + + #include +@@ -13967,16 +13970,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13970: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13973: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13973: \$? = $ac_status" >&5 ++ echo "$as_me:13976: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13976: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13979: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13979: \$? = $ac_status" >&5 ++ echo "$as_me:13982: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_xopen_source=no + else +@@ -13988,7 +13991,7 @@ + CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13991 "configure" ++#line 13994 "configure" + #include "confdefs.h" + + #include +@@ -14007,16 +14010,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14010: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14013: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14013: \$? = $ac_status" >&5 ++ echo "$as_me:14016: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14016: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14019: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14019: \$? = $ac_status" >&5 ++ echo "$as_me:14022: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_xopen_source=no + else +@@ -14031,7 +14034,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:14034: result: $cf_cv_xopen_source" >&5 ++echo "$as_me:14037: result: $cf_cv_xopen_source" >&5 + echo "${ECHO_T}$cf_cv_xopen_source" >&6 + + if test "$cf_cv_xopen_source" != no ; then +@@ -14185,7 +14188,7 @@ + fi; + if test "$enable_largefile" != no; then + +- echo "$as_me:14188: checking for special C compiler options needed for large files" >&5 ++ echo "$as_me:14191: checking for special C compiler options needed for large files" >&5 + echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 + if test "${ac_cv_sys_largefile_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -14197,7 +14200,7 @@ + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14200 "configure" ++#line 14203 "configure" + #include "confdefs.h" + #include + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -14217,16 +14220,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14220: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14223: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14223: \$? = $ac_status" >&5 ++ echo "$as_me:14226: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14226: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14229: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14229: \$? = $ac_status" >&5 ++ echo "$as_me:14232: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -14236,16 +14239,16 @@ + rm -f "conftest.$ac_objext" + CC="$CC -n32" + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14239: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14242: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14242: \$? = $ac_status" >&5 ++ echo "$as_me:14245: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14245: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14248: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14248: \$? = $ac_status" >&5 ++ echo "$as_me:14251: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sys_largefile_CC=' -n32'; break + else +@@ -14259,13 +14262,13 @@ + rm -f "conftest.$ac_ext" + fi + fi +-echo "$as_me:14262: result: $ac_cv_sys_largefile_CC" >&5 ++echo "$as_me:14265: result: $ac_cv_sys_largefile_CC" >&5 + echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 + if test "$ac_cv_sys_largefile_CC" != no; then + CC=$CC$ac_cv_sys_largefile_CC + fi + +- echo "$as_me:14268: checking for _FILE_OFFSET_BITS value needed for large files" >&5 ++ echo "$as_me:14271: checking for _FILE_OFFSET_BITS value needed for large files" >&5 + echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 + if test "${ac_cv_sys_file_offset_bits+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -14273,7 +14276,7 @@ + while :; do + ac_cv_sys_file_offset_bits=no + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14276 "configure" ++#line 14279 "configure" + #include "confdefs.h" + #include + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -14293,16 +14296,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14296: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14299: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14299: \$? = $ac_status" >&5 ++ echo "$as_me:14302: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14302: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14305: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14305: \$? = $ac_status" >&5 ++ echo "$as_me:14308: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -14311,7 +14314,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14314 "configure" ++#line 14317 "configure" + #include "confdefs.h" + #define _FILE_OFFSET_BITS 64 + #include +@@ -14332,16 +14335,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14335: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14338: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14338: \$? = $ac_status" >&5 ++ echo "$as_me:14341: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14341: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14344: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14344: \$? = $ac_status" >&5 ++ echo "$as_me:14347: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sys_file_offset_bits=64; break + else +@@ -14352,7 +14355,7 @@ + break + done + fi +-echo "$as_me:14355: result: $ac_cv_sys_file_offset_bits" >&5 ++echo "$as_me:14358: result: $ac_cv_sys_file_offset_bits" >&5 + echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 + if test "$ac_cv_sys_file_offset_bits" != no; then + +@@ -14362,7 +14365,7 @@ + + fi + rm -rf conftest* +- echo "$as_me:14365: checking for _LARGE_FILES value needed for large files" >&5 ++ echo "$as_me:14368: checking for _LARGE_FILES value needed for large files" >&5 + echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 + if test "${ac_cv_sys_large_files+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -14370,7 +14373,7 @@ + while :; do + ac_cv_sys_large_files=no + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14373 "configure" ++#line 14376 "configure" + #include "confdefs.h" + #include + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -14390,16 +14393,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14393: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14396: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14396: \$? = $ac_status" >&5 ++ echo "$as_me:14399: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14399: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14402: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14402: \$? = $ac_status" >&5 ++ echo "$as_me:14405: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -14408,7 +14411,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14411 "configure" ++#line 14414 "configure" + #include "confdefs.h" + #define _LARGE_FILES 1 + #include +@@ -14429,16 +14432,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14432: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14435: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14435: \$? = $ac_status" >&5 ++ echo "$as_me:14438: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14438: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14441: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14441: \$? = $ac_status" >&5 ++ echo "$as_me:14444: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sys_large_files=1; break + else +@@ -14449,7 +14452,7 @@ + break + done + fi +-echo "$as_me:14452: result: $ac_cv_sys_large_files" >&5 ++echo "$as_me:14455: result: $ac_cv_sys_large_files" >&5 + echo "${ECHO_T}$ac_cv_sys_large_files" >&6 + if test "$ac_cv_sys_large_files" != no; then + +@@ -14462,7 +14465,7 @@ + fi + + if test "$enable_largefile" != no ; then +- echo "$as_me:14465: checking for _LARGEFILE_SOURCE value needed for large files" >&5 ++ echo "$as_me:14468: checking for _LARGEFILE_SOURCE value needed for large files" >&5 + echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6 + if test "${ac_cv_sys_largefile_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -14470,7 +14473,7 @@ + while :; do + ac_cv_sys_largefile_source=no + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14473 "configure" ++#line 14476 "configure" + #include "confdefs.h" + #include + int +@@ -14482,16 +14485,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14485: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14488: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14488: \$? = $ac_status" >&5 ++ echo "$as_me:14491: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14491: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14494: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14494: \$? = $ac_status" >&5 ++ echo "$as_me:14497: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -14500,7 +14503,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14503 "configure" ++#line 14506 "configure" + #include "confdefs.h" + #define _LARGEFILE_SOURCE 1 + #include +@@ -14513,16 +14516,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14516: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14519: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14519: \$? = $ac_status" >&5 ++ echo "$as_me:14522: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14522: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14525: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14525: \$? = $ac_status" >&5 ++ echo "$as_me:14528: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sys_largefile_source=1; break + else +@@ -14533,7 +14536,7 @@ + break + done + fi +-echo "$as_me:14536: result: $ac_cv_sys_largefile_source" >&5 ++echo "$as_me:14539: result: $ac_cv_sys_largefile_source" >&5 + echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6 + if test "$ac_cv_sys_largefile_source" != no; then + +@@ -14547,13 +14550,13 @@ + # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug + # in glibc 2.1.3, but that breaks too many other things. + # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. +-echo "$as_me:14550: checking for fseeko" >&5 ++echo "$as_me:14553: checking for fseeko" >&5 + echo $ECHO_N "checking for fseeko... $ECHO_C" >&6 + if test "${ac_cv_func_fseeko+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14556 "configure" ++#line 14559 "configure" + #include "confdefs.h" + #include + int +@@ -14565,16 +14568,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:14568: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14571: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14571: \$? = $ac_status" >&5 ++ echo "$as_me:14574: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:14574: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14577: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14577: \$? = $ac_status" >&5 ++ echo "$as_me:14580: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_fseeko=yes + else +@@ -14584,7 +14587,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:14587: result: $ac_cv_func_fseeko" >&5 ++echo "$as_me:14590: result: $ac_cv_func_fseeko" >&5 + echo "${ECHO_T}$ac_cv_func_fseeko" >&6 + if test $ac_cv_func_fseeko = yes; then + +@@ -14623,14 +14626,14 @@ + + fi + +- echo "$as_me:14626: checking whether to use struct dirent64" >&5 ++ echo "$as_me:14629: checking whether to use struct dirent64" >&5 + echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6 + if test "${cf_cv_struct_dirent64+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14633 "configure" ++#line 14636 "configure" + #include "confdefs.h" + + #pragma GCC diagnostic error "-Wincompatible-pointer-types" +@@ -14653,16 +14656,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14656: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14659: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14659: \$? = $ac_status" >&5 ++ echo "$as_me:14662: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14662: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14665: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14665: \$? = $ac_status" >&5 ++ echo "$as_me:14668: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_struct_dirent64=yes + else +@@ -14673,7 +14676,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:14676: result: $cf_cv_struct_dirent64" >&5 ++echo "$as_me:14679: result: $cf_cv_struct_dirent64" >&5 + echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 + test "$cf_cv_struct_dirent64" = yes && + cat >>confdefs.h <<\EOF +@@ -14683,7 +14686,7 @@ + fi + + ### Enable compiling-in rcs id's +-echo "$as_me:14686: checking if RCS identifiers should be compiled-in" >&5 ++echo "$as_me:14689: checking if RCS identifiers should be compiled-in" >&5 + echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6 + + # Check whether --with-rcs-ids or --without-rcs-ids was given. +@@ -14693,7 +14696,7 @@ + else + with_rcs_ids=no + fi; +-echo "$as_me:14696: result: $with_rcs_ids" >&5 ++echo "$as_me:14699: result: $with_rcs_ids" >&5 + echo "${ECHO_T}$with_rcs_ids" >&6 + test "$with_rcs_ids" = yes && + cat >>confdefs.h <<\EOF +@@ -14703,7 +14706,7 @@ + ############################################################################### + + ### Note that some functions (such as const) are normally disabled anyway. +-echo "$as_me:14706: checking if you want to build with function extensions" >&5 ++echo "$as_me:14709: checking if you want to build with function extensions" >&5 + echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6 + + # Check whether --enable-ext-funcs or --disable-ext-funcs was given. +@@ -14713,7 +14716,7 @@ + else + with_ext_funcs=yes + fi; +-echo "$as_me:14716: result: $with_ext_funcs" >&5 ++echo "$as_me:14719: result: $with_ext_funcs" >&5 + echo "${ECHO_T}$with_ext_funcs" >&6 + if test "$with_ext_funcs" = yes ; then + NCURSES_EXT_FUNCS=1 +@@ -14731,7 +14734,7 @@ + fi + + ### use option --enable-const to turn on use of const beyond that in XSI. +-echo "$as_me:14734: checking for extended use of const keyword" >&5 ++echo "$as_me:14737: checking for extended use of const keyword" >&5 + echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6 + + # Check whether --enable-const or --disable-const was given. +@@ -14741,7 +14744,7 @@ + else + with_ext_const=no + fi; +-echo "$as_me:14744: result: $with_ext_const" >&5 ++echo "$as_me:14747: result: $with_ext_const" >&5 + echo "${ECHO_T}$with_ext_const" >&6 + NCURSES_CONST='/*nothing*/' + if test "$with_ext_const" = yes ; then +@@ -14751,7 +14754,7 @@ + ############################################################################### + # These options are relatively safe to experiment with. + +-echo "$as_me:14754: checking if you want all development code" >&5 ++echo "$as_me:14757: checking if you want all development code" >&5 + echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6 + + # Check whether --with-develop or --without-develop was given. +@@ -14761,7 +14764,7 @@ + else + with_develop=no + fi; +-echo "$as_me:14764: result: $with_develop" >&5 ++echo "$as_me:14767: result: $with_develop" >&5 + echo "${ECHO_T}$with_develop" >&6 + + ############################################################################### +@@ -14770,7 +14773,7 @@ + # This is still experimental (20080329), but should ultimately be moved to + # the script-block --with-normal, etc. + +-echo "$as_me:14773: checking if you want to link with the pthread library" >&5 ++echo "$as_me:14776: checking if you want to link with the pthread library" >&5 + echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6 + + # Check whether --with-pthread or --without-pthread was given. +@@ -14780,27 +14783,27 @@ + else + with_pthread=no + fi; +-echo "$as_me:14783: result: $with_pthread" >&5 ++echo "$as_me:14786: result: $with_pthread" >&5 + echo "${ECHO_T}$with_pthread" >&6 + + if test "$with_pthread" != no ; then +- echo "$as_me:14787: checking for pthread.h" >&5 ++ echo "$as_me:14790: checking for pthread.h" >&5 + echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 + if test "${ac_cv_header_pthread_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14793 "configure" ++#line 14796 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:14797: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:14800: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:14803: \$? = $ac_status" >&5 ++ echo "$as_me:14806: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -14819,7 +14822,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:14822: result: $ac_cv_header_pthread_h" >&5 ++echo "$as_me:14825: result: $ac_cv_header_pthread_h" >&5 + echo "${ECHO_T}$ac_cv_header_pthread_h" >&6 + if test "$ac_cv_header_pthread_h" = yes; then + +@@ -14829,7 +14832,7 @@ + + for cf_lib_pthread in pthread c_r + do +- echo "$as_me:14832: checking if we can link with the $cf_lib_pthread library" >&5 ++ echo "$as_me:14835: checking if we can link with the $cf_lib_pthread library" >&5 + echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6 + cf_save_LIBS="$LIBS" + +@@ -14850,7 +14853,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14853 "configure" ++#line 14856 "configure" + #include "confdefs.h" + + #include +@@ -14867,16 +14870,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:14870: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14873: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14873: \$? = $ac_status" >&5 ++ echo "$as_me:14876: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:14876: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14879: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14879: \$? = $ac_status" >&5 ++ echo "$as_me:14882: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + with_pthread=yes + else +@@ -14886,7 +14889,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS="$cf_save_LIBS" +- echo "$as_me:14889: result: $with_pthread" >&5 ++ echo "$as_me:14892: result: $with_pthread" >&5 + echo "${ECHO_T}$with_pthread" >&6 + test "$with_pthread" = yes && break + done +@@ -14914,7 +14917,7 @@ + EOF + + else +- { { echo "$as_me:14917: error: Cannot link with pthread library" >&5 ++ { { echo "$as_me:14920: error: Cannot link with pthread library" >&5 + echo "$as_me: error: Cannot link with pthread library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -14923,7 +14926,7 @@ + + fi + +-echo "$as_me:14926: checking if you want to use weak-symbols for pthreads" >&5 ++echo "$as_me:14929: checking if you want to use weak-symbols for pthreads" >&5 + echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6 + + # Check whether --enable-weak-symbols or --disable-weak-symbols was given. +@@ -14933,18 +14936,18 @@ + else + use_weak_symbols=no + fi; +-echo "$as_me:14936: result: $use_weak_symbols" >&5 ++echo "$as_me:14939: result: $use_weak_symbols" >&5 + echo "${ECHO_T}$use_weak_symbols" >&6 + if test "$use_weak_symbols" = yes ; then + +-echo "$as_me:14940: checking if $CC supports weak symbols" >&5 ++echo "$as_me:14943: checking if $CC supports weak symbols" >&5 + echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6 + if test "${cf_cv_weak_symbols+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14947 "configure" ++#line 14950 "configure" + #include "confdefs.h" + + #include +@@ -14970,16 +14973,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14973: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14976: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14976: \$? = $ac_status" >&5 ++ echo "$as_me:14979: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14979: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14982: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14982: \$? = $ac_status" >&5 ++ echo "$as_me:14985: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_weak_symbols=yes + else +@@ -14990,7 +14993,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:14993: result: $cf_cv_weak_symbols" >&5 ++echo "$as_me:14996: result: $cf_cv_weak_symbols" >&5 + echo "${ECHO_T}$cf_cv_weak_symbols" >&6 + + else +@@ -15019,13 +15022,13 @@ + fi + + # OpenSUSE is installing ncurses6, using reentrant option. +-echo "$as_me:15022: checking for _nc_TABSIZE" >&5 ++echo "$as_me:15025: checking for _nc_TABSIZE" >&5 + echo $ECHO_N "checking for _nc_TABSIZE... $ECHO_C" >&6 + if test "${ac_cv_func__nc_TABSIZE+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 15028 "configure" ++#line 15031 "configure" + #include "confdefs.h" + #define _nc_TABSIZE autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -15056,16 +15059,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:15059: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15062: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15062: \$? = $ac_status" >&5 ++ echo "$as_me:15065: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:15065: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15068: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15068: \$? = $ac_status" >&5 ++ echo "$as_me:15071: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func__nc_TABSIZE=yes + else +@@ -15075,7 +15078,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:15078: result: $ac_cv_func__nc_TABSIZE" >&5 ++echo "$as_me:15081: result: $ac_cv_func__nc_TABSIZE" >&5 + echo "${ECHO_T}$ac_cv_func__nc_TABSIZE" >&6 + if test "$ac_cv_func__nc_TABSIZE" = yes; then + assume_reentrant=yes +@@ -15087,7 +15090,7 @@ + # opaque outside of that, so there is no --enable-opaque option. We can use + # this option without --with-pthreads, but this will be always set for + # pthreads. +-echo "$as_me:15090: checking if you want experimental reentrant code" >&5 ++echo "$as_me:15093: checking if you want experimental reentrant code" >&5 + echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6 + + # Check whether --enable-reentrant or --disable-reentrant was given. +@@ -15097,7 +15100,7 @@ + else + with_reentrant=$assume_reentrant + fi; +-echo "$as_me:15100: result: $with_reentrant" >&5 ++echo "$as_me:15103: result: $with_reentrant" >&5 + echo "${ECHO_T}$with_reentrant" >&6 + if test "$with_reentrant" = yes ; then + cf_cv_enable_reentrant=1 +@@ -15120,7 +15123,7 @@ + + ### Allow using a different wrap-prefix + if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then +- echo "$as_me:15123: checking for prefix used to wrap public variables" >&5 ++ echo "$as_me:15126: checking for prefix used to wrap public variables" >&5 + echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6 + + # Check whether --with-wrap-prefix or --without-wrap-prefix was given. +@@ -15130,7 +15133,7 @@ + else + NCURSES_WRAP_PREFIX=_nc_ + fi; +- echo "$as_me:15133: result: $NCURSES_WRAP_PREFIX" >&5 ++ echo "$as_me:15136: result: $NCURSES_WRAP_PREFIX" >&5 + echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 + else + NCURSES_WRAP_PREFIX=_nc_ +@@ -15144,7 +15147,7 @@ + + ### use option --disable-echo to suppress full display compiling commands + +-echo "$as_me:15147: checking if you want to see long compiling messages" >&5 ++echo "$as_me:15150: checking if you want to see long compiling messages" >&5 + echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6 + + # Check whether --enable-echo or --disable-echo was given. +@@ -15178,10 +15181,10 @@ + ECHO_CC='' + + fi; +-echo "$as_me:15181: result: $enableval" >&5 ++echo "$as_me:15184: result: $enableval" >&5 + echo "${ECHO_T}$enableval" >&6 + +-echo "$as_me:15184: checking if you want to use C11 _Noreturn feature" >&5 ++echo "$as_me:15187: checking if you want to use C11 _Noreturn feature" >&5 + echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6 + + # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given. +@@ -15198,17 +15201,17 @@ + enable_stdnoreturn=no + + fi; +-echo "$as_me:15201: result: $enable_stdnoreturn" >&5 ++echo "$as_me:15204: result: $enable_stdnoreturn" >&5 + echo "${ECHO_T}$enable_stdnoreturn" >&6 + + if test $enable_stdnoreturn = yes; then +-echo "$as_me:15205: checking for C11 _Noreturn feature" >&5 ++echo "$as_me:15208: checking for C11 _Noreturn feature" >&5 + echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6 + if test "${cf_cv_c11_noreturn+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 15211 "configure" ++#line 15214 "configure" + #include "confdefs.h" + + #include +@@ -15225,16 +15228,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:15228: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15231: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15231: \$? = $ac_status" >&5 ++ echo "$as_me:15234: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:15234: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15237: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15237: \$? = $ac_status" >&5 ++ echo "$as_me:15240: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_c11_noreturn=yes + else +@@ -15245,7 +15248,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:15248: result: $cf_cv_c11_noreturn" >&5 ++echo "$as_me:15251: result: $cf_cv_c11_noreturn" >&5 + echo "${ECHO_T}$cf_cv_c11_noreturn" >&6 + else + cf_cv_c11_noreturn=no, +@@ -15275,7 +15278,7 @@ + (*-Werror=*) + test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 + +-echo "${as_me:-configure}:15278: testing repairing CFLAGS: $CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:15281: testing repairing CFLAGS: $CFLAGS ..." 1>&5 + + cf_temp_flags= + for cf_temp_scan in $CFLAGS +@@ -15298,11 +15301,11 @@ + CFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 + +-echo "${as_me:-configure}:15301: testing ... fixed $CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:15304: testing ... fixed $CFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +-echo "${as_me:-configure}:15305: testing ... extra $EXTRA_CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:15308: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + ;; + esac +@@ -15314,7 +15317,7 @@ + (*-Werror=*) + test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 + +-echo "${as_me:-configure}:15317: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 ++echo "${as_me:-configure}:15320: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 + + cf_temp_flags= + for cf_temp_scan in $CPPFLAGS +@@ -15337,11 +15340,11 @@ + CPPFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 + +-echo "${as_me:-configure}:15340: testing ... fixed $CPPFLAGS ..." 1>&5 ++echo "${as_me:-configure}:15343: testing ... fixed $CPPFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +-echo "${as_me:-configure}:15344: testing ... extra $EXTRA_CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:15347: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + ;; + esac +@@ -15353,7 +15356,7 @@ + (*-Werror=*) + test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:15356: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:15359: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 + + cf_temp_flags= + for cf_temp_scan in $LDFLAGS +@@ -15376,17 +15379,17 @@ + LDFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:15379: testing ... fixed $LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:15382: testing ... fixed $LDFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +-echo "${as_me:-configure}:15383: testing ... extra $EXTRA_CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:15386: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + ;; + esac + fi + +-echo "$as_me:15389: checking if you want to turn on gcc warnings" >&5 ++echo "$as_me:15392: checking if you want to turn on gcc warnings" >&5 + echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6 + + # Check whether --enable-warnings or --disable-warnings was given. +@@ -15403,7 +15406,7 @@ + enable_warnings=no + + fi; +-echo "$as_me:15406: result: $enable_warnings" >&5 ++echo "$as_me:15409: result: $enable_warnings" >&5 + echo "${ECHO_T}$enable_warnings" >&6 + if test "$enable_warnings" = "yes" + then +@@ -15427,7 +15430,7 @@ + done + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 15430 "configure" ++#line 15433 "configure" + #include "confdefs.h" + + #include +@@ -15442,26 +15445,26 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:15445: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15448: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15448: \$? = $ac_status" >&5 ++ echo "$as_me:15451: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:15451: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15454: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15454: \$? = $ac_status" >&5 ++ echo "$as_me:15457: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + +-echo "$as_me:15457: checking for X11/Xt const-feature" >&5 ++echo "$as_me:15460: checking for X11/Xt const-feature" >&5 + echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6 + if test "${cf_cv_const_x_string+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 15464 "configure" ++#line 15467 "configure" + #include "confdefs.h" + + #define _CONST_X_STRING /* X11R7.8 (perhaps) */ +@@ -15478,16 +15481,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:15481: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15484: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15484: \$? = $ac_status" >&5 ++ echo "$as_me:15487: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:15487: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15490: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15490: \$? = $ac_status" >&5 ++ echo "$as_me:15493: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_const_x_string=no +@@ -15502,7 +15505,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:15505: result: $cf_cv_const_x_string" >&5 ++echo "$as_me:15508: result: $cf_cv_const_x_string" >&5 + echo "${ECHO_T}$cf_cv_const_x_string" >&6 + + LIBS="$cf_save_LIBS_CF_CONST_X_STRING" +@@ -15531,7 +15534,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi + cat > "conftest.$ac_ext" <&5 ++ { echo "$as_me:15553: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" +@@ -15563,12 +15566,12 @@ + wd981 + do + CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" +- if { (eval echo "$as_me:15566: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:15569: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15569: \$? = $ac_status" >&5 ++ echo "$as_me:15572: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- test -n "$verbose" && echo "$as_me:15571: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:15574: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" + fi +@@ -15576,7 +15579,7 @@ + CFLAGS="$cf_save_CFLAGS" + elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" + then +- { echo "$as_me:15579: checking for $CC warning options..." >&5 ++ { echo "$as_me:15582: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + cf_warn_CONST="" +@@ -15599,12 +15602,12 @@ + Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum + do + CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" +- if { (eval echo "$as_me:15602: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:15605: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15605: \$? = $ac_status" >&5 ++ echo "$as_me:15608: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- test -n "$verbose" && echo "$as_me:15607: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:15610: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + case "$cf_opt" in + (Winline) +@@ -15612,7 +15615,7 @@ + ([34].*) + test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 + +-echo "${as_me:-configure}:15615: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 ++echo "${as_me:-configure}:15618: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 + + continue;; + esac +@@ -15622,7 +15625,7 @@ + ([12].*) + test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 + +-echo "${as_me:-configure}:15625: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 ++echo "${as_me:-configure}:15628: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 + + continue;; + esac +@@ -15655,10 +15658,10 @@ + EOF + if test "$GCC" = yes + then +- { echo "$as_me:15658: checking for $CC __attribute__ directives..." >&5 ++ { echo "$as_me:15661: checking for $CC __attribute__ directives..." >&5 + echo "$as_me: checking for $CC __attribute__ directives..." >&6;} + cat > "conftest.$ac_ext" <&5 ++ if { (eval echo "$as_me:15713: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15713: \$? = $ac_status" >&5 ++ echo "$as_me:15716: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- test -n "$verbose" && echo "$as_me:15715: result: ... $cf_attribute" >&5 ++ test -n "$verbose" && echo "$as_me:15718: result: ... $cf_attribute" >&5 + echo "${ECHO_T}... $cf_attribute" >&6 + cat conftest.h >>confdefs.h + case "$cf_attribute" in +@@ -15780,7 +15783,7 @@ + fi + + ### use option --enable-assertions to turn on generation of assertion code +-echo "$as_me:15783: checking if you want to enable runtime assertions" >&5 ++echo "$as_me:15786: checking if you want to enable runtime assertions" >&5 + echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6 + + # Check whether --enable-assertions or --disable-assertions was given. +@@ -15790,7 +15793,7 @@ + else + with_assertions=no + fi; +-echo "$as_me:15793: result: $with_assertions" >&5 ++echo "$as_me:15796: result: $with_assertions" >&5 + echo "${ECHO_T}$with_assertions" >&6 + if test -n "$GCC" + then +@@ -15843,7 +15846,7 @@ + ;; + esac + +-echo "$as_me:15846: checking whether to add trace feature to all models" >&5 ++echo "$as_me:15849: checking whether to add trace feature to all models" >&5 + echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6 + + # Check whether --with-trace or --without-trace was given. +@@ -15853,7 +15856,7 @@ + else + cf_with_trace=$cf_all_traces + fi; +-echo "$as_me:15856: result: $cf_with_trace" >&5 ++echo "$as_me:15859: result: $cf_with_trace" >&5 + echo "${ECHO_T}$cf_with_trace" >&6 + + if test "$cf_with_trace" = yes ; then +@@ -15961,7 +15964,7 @@ + ADA_TRACE=FALSE + fi + +-echo "$as_me:15964: checking if we want to use GNAT projects" >&5 ++echo "$as_me:15967: checking if we want to use GNAT projects" >&5 + echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6 + + # Check whether --enable-gnat-projects or --disable-gnat-projects was given. +@@ -15978,21 +15981,21 @@ + enable_gnat_projects=yes + + fi; +-echo "$as_me:15981: result: $enable_gnat_projects" >&5 ++echo "$as_me:15984: result: $enable_gnat_projects" >&5 + echo "${ECHO_T}$enable_gnat_projects" >&6 + + ### Checks for libraries. + case $cf_cv_system_name in + (*mingw32*) + +-echo "$as_me:15988: checking if ssp library is needed" >&5 ++echo "$as_me:15991: checking if ssp library is needed" >&5 + echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6 + if test "${cf_cv_need_libssp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 15995 "configure" ++#line 15998 "configure" + #include "confdefs.h" + + #include +@@ -16009,16 +16012,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:16012: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16015: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16015: \$? = $ac_status" >&5 ++ echo "$as_me:16018: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:16018: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16021: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16021: \$? = $ac_status" >&5 ++ echo "$as_me:16024: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_need_libssp=no + else +@@ -16028,7 +16031,7 @@ + cf_save_LIBS="$LIBS" + LIBS="$LIBS -lssp" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16031 "configure" ++#line 16034 "configure" + #include "confdefs.h" + + #include +@@ -16045,16 +16048,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:16048: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16051: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16051: \$? = $ac_status" >&5 ++ echo "$as_me:16054: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:16054: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16057: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16057: \$? = $ac_status" >&5 ++ echo "$as_me:16060: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_need_libssp=yes + else +@@ -16068,7 +16071,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:16071: result: $cf_cv_need_libssp" >&5 ++echo "$as_me:16074: result: $cf_cv_need_libssp" >&5 + echo "${ECHO_T}$cf_cv_need_libssp" >&6 + + if test "x$cf_cv_need_libssp" = xyes +@@ -16094,13 +16097,13 @@ + + ;; + (*) +-echo "$as_me:16097: checking for gettimeofday" >&5 ++echo "$as_me:16100: checking for gettimeofday" >&5 + echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6 + if test "${ac_cv_func_gettimeofday+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16103 "configure" ++#line 16106 "configure" + #include "confdefs.h" + #define gettimeofday autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -16131,16 +16134,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:16134: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16137: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16137: \$? = $ac_status" >&5 ++ echo "$as_me:16140: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:16140: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16143: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16143: \$? = $ac_status" >&5 ++ echo "$as_me:16146: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_gettimeofday=yes + else +@@ -16150,7 +16153,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:16153: result: $ac_cv_func_gettimeofday" >&5 ++echo "$as_me:16156: result: $ac_cv_func_gettimeofday" >&5 + echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 + if test "$ac_cv_func_gettimeofday" = yes; then + cat >>confdefs.h <<\EOF +@@ -16159,7 +16162,7 @@ + + else + +-echo "$as_me:16162: checking for gettimeofday in -lbsd" >&5 ++echo "$as_me:16165: checking for gettimeofday in -lbsd" >&5 + echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6 + if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -16167,7 +16170,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16170 "configure" ++#line 16173 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -16186,16 +16189,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:16189: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16192: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16192: \$? = $ac_status" >&5 ++ echo "$as_me:16195: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:16195: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16198: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16198: \$? = $ac_status" >&5 ++ echo "$as_me:16201: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_bsd_gettimeofday=yes + else +@@ -16206,7 +16209,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:16209: result: $ac_cv_lib_bsd_gettimeofday" >&5 ++echo "$as_me:16212: result: $ac_cv_lib_bsd_gettimeofday" >&5 + echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6 + if test "$ac_cv_lib_bsd_gettimeofday" = yes; then + +@@ -16222,13 +16225,13 @@ + esac + + ### Checks for header files. +-echo "$as_me:16225: checking for ANSI C header files" >&5 ++echo "$as_me:16228: checking for ANSI C header files" >&5 + echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 + if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16231 "configure" ++#line 16234 "configure" + #include "confdefs.h" + #include + #include +@@ -16236,13 +16239,13 @@ + #include + + _ACEOF +-if { (eval echo "$as_me:16239: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:16242: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:16245: \$? = $ac_status" >&5 ++ echo "$as_me:16248: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -16264,7 +16267,7 @@ + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16267 "configure" ++#line 16270 "configure" + #include "confdefs.h" + #include + +@@ -16282,7 +16285,7 @@ + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16285 "configure" ++#line 16288 "configure" + #include "confdefs.h" + #include + +@@ -16303,7 +16306,7 @@ + : + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16306 "configure" ++#line 16309 "configure" + #include "confdefs.h" + #include + #if ((' ' & 0x0FF) == 0x020) +@@ -16329,15 +16332,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:16332: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16335: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16335: \$? = $ac_status" >&5 ++ echo "$as_me:16338: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:16337: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16340: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16340: \$? = $ac_status" >&5 ++ echo "$as_me:16343: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -16350,7 +16353,7 @@ + fi + fi + fi +-echo "$as_me:16353: result: $ac_cv_header_stdc" >&5 ++echo "$as_me:16356: result: $ac_cv_header_stdc" >&5 + echo "${ECHO_T}$ac_cv_header_stdc" >&6 + if test $ac_cv_header_stdc = yes; then + +@@ -16366,28 +16369,28 @@ + inttypes.h stdint.h unistd.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:16369: checking for $ac_header" >&5 ++echo "$as_me:16372: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16375 "configure" ++#line 16378 "configure" + #include "confdefs.h" + $ac_includes_default + #include <$ac_header> + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16381: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16384: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16384: \$? = $ac_status" >&5 ++ echo "$as_me:16387: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16387: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16390: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16390: \$? = $ac_status" >&5 ++ echo "$as_me:16393: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_Header=yes" + else +@@ -16397,7 +16400,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:16400: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:16403: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:16413: checking for signed char" >&5 + echo $ECHO_N "checking for signed char... $ECHO_C" >&6 + if test "${ac_cv_type_signed_char+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16416 "configure" ++#line 16419 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -16428,16 +16431,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16431: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16434: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16434: \$? = $ac_status" >&5 ++ echo "$as_me:16437: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16437: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16440: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16440: \$? = $ac_status" >&5 ++ echo "$as_me:16443: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_signed_char=yes + else +@@ -16447,10 +16450,10 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:16450: result: $ac_cv_type_signed_char" >&5 ++echo "$as_me:16453: result: $ac_cv_type_signed_char" >&5 + echo "${ECHO_T}$ac_cv_type_signed_char" >&6 + +-echo "$as_me:16453: checking size of signed char" >&5 ++echo "$as_me:16456: checking size of signed char" >&5 + echo $ECHO_N "checking size of signed char... $ECHO_C" >&6 + if test "${ac_cv_sizeof_signed_char+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -16459,7 +16462,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16462 "configure" ++#line 16465 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -16471,21 +16474,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16474: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16477: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16477: \$? = $ac_status" >&5 ++ echo "$as_me:16480: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16480: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16483: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16483: \$? = $ac_status" >&5 ++ echo "$as_me:16486: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16488 "configure" ++#line 16491 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -16497,16 +16500,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16500: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16503: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16503: \$? = $ac_status" >&5 ++ echo "$as_me:16506: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16506: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16509: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16509: \$? = $ac_status" >&5 ++ echo "$as_me:16512: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid; break + else +@@ -16522,7 +16525,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16525 "configure" ++#line 16528 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -16534,16 +16537,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16537: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16540: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16540: \$? = $ac_status" >&5 ++ echo "$as_me:16543: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16543: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16546: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16546: \$? = $ac_status" >&5 ++ echo "$as_me:16549: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=$ac_mid; break + else +@@ -16559,7 +16562,7 @@ + while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16562 "configure" ++#line 16565 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -16571,16 +16574,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16574: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16577: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16577: \$? = $ac_status" >&5 ++ echo "$as_me:16580: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16580: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16583: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16583: \$? = $ac_status" >&5 ++ echo "$as_me:16586: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid + else +@@ -16593,12 +16596,12 @@ + ac_cv_sizeof_signed_char=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:16596: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:16599: error: cannot run test program while cross compiling" >&5 + echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16601 "configure" ++#line 16604 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -16614,15 +16617,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:16617: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16620: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16620: \$? = $ac_status" >&5 ++ echo "$as_me:16623: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:16622: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16625: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16625: \$? = $ac_status" >&5 ++ echo "$as_me:16628: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sizeof_signed_char=`cat conftest.val` + else +@@ -16638,19 +16641,19 @@ + ac_cv_sizeof_signed_char=0 + fi + fi +-echo "$as_me:16641: result: $ac_cv_sizeof_signed_char" >&5 ++echo "$as_me:16644: result: $ac_cv_sizeof_signed_char" >&5 + echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 + cat >>confdefs.h <&5 ++echo "$as_me:16650: checking for ANSI C header files" >&5 + echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 + if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16653 "configure" ++#line 16656 "configure" + #include "confdefs.h" + #include + #include +@@ -16658,13 +16661,13 @@ + #include + + _ACEOF +-if { (eval echo "$as_me:16661: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:16664: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:16667: \$? = $ac_status" >&5 ++ echo "$as_me:16670: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -16686,7 +16689,7 @@ + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16689 "configure" ++#line 16692 "configure" + #include "confdefs.h" + #include + +@@ -16704,7 +16707,7 @@ + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16707 "configure" ++#line 16710 "configure" + #include "confdefs.h" + #include + +@@ -16725,7 +16728,7 @@ + : + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16728 "configure" ++#line 16731 "configure" + #include "confdefs.h" + #include + #if ((' ' & 0x0FF) == 0x020) +@@ -16751,15 +16754,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:16754: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16757: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16757: \$? = $ac_status" >&5 ++ echo "$as_me:16760: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:16759: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16762: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16762: \$? = $ac_status" >&5 ++ echo "$as_me:16765: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -16772,7 +16775,7 @@ + fi + fi + fi +-echo "$as_me:16775: result: $ac_cv_header_stdc" >&5 ++echo "$as_me:16778: result: $ac_cv_header_stdc" >&5 + echo "${ECHO_T}$ac_cv_header_stdc" >&6 + if test $ac_cv_header_stdc = yes; then + +@@ -16785,13 +16788,13 @@ + ac_header_dirent=no + for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do + as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` +-echo "$as_me:16788: checking for $ac_hdr that defines DIR" >&5 ++echo "$as_me:16791: checking for $ac_hdr that defines DIR" >&5 + echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16794 "configure" ++#line 16797 "configure" + #include "confdefs.h" + #include + #include <$ac_hdr> +@@ -16806,16 +16809,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16809: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16812: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16812: \$? = $ac_status" >&5 ++ echo "$as_me:16815: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16815: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16818: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16818: \$? = $ac_status" >&5 ++ echo "$as_me:16821: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_Header=yes" + else +@@ -16825,7 +16828,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:16828: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:16831: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++ echo "$as_me:16844: checking for opendir in -ldir" >&5 + echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 + if test "${ac_cv_lib_dir_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -16846,7 +16849,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldir $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16849 "configure" ++#line 16852 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -16865,16 +16868,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:16868: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16871: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16871: \$? = $ac_status" >&5 ++ echo "$as_me:16874: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:16874: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16877: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16877: \$? = $ac_status" >&5 ++ echo "$as_me:16880: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_dir_opendir=yes + else +@@ -16885,14 +16888,14 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:16888: result: $ac_cv_lib_dir_opendir" >&5 ++echo "$as_me:16891: result: $ac_cv_lib_dir_opendir" >&5 + echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 + if test "$ac_cv_lib_dir_opendir" = yes; then + LIBS="$LIBS -ldir" + fi + + else +- echo "$as_me:16895: checking for opendir in -lx" >&5 ++ echo "$as_me:16898: checking for opendir in -lx" >&5 + echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 + if test "${ac_cv_lib_x_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -16900,7 +16903,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lx $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16903 "configure" ++#line 16906 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -16919,16 +16922,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:16922: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16925: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16925: \$? = $ac_status" >&5 ++ echo "$as_me:16928: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:16928: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16931: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16931: \$? = $ac_status" >&5 ++ echo "$as_me:16934: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_x_opendir=yes + else +@@ -16939,7 +16942,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:16942: result: $ac_cv_lib_x_opendir" >&5 ++echo "$as_me:16945: result: $ac_cv_lib_x_opendir" >&5 + echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 + if test "$ac_cv_lib_x_opendir" = yes; then + LIBS="$LIBS -lx" +@@ -16947,13 +16950,13 @@ + + fi + +-echo "$as_me:16950: checking whether time.h and sys/time.h may both be included" >&5 ++echo "$as_me:16953: checking whether time.h and sys/time.h may both be included" >&5 + echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 + if test "${ac_cv_header_time+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16956 "configure" ++#line 16959 "configure" + #include "confdefs.h" + #include + #include +@@ -16969,16 +16972,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16972: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16975: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16975: \$? = $ac_status" >&5 ++ echo "$as_me:16978: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16978: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16981: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16981: \$? = $ac_status" >&5 ++ echo "$as_me:16984: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_header_time=yes + else +@@ -16988,7 +16991,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:16991: result: $ac_cv_header_time" >&5 ++echo "$as_me:16994: result: $ac_cv_header_time" >&5 + echo "${ECHO_T}$ac_cv_header_time" >&6 + if test $ac_cv_header_time = yes; then + +@@ -17006,13 +17009,13 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_main_return="return" + +-echo "$as_me:17009: checking for an ANSI C-conforming const" >&5 ++echo "$as_me:17012: checking for an ANSI C-conforming const" >&5 + echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 + if test "${ac_cv_c_const+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17015 "configure" ++#line 17018 "configure" + #include "confdefs.h" + + int +@@ -17070,16 +17073,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:17073: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17076: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17076: \$? = $ac_status" >&5 ++ echo "$as_me:17079: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:17079: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17082: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17082: \$? = $ac_status" >&5 ++ echo "$as_me:17085: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_c_const=yes + else +@@ -17089,7 +17092,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:17092: result: $ac_cv_c_const" >&5 ++echo "$as_me:17095: result: $ac_cv_c_const" >&5 + echo "${ECHO_T}$ac_cv_c_const" >&6 + if test $ac_cv_c_const = no; then + +@@ -17101,7 +17104,7 @@ + + ### Checks for external-data + +-echo "$as_me:17104: checking if data-only library module links" >&5 ++echo "$as_me:17107: checking if data-only library module links" >&5 + echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6 + if test "${cf_cv_link_dataonly+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17109,20 +17112,20 @@ + + rm -f conftest.a + cat >conftest.$ac_ext <&5 ++ if { (eval echo "$as_me:17118: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17118: \$? = $ac_status" >&5 ++ echo "$as_me:17121: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then + mv conftest.o data.o && \ + ( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null + fi + rm -f conftest.$ac_ext data.o + cat >conftest.$ac_ext <&5 ++ if { (eval echo "$as_me:17141: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17141: \$? = $ac_status" >&5 ++ echo "$as_me:17144: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then + mv conftest.o func.o && \ + ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null +@@ -17151,7 +17154,7 @@ + cf_cv_link_dataonly=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17154 "configure" ++#line 17157 "configure" + #include "confdefs.h" + + int main(void) +@@ -17162,15 +17165,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:17165: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17168: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17168: \$? = $ac_status" >&5 ++ echo "$as_me:17171: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:17170: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17173: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17173: \$? = $ac_status" >&5 ++ echo "$as_me:17176: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_link_dataonly=yes + else +@@ -17185,7 +17188,7 @@ + + fi + +-echo "$as_me:17188: result: $cf_cv_link_dataonly" >&5 ++echo "$as_me:17191: result: $cf_cv_link_dataonly" >&5 + echo "${ECHO_T}$cf_cv_link_dataonly" >&6 + + if test "$cf_cv_link_dataonly" = no ; then +@@ -17204,23 +17207,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:17207: checking for $ac_header" >&5 ++echo "$as_me:17210: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17213 "configure" ++#line 17216 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:17217: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:17220: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:17223: \$? = $ac_status" >&5 ++ echo "$as_me:17226: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -17239,7 +17242,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:17242: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:17245: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:17255: checking for working mkstemp" >&5 + echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 + if test "${cf_cv_func_mkstemp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17260,7 +17263,7 @@ + cf_cv_func_mkstemp=maybe + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17263 "configure" ++#line 17266 "configure" + #include "confdefs.h" + + #include +@@ -17301,15 +17304,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:17304: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17307: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17307: \$? = $ac_status" >&5 ++ echo "$as_me:17310: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:17309: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17312: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17312: \$? = $ac_status" >&5 ++ echo "$as_me:17315: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_mkstemp=yes + +@@ -17324,16 +17327,16 @@ + fi + + fi +-echo "$as_me:17327: result: $cf_cv_func_mkstemp" >&5 ++echo "$as_me:17330: result: $cf_cv_func_mkstemp" >&5 + echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 + if test "x$cf_cv_func_mkstemp" = xmaybe ; then +- echo "$as_me:17330: checking for mkstemp" >&5 ++ echo "$as_me:17333: checking for mkstemp" >&5 + echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 + if test "${ac_cv_func_mkstemp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17336 "configure" ++#line 17339 "configure" + #include "confdefs.h" + #define mkstemp autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -17364,16 +17367,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:17367: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17370: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17370: \$? = $ac_status" >&5 ++ echo "$as_me:17373: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:17373: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17376: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17376: \$? = $ac_status" >&5 ++ echo "$as_me:17379: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_mkstemp=yes + else +@@ -17383,7 +17386,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:17386: result: $ac_cv_func_mkstemp" >&5 ++echo "$as_me:17389: result: $ac_cv_func_mkstemp" >&5 + echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 + + fi +@@ -17412,7 +17415,7 @@ + unset cf_TEMP_gnat + # Extract the first word of "$cf_prog_gnat", so it can be a program name with args. + set dummy $cf_prog_gnat; ac_word=$2 +-echo "$as_me:17415: checking for $ac_word" >&5 ++echo "$as_me:17418: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17429,7 +17432,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word" +- echo "$as_me:17432: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:17435: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -17441,10 +17444,10 @@ + cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat + + if test -n "$cf_TEMP_gnat"; then +- echo "$as_me:17444: result: $cf_TEMP_gnat" >&5 ++ echo "$as_me:17447: result: $cf_TEMP_gnat" >&5 + echo "${ECHO_T}$cf_TEMP_gnat" >&6 + else +- echo "$as_me:17447: result: no" >&5 ++ echo "$as_me:17450: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -17454,7 +17457,7 @@ + unset cf_cv_gnat_version + unset cf_TEMP_gnat + +-echo "$as_me:17457: checking for $cf_prog_gnat version" >&5 ++echo "$as_me:17460: checking for $cf_prog_gnat version" >&5 + echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6 + if test "${cf_cv_gnat_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17465,7 +17468,7 @@ + sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` + + fi +-echo "$as_me:17468: result: $cf_cv_gnat_version" >&5 ++echo "$as_me:17471: result: $cf_cv_gnat_version" >&5 + echo "${ECHO_T}$cf_cv_gnat_version" >&6 + test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no + eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version +@@ -17494,7 +17497,7 @@ + cd conftest.src + for cf_gprconfig in Ada C + do +- echo "$as_me:17497: checking for gprconfig name for $cf_gprconfig" >&5 ++ echo "$as_me:17500: checking for gprconfig name for $cf_gprconfig" >&5 + echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6 + if test "$cf_gprconfig" = C + then +@@ -17513,10 +17516,10 @@ + if test -n "$cf_gprconfig_value" + then + eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value" +- echo "$as_me:17516: result: $cf_gprconfig_value" >&5 ++ echo "$as_me:17519: result: $cf_gprconfig_value" >&5 + echo "${ECHO_T}$cf_gprconfig_value" >&6 + else +- echo "$as_me:17519: result: missing" >&5 ++ echo "$as_me:17522: result: missing" >&5 + echo "${ECHO_T}missing" >&6 + cf_ada_config="#" + break +@@ -17529,7 +17532,7 @@ + if test "x$cf_ada_config" != "x#" + then + +-echo "$as_me:17532: checking for gnat version" >&5 ++echo "$as_me:17535: checking for gnat version" >&5 + echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 + if test "${cf_cv_gnat_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17540,7 +17543,7 @@ + sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` + + fi +-echo "$as_me:17543: result: $cf_cv_gnat_version" >&5 ++echo "$as_me:17546: result: $cf_cv_gnat_version" >&5 + echo "${ECHO_T}$cf_cv_gnat_version" >&6 + test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no + +@@ -17549,7 +17552,7 @@ + cf_cv_prog_gnat_correct=yes + ;; + (*) +- { echo "$as_me:17552: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 ++ { echo "$as_me:17555: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 + echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} + cf_cv_prog_gnat_correct=no + ;; +@@ -17557,7 +17560,7 @@ + + # Extract the first word of "m4", so it can be a program name with args. + set dummy m4; ac_word=$2 +-echo "$as_me:17560: checking for $ac_word" >&5 ++echo "$as_me:17563: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_M4_exists+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17572,7 +17575,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_M4_exists="yes" +-echo "$as_me:17575: found $ac_dir/$ac_word" >&5 ++echo "$as_me:17578: found $ac_dir/$ac_word" >&5 + break + done + +@@ -17581,20 +17584,20 @@ + fi + M4_exists=$ac_cv_prog_M4_exists + if test -n "$M4_exists"; then +- echo "$as_me:17584: result: $M4_exists" >&5 ++ echo "$as_me:17587: result: $M4_exists" >&5 + echo "${ECHO_T}$M4_exists" >&6 + else +- echo "$as_me:17587: result: no" >&5 ++ echo "$as_me:17590: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + if test "$ac_cv_prog_M4_exists" = no; then + cf_cv_prog_gnat_correct=no +- { echo "$as_me:17593: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 ++ { echo "$as_me:17596: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 + echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;} + fi + if test "$cf_cv_prog_gnat_correct" = yes; then +- echo "$as_me:17597: checking if GNAT works" >&5 ++ echo "$as_me:17600: checking if GNAT works" >&5 + echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 + + rm -rf ./conftest* ./*~conftest* +@@ -17622,7 +17625,7 @@ + fi + rm -rf ./conftest* ./*~conftest* + +- echo "$as_me:17625: result: $cf_cv_prog_gnat_correct" >&5 ++ echo "$as_me:17628: result: $cf_cv_prog_gnat_correct" >&5 + echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 + fi + else +@@ -17632,7 +17635,7 @@ + + if test "$cf_cv_prog_gnat_correct" = yes; then + +- echo "$as_me:17635: checking optimization options for ADAFLAGS" >&5 ++ echo "$as_me:17638: checking optimization options for ADAFLAGS" >&5 + echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 + case "$CFLAGS" in + (*-g*) +@@ -17649,10 +17652,10 @@ + + ;; + esac +- echo "$as_me:17652: result: $ADAFLAGS" >&5 ++ echo "$as_me:17655: result: $ADAFLAGS" >&5 + echo "${ECHO_T}$ADAFLAGS" >&6 + +-echo "$as_me:17655: checking if GNATPREP supports -T option" >&5 ++echo "$as_me:17658: checking if GNATPREP supports -T option" >&5 + echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6 + if test "${cf_cv_gnatprep_opt_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17662,11 +17665,11 @@ + gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes + + fi +-echo "$as_me:17665: result: $cf_cv_gnatprep_opt_t" >&5 ++echo "$as_me:17668: result: $cf_cv_gnatprep_opt_t" >&5 + echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6 + test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS" + +-echo "$as_me:17669: checking if GNAT supports generics" >&5 ++echo "$as_me:17672: checking if GNAT supports generics" >&5 + echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 + case "$cf_cv_gnat_version" in + (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9]) +@@ -17676,7 +17679,7 @@ + cf_gnat_generics=no + ;; + esac +-echo "$as_me:17679: result: $cf_gnat_generics" >&5 ++echo "$as_me:17682: result: $cf_gnat_generics" >&5 + echo "${ECHO_T}$cf_gnat_generics" >&6 + + if test "$cf_gnat_generics" = yes +@@ -17688,7 +17691,7 @@ + cf_generic_objects= + fi + +-echo "$as_me:17691: checking if GNAT supports SIGINT" >&5 ++echo "$as_me:17694: checking if GNAT supports SIGINT" >&5 + echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6 + if test "${cf_cv_gnat_sigint+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17736,7 +17739,7 @@ + rm -rf ./conftest* ./*~conftest* + + fi +-echo "$as_me:17739: result: $cf_cv_gnat_sigint" >&5 ++echo "$as_me:17742: result: $cf_cv_gnat_sigint" >&5 + echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 + + if test "$cf_cv_gnat_sigint" = yes ; then +@@ -17749,7 +17752,7 @@ + cf_gnat_projects=no + + if test "$enable_gnat_projects" != no ; then +-echo "$as_me:17752: checking if GNAT supports project files" >&5 ++echo "$as_me:17755: checking if GNAT supports project files" >&5 + echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 + case "$cf_cv_gnat_version" in + (3.[0-9]*) +@@ -17812,15 +17815,15 @@ + esac + ;; + esac +-echo "$as_me:17815: result: $cf_gnat_projects" >&5 ++echo "$as_me:17818: result: $cf_gnat_projects" >&5 + echo "${ECHO_T}$cf_gnat_projects" >&6 + fi # enable_gnat_projects + + if test "$cf_gnat_projects" = yes + then +- echo "$as_me:17821: checking if GNAT supports libraries" >&5 ++ echo "$as_me:17824: checking if GNAT supports libraries" >&5 + echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 +- echo "$as_me:17823: result: $cf_gnat_libraries" >&5 ++ echo "$as_me:17826: result: $cf_gnat_libraries" >&5 + echo "${ECHO_T}$cf_gnat_libraries" >&6 + fi + +@@ -17840,7 +17843,7 @@ + then + USE_GNAT_MAKE_GPR="" + else +- { echo "$as_me:17843: WARNING: use old makefile rules since tools are missing" >&5 ++ { echo "$as_me:17846: WARNING: use old makefile rules since tools are missing" >&5 + echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;} + fi + fi +@@ -17852,7 +17855,7 @@ + USE_GNAT_LIBRARIES="#" + fi + +-echo "$as_me:17855: checking for ada-compiler" >&5 ++echo "$as_me:17858: checking for ada-compiler" >&5 + echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6 + + # Check whether --with-ada-compiler or --without-ada-compiler was given. +@@ -17863,12 +17866,12 @@ + cf_ada_compiler=gnatmake + fi; + +-echo "$as_me:17866: result: $cf_ada_compiler" >&5 ++echo "$as_me:17869: result: $cf_ada_compiler" >&5 + echo "${ECHO_T}$cf_ada_compiler" >&6 + + cf_ada_package=terminal_interface + +-echo "$as_me:17871: checking for ada-include" >&5 ++echo "$as_me:17874: checking for ada-include" >&5 + echo $ECHO_N "checking for ada-include... $ECHO_C" >&6 + + # Check whether --with-ada-include or --without-ada-include was given. +@@ -17904,7 +17907,7 @@ + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:17907: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:17910: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -17913,10 +17916,10 @@ + fi + eval ADA_INCLUDE="$withval" + +-echo "$as_me:17916: result: $ADA_INCLUDE" >&5 ++echo "$as_me:17919: result: $ADA_INCLUDE" >&5 + echo "${ECHO_T}$ADA_INCLUDE" >&6 + +-echo "$as_me:17919: checking for ada-objects" >&5 ++echo "$as_me:17922: checking for ada-objects" >&5 + echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6 + + # Check whether --with-ada-objects or --without-ada-objects was given. +@@ -17952,7 +17955,7 @@ + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:17955: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:17958: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -17961,10 +17964,10 @@ + fi + eval ADA_OBJECTS="$withval" + +-echo "$as_me:17964: result: $ADA_OBJECTS" >&5 ++echo "$as_me:17967: result: $ADA_OBJECTS" >&5 + echo "${ECHO_T}$ADA_OBJECTS" >&6 + +-echo "$as_me:17967: checking if an Ada95 shared-library should be built" >&5 ++echo "$as_me:17970: checking if an Ada95 shared-library should be built" >&5 + echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6 + + # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given. +@@ -17974,14 +17977,14 @@ + else + with_ada_sharedlib=no + fi; +-echo "$as_me:17977: result: $with_ada_sharedlib" >&5 ++echo "$as_me:17980: result: $with_ada_sharedlib" >&5 + echo "${ECHO_T}$with_ada_sharedlib" >&6 + + if test "x$with_ada_sharedlib" != xno + then + if test "x$cf_gnat_projects" != xyes + then +- { echo "$as_me:17984: WARNING: disabling shared-library since GNAT projects are not supported" >&5 ++ { echo "$as_me:17987: WARNING: disabling shared-library since GNAT projects are not supported" >&5 + echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;} + with_ada_sharedlib=no + fi +@@ -18001,7 +18004,7 @@ + + # allow the Ada binding to be renamed + +-echo "$as_me:18004: checking for ada-libname" >&5 ++echo "$as_me:18007: checking for ada-libname" >&5 + echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6 + + # Check whether --with-ada-libname or --without-ada-libname was given. +@@ -18017,16 +18020,16 @@ + ;; + esac + +-echo "$as_me:18020: result: $ADA_LIBNAME" >&5 ++echo "$as_me:18023: result: $ADA_LIBNAME" >&5 + echo "${ECHO_T}$ADA_LIBNAME" >&6 + + else +- { { echo "$as_me:18024: error: No usable Ada compiler found" >&5 ++ { { echo "$as_me:18027: error: No usable Ada compiler found" >&5 + echo "$as_me: error: No usable Ada compiler found" >&2;} + { (exit 1); exit 1; }; } + fi + else +- { { echo "$as_me:18029: error: The Ada compiler is needed for this package" >&5 ++ { { echo "$as_me:18032: error: The Ada compiler is needed for this package" >&5 + echo "$as_me: error: The Ada compiler is needed for this package" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -18066,7 +18069,7 @@ + fi + + ### Build up pieces for makefile rules +-echo "$as_me:18069: checking default library suffix" >&5 ++echo "$as_me:18072: checking default library suffix" >&5 + echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -18077,10 +18080,10 @@ + (shared) DFT_ARG_SUFFIX='' ;; + esac + test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" +-echo "$as_me:18080: result: $DFT_ARG_SUFFIX" >&5 ++echo "$as_me:18083: result: $DFT_ARG_SUFFIX" >&5 + echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 + +-echo "$as_me:18083: checking default library-dependency suffix" >&5 ++echo "$as_me:18086: checking default library-dependency suffix" >&5 + echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 + + case X$DFT_LWR_MODEL in +@@ -18163,10 +18166,10 @@ + DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}" + DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}" + fi +-echo "$as_me:18166: result: $DFT_DEP_SUFFIX" >&5 ++echo "$as_me:18169: result: $DFT_DEP_SUFFIX" >&5 + echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 + +-echo "$as_me:18169: checking default object directory" >&5 ++echo "$as_me:18172: checking default object directory" >&5 + echo $ECHO_N "checking default object directory... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -18182,7 +18185,7 @@ + DFT_OBJ_SUBDIR='obj_s' ;; + esac + esac +-echo "$as_me:18185: result: $DFT_OBJ_SUBDIR" >&5 ++echo "$as_me:18188: result: $DFT_OBJ_SUBDIR" >&5 + echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 + + ### Set up low-level terminfo dependencies for makefiles. +@@ -18324,7 +18327,7 @@ + : "${CONFIG_STATUS=./config.status}" + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ echo "$as_me:18327: creating $CONFIG_STATUS" >&5 ++{ echo "$as_me:18330: creating $CONFIG_STATUS" >&5 + echo "$as_me: creating $CONFIG_STATUS" >&6;} + cat >"$CONFIG_STATUS" <<_ACEOF + #! $SHELL +@@ -18503,7 +18506,7 @@ + echo "$ac_cs_version"; exit 0 ;; + --he | --h) + # Conflict between --help and --header +- { { echo "$as_me:18506: error: ambiguous option: $1 ++ { { echo "$as_me:18509: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&5 + echo "$as_me: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&2;} +@@ -18522,7 +18525,7 @@ + ac_need_defaults=false;; + + # This is an error. +- -*) { { echo "$as_me:18525: error: unrecognized option: $1 ++ -*) { { echo "$as_me:18528: error: unrecognized option: $1 + Try \`$0 --help' for more information." >&5 + echo "$as_me: error: unrecognized option: $1 + Try \`$0 --help' for more information." >&2;} +@@ -18596,7 +18599,7 @@ + "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; + "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; +- *) { { echo "$as_me:18599: error: invalid argument: $ac_config_target" >&5 ++ *) { { echo "$as_me:18602: error: invalid argument: $ac_config_target" >&5 + echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +@@ -18956,7 +18959,7 @@ + esac + + if test x"$ac_file" != x-; then +- { echo "$as_me:18959: creating $ac_file" >&5 ++ { echo "$as_me:18962: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi +@@ -18974,7 +18977,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:18977: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:18980: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -18987,7 +18990,7 @@ + echo "$srcdir/$f" + else + # /dev/null tree +- { { echo "$as_me:18990: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:18993: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -19003,7 +19006,7 @@ + if test -n "$ac_seen"; then + ac_used=`grep '@datarootdir@' "$ac_item"` + if test -z "$ac_used"; then +- { echo "$as_me:19006: WARNING: datarootdir was used implicitly but not set: ++ { echo "$as_me:19009: WARNING: datarootdir was used implicitly but not set: + $ac_seen" >&5 + echo "$as_me: WARNING: datarootdir was used implicitly but not set: + $ac_seen" >&2;} +@@ -19012,7 +19015,7 @@ + fi + ac_seen=`grep '${datarootdir}' "$ac_item"` + if test -n "$ac_seen"; then +- { echo "$as_me:19015: WARNING: datarootdir was used explicitly but not set: ++ { echo "$as_me:19018: WARNING: datarootdir was used explicitly but not set: + $ac_seen" >&5 + echo "$as_me: WARNING: datarootdir was used explicitly but not set: + $ac_seen" >&2;} +@@ -19049,7 +19052,7 @@ + ac_init=`${EGREP-egrep} '[ ]*'$ac_name'[ ]*=' "$ac_file"` + if test -z "$ac_init"; then + ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` +- { echo "$as_me:19052: WARNING: Variable $ac_name is used but was not set: ++ { echo "$as_me:19055: WARNING: Variable $ac_name is used but was not set: + $ac_seen" >&5 + echo "$as_me: WARNING: Variable $ac_name is used but was not set: + $ac_seen" >&2;} +@@ -19060,7 +19063,7 @@ + ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out + if test -s $tmp/out; then + ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` +- { echo "$as_me:19063: WARNING: Some variables may not be substituted: ++ { echo "$as_me:19066: WARNING: Some variables may not be substituted: + $ac_seen" >&5 + echo "$as_me: WARNING: Some variables may not be substituted: + $ac_seen" >&2;} +@@ -19109,7 +19112,7 @@ + * ) ac_file_in=$ac_file.in ;; + esac + +- test x"$ac_file" != x- && { echo "$as_me:19112: creating $ac_file" >&5 ++ test x"$ac_file" != x- && { echo "$as_me:19115: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + + # First look for the input files in the build tree, otherwise in the +@@ -19120,7 +19123,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:19123: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:19126: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -19133,7 +19136,7 @@ + echo "$srcdir/$f" + else + # /dev/null tree +- { { echo "$as_me:19136: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:19139: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -19191,7 +19194,7 @@ + rm -f $tmp/in + if test x"$ac_file" != x-; then + if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then +- { echo "$as_me:19194: $ac_file is unchanged" >&5 ++ { echo "$as_me:19197: $ac_file is unchanged" >&5 + echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +Index: NEWS +Prereq: 1.3741 +--- ncurses-6.3-20211106+/NEWS 2021-11-06 23:43:40.000000000 +0000 ++++ ncurses-6.3-20211113/NEWS 2021-11-14 00:34:58.000000000 +0000 +@@ -26,7 +26,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: NEWS,v 1.3741 2021/11/06 23:43:40 tom Exp $ ++-- $Id: NEWS,v 1.3743 2021/11/14 00:34:58 tom Exp $ + ------------------------------------------------------------------------------- + + This is a log of changes that ncurses has gone through since Zeyd started +@@ -46,6 +46,13 @@ + Changes through 1.9.9e did not credit all contributions; + it is not possible to add this information. + ++20211113 ++ + minor clarification to clear.1 (Debian #999437). ++ + add xterm+sl-alt, use that in foot+base (report by Jonas Grosse ++ Sundrup) -TD ++ + improve search-path check for pkg-config, for Debian testing which ++ installs pkg-config with architecture-prefixes. ++ + 20211106 + + improve check in misc/Makefile.in for empty $PKG_CONFIG_LIBDIR + + modify wnoutrefresh to call pnoutrefresh if its parameter is a pad, +Index: VERSION +--- ncurses-6.3-20211106+/VERSION 2021-11-06 08:19:47.000000000 +0000 ++++ ncurses-6.3-20211113/VERSION 2021-11-13 11:06:04.000000000 +0000 +@@ -1 +1 @@ +-5:0:10 6.3 20211106 ++5:0:10 6.3 20211113 +Index: aclocal.m4 +Prereq: 1.991 +--- ncurses-6.3-20211106+/aclocal.m4 2021-10-30 14:46:08.000000000 +0000 ++++ ncurses-6.3-20211113/aclocal.m4 2021-11-07 15:31:47.000000000 +0000 +@@ -29,7 +29,7 @@ + dnl + dnl Author: Thomas E. Dickey 1995-on + dnl +-dnl $Id: aclocal.m4,v 1.991 2021/10/30 14:46:08 tom Exp $ ++dnl $Id: aclocal.m4,v 1.992 2021/11/07 15:31:47 tom Exp $ + dnl Macros used in NCURSES auto-configuration script. + dnl + dnl These macros are maintained separately from NCURSES. The copyright on +@@ -9237,7 +9237,7 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_WITH_PKG_CONFIG_LIBDIR version: 16 updated: 2021/10/26 16:50:11 ++dnl CF_WITH_PKG_CONFIG_LIBDIR version: 17 updated: 2021/11/07 10:30:15 + dnl ------------------------- + dnl Allow the choice of the pkg-config library directory to be overridden. + dnl +@@ -9277,12 +9277,15 @@ + if test "x$PKG_CONFIG" != xnone + then + # works for pkg-config since version 0.24 (2009) +- cf_pkg_program=`echo "$PKG_CONFIG" | sed -e 's,^.*/,,'` +- cf_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null | tr : ' '` +- + # works for pkgconf since version 0.8.3 (2012) +- test -z "$cf_search_path" && \ +- cf_search_path=`pkgconf --variable=pc_path pkgconf 2>/dev/null | tr : ' '` ++ for cf_pkg_program in \ ++ `echo "$PKG_CONFIG" | sed -e 's,^.*/,,'` \ ++ pkg-config \ ++ pkgconf ++ do ++ cf_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null | tr : ' '` ++ test -n "$cf_search_path" && break ++ done + + # works for pkg-config since import in 2005 of original 2001 HP code. + test -z "$cf_search_path" && \ +Index: configure +--- ncurses-6.3-20211106+/configure 2021-10-30 14:46:35.000000000 +0000 ++++ ncurses-6.3-20211113/configure 2021-11-07 15:32:40.000000000 +0000 +@@ -4163,12 +4163,15 @@ + if test "x$PKG_CONFIG" != xnone + then + # works for pkg-config since version 0.24 (2009) +- cf_pkg_program=`echo "$PKG_CONFIG" | sed -e 's,^.*/,,'` +- cf_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null | tr : ' '` +- + # works for pkgconf since version 0.8.3 (2012) +- test -z "$cf_search_path" && \ +- cf_search_path=`pkgconf --variable=pc_path pkgconf 2>/dev/null | tr : ' '` ++ for cf_pkg_program in \ ++ `echo "$PKG_CONFIG" | sed -e 's,^.*/,,'` \ ++ pkg-config \ ++ pkgconf ++ do ++ cf_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null | tr : ' '` ++ test -n "$cf_search_path" && break ++ done + + # works for pkg-config since import in 2005 of original 2001 HP code. + test -z "$cf_search_path" && \ +@@ -4182,7 +4185,7 @@ + "` + fi + +- echo "$as_me:4185: result: $cf_search_path" >&5 ++ echo "$as_me:4188: result: $cf_search_path" >&5 + echo "${ECHO_T}$cf_search_path" >&6 + + ;; +@@ -4190,7 +4193,7 @@ + ;; + esac + +-echo "$as_me:4193: checking for first directory" >&5 ++echo "$as_me:4196: checking for first directory" >&5 + echo $ECHO_N "checking for first directory... $ECHO_C" >&6 + cf_pkg_config_path=none + for cf_config in $cf_search_path +@@ -4201,7 +4204,7 @@ + break + fi + done +-echo "$as_me:4204: result: $cf_pkg_config_path" >&5 ++echo "$as_me:4207: result: $cf_pkg_config_path" >&5 + echo "${ECHO_T}$cf_pkg_config_path" >&6 + + if test "x$cf_pkg_config_path" != xnone ; then +@@ -4211,7 +4214,7 @@ + + if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path" + then +- echo "$as_me:4214: checking for workaround" >&5 ++ echo "$as_me:4217: checking for workaround" >&5 + echo $ECHO_N "checking for workaround... $ECHO_C" >&6 + if test "$prefix" = "NONE" ; then + cf_prefix="$ac_default_prefix" +@@ -4234,16 +4237,16 @@ + esac + done + test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup +- echo "$as_me:4237: result: $PKG_CONFIG_LIBDIR" >&5 ++ echo "$as_me:4240: result: $PKG_CONFIG_LIBDIR" >&5 + echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 + fi + + if test "x$PKG_CONFIG" != xnone + then +- echo "$as_me:4243: checking if we should install .pc files for $PKG_CONFIG" >&5 ++ echo "$as_me:4246: checking if we should install .pc files for $PKG_CONFIG" >&5 + echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6 + else +- echo "$as_me:4246: checking if we should install .pc files" >&5 ++ echo "$as_me:4249: checking if we should install .pc files" >&5 + echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6 + fi + +@@ -4254,7 +4257,7 @@ + else + enable_pc_files=no + fi; +-echo "$as_me:4257: result: $enable_pc_files" >&5 ++echo "$as_me:4260: result: $enable_pc_files" >&5 + echo "${ECHO_T}$enable_pc_files" >&6 + + if test "x$enable_pc_files" != xno +@@ -4262,7 +4265,7 @@ + MAKE_PC_FILES= + case "x$PKG_CONFIG_LIBDIR" in + (xno|xnone|xyes|x) +- { echo "$as_me:4265: WARNING: no PKG_CONFIG_LIBDIR was found" >&5 ++ { echo "$as_me:4268: WARNING: no PKG_CONFIG_LIBDIR was found" >&5 + echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;} + ;; + (*) +@@ -4292,7 +4295,7 @@ + PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:4295: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5 ++ { { echo "$as_me:4298: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5 + echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -4306,7 +4309,7 @@ + + if test -z "$MAKE_PC_FILES" + then +- echo "$as_me:4309: checking for suffix to add to pc-files" >&5 ++ echo "$as_me:4312: checking for suffix to add to pc-files" >&5 + echo $ECHO_N "checking for suffix to add to pc-files... $ECHO_C" >&6 + + # Check whether --with-pc-suffix or --without-pc-suffix was given. +@@ -4321,13 +4324,13 @@ + esac + fi; + test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none +- echo "$as_me:4324: result: $PC_MODULE_SUFFIX" >&5 ++ echo "$as_me:4327: result: $PC_MODULE_SUFFIX" >&5 + echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6 + test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX= + + fi + +-echo "$as_me:4330: checking if we should assume mixed-case filenames" >&5 ++echo "$as_me:4333: checking if we should assume mixed-case filenames" >&5 + echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6 + + # Check whether --enable-mixed-case or --disable-mixed-case was given. +@@ -4337,11 +4340,11 @@ + else + enable_mixedcase=auto + fi; +-echo "$as_me:4340: result: $enable_mixedcase" >&5 ++echo "$as_me:4343: result: $enable_mixedcase" >&5 + echo "${ECHO_T}$enable_mixedcase" >&6 + if test "$enable_mixedcase" = "auto" ; then + +-echo "$as_me:4344: checking if filesystem supports mixed-case filenames" >&5 ++echo "$as_me:4347: checking if filesystem supports mixed-case filenames" >&5 + echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6 + if test "${cf_cv_mixedcase+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4368,7 +4371,7 @@ + fi + + fi +-echo "$as_me:4371: result: $cf_cv_mixedcase" >&5 ++echo "$as_me:4374: result: $cf_cv_mixedcase" >&5 + echo "${ECHO_T}$cf_cv_mixedcase" >&6 + test "$cf_cv_mixedcase" = yes && + cat >>confdefs.h <<\EOF +@@ -4387,7 +4390,7 @@ + fi + + # do this after mixed-case option (tags/TAGS is not as important as tic). +-echo "$as_me:4390: checking whether ${MAKE-make} sets \${MAKE}" >&5 ++echo "$as_me:4393: checking whether ${MAKE-make} sets \${MAKE}" >&5 + echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 + set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` + if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then +@@ -4407,16 +4410,16 @@ + rm -f conftest.make + fi + if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then +- echo "$as_me:4410: result: yes" >&5 ++ echo "$as_me:4413: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + SET_MAKE= + else +- echo "$as_me:4414: result: no" >&5 ++ echo "$as_me:4417: result: no" >&5 + echo "${ECHO_T}no" >&6 + SET_MAKE="MAKE=${MAKE-make}" + fi + +-echo "$as_me:4419: checking for \".PHONY\" make-support" >&5 ++echo "$as_me:4422: checking for \".PHONY\" make-support" >&5 + echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6 + if test "${cf_cv_make_PHONY+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4471,7 +4474,7 @@ + rm -rf conftest* + + fi +-echo "$as_me:4474: result: $cf_cv_make_PHONY" >&5 ++echo "$as_me:4477: result: $cf_cv_make_PHONY" >&5 + echo "${ECHO_T}$cf_cv_make_PHONY" >&6 + MAKE_NO_PHONY="#" + MAKE_PHONY="#" +@@ -4482,7 +4485,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:4485: checking for $ac_word" >&5 ++echo "$as_me:4488: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_CTAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4497,7 +4500,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_CTAGS="$ac_prog" +-echo "$as_me:4500: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4503: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4505,10 +4508,10 @@ + fi + CTAGS=$ac_cv_prog_CTAGS + if test -n "$CTAGS"; then +- echo "$as_me:4508: result: $CTAGS" >&5 ++ echo "$as_me:4511: result: $CTAGS" >&5 + echo "${ECHO_T}$CTAGS" >&6 + else +- echo "$as_me:4511: result: no" >&5 ++ echo "$as_me:4514: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4519,7 +4522,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:4522: checking for $ac_word" >&5 ++echo "$as_me:4525: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ETAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4534,7 +4537,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ETAGS="$ac_prog" +-echo "$as_me:4537: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4540: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4542,10 +4545,10 @@ + fi + ETAGS=$ac_cv_prog_ETAGS + if test -n "$ETAGS"; then +- echo "$as_me:4545: result: $ETAGS" >&5 ++ echo "$as_me:4548: result: $ETAGS" >&5 + echo "${ECHO_T}$ETAGS" >&6 + else +- echo "$as_me:4548: result: no" >&5 ++ echo "$as_me:4551: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4554,7 +4557,7 @@ + + # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args. + set dummy ${CTAGS:-ctags}; ac_word=$2 +-echo "$as_me:4557: checking for $ac_word" >&5 ++echo "$as_me:4560: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4569,7 +4572,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_MAKE_LOWER_TAGS="yes" +-echo "$as_me:4572: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4575: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4578,17 +4581,17 @@ + fi + MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS + if test -n "$MAKE_LOWER_TAGS"; then +- echo "$as_me:4581: result: $MAKE_LOWER_TAGS" >&5 ++ echo "$as_me:4584: result: $MAKE_LOWER_TAGS" >&5 + echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 + else +- echo "$as_me:4584: result: no" >&5 ++ echo "$as_me:4587: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + if test "$cf_cv_mixedcase" = yes ; then + # Extract the first word of "${ETAGS:-etags}", so it can be a program name with args. + set dummy ${ETAGS:-etags}; ac_word=$2 +-echo "$as_me:4591: checking for $ac_word" >&5 ++echo "$as_me:4594: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4603,7 +4606,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_MAKE_UPPER_TAGS="yes" +-echo "$as_me:4606: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4609: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4612,10 +4615,10 @@ + fi + MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS + if test -n "$MAKE_UPPER_TAGS"; then +- echo "$as_me:4615: result: $MAKE_UPPER_TAGS" >&5 ++ echo "$as_me:4618: result: $MAKE_UPPER_TAGS" >&5 + echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 + else +- echo "$as_me:4618: result: no" >&5 ++ echo "$as_me:4621: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4635,7 +4638,7 @@ + MAKE_LOWER_TAGS="#" + fi + +-echo "$as_me:4638: checking for makeflags variable" >&5 ++echo "$as_me:4641: checking for makeflags variable" >&5 + echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6 + if test "${cf_cv_makeflags+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4665,7 +4668,7 @@ + ;; + (*) + +-echo "${as_me:-configure}:4668: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 ++echo "${as_me:-configure}:4671: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 + + ;; + esac +@@ -4673,13 +4676,13 @@ + rm -f cf_makeflags.tmp + + fi +-echo "$as_me:4676: result: $cf_cv_makeflags" >&5 ++echo "$as_me:4679: result: $cf_cv_makeflags" >&5 + echo "${ECHO_T}$cf_cv_makeflags" >&6 + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. + set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +-echo "$as_me:4682: checking for $ac_word" >&5 ++echo "$as_me:4685: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4694,7 +4697,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" +-echo "$as_me:4697: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4700: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4702,10 +4705,10 @@ + fi + RANLIB=$ac_cv_prog_RANLIB + if test -n "$RANLIB"; then +- echo "$as_me:4705: result: $RANLIB" >&5 ++ echo "$as_me:4708: result: $RANLIB" >&5 + echo "${ECHO_T}$RANLIB" >&6 + else +- echo "$as_me:4708: result: no" >&5 ++ echo "$as_me:4711: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4714,7 +4717,7 @@ + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. + set dummy ranlib; ac_word=$2 +-echo "$as_me:4717: checking for $ac_word" >&5 ++echo "$as_me:4720: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4729,7 +4732,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_RANLIB="ranlib" +-echo "$as_me:4732: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4735: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4738,10 +4741,10 @@ + fi + ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB + if test -n "$ac_ct_RANLIB"; then +- echo "$as_me:4741: result: $ac_ct_RANLIB" >&5 ++ echo "$as_me:4744: result: $ac_ct_RANLIB" >&5 + echo "${ECHO_T}$ac_ct_RANLIB" >&6 + else +- echo "$as_me:4744: result: no" >&5 ++ echo "$as_me:4747: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4753,7 +4756,7 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. + set dummy ${ac_tool_prefix}ld; ac_word=$2 +-echo "$as_me:4756: checking for $ac_word" >&5 ++echo "$as_me:4759: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4768,7 +4771,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_LD="${ac_tool_prefix}ld" +-echo "$as_me:4771: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4774: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4776,10 +4779,10 @@ + fi + LD=$ac_cv_prog_LD + if test -n "$LD"; then +- echo "$as_me:4779: result: $LD" >&5 ++ echo "$as_me:4782: result: $LD" >&5 + echo "${ECHO_T}$LD" >&6 + else +- echo "$as_me:4782: result: no" >&5 ++ echo "$as_me:4785: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4788,7 +4791,7 @@ + ac_ct_LD=$LD + # Extract the first word of "ld", so it can be a program name with args. + set dummy ld; ac_word=$2 +-echo "$as_me:4791: checking for $ac_word" >&5 ++echo "$as_me:4794: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4803,7 +4806,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_LD="ld" +-echo "$as_me:4806: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4809: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4812,10 +4815,10 @@ + fi + ac_ct_LD=$ac_cv_prog_ac_ct_LD + if test -n "$ac_ct_LD"; then +- echo "$as_me:4815: result: $ac_ct_LD" >&5 ++ echo "$as_me:4818: result: $ac_ct_LD" >&5 + echo "${ECHO_T}$ac_ct_LD" >&6 + else +- echo "$as_me:4818: result: no" >&5 ++ echo "$as_me:4821: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4827,7 +4830,7 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. + set dummy ${ac_tool_prefix}ar; ac_word=$2 +-echo "$as_me:4830: checking for $ac_word" >&5 ++echo "$as_me:4833: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4842,7 +4845,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_AR="${ac_tool_prefix}ar" +-echo "$as_me:4845: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4848: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4850,10 +4853,10 @@ + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +- echo "$as_me:4853: result: $AR" >&5 ++ echo "$as_me:4856: result: $AR" >&5 + echo "${ECHO_T}$AR" >&6 + else +- echo "$as_me:4856: result: no" >&5 ++ echo "$as_me:4859: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4862,7 +4865,7 @@ + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. + set dummy ar; ac_word=$2 +-echo "$as_me:4865: checking for $ac_word" >&5 ++echo "$as_me:4868: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4877,7 +4880,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_AR="ar" +-echo "$as_me:4880: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4883: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4886,10 +4889,10 @@ + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +- echo "$as_me:4889: result: $ac_ct_AR" >&5 ++ echo "$as_me:4892: result: $ac_ct_AR" >&5 + echo "${ECHO_T}$ac_ct_AR" >&6 + else +- echo "$as_me:4892: result: no" >&5 ++ echo "$as_me:4895: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4901,7 +4904,7 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args. + set dummy ${ac_tool_prefix}nm; ac_word=$2 +-echo "$as_me:4904: checking for $ac_word" >&5 ++echo "$as_me:4907: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_NM+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4916,7 +4919,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_NM="${ac_tool_prefix}nm" +-echo "$as_me:4919: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4922: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4924,10 +4927,10 @@ + fi + NM=$ac_cv_prog_NM + if test -n "$NM"; then +- echo "$as_me:4927: result: $NM" >&5 ++ echo "$as_me:4930: result: $NM" >&5 + echo "${ECHO_T}$NM" >&6 + else +- echo "$as_me:4930: result: no" >&5 ++ echo "$as_me:4933: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4936,7 +4939,7 @@ + ac_ct_NM=$NM + # Extract the first word of "nm", so it can be a program name with args. + set dummy nm; ac_word=$2 +-echo "$as_me:4939: checking for $ac_word" >&5 ++echo "$as_me:4942: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_NM+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4951,7 +4954,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_NM="nm" +-echo "$as_me:4954: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4957: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4960,10 +4963,10 @@ + fi + ac_ct_NM=$ac_cv_prog_ac_ct_NM + if test -n "$ac_ct_NM"; then +- echo "$as_me:4963: result: $ac_ct_NM" >&5 ++ echo "$as_me:4966: result: $ac_ct_NM" >&5 + echo "${ECHO_T}$ac_ct_NM" >&6 + else +- echo "$as_me:4966: result: no" >&5 ++ echo "$as_me:4969: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4975,7 +4978,7 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. + set dummy ${ac_tool_prefix}ar; ac_word=$2 +-echo "$as_me:4978: checking for $ac_word" >&5 ++echo "$as_me:4981: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4990,7 +4993,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_AR="${ac_tool_prefix}ar" +-echo "$as_me:4993: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4996: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4998,10 +5001,10 @@ + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +- echo "$as_me:5001: result: $AR" >&5 ++ echo "$as_me:5004: result: $AR" >&5 + echo "${ECHO_T}$AR" >&6 + else +- echo "$as_me:5004: result: no" >&5 ++ echo "$as_me:5007: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5010,7 +5013,7 @@ + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. + set dummy ar; ac_word=$2 +-echo "$as_me:5013: checking for $ac_word" >&5 ++echo "$as_me:5016: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5025,7 +5028,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_AR="ar" +-echo "$as_me:5028: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5031: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5034,10 +5037,10 @@ + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +- echo "$as_me:5037: result: $ac_ct_AR" >&5 ++ echo "$as_me:5040: result: $ac_ct_AR" >&5 + echo "${ECHO_T}$ac_ct_AR" >&6 + else +- echo "$as_me:5040: result: no" >&5 ++ echo "$as_me:5043: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5046,7 +5049,7 @@ + AR="$ac_cv_prog_AR" + fi + +-echo "$as_me:5049: checking for options to update archives" >&5 ++echo "$as_me:5052: checking for options to update archives" >&5 + echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6 + if test "${cf_cv_ar_flags+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5083,13 +5086,13 @@ + rm -f conftest.a + + cat >"conftest.$ac_ext" <&5 ++ if { (eval echo "$as_me:5092: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5092: \$? = $ac_status" >&5 ++ echo "$as_me:5095: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then + echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5 + $AR $ARFLAGS "$cf_ar_flags" conftest.a "conftest.$ac_cv_objext" 2>&5 1>/dev/null +@@ -5100,7 +5103,7 @@ + else + test -n "$verbose" && echo " cannot compile test-program" 1>&6 + +-echo "${as_me:-configure}:5103: testing cannot compile test-program ..." 1>&5 ++echo "${as_me:-configure}:5106: testing cannot compile test-program ..." 1>&5 + + break + fi +@@ -5110,7 +5113,7 @@ + esac + + fi +-echo "$as_me:5113: result: $cf_cv_ar_flags" >&5 ++echo "$as_me:5116: result: $cf_cv_ar_flags" >&5 + echo "${ECHO_T}$cf_cv_ar_flags" >&6 + + if test -n "$ARFLAGS" ; then +@@ -5121,7 +5124,7 @@ + ARFLAGS=$cf_cv_ar_flags + fi + +-echo "$as_me:5124: checking if you have specified an install-prefix" >&5 ++echo "$as_me:5127: checking if you have specified an install-prefix" >&5 + echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6 + + # Check whether --with-install-prefix or --without-install-prefix was given. +@@ -5134,7 +5137,7 @@ + ;; + esac + fi; +-echo "$as_me:5137: result: $DESTDIR" >&5 ++echo "$as_me:5140: result: $DESTDIR" >&5 + echo "${ECHO_T}$DESTDIR" >&6 + + ############################################################################### +@@ -5169,7 +5172,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:5172: checking for $ac_word" >&5 ++echo "$as_me:5175: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_BUILD_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5184,7 +5187,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_BUILD_CC="$ac_prog" +-echo "$as_me:5187: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5190: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5192,10 +5195,10 @@ + fi + BUILD_CC=$ac_cv_prog_BUILD_CC + if test -n "$BUILD_CC"; then +- echo "$as_me:5195: result: $BUILD_CC" >&5 ++ echo "$as_me:5198: result: $BUILD_CC" >&5 + echo "${ECHO_T}$BUILD_CC" >&6 + else +- echo "$as_me:5198: result: no" >&5 ++ echo "$as_me:5201: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5204,12 +5207,12 @@ + test -n "$BUILD_CC" || BUILD_CC="none" + + fi; +- echo "$as_me:5207: checking for native build C compiler" >&5 ++ echo "$as_me:5210: checking for native build C compiler" >&5 + echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6 +- echo "$as_me:5209: result: $BUILD_CC" >&5 ++ echo "$as_me:5212: result: $BUILD_CC" >&5 + echo "${ECHO_T}$BUILD_CC" >&6 + +- echo "$as_me:5212: checking for native build C preprocessor" >&5 ++ echo "$as_me:5215: checking for native build C preprocessor" >&5 + echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6 + + # Check whether --with-build-cpp or --without-build-cpp was given. +@@ -5219,10 +5222,10 @@ + else + BUILD_CPP='${BUILD_CC} -E' + fi; +- echo "$as_me:5222: result: $BUILD_CPP" >&5 ++ echo "$as_me:5225: result: $BUILD_CPP" >&5 + echo "${ECHO_T}$BUILD_CPP" >&6 + +- echo "$as_me:5225: checking for native build C flags" >&5 ++ echo "$as_me:5228: checking for native build C flags" >&5 + echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6 + + # Check whether --with-build-cflags or --without-build-cflags was given. +@@ -5230,10 +5233,10 @@ + withval="$with_build_cflags" + BUILD_CFLAGS="$withval" + fi; +- echo "$as_me:5233: result: $BUILD_CFLAGS" >&5 ++ echo "$as_me:5236: result: $BUILD_CFLAGS" >&5 + echo "${ECHO_T}$BUILD_CFLAGS" >&6 + +- echo "$as_me:5236: checking for native build C preprocessor-flags" >&5 ++ echo "$as_me:5239: checking for native build C preprocessor-flags" >&5 + echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6 + + # Check whether --with-build-cppflags or --without-build-cppflags was given. +@@ -5241,10 +5244,10 @@ + withval="$with_build_cppflags" + BUILD_CPPFLAGS="$withval" + fi; +- echo "$as_me:5244: result: $BUILD_CPPFLAGS" >&5 ++ echo "$as_me:5247: result: $BUILD_CPPFLAGS" >&5 + echo "${ECHO_T}$BUILD_CPPFLAGS" >&6 + +- echo "$as_me:5247: checking for native build linker-flags" >&5 ++ echo "$as_me:5250: checking for native build linker-flags" >&5 + echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6 + + # Check whether --with-build-ldflags or --without-build-ldflags was given. +@@ -5252,10 +5255,10 @@ + withval="$with_build_ldflags" + BUILD_LDFLAGS="$withval" + fi; +- echo "$as_me:5255: result: $BUILD_LDFLAGS" >&5 ++ echo "$as_me:5258: result: $BUILD_LDFLAGS" >&5 + echo "${ECHO_T}$BUILD_LDFLAGS" >&6 + +- echo "$as_me:5258: checking for native build linker-libraries" >&5 ++ echo "$as_me:5261: checking for native build linker-libraries" >&5 + echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6 + + # Check whether --with-build-libs or --without-build-libs was given. +@@ -5263,7 +5266,7 @@ + withval="$with_build_libs" + BUILD_LIBS="$withval" + fi; +- echo "$as_me:5266: result: $BUILD_LIBS" >&5 ++ echo "$as_me:5269: result: $BUILD_LIBS" >&5 + echo "${ECHO_T}$BUILD_LIBS" >&6 + + # this assumes we're on Unix. +@@ -5273,7 +5276,7 @@ + : ${BUILD_CC:='${CC}'} + + if { test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}'; } ; then +- { { echo "$as_me:5276: error: Cross-build requires two compilers. ++ { { echo "$as_me:5279: error: Cross-build requires two compilers. + Use --with-build-cc to specify the native compiler." >&5 + echo "$as_me: error: Cross-build requires two compilers. + Use --with-build-cc to specify the native compiler." >&2;} +@@ -5298,7 +5301,7 @@ + ### shared, for example. + cf_list_models="" + +-echo "$as_me:5301: checking if libtool -version-number should be used" >&5 ++echo "$as_me:5304: checking if libtool -version-number should be used" >&5 + echo $ECHO_N "checking if libtool -version-number should be used... $ECHO_C" >&6 + + # Check whether --enable-libtool-version or --disable-libtool-version was given. +@@ -5315,7 +5318,7 @@ + cf_libtool_version=yes + + fi; +-echo "$as_me:5318: result: $cf_libtool_version" >&5 ++echo "$as_me:5321: result: $cf_libtool_version" >&5 + echo "${ECHO_T}$cf_libtool_version" >&6 + + if test "$cf_libtool_version" = yes ; then +@@ -5324,25 +5327,25 @@ + LIBTOOL_VERSION="-version-info" + case "x$VERSION" in + (x) +- { echo "$as_me:5327: WARNING: VERSION was not set" >&5 ++ { echo "$as_me:5330: WARNING: VERSION was not set" >&5 + echo "$as_me: WARNING: VERSION was not set" >&2;} + ;; + (x*.*.*) + ABI_VERSION="$VERSION" + test -n "$verbose" && echo " ABI_VERSION: $ABI_VERSION" 1>&6 + +-echo "${as_me:-configure}:5334: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 ++echo "${as_me:-configure}:5337: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 + + ;; + (x*:*:*) + ABI_VERSION=`echo "$VERSION" | sed -e 's/:/./g'` + test -n "$verbose" && echo " ABI_VERSION: $ABI_VERSION" 1>&6 + +-echo "${as_me:-configure}:5341: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 ++echo "${as_me:-configure}:5344: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 + + ;; + (*) +- { echo "$as_me:5345: WARNING: unexpected VERSION value: $VERSION" >&5 ++ { echo "$as_me:5348: WARNING: unexpected VERSION value: $VERSION" >&5 + echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;} + ;; + esac +@@ -5364,7 +5367,7 @@ + LIB_INSTALL= + LIB_UNINSTALL= + +-echo "$as_me:5367: checking if you want to build libraries with libtool" >&5 ++echo "$as_me:5370: checking if you want to build libraries with libtool" >&5 + echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6 + + # Check whether --with-libtool or --without-libtool was given. +@@ -5374,7 +5377,7 @@ + else + with_libtool=no + fi; +-echo "$as_me:5377: result: $with_libtool" >&5 ++echo "$as_me:5380: result: $with_libtool" >&5 + echo "${ECHO_T}$with_libtool" >&6 + if test "$with_libtool" != "no"; then + +@@ -5405,7 +5408,7 @@ + with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:5408: error: expected a pathname, not \"$with_libtool\"" >&5 ++ { { echo "$as_me:5411: error: expected a pathname, not \"$with_libtool\"" >&5 + echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -5418,7 +5421,7 @@ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-echo "$as_me:5421: checking for $ac_word" >&5 ++echo "$as_me:5424: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_LIBTOOL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5433,7 +5436,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog" +-echo "$as_me:5436: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5439: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5441,10 +5444,10 @@ + fi + LIBTOOL=$ac_cv_prog_LIBTOOL + if test -n "$LIBTOOL"; then +- echo "$as_me:5444: result: $LIBTOOL" >&5 ++ echo "$as_me:5447: result: $LIBTOOL" >&5 + echo "${ECHO_T}$LIBTOOL" >&6 + else +- echo "$as_me:5447: result: no" >&5 ++ echo "$as_me:5450: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5457,7 +5460,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:5460: checking for $ac_word" >&5 ++echo "$as_me:5463: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5472,7 +5475,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_LIBTOOL="$ac_prog" +-echo "$as_me:5475: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5478: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5480,10 +5483,10 @@ + fi + ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL + if test -n "$ac_ct_LIBTOOL"; then +- echo "$as_me:5483: result: $ac_ct_LIBTOOL" >&5 ++ echo "$as_me:5486: result: $ac_ct_LIBTOOL" >&5 + echo "${ECHO_T}$ac_ct_LIBTOOL" >&6 + else +- echo "$as_me:5486: result: no" >&5 ++ echo "$as_me:5489: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5514,7 +5517,7 @@ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-echo "$as_me:5517: checking for $ac_word" >&5 ++echo "$as_me:5520: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_LIBTOOL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5529,7 +5532,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog" +-echo "$as_me:5532: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5535: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5537,10 +5540,10 @@ + fi + LIBTOOL=$ac_cv_prog_LIBTOOL + if test -n "$LIBTOOL"; then +- echo "$as_me:5540: result: $LIBTOOL" >&5 ++ echo "$as_me:5543: result: $LIBTOOL" >&5 + echo "${ECHO_T}$LIBTOOL" >&6 + else +- echo "$as_me:5543: result: no" >&5 ++ echo "$as_me:5546: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5553,7 +5556,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:5556: checking for $ac_word" >&5 ++echo "$as_me:5559: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5568,7 +5571,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_LIBTOOL="$ac_prog" +-echo "$as_me:5571: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5574: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5576,10 +5579,10 @@ + fi + ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL + if test -n "$ac_ct_LIBTOOL"; then +- echo "$as_me:5579: result: $ac_ct_LIBTOOL" >&5 ++ echo "$as_me:5582: result: $ac_ct_LIBTOOL" >&5 + echo "${ECHO_T}$ac_ct_LIBTOOL" >&6 + else +- echo "$as_me:5582: result: no" >&5 ++ echo "$as_me:5585: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5601,7 +5604,7 @@ + fi + fi + if test -z "$LIBTOOL" ; then +- { { echo "$as_me:5604: error: Cannot find libtool" >&5 ++ { { echo "$as_me:5607: error: Cannot find libtool" >&5 + echo "$as_me: error: Cannot find libtool" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -5617,7 +5620,7 @@ + + if test -n "$LIBTOOL" && test "$LIBTOOL" != none + then +- echo "$as_me:5620: checking version of $LIBTOOL" >&5 ++ echo "$as_me:5623: checking version of $LIBTOOL" >&5 + echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6 + + if test -n "$LIBTOOL" && test "$LIBTOOL" != none +@@ -5628,7 +5631,7 @@ + fi + test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version + +- echo "$as_me:5631: result: $cf_cv_libtool_version" >&5 ++ echo "$as_me:5634: result: $cf_cv_libtool_version" >&5 + echo "${ECHO_T}$cf_cv_libtool_version" >&6 + if test -n "$cf_cv_libtool_version" + then +@@ -5637,18 +5640,18 @@ + (*...GNU-libtool...*) + ;; + (*) +- { { echo "$as_me:5640: error: This is not GNU libtool" >&5 ++ { { echo "$as_me:5643: error: This is not GNU libtool" >&5 + echo "$as_me: error: This is not GNU libtool" >&2;} + { (exit 1); exit 1; }; } + ;; + esac + else +- { { echo "$as_me:5646: error: No version found for $LIBTOOL" >&5 ++ { { echo "$as_me:5649: error: No version found for $LIBTOOL" >&5 + echo "$as_me: error: No version found for $LIBTOOL" >&2;} + { (exit 1); exit 1; }; } + fi + else +- { { echo "$as_me:5651: error: GNU libtool has not been found" >&5 ++ { { echo "$as_me:5654: error: GNU libtool has not been found" >&5 + echo "$as_me: error: GNU libtool has not been found" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -5684,7 +5687,7 @@ + + else + +-echo "$as_me:5687: checking if you want to build shared libraries" >&5 ++echo "$as_me:5690: checking if you want to build shared libraries" >&5 + echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6 + + # Check whether --with-shared or --without-shared was given. +@@ -5694,11 +5697,11 @@ + else + with_shared=no + fi; +-echo "$as_me:5697: result: $with_shared" >&5 ++echo "$as_me:5700: result: $with_shared" >&5 + echo "${ECHO_T}$with_shared" >&6 + test "x$with_shared" = "xyes" && cf_list_models="$cf_list_models shared" + +-echo "$as_me:5701: checking if you want to build static libraries" >&5 ++echo "$as_me:5704: checking if you want to build static libraries" >&5 + echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6 + + # Check whether --with-normal or --without-normal was given. +@@ -5708,11 +5711,11 @@ + else + with_normal=yes + fi; +-echo "$as_me:5711: result: $with_normal" >&5 ++echo "$as_me:5714: result: $with_normal" >&5 + echo "${ECHO_T}$with_normal" >&6 + test "x$with_normal" = "xyes" && cf_list_models="$cf_list_models normal" + +-echo "$as_me:5715: checking if you want to build debug libraries" >&5 ++echo "$as_me:5718: checking if you want to build debug libraries" >&5 + echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6 + + # Check whether --with-debug or --without-debug was given. +@@ -5722,11 +5725,11 @@ + else + with_debug=yes + fi; +-echo "$as_me:5725: result: $with_debug" >&5 ++echo "$as_me:5728: result: $with_debug" >&5 + echo "${ECHO_T}$with_debug" >&6 + test "x$with_debug" = "xyes" && cf_list_models="$cf_list_models debug" + +-echo "$as_me:5729: checking if you want to build profiling libraries" >&5 ++echo "$as_me:5732: checking if you want to build profiling libraries" >&5 + echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6 + + # Check whether --with-profile or --without-profile was given. +@@ -5736,7 +5739,7 @@ + else + with_profile=no + fi; +-echo "$as_me:5739: result: $with_profile" >&5 ++echo "$as_me:5742: result: $with_profile" >&5 + echo "${ECHO_T}$with_profile" >&6 + test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile" + +@@ -5744,7 +5747,7 @@ + + if test "X$cf_with_cxx_binding" != Xno; then + if test "x$with_shared" = "xyes"; then +-echo "$as_me:5747: checking if you want to build C++ shared libraries" >&5 ++echo "$as_me:5750: checking if you want to build C++ shared libraries" >&5 + echo $ECHO_N "checking if you want to build C++ shared libraries... $ECHO_C" >&6 + + # Check whether --with-cxx-shared or --without-cxx-shared was given. +@@ -5754,26 +5757,26 @@ + else + with_shared_cxx=no + fi; +-echo "$as_me:5757: result: $with_shared_cxx" >&5 ++echo "$as_me:5760: result: $with_shared_cxx" >&5 + echo "${ECHO_T}$with_shared_cxx" >&6 + fi + fi + + ############################################################################### + +-echo "$as_me:5764: checking for specified models" >&5 ++echo "$as_me:5767: checking for specified models" >&5 + echo $ECHO_N "checking for specified models... $ECHO_C" >&6 + test -z "$cf_list_models" && cf_list_models=normal + test "$with_libtool" != "no" && cf_list_models=libtool +-echo "$as_me:5768: result: $cf_list_models" >&5 ++echo "$as_me:5771: result: $cf_list_models" >&5 + echo "${ECHO_T}$cf_list_models" >&6 + + ### Use the first model as the default, and save its suffix for use in building + ### up test-applications. +-echo "$as_me:5773: checking for default model" >&5 ++echo "$as_me:5776: checking for default model" >&5 + echo $ECHO_N "checking for default model... $ECHO_C" >&6 + DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'` +-echo "$as_me:5776: result: $DFT_LWR_MODEL" >&5 ++echo "$as_me:5779: result: $DFT_LWR_MODEL" >&5 + echo "${ECHO_T}$DFT_LWR_MODEL" >&6 + + DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` +@@ -5787,7 +5790,7 @@ + LIB_DIR=../lib + LIB_2ND=../../lib + +-echo "$as_me:5790: checking if you want to have a library-prefix" >&5 ++echo "$as_me:5793: checking if you want to have a library-prefix" >&5 + echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6 + + # Check whether --with-lib-prefix or --without-lib-prefix was given. +@@ -5797,7 +5800,7 @@ + else + with_lib_prefix=auto + fi; +-echo "$as_me:5800: result: $with_lib_prefix" >&5 ++echo "$as_me:5803: result: $with_lib_prefix" >&5 + echo "${ECHO_T}$with_lib_prefix" >&6 + + if test "$with_lib_prefix" = auto +@@ -5828,19 +5831,19 @@ + + LIB_SUFFIX= + +- echo "$as_me:5831: checking for PATH separator" >&5 ++ echo "$as_me:5834: checking for PATH separator" >&5 + echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6 + case "$cf_cv_system_name" in + (os2*) PATH_SEPARATOR=';' ;; + (*) ${PATH_SEPARATOR:=':'} ;; + esac + +- echo "$as_me:5838: result: $PATH_SEPARATOR" >&5 ++ echo "$as_me:5841: result: $PATH_SEPARATOR" >&5 + echo "${ECHO_T}$PATH_SEPARATOR" >&6 + + ############################################################################### + +-echo "$as_me:5843: checking if you want to build a separate terminfo library" >&5 ++echo "$as_me:5846: checking if you want to build a separate terminfo library" >&5 + echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6 + + # Check whether --with-termlib or --without-termlib was given. +@@ -5850,10 +5853,10 @@ + else + with_termlib=no + fi; +-echo "$as_me:5853: result: $with_termlib" >&5 ++echo "$as_me:5856: result: $with_termlib" >&5 + echo "${ECHO_T}$with_termlib" >&6 + +-echo "$as_me:5856: checking if you want to build a separate tic library" >&5 ++echo "$as_me:5859: checking if you want to build a separate tic library" >&5 + echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6 + + # Check whether --with-ticlib or --without-ticlib was given. +@@ -5863,7 +5866,7 @@ + else + with_ticlib=no + fi; +-echo "$as_me:5866: result: $with_ticlib" >&5 ++echo "$as_me:5869: result: $with_ticlib" >&5 + echo "${ECHO_T}$with_ticlib" >&6 + + if test X"$CC_G_OPT" = X"" ; then +@@ -5876,7 +5879,7 @@ + test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT='' + fi + +-echo "$as_me:5879: checking for default loader flags" >&5 ++echo "$as_me:5882: checking for default loader flags" >&5 + echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6 + case "$DFT_LWR_MODEL" in + (libtool) LD_MODEL='' ;; +@@ -5885,13 +5888,13 @@ + (profile) LD_MODEL='-pg';; + (shared) LD_MODEL='' ;; + esac +-echo "$as_me:5888: result: $LD_MODEL" >&5 ++echo "$as_me:5891: result: $LD_MODEL" >&5 + echo "${ECHO_T}$LD_MODEL" >&6 + + case "$DFT_LWR_MODEL" in + (shared) + +-echo "$as_me:5894: checking if rpath option should be used" >&5 ++echo "$as_me:5897: checking if rpath option should be used" >&5 + echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6 + + # Check whether --enable-rpath or --disable-rpath was given. +@@ -5901,10 +5904,10 @@ + else + cf_cv_enable_rpath=no + fi; +-echo "$as_me:5904: result: $cf_cv_enable_rpath" >&5 ++echo "$as_me:5907: result: $cf_cv_enable_rpath" >&5 + echo "${ECHO_T}$cf_cv_enable_rpath" >&6 + +-echo "$as_me:5907: checking if shared libraries should be relinked during install" >&5 ++echo "$as_me:5910: checking if shared libraries should be relinked during install" >&5 + echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6 + + # Check whether --enable-relink or --disable-relink was given. +@@ -5914,7 +5917,7 @@ + else + cf_cv_do_relink=yes + fi; +-echo "$as_me:5917: result: $cf_cv_do_relink" >&5 ++echo "$as_me:5920: result: $cf_cv_do_relink" >&5 + echo "${ECHO_T}$cf_cv_do_relink" >&6 + ;; + esac +@@ -5925,7 +5928,7 @@ + LD_RPATH_OPT= + if test "x$cf_cv_enable_rpath" != xno + then +- echo "$as_me:5928: checking for an rpath option" >&5 ++ echo "$as_me:5931: checking for an rpath option" >&5 + echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 + case "$cf_cv_system_name" in + (irix*) +@@ -5956,12 +5959,12 @@ + (*) + ;; + esac +- echo "$as_me:5959: result: $LD_RPATH_OPT" >&5 ++ echo "$as_me:5962: result: $LD_RPATH_OPT" >&5 + echo "${ECHO_T}$LD_RPATH_OPT" >&6 + + case "x$LD_RPATH_OPT" in + (x-R*) +- echo "$as_me:5964: checking if we need a space after rpath option" >&5 ++ echo "$as_me:5967: checking if we need a space after rpath option" >&5 + echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6 + cf_save_LIBS="$LIBS" + +@@ -5982,7 +5985,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 5985 "configure" ++#line 5988 "configure" + #include "confdefs.h" + + int +@@ -5994,16 +5997,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:5997: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6000: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6000: \$? = $ac_status" >&5 ++ echo "$as_me:6003: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6003: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6006: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6006: \$? = $ac_status" >&5 ++ echo "$as_me:6009: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_rpath_space=no + else +@@ -6013,7 +6016,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS="$cf_save_LIBS" +- echo "$as_me:6016: result: $cf_rpath_space" >&5 ++ echo "$as_me:6019: result: $cf_rpath_space" >&5 + echo "${ECHO_T}$cf_rpath_space" >&6 + test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " + ;; +@@ -6035,7 +6038,7 @@ + cf_ld_rpath_opt= + test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT" + +- echo "$as_me:6038: checking if release/abi version should be used for shared libs" >&5 ++ echo "$as_me:6041: checking if release/abi version should be used for shared libs" >&5 + echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6 + + # Check whether --with-shlib-version or --without-shlib-version was given. +@@ -6050,9 +6053,9 @@ + cf_cv_shlib_version=$withval + ;; + (*) +- echo "$as_me:6053: result: $withval" >&5 ++ echo "$as_me:6056: result: $withval" >&5 + echo "${ECHO_T}$withval" >&6 +- { { echo "$as_me:6055: error: option value must be one of: rel, abi, or auto" >&5 ++ { { echo "$as_me:6058: error: option value must be one of: rel, abi, or auto" >&5 + echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -6061,7 +6064,7 @@ + else + cf_cv_shlib_version=auto + fi; +- echo "$as_me:6064: result: $cf_cv_shlib_version" >&5 ++ echo "$as_me:6067: result: $cf_cv_shlib_version" >&5 + echo "${ECHO_T}$cf_cv_shlib_version" >&6 + + cf_cv_rm_so_locs=no +@@ -6084,14 +6087,14 @@ + + if test "$cf_try_fPIC" = yes + then +- echo "$as_me:6087: checking which $CC option to use" >&5 ++ echo "$as_me:6090: checking which $CC option to use" >&5 + echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6 + cf_save_CFLAGS="$CFLAGS" + for CC_SHARED_OPTS in -fPIC -fpic '' + do + CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6094 "configure" ++#line 6097 "configure" + #include "confdefs.h" + #include + int +@@ -6103,16 +6106,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:6106: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6109: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6109: \$? = $ac_status" >&5 ++ echo "$as_me:6112: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:6112: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6115: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6115: \$? = $ac_status" >&5 ++ echo "$as_me:6118: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -6121,7 +6124,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + done +- echo "$as_me:6124: result: $CC_SHARED_OPTS" >&5 ++ echo "$as_me:6127: result: $CC_SHARED_OPTS" >&5 + echo "${ECHO_T}$CC_SHARED_OPTS" >&6 + CFLAGS="$cf_save_CFLAGS" + fi +@@ -6192,7 +6195,7 @@ + MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@' + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi + cf_cv_shlib_version_infix=yes +- echo "$as_me:6195: checking if ld -search_paths_first works" >&5 ++ echo "$as_me:6198: checking if ld -search_paths_first works" >&5 + echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6 + if test "${cf_cv_ldflags_search_paths_first+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6201,7 +6204,7 @@ + cf_save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -Wl,-search_paths_first" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6204 "configure" ++#line 6207 "configure" + #include "confdefs.h" + + int +@@ -6213,16 +6216,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6216: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6219: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6219: \$? = $ac_status" >&5 ++ echo "$as_me:6222: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6222: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6225: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6225: \$? = $ac_status" >&5 ++ echo "$as_me:6228: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ldflags_search_paths_first=yes + else +@@ -6233,7 +6236,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LDFLAGS=$cf_save_LDFLAGS + fi +-echo "$as_me:6236: result: $cf_cv_ldflags_search_paths_first" >&5 ++echo "$as_me:6239: result: $cf_cv_ldflags_search_paths_first" >&5 + echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 + if test "$cf_cv_ldflags_search_paths_first" = yes; then + LDFLAGS="$LDFLAGS -Wl,-search_paths_first" +@@ -6583,7 +6586,7 @@ + do + CFLAGS="$cf_shared_opts $cf_save_CFLAGS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6586 "configure" ++#line 6589 "configure" + #include "confdefs.h" + #include + int +@@ -6595,16 +6598,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:6598: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6601: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6601: \$? = $ac_status" >&5 ++ echo "$as_me:6604: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:6604: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6607: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6607: \$? = $ac_status" >&5 ++ echo "$as_me:6610: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -6641,7 +6644,7 @@ + test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes + ;; + (*) +- { echo "$as_me:6644: WARNING: ignored --with-shlib-version" >&5 ++ { echo "$as_me:6647: WARNING: ignored --with-shlib-version" >&5 + echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} + ;; + esac +@@ -6651,7 +6654,7 @@ + if test -n "$cf_try_cflags" + then + cat > conftest.$ac_ext < + int main(int argc, char *argv[]) + { +@@ -6663,18 +6666,18 @@ + for cf_opt in $cf_try_cflags + do + CFLAGS="$cf_save_CFLAGS -$cf_opt" +- echo "$as_me:6666: checking if CFLAGS option -$cf_opt works" >&5 ++ echo "$as_me:6669: checking if CFLAGS option -$cf_opt works" >&5 + echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6 +- if { (eval echo "$as_me:6668: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:6671: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6671: \$? = $ac_status" >&5 ++ echo "$as_me:6674: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- echo "$as_me:6673: result: yes" >&5 ++ echo "$as_me:6676: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + cf_save_CFLAGS="$CFLAGS" + else +- echo "$as_me:6677: result: no" >&5 ++ echo "$as_me:6680: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + done +@@ -6689,17 +6692,17 @@ + + test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6 + +-echo "${as_me:-configure}:6692: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 ++echo "${as_me:-configure}:6695: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 + + test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 + +-echo "${as_me:-configure}:6696: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 ++echo "${as_me:-configure}:6699: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 + + for model in $cf_list_models ; do + case "$model" in + (libtool) + +-echo "$as_me:6702: checking for additional libtool options" >&5 ++echo "$as_me:6705: checking for additional libtool options" >&5 + echo $ECHO_N "checking for additional libtool options... $ECHO_C" >&6 + + # Check whether --with-libtool-opts or --without-libtool-opts was given. +@@ -6709,7 +6712,7 @@ + else + with_libtool_opts=no + fi; +-echo "$as_me:6712: result: $with_libtool_opts" >&5 ++echo "$as_me:6715: result: $with_libtool_opts" >&5 + echo "${ECHO_T}$with_libtool_opts" >&6 + + case .$with_libtool_opts in +@@ -6720,7 +6723,7 @@ + ;; + esac + +-echo "$as_me:6723: checking if exported-symbols file should be used" >&5 ++echo "$as_me:6726: checking if exported-symbols file should be used" >&5 + echo $ECHO_N "checking if exported-symbols file should be used... $ECHO_C" >&6 + + # Check whether --with-export-syms or --without-export-syms was given. +@@ -6735,7 +6738,7 @@ + with_export_syms='${top_srcdir}/package/${PACKAGE}.sym' + + fi +-echo "$as_me:6738: result: $with_export_syms" >&5 ++echo "$as_me:6741: result: $with_export_syms" >&5 + echo "${ECHO_T}$with_export_syms" >&6 + if test "x$with_export_syms" != xno + then +@@ -6746,15 +6749,15 @@ + ;; + (shared) + if test "$CC_SHARED_OPTS" = "unknown"; then +- { { echo "$as_me:6749: error: Shared libraries are not supported in this version" >&5 ++ { { echo "$as_me:6752: error: Shared libraries are not supported in this version" >&5 + echo "$as_me: error: Shared libraries are not supported in this version" >&2;} + { (exit 1); exit 1; }; } + fi + # workaround for inept transition to PIE vs PIC... +- echo "$as_me:6754: checking if current CFLAGS link properly" >&5 ++ echo "$as_me:6757: checking if current CFLAGS link properly" >&5 + echo $ECHO_N "checking if current CFLAGS link properly... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6757 "configure" ++#line 6760 "configure" + #include "confdefs.h" + #include + int +@@ -6766,16 +6769,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6769: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6772: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6772: \$? = $ac_status" >&5 ++ echo "$as_me:6775: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6775: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6778: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6778: \$? = $ac_status" >&5 ++ echo "$as_me:6781: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cflags_work=yes + else +@@ -6784,18 +6787,18 @@ + cf_cflags_work=no + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +- echo "$as_me:6787: result: $cf_cflags_work" >&5 ++ echo "$as_me:6790: result: $cf_cflags_work" >&5 + echo "${ECHO_T}$cf_cflags_work" >&6 + if test "$cf_cflags_work" = no + then + test -n "$verbose" && echo " try to work around by appending shared-options" 1>&6 + +-echo "${as_me:-configure}:6793: testing try to work around by appending shared-options ..." 1>&5 ++echo "${as_me:-configure}:6796: testing try to work around by appending shared-options ..." 1>&5 + + CFLAGS="$CFLAGS $CC_SHARED_OPTS" + fi + +-echo "$as_me:6798: checking if versioned-symbols file should be used" >&5 ++echo "$as_me:6801: checking if versioned-symbols file should be used" >&5 + echo $ECHO_N "checking if versioned-symbols file should be used... $ECHO_C" >&6 + + # Check whether --with-versioned-syms or --without-versioned-syms was given. +@@ -6813,18 +6816,18 @@ + (xno) + ;; + (x/*) +- test -f "$with_versioned_syms" || { { echo "$as_me:6816: error: expected a filename: $with_versioned_syms" >&5 ++ test -f "$with_versioned_syms" || { { echo "$as_me:6819: error: expected a filename: $with_versioned_syms" >&5 + echo "$as_me: error: expected a filename: $with_versioned_syms" >&2;} + { (exit 1); exit 1; }; } + ;; + (*) +- test -f "$with_versioned_syms" || { { echo "$as_me:6821: error: expected a filename: $with_versioned_syms" >&5 ++ test -f "$with_versioned_syms" || { { echo "$as_me:6824: error: expected a filename: $with_versioned_syms" >&5 + echo "$as_me: error: expected a filename: $with_versioned_syms" >&2;} + { (exit 1); exit 1; }; } + with_versioned_syms=`pwd`/"$with_versioned_syms" + ;; + esac +-echo "$as_me:6827: result: $with_versioned_syms" >&5 ++echo "$as_me:6830: result: $with_versioned_syms" >&5 + echo "${ECHO_T}$with_versioned_syms" >&6 + + RESULTING_SYMS= +@@ -6840,7 +6843,7 @@ + MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-Wl,%\\${VERSIONED_SYMS} -Wl,%"` + test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 + +-echo "${as_me:-configure}:6843: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 ++echo "${as_me:-configure}:6846: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 + + ;; + (*-dy\ *) +@@ -6848,11 +6851,11 @@ + MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-dy%\\${VERSIONED_SYMS} -dy%"` + test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 + +-echo "${as_me:-configure}:6851: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 ++echo "${as_me:-configure}:6854: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 + + ;; + (*) +- { echo "$as_me:6855: WARNING: this system does not support versioned-symbols" >&5 ++ { echo "$as_me:6858: WARNING: this system does not support versioned-symbols" >&5 + echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;} + ;; + esac +@@ -6864,7 +6867,7 @@ + # symbols. + if test "x$VERSIONED_SYMS" != "x" + then +- echo "$as_me:6867: checking if wildcards can be used to selectively omit symbols" >&5 ++ echo "$as_me:6870: checking if wildcards can be used to selectively omit symbols" >&5 + echo $ECHO_N "checking if wildcards can be used to selectively omit symbols... $ECHO_C" >&6 + WILDCARD_SYMS=no + +@@ -6901,7 +6904,7 @@ + } submodule_1.0; + EOF + cat >conftest.$ac_ext <&5 ++ echo "$as_me:6938: result: $WILDCARD_SYMS" >&5 + echo "${ECHO_T}$WILDCARD_SYMS" >&6 + rm -f conftest.* + fi +@@ -6945,7 +6948,7 @@ + ### Checks for special libraries, must be done up-front. + SHLIB_LIST="" + +-echo "$as_me:6948: checking if you want to link with the GPM mouse library" >&5 ++echo "$as_me:6951: checking if you want to link with the GPM mouse library" >&5 + echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6 + + # Check whether --with-gpm or --without-gpm was given. +@@ -6955,27 +6958,27 @@ + else + with_gpm=maybe + fi; +-echo "$as_me:6958: result: $with_gpm" >&5 ++echo "$as_me:6961: result: $with_gpm" >&5 + echo "${ECHO_T}$with_gpm" >&6 + + if test "$with_gpm" != no ; then +- echo "$as_me:6962: checking for gpm.h" >&5 ++ echo "$as_me:6965: checking for gpm.h" >&5 + echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6 + if test "${ac_cv_header_gpm_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6968 "configure" ++#line 6971 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:6972: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:6975: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:6978: \$? = $ac_status" >&5 ++ echo "$as_me:6981: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -6994,7 +6997,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:6997: result: $ac_cv_header_gpm_h" >&5 ++echo "$as_me:7000: result: $ac_cv_header_gpm_h" >&5 + echo "${ECHO_T}$ac_cv_header_gpm_h" >&6 + if test "$ac_cv_header_gpm_h" = yes; then + +@@ -7005,7 +7008,7 @@ + if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then + test -n "$verbose" && echo " assuming we really have GPM library" 1>&6 + +-echo "${as_me:-configure}:7008: testing assuming we really have GPM library ..." 1>&5 ++echo "${as_me:-configure}:7011: testing assuming we really have GPM library ..." 1>&5 + + cat >>confdefs.h <<\EOF + #define HAVE_LIBGPM 1 +@@ -7013,7 +7016,7 @@ + + with_gpm=yes + else +- echo "$as_me:7016: checking for Gpm_Open in -lgpm" >&5 ++ echo "$as_me:7019: checking for Gpm_Open in -lgpm" >&5 + echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 + if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7021,7 +7024,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7024 "configure" ++#line 7027 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -7040,16 +7043,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7043: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7046: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7046: \$? = $ac_status" >&5 ++ echo "$as_me:7049: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7049: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7052: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7052: \$? = $ac_status" >&5 ++ echo "$as_me:7055: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gpm_Gpm_Open=yes + else +@@ -7060,18 +7063,18 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:7063: result: $ac_cv_lib_gpm_Gpm_Open" >&5 ++echo "$as_me:7066: result: $ac_cv_lib_gpm_Gpm_Open" >&5 + echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 + if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then + with_gpm=yes + else + + if test "$with_gpm" = maybe; then +- { echo "$as_me:7070: WARNING: Cannot link with GPM library" >&5 ++ { echo "$as_me:7073: WARNING: Cannot link with GPM library" >&5 + echo "$as_me: WARNING: Cannot link with GPM library" >&2;} + with_gpm=no + else +- { { echo "$as_me:7074: error: Cannot link with GPM library" >&5 ++ { { echo "$as_me:7077: error: Cannot link with GPM library" >&5 + echo "$as_me: error: Cannot link with GPM library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -7082,7 +7085,7 @@ + + else + +- test "$with_gpm" != maybe && { echo "$as_me:7085: WARNING: Cannot find GPM header" >&5 ++ test "$with_gpm" != maybe && { echo "$as_me:7088: WARNING: Cannot find GPM header" >&5 + echo "$as_me: WARNING: Cannot find GPM header" >&2;} + with_gpm=no + +@@ -7091,7 +7094,7 @@ + fi + + if test "$with_gpm" != no ; then +- echo "$as_me:7094: checking if you want to load GPM dynamically" >&5 ++ echo "$as_me:7097: checking if you want to load GPM dynamically" >&5 + echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6 + + # Check whether --with-dlsym or --without-dlsym was given. +@@ -7101,18 +7104,18 @@ + else + with_dlsym=yes + fi; +- echo "$as_me:7104: result: $with_dlsym" >&5 ++ echo "$as_me:7107: result: $with_dlsym" >&5 + echo "${ECHO_T}$with_dlsym" >&6 + if test "x$with_dlsym" = xyes ; then + + cf_have_dlsym=no +-echo "$as_me:7109: checking for dlsym" >&5 ++echo "$as_me:7112: checking for dlsym" >&5 + echo $ECHO_N "checking for dlsym... $ECHO_C" >&6 + if test "${ac_cv_func_dlsym+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7115 "configure" ++#line 7118 "configure" + #include "confdefs.h" + #define dlsym autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -7143,16 +7146,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7146: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7149: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7149: \$? = $ac_status" >&5 ++ echo "$as_me:7152: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7152: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7155: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7155: \$? = $ac_status" >&5 ++ echo "$as_me:7158: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_dlsym=yes + else +@@ -7162,14 +7165,14 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:7165: result: $ac_cv_func_dlsym" >&5 ++echo "$as_me:7168: result: $ac_cv_func_dlsym" >&5 + echo "${ECHO_T}$ac_cv_func_dlsym" >&6 + if test "$ac_cv_func_dlsym" = yes; then + cf_have_dlsym=yes + else + + cf_have_libdl=no +-echo "$as_me:7172: checking for dlsym in -ldl" >&5 ++echo "$as_me:7175: checking for dlsym in -ldl" >&5 + echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6 + if test "${ac_cv_lib_dl_dlsym+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7177,7 +7180,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldl $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7180 "configure" ++#line 7183 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -7196,16 +7199,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7199: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7202: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7202: \$? = $ac_status" >&5 ++ echo "$as_me:7205: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7205: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7208: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7208: \$? = $ac_status" >&5 ++ echo "$as_me:7211: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_dl_dlsym=yes + else +@@ -7216,7 +7219,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:7219: result: $ac_cv_lib_dl_dlsym" >&5 ++echo "$as_me:7222: result: $ac_cv_lib_dl_dlsym" >&5 + echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6 + if test "$ac_cv_lib_dl_dlsym" = yes; then + +@@ -7245,10 +7248,10 @@ + LIBS="$cf_add_libs" + } + +- echo "$as_me:7248: checking whether able to link to dl*() functions" >&5 ++ echo "$as_me:7251: checking whether able to link to dl*() functions" >&5 + echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7251 "configure" ++#line 7254 "configure" + #include "confdefs.h" + #include + int +@@ -7266,16 +7269,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7269: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7272: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7272: \$? = $ac_status" >&5 ++ echo "$as_me:7275: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7275: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7278: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7278: \$? = $ac_status" >&5 ++ echo "$as_me:7281: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cat >>confdefs.h <<\EOF +@@ -7286,15 +7289,15 @@ + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + +- { { echo "$as_me:7289: error: Cannot link test program for libdl" >&5 ++ { { echo "$as_me:7292: error: Cannot link test program for libdl" >&5 + echo "$as_me: error: Cannot link test program for libdl" >&2;} + { (exit 1); exit 1; }; } + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +- echo "$as_me:7294: result: ok" >&5 ++ echo "$as_me:7297: result: ok" >&5 + echo "${ECHO_T}ok" >&6 + else +- { { echo "$as_me:7297: error: Cannot find dlsym function" >&5 ++ { { echo "$as_me:7300: error: Cannot find dlsym function" >&5 + echo "$as_me: error: Cannot find dlsym function" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -7302,12 +7305,12 @@ + if test "x$with_gpm" != xyes ; then + test -n "$verbose" && echo " assuming soname for gpm is $with_gpm" 1>&6 + +-echo "${as_me:-configure}:7305: testing assuming soname for gpm is $with_gpm ..." 1>&5 ++echo "${as_me:-configure}:7308: testing assuming soname for gpm is $with_gpm ..." 1>&5 + + cf_cv_gpm_soname="$with_gpm" + else + +-echo "$as_me:7310: checking for soname of gpm library" >&5 ++echo "$as_me:7313: checking for soname of gpm library" >&5 + echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6 + if test "${cf_cv_gpm_soname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7341,15 +7344,15 @@ + done + LIBS="$cf_add_libs" + +- if { (eval echo "$as_me:7344: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:7347: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7347: \$? = $ac_status" >&5 ++ echo "$as_me:7350: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then +- if { (eval echo "$as_me:7349: \"$ac_link\"") >&5 ++ if { (eval echo "$as_me:7352: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7352: \$? = $ac_status" >&5 ++ echo "$as_me:7355: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then + cf_cv_gpm_soname="`ldd \"conftest$ac_exeext\" 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | ${FGREP-fgrep} libgpm.`" + test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown +@@ -7360,7 +7363,7 @@ + fi + + fi +-echo "$as_me:7363: result: $cf_cv_gpm_soname" >&5 ++echo "$as_me:7366: result: $cf_cv_gpm_soname" >&5 + echo "${ECHO_T}$cf_cv_gpm_soname" >&6 + + fi +@@ -7428,7 +7431,7 @@ + #define HAVE_LIBGPM 1 + EOF + +-echo "$as_me:7431: checking for Gpm_Wgetch in -lgpm" >&5 ++echo "$as_me:7434: checking for Gpm_Wgetch in -lgpm" >&5 + echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6 + if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7436,7 +7439,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7439 "configure" ++#line 7442 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -7455,16 +7458,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7458: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7461: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7461: \$? = $ac_status" >&5 ++ echo "$as_me:7464: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7464: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7467: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7467: \$? = $ac_status" >&5 ++ echo "$as_me:7470: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gpm_Gpm_Wgetch=yes + else +@@ -7475,11 +7478,11 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:7478: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5 ++echo "$as_me:7481: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5 + echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6 + if test "$ac_cv_lib_gpm_Gpm_Wgetch" = yes; then + +-echo "$as_me:7482: checking if GPM is weakly bound to curses library" >&5 ++echo "$as_me:7485: checking if GPM is weakly bound to curses library" >&5 + echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6 + if test "${cf_cv_check_gpm_wgetch+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7503,15 +7506,15 @@ + # to rely on the static library, noting that some packagers may not + # include it. + LIBS="-static -lgpm -dynamic $LIBS" +- if { (eval echo "$as_me:7506: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:7509: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7509: \$? = $ac_status" >&5 ++ echo "$as_me:7512: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then +- if { (eval echo "$as_me:7511: \"$ac_link\"") >&5 ++ if { (eval echo "$as_me:7514: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7514: \$? = $ac_status" >&5 ++ echo "$as_me:7517: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then + cf_cv_check_gpm_wgetch="`nm \"conftest$ac_exeext\" | ${EGREP-egrep} '\' | ${EGREP-egrep} '\<[vVwW]\>'`" + test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes +@@ -7523,11 +7526,11 @@ + fi + + fi +-echo "$as_me:7526: result: $cf_cv_check_gpm_wgetch" >&5 ++echo "$as_me:7529: result: $cf_cv_check_gpm_wgetch" >&5 + echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6 + + if test "$cf_cv_check_gpm_wgetch" != yes ; then +- { echo "$as_me:7530: WARNING: GPM library is already linked with curses - read the FAQ" >&5 ++ { echo "$as_me:7533: WARNING: GPM library is already linked with curses - read the FAQ" >&5 + echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;} + fi + +@@ -7535,7 +7538,7 @@ + + fi + +-echo "$as_me:7538: checking if you want to use PCRE2 for regular-expressions" >&5 ++echo "$as_me:7541: checking if you want to use PCRE2 for regular-expressions" >&5 + echo $ECHO_N "checking if you want to use PCRE2 for regular-expressions... $ECHO_C" >&6 + + # Check whether --with-pcre2 or --without-pcre2 was given. +@@ -7544,7 +7547,7 @@ + + fi; + test -z "$with_pcre2" && with_pcre2=no +-echo "$as_me:7547: result: $with_pcre2" >&5 ++echo "$as_me:7550: result: $with_pcre2" >&5 + echo "${ECHO_T}$with_pcre2" >&6 + + if test "x$with_pcre2" != xno ; then +@@ -7555,17 +7558,17 @@ + if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then + test -n "$verbose" && echo " found package $cf_with_pcre2" 1>&6 + +-echo "${as_me:-configure}:7558: testing found package $cf_with_pcre2 ..." 1>&5 ++echo "${as_me:-configure}:7561: testing found package $cf_with_pcre2 ..." 1>&5 + + cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_with_pcre2" 2>/dev/null`" + cf_pkgconfig_libs="`$PKG_CONFIG --libs "$cf_with_pcre2" 2>/dev/null`" + test -n "$verbose" && echo " package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs" 1>&6 + +-echo "${as_me:-configure}:7564: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 ++echo "${as_me:-configure}:7567: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 + + test -n "$verbose" && echo " package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs" 1>&6 + +-echo "${as_me:-configure}:7568: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5 ++echo "${as_me:-configure}:7571: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5 + + cf_fix_cppflags=no + cf_new_cflags= +@@ -7689,7 +7692,7 @@ + fi + + done +- cf_with_pcre2_ok=yes || { { echo "$as_me:7692: error: Cannot find PCRE2 library" >&5 ++ cf_with_pcre2_ok=yes || { { echo "$as_me:7695: error: Cannot find PCRE2 library" >&5 + echo "$as_me: error: Cannot find PCRE2 library" >&2;} + { (exit 1); exit 1; }; } + +@@ -7702,7 +7705,7 @@ + (*pcre2-posix*|*pcreposix*) + ;; + (*) +- echo "$as_me:7705: checking for regcomp in -lpcre2-posix" >&5 ++ echo "$as_me:7708: checking for regcomp in -lpcre2-posix" >&5 + echo $ECHO_N "checking for regcomp in -lpcre2-posix... $ECHO_C" >&6 + if test "${ac_cv_lib_pcre2_posix_regcomp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7710,7 +7713,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lpcre2-posix $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7713 "configure" ++#line 7716 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -7729,16 +7732,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7732: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7735: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7735: \$? = $ac_status" >&5 ++ echo "$as_me:7738: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7738: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7741: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7741: \$? = $ac_status" >&5 ++ echo "$as_me:7744: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_pcre2_posix_regcomp=yes + else +@@ -7749,7 +7752,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:7752: result: $ac_cv_lib_pcre2_posix_regcomp" >&5 ++echo "$as_me:7755: result: $ac_cv_lib_pcre2_posix_regcomp" >&5 + echo "${ECHO_T}$ac_cv_lib_pcre2_posix_regcomp" >&6 + if test "$ac_cv_lib_pcre2_posix_regcomp" = yes; then + +@@ -7770,7 +7773,7 @@ + LIBS="$cf_add_libs" + + else +- echo "$as_me:7773: checking for regcomp in -lpcreposix" >&5 ++ echo "$as_me:7776: checking for regcomp in -lpcreposix" >&5 + echo $ECHO_N "checking for regcomp in -lpcreposix... $ECHO_C" >&6 + if test "${ac_cv_lib_pcreposix_regcomp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7778,7 +7781,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lpcreposix $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7781 "configure" ++#line 7784 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -7797,16 +7800,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7800: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7803: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7803: \$? = $ac_status" >&5 ++ echo "$as_me:7806: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7806: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7809: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7809: \$? = $ac_status" >&5 ++ echo "$as_me:7812: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_pcreposix_regcomp=yes + else +@@ -7817,7 +7820,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:7820: result: $ac_cv_lib_pcreposix_regcomp" >&5 ++echo "$as_me:7823: result: $ac_cv_lib_pcreposix_regcomp" >&5 + echo "${ECHO_T}$ac_cv_lib_pcreposix_regcomp" >&6 + if test "$ac_cv_lib_pcreposix_regcomp" = yes; then + +@@ -7838,7 +7841,7 @@ + LIBS="$cf_add_libs" + + else +- { { echo "$as_me:7841: error: Cannot find PCRE2 POSIX library" >&5 ++ { { echo "$as_me:7844: error: Cannot find PCRE2 POSIX library" >&5 + echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -7853,23 +7856,23 @@ + for ac_header in pcre2posix.h pcreposix.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:7856: checking for $ac_header" >&5 ++echo "$as_me:7859: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7862 "configure" ++#line 7865 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:7866: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:7869: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:7872: \$? = $ac_status" >&5 ++ echo "$as_me:7875: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -7888,7 +7891,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:7891: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:7894: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:7907: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7910 "configure" ++#line 7913 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -7938,16 +7941,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7941: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7944: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7944: \$? = $ac_status" >&5 ++ echo "$as_me:7947: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7947: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7950: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7950: \$? = $ac_status" >&5 ++ echo "$as_me:7953: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -7957,7 +7960,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:7960: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:7963: result: `eval echo '${'"$as_ac_var"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 + if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then + cat >>confdefs.h </dev/null ; then +-echo "$as_me:7974: checking if you want to use sysmouse" >&5 ++echo "$as_me:7977: checking if you want to use sysmouse" >&5 + echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6 + + # Check whether --with-sysmouse or --without-sysmouse was given. +@@ -7983,7 +7986,7 @@ + fi; + if test "$cf_with_sysmouse" != no ; then + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7986 "configure" ++#line 7989 "configure" + #include "confdefs.h" + + #include +@@ -8006,16 +8009,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:8009: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8012: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8012: \$? = $ac_status" >&5 ++ echo "$as_me:8015: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:8015: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8018: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8018: \$? = $ac_status" >&5 ++ echo "$as_me:8021: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_with_sysmouse=yes + else +@@ -8025,7 +8028,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:8028: result: $cf_with_sysmouse" >&5 ++echo "$as_me:8031: result: $cf_with_sysmouse" >&5 + echo "${ECHO_T}$cf_with_sysmouse" >&6 + test "$cf_with_sysmouse" = yes && + cat >>confdefs.h <<\EOF +@@ -8035,7 +8038,7 @@ + fi + + # pretend that ncurses==ncursesw==ncursest +-echo "$as_me:8038: checking if you want to disable library suffixes" >&5 ++echo "$as_me:8041: checking if you want to disable library suffixes" >&5 + echo $ECHO_N "checking if you want to disable library suffixes... $ECHO_C" >&6 + + # Check whether --enable-lib-suffixes or --disable-lib-suffixes was given. +@@ -8052,13 +8055,13 @@ + disable_lib_suffixes=no + + fi; +-echo "$as_me:8055: result: $disable_lib_suffixes" >&5 ++echo "$as_me:8058: result: $disable_lib_suffixes" >&5 + echo "${ECHO_T}$disable_lib_suffixes" >&6 + + ### If we're building with rpath, try to link non-standard libs that way too. + if test "$DFT_LWR_MODEL" = "shared" && test "x$cf_cv_enable_rpath" != xno; then + +-echo "$as_me:8061: checking if rpath-hack should be disabled" >&5 ++echo "$as_me:8064: checking if rpath-hack should be disabled" >&5 + echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6 + + # Check whether --enable-rpath-hack or --disable-rpath-hack was given. +@@ -8076,22 +8079,22 @@ + + fi; + if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi +-echo "$as_me:8079: result: $cf_disable_rpath_hack" >&5 ++echo "$as_me:8082: result: $cf_disable_rpath_hack" >&5 + echo "${ECHO_T}$cf_disable_rpath_hack" >&6 + + if test "$enable_rpath_hack" = yes ; then + +-echo "$as_me:8084: checking for updated LDFLAGS" >&5 ++echo "$as_me:8087: checking for updated LDFLAGS" >&5 + echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6 + if test -n "$LD_RPATH_OPT" ; then +- echo "$as_me:8087: result: maybe" >&5 ++ echo "$as_me:8090: result: maybe" >&5 + echo "${ECHO_T}maybe" >&6 + + for ac_prog in ldd + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:8094: checking for $ac_word" >&5 ++echo "$as_me:8097: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8106,7 +8109,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_cf_ldd_prog="$ac_prog" +-echo "$as_me:8109: found $ac_dir/$ac_word" >&5 ++echo "$as_me:8112: found $ac_dir/$ac_word" >&5 + break + done + +@@ -8114,10 +8117,10 @@ + fi + cf_ldd_prog=$ac_cv_prog_cf_ldd_prog + if test -n "$cf_ldd_prog"; then +- echo "$as_me:8117: result: $cf_ldd_prog" >&5 ++ echo "$as_me:8120: result: $cf_ldd_prog" >&5 + echo "${ECHO_T}$cf_ldd_prog" >&6 + else +- echo "$as_me:8120: result: no" >&5 ++ echo "$as_me:8123: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -8131,7 +8134,7 @@ + cf_rpath_oops= + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8134 "configure" ++#line 8137 "configure" + #include "confdefs.h" + #include + int +@@ -8143,16 +8146,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:8146: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8149: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8149: \$? = $ac_status" >&5 ++ echo "$as_me:8152: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:8152: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8155: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8155: \$? = $ac_status" >&5 ++ echo "$as_me:8158: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq` + cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq` +@@ -8180,7 +8183,7 @@ + then + test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6 + +-echo "${as_me:-configure}:8183: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 ++echo "${as_me:-configure}:8186: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 + + LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" + break +@@ -8192,11 +8195,11 @@ + + test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:8195: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:8198: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:8199: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:8202: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 + + cf_rpath_dst= + for cf_rpath_src in $LDFLAGS +@@ -8233,7 +8236,7 @@ + then + test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 + +-echo "${as_me:-configure}:8236: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 ++echo "${as_me:-configure}:8239: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 + + EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" + fi +@@ -8246,11 +8249,11 @@ + + test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:8249: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:8252: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 + +-echo "${as_me:-configure}:8253: testing ...checking LIBS $LIBS ..." 1>&5 ++echo "${as_me:-configure}:8256: testing ...checking LIBS $LIBS ..." 1>&5 + + cf_rpath_dst= + for cf_rpath_src in $LIBS +@@ -8287,7 +8290,7 @@ + then + test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 + +-echo "${as_me:-configure}:8290: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 ++echo "${as_me:-configure}:8293: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 + + EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" + fi +@@ -8300,14 +8303,14 @@ + + test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 + +-echo "${as_me:-configure}:8303: testing ...checked LIBS $LIBS ..." 1>&5 ++echo "${as_me:-configure}:8306: testing ...checked LIBS $LIBS ..." 1>&5 + + test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:8307: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:8310: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 + + else +- echo "$as_me:8310: result: no" >&5 ++ echo "$as_me:8313: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -8321,7 +8324,7 @@ + EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS" + if test -n "$EXTRA_PKG_LDFLAGS" + then +- echo "$as_me:8324: checking if you want to disable extra LDFLAGS for package-scripts" >&5 ++ echo "$as_me:8327: checking if you want to disable extra LDFLAGS for package-scripts" >&5 + echo $ECHO_N "checking if you want to disable extra LDFLAGS for package-scripts... $ECHO_C" >&6 + + # Check whether --enable-pkg-ldflags or --disable-pkg-ldflags was given. +@@ -8338,7 +8341,7 @@ + disable_pkg_ldflags=no + + fi; +- echo "$as_me:8341: result: $disable_pkg_ldflags" >&5 ++ echo "$as_me:8344: result: $disable_pkg_ldflags" >&5 + echo "${ECHO_T}$disable_pkg_ldflags" >&6 + test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS= + fi +@@ -8346,7 +8349,7 @@ + ############################################################################### + + ### use option --with-extra-suffix to append suffix to headers and libraries +-echo "$as_me:8349: checking if you wish to append extra suffix to header/library paths" >&5 ++echo "$as_me:8352: checking if you wish to append extra suffix to header/library paths" >&5 + echo $ECHO_N "checking if you wish to append extra suffix to header/library paths... $ECHO_C" >&6 + EXTRA_SUFFIX= + +@@ -8365,11 +8368,11 @@ + esac + + fi; +-echo "$as_me:8368: result: $EXTRA_SUFFIX" >&5 ++echo "$as_me:8371: result: $EXTRA_SUFFIX" >&5 + echo "${ECHO_T}$EXTRA_SUFFIX" >&6 + + ### use option --disable-overwrite to leave out the link to -lcurses +-echo "$as_me:8372: checking if you wish to install ncurses overwriting curses" >&5 ++echo "$as_me:8375: checking if you wish to install ncurses overwriting curses" >&5 + echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6 + + # Check whether --enable-overwrite or --disable-overwrite was given. +@@ -8379,10 +8382,10 @@ + else + if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi + fi; +-echo "$as_me:8382: result: $with_overwrite" >&5 ++echo "$as_me:8385: result: $with_overwrite" >&5 + echo "${ECHO_T}$with_overwrite" >&6 + +-echo "$as_me:8385: checking if external terminfo-database is used" >&5 ++echo "$as_me:8388: checking if external terminfo-database is used" >&5 + echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6 + + # Check whether --enable-database or --disable-database was given. +@@ -8392,7 +8395,7 @@ + else + use_database=yes + fi; +-echo "$as_me:8395: result: $use_database" >&5 ++echo "$as_me:8398: result: $use_database" >&5 + echo "${ECHO_T}$use_database" >&6 + + case "$host_os" in +@@ -8408,7 +8411,7 @@ + if test "$use_database" != no ; then + NCURSES_USE_DATABASE=1 + +- echo "$as_me:8411: checking which terminfo source-file will be installed" >&5 ++ echo "$as_me:8414: checking which terminfo source-file will be installed" >&5 + echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6 + + # Check whether --with-database or --without-database was given. +@@ -8416,10 +8419,10 @@ + withval="$with_database" + TERMINFO_SRC=$withval + fi; +- echo "$as_me:8419: result: $TERMINFO_SRC" >&5 ++ echo "$as_me:8422: result: $TERMINFO_SRC" >&5 + echo "${ECHO_T}$TERMINFO_SRC" >&6 + +- echo "$as_me:8422: checking whether to use hashed database instead of directory/tree" >&5 ++ echo "$as_me:8425: checking whether to use hashed database instead of directory/tree" >&5 + echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6 + + # Check whether --with-hashed-db or --without-hashed-db was given. +@@ -8429,13 +8432,13 @@ + else + with_hashed_db=no + fi; +- echo "$as_me:8432: result: $with_hashed_db" >&5 ++ echo "$as_me:8435: result: $with_hashed_db" >&5 + echo "${ECHO_T}$with_hashed_db" >&6 + else + with_hashed_db=no + fi + +-echo "$as_me:8438: checking for list of fallback descriptions" >&5 ++echo "$as_me:8441: checking for list of fallback descriptions" >&5 + echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6 + + # Check whether --with-fallbacks or --without-fallbacks was given. +@@ -8445,7 +8448,7 @@ + else + with_fallback= + fi; +-echo "$as_me:8448: result: $with_fallback" >&5 ++echo "$as_me:8451: result: $with_fallback" >&5 + echo "${ECHO_T}$with_fallback" >&6 + + case ".$with_fallback" in +@@ -8453,7 +8456,7 @@ + FALLBACK_LIST= + ;; + (.yes) +- { echo "$as_me:8456: WARNING: expected a list of terminal descriptions" >&5 ++ { echo "$as_me:8459: WARNING: expected a list of terminal descriptions" >&5 + echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;} + ;; + (*) +@@ -8469,7 +8472,7 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}tic", so it can be a program name with args. + set dummy ${ac_tool_prefix}tic; ac_word=$2 +-echo "$as_me:8472: checking for $ac_word" >&5 ++echo "$as_me:8475: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_TIC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8484,7 +8487,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_TIC="${ac_tool_prefix}tic" +-echo "$as_me:8487: found $ac_dir/$ac_word" >&5 ++echo "$as_me:8490: found $ac_dir/$ac_word" >&5 + break + done + +@@ -8492,10 +8495,10 @@ + fi + TIC=$ac_cv_prog_TIC + if test -n "$TIC"; then +- echo "$as_me:8495: result: $TIC" >&5 ++ echo "$as_me:8498: result: $TIC" >&5 + echo "${ECHO_T}$TIC" >&6 + else +- echo "$as_me:8498: result: no" >&5 ++ echo "$as_me:8501: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -8504,7 +8507,7 @@ + ac_ct_TIC=$TIC + # Extract the first word of "tic", so it can be a program name with args. + set dummy tic; ac_word=$2 +-echo "$as_me:8507: checking for $ac_word" >&5 ++echo "$as_me:8510: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_TIC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8519,7 +8522,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_TIC="tic" +-echo "$as_me:8522: found $ac_dir/$ac_word" >&5 ++echo "$as_me:8525: found $ac_dir/$ac_word" >&5 + break + done + +@@ -8527,10 +8530,10 @@ + fi + ac_ct_TIC=$ac_cv_prog_ac_ct_TIC + if test -n "$ac_ct_TIC"; then +- echo "$as_me:8530: result: $ac_ct_TIC" >&5 ++ echo "$as_me:8533: result: $ac_ct_TIC" >&5 + echo "${ECHO_T}$ac_ct_TIC" >&6 + else +- echo "$as_me:8533: result: no" >&5 ++ echo "$as_me:8536: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -8542,7 +8545,7 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}infocmp", so it can be a program name with args. + set dummy ${ac_tool_prefix}infocmp; ac_word=$2 +-echo "$as_me:8545: checking for $ac_word" >&5 ++echo "$as_me:8548: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_INFOCMP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8557,7 +8560,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_INFOCMP="${ac_tool_prefix}infocmp" +-echo "$as_me:8560: found $ac_dir/$ac_word" >&5 ++echo "$as_me:8563: found $ac_dir/$ac_word" >&5 + break + done + +@@ -8565,10 +8568,10 @@ + fi + INFOCMP=$ac_cv_prog_INFOCMP + if test -n "$INFOCMP"; then +- echo "$as_me:8568: result: $INFOCMP" >&5 ++ echo "$as_me:8571: result: $INFOCMP" >&5 + echo "${ECHO_T}$INFOCMP" >&6 + else +- echo "$as_me:8571: result: no" >&5 ++ echo "$as_me:8574: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -8577,7 +8580,7 @@ + ac_ct_INFOCMP=$INFOCMP + # Extract the first word of "infocmp", so it can be a program name with args. + set dummy infocmp; ac_word=$2 +-echo "$as_me:8580: checking for $ac_word" >&5 ++echo "$as_me:8583: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_INFOCMP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8592,7 +8595,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_INFOCMP="infocmp" +-echo "$as_me:8595: found $ac_dir/$ac_word" >&5 ++echo "$as_me:8598: found $ac_dir/$ac_word" >&5 + break + done + +@@ -8600,10 +8603,10 @@ + fi + ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP + if test -n "$ac_ct_INFOCMP"; then +- echo "$as_me:8603: result: $ac_ct_INFOCMP" >&5 ++ echo "$as_me:8606: result: $ac_ct_INFOCMP" >&5 + echo "${ECHO_T}$ac_ct_INFOCMP" >&6 + else +- echo "$as_me:8606: result: no" >&5 ++ echo "$as_me:8609: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -8618,10 +8621,10 @@ + # Check whether --with-tic-path or --without-tic-path was given. + if test "${with_tic_path+set}" = set; then + withval="$with_tic_path" +- echo "$as_me:8621: checking for tic program for fallbacks" >&5 ++ echo "$as_me:8624: checking for tic program for fallbacks" >&5 + echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6 + TIC=$withval +- echo "$as_me:8624: result: $TIC" >&5 ++ echo "$as_me:8627: result: $TIC" >&5 + echo "${ECHO_T}$TIC" >&6 + + if test "x$prefix" != xNONE; then +@@ -8649,7 +8652,7 @@ + TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:8652: error: expected a pathname, not \"$TIC\"" >&5 ++ { { echo "$as_me:8655: error: expected a pathname, not \"$TIC\"" >&5 + echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -8662,7 +8665,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:8665: checking for $ac_word" >&5 ++echo "$as_me:8668: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_TIC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8679,7 +8682,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_TIC="$ac_dir/$ac_word" +- echo "$as_me:8682: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:8685: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -8690,10 +8693,10 @@ + TIC=$ac_cv_path_TIC + + if test -n "$TIC"; then +- echo "$as_me:8693: result: $TIC" >&5 ++ echo "$as_me:8696: result: $TIC" >&5 + echo "${ECHO_T}$TIC" >&6 + else +- echo "$as_me:8696: result: no" >&5 ++ echo "$as_me:8699: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -8752,7 +8755,7 @@ + + if test -n "$cf_path_prog" ; then + +-echo "${as_me:-configure}:8755: testing defining path for ${cf_path_prog} ..." 1>&5 ++echo "${as_me:-configure}:8758: testing defining path for ${cf_path_prog} ..." 1>&5 + + cat >>confdefs.h <&5 ++ { echo "$as_me:8773: WARNING: no tic program found for fallbacks" >&5 + echo "$as_me: WARNING: no tic program found for fallbacks" >&2;} + fi + +@@ -8776,10 +8779,10 @@ + # Check whether --with-infocmp-path or --without-infocmp-path was given. + if test "${with_infocmp_path+set}" = set; then + withval="$with_infocmp_path" +- echo "$as_me:8779: checking for infocmp program for fallbacks" >&5 ++ echo "$as_me:8782: checking for infocmp program for fallbacks" >&5 + echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6 + INFOCMP=$withval +- echo "$as_me:8782: result: $INFOCMP" >&5 ++ echo "$as_me:8785: result: $INFOCMP" >&5 + echo "${ECHO_T}$INFOCMP" >&6 + + if test "x$prefix" != xNONE; then +@@ -8807,7 +8810,7 @@ + INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:8810: error: expected a pathname, not \"$INFOCMP\"" >&5 ++ { { echo "$as_me:8813: error: expected a pathname, not \"$INFOCMP\"" >&5 + echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -8820,7 +8823,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:8823: checking for $ac_word" >&5 ++echo "$as_me:8826: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_INFOCMP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8837,7 +8840,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_INFOCMP="$ac_dir/$ac_word" +- echo "$as_me:8840: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:8843: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -8848,10 +8851,10 @@ + INFOCMP=$ac_cv_path_INFOCMP + + if test -n "$INFOCMP"; then +- echo "$as_me:8851: result: $INFOCMP" >&5 ++ echo "$as_me:8854: result: $INFOCMP" >&5 + echo "${ECHO_T}$INFOCMP" >&6 + else +- echo "$as_me:8854: result: no" >&5 ++ echo "$as_me:8857: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -8910,7 +8913,7 @@ + + if test -n "$cf_path_prog" ; then + +-echo "${as_me:-configure}:8913: testing defining path for ${cf_path_prog} ..." 1>&5 ++echo "${as_me:-configure}:8916: testing defining path for ${cf_path_prog} ..." 1>&5 + + cat >>confdefs.h <&5 ++ { echo "$as_me:8931: WARNING: no infocmp program found for fallbacks" >&5 + echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;} + fi + +@@ -8935,7 +8938,7 @@ + test -z "$INFOCMP" && FALLBACK_LIST= + if test -z "$FALLBACK_LIST" + then +- { echo "$as_me:8938: WARNING: ignoring fallback option because tic/infocmp are not available" >&5 ++ { echo "$as_me:8941: WARNING: ignoring fallback option because tic/infocmp are not available" >&5 + echo "$as_me: WARNING: ignoring fallback option because tic/infocmp are not available" >&2;} + fi + fi +@@ -8943,7 +8946,7 @@ + USE_FALLBACKS= + test -z "$FALLBACK_LIST" && USE_FALLBACKS="#" + +-echo "$as_me:8946: checking if you want modern xterm or antique" >&5 ++echo "$as_me:8949: checking if you want modern xterm or antique" >&5 + echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6 + + # Check whether --with-xterm-new or --without-xterm-new was given. +@@ -8957,11 +8960,11 @@ + (no) with_xterm_new=xterm-old;; + (*) with_xterm_new=xterm-new;; + esac +-echo "$as_me:8960: result: $with_xterm_new" >&5 ++echo "$as_me:8963: result: $with_xterm_new" >&5 + echo "${ECHO_T}$with_xterm_new" >&6 + WHICH_XTERM=$with_xterm_new + +-echo "$as_me:8964: checking if xterm backspace sends BS or DEL" >&5 ++echo "$as_me:8967: checking if xterm backspace sends BS or DEL" >&5 + echo $ECHO_N "checking if xterm backspace sends BS or DEL... $ECHO_C" >&6 + + # Check whether --with-xterm-kbs or --without-xterm-kbs was given. +@@ -8982,7 +8985,7 @@ + with_xterm_kbs=$withval + ;; + esac +-echo "$as_me:8985: result: $with_xterm_kbs" >&5 ++echo "$as_me:8988: result: $with_xterm_kbs" >&5 + echo "${ECHO_T}$with_xterm_kbs" >&6 + XTERM_KBS=$with_xterm_kbs + +@@ -8992,7 +8995,7 @@ + MAKE_TERMINFO="#" + else + +-echo "$as_me:8995: checking for list of terminfo directories" >&5 ++echo "$as_me:8998: checking for list of terminfo directories" >&5 + echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6 + + # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given. +@@ -9032,7 +9035,7 @@ + cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:9035: error: expected a pathname, not \"$cf_src_path\"" >&5 ++ { { echo "$as_me:9038: error: expected a pathname, not \"$cf_src_path\"" >&5 + echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -9055,7 +9058,7 @@ + ;; + esac + +-echo "$as_me:9058: result: $TERMINFO_DIRS" >&5 ++echo "$as_me:9061: result: $TERMINFO_DIRS" >&5 + echo "${ECHO_T}$TERMINFO_DIRS" >&6 + test -n "$TERMINFO_DIRS" && + cat >>confdefs.h <&5 ++ { echo "$as_me:9070: WARNING: ignoring non-directory/file TERMINFO value" >&5 + echo "$as_me: WARNING: ignoring non-directory/file TERMINFO value" >&2;} + unset TERMINFO + ;; + esac + +-echo "$as_me:9073: checking for default terminfo directory" >&5 ++echo "$as_me:9076: checking for default terminfo directory" >&5 + echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6 + + # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given. +@@ -9106,7 +9109,7 @@ + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:9109: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:9112: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -9115,7 +9118,7 @@ + fi + eval TERMINFO="$withval" + +-echo "$as_me:9118: result: $TERMINFO" >&5 ++echo "$as_me:9121: result: $TERMINFO" >&5 + echo "${ECHO_T}$TERMINFO" >&6 + + cat >>confdefs.h <&5 ++echo "$as_me:9132: checking if big-core option selected" >&5 + echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6 + + # Check whether --enable-big-core or --disable-big-core was given. +@@ -9138,7 +9141,7 @@ + with_big_core=no + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9141 "configure" ++#line 9144 "configure" + #include "confdefs.h" + + #include +@@ -9152,15 +9155,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:9155: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9158: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9158: \$? = $ac_status" >&5 ++ echo "$as_me:9161: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:9160: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9163: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9163: \$? = $ac_status" >&5 ++ echo "$as_me:9166: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + with_big_core=yes + else +@@ -9172,7 +9175,7 @@ + rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" + fi + fi; +-echo "$as_me:9175: result: $with_big_core" >&5 ++echo "$as_me:9178: result: $with_big_core" >&5 + echo "${ECHO_T}$with_big_core" >&6 + test "x$with_big_core" = "xyes" && + cat >>confdefs.h <<\EOF +@@ -9182,7 +9185,7 @@ + ### ISO C only guarantees 512-char strings, we have tables which load faster + ### when constructed using "big" strings. More than the C compiler, the awk + ### program is a limit on most vendor UNIX systems. Check that we can build. +-echo "$as_me:9185: checking if big-strings option selected" >&5 ++echo "$as_me:9188: checking if big-strings option selected" >&5 + echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6 + + # Check whether --enable-big-strings or --disable-big-strings was given. +@@ -9206,14 +9209,14 @@ + esac + + fi; +-echo "$as_me:9209: result: $with_big_strings" >&5 ++echo "$as_me:9212: result: $with_big_strings" >&5 + echo "${ECHO_T}$with_big_strings" >&6 + + USE_BIG_STRINGS=0 + test "x$with_big_strings" = "xyes" && USE_BIG_STRINGS=1 + + ### use option --enable-termcap to compile in the termcap fallback support +-echo "$as_me:9216: checking if you want termcap-fallback support" >&5 ++echo "$as_me:9219: checking if you want termcap-fallback support" >&5 + echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6 + + # Check whether --enable-termcap or --disable-termcap was given. +@@ -9223,14 +9226,14 @@ + else + with_termcap=no + fi; +-echo "$as_me:9226: result: $with_termcap" >&5 ++echo "$as_me:9229: result: $with_termcap" >&5 + echo "${ECHO_T}$with_termcap" >&6 + + NCURSES_USE_TERMCAP=0 + if test "x$with_termcap" != "xyes" ; then + if test "$use_database" = no ; then + if test -z "$with_fallback" ; then +- { { echo "$as_me:9233: error: You have disabled the database w/o specifying fallbacks" >&5 ++ { { echo "$as_me:9236: error: You have disabled the database w/o specifying fallbacks" >&5 + echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -9243,13 +9246,13 @@ + else + + if test "$with_ticlib" != no ; then +- { { echo "$as_me:9246: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5 ++ { { echo "$as_me:9249: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5 + echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;} + { (exit 1); exit 1; }; } + fi + + NCURSES_USE_TERMCAP=1 +- echo "$as_me:9252: checking for list of termcap files" >&5 ++ echo "$as_me:9255: checking for list of termcap files" >&5 + echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6 + + # Check whether --with-termpath or --without-termpath was given. +@@ -9289,7 +9292,7 @@ + cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:9292: error: expected a pathname, not \"$cf_src_path\"" >&5 ++ { { echo "$as_me:9295: error: expected a pathname, not \"$cf_src_path\"" >&5 + echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -9312,7 +9315,7 @@ + ;; + esac + +- echo "$as_me:9315: result: $TERMPATH" >&5 ++ echo "$as_me:9318: result: $TERMPATH" >&5 + echo "${ECHO_T}$TERMPATH" >&6 + test -n "$TERMPATH" && + cat >>confdefs.h <&5 ++ echo "$as_me:9326: checking if fast termcap-loader is needed" >&5 + echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6 + + # Check whether --enable-getcap or --disable-getcap was given. +@@ -9330,14 +9333,14 @@ + else + with_getcap=no + fi; +- echo "$as_me:9333: result: $with_getcap" >&5 ++ echo "$as_me:9336: result: $with_getcap" >&5 + echo "${ECHO_T}$with_getcap" >&6 + test "x$with_getcap" = "xyes" && + cat >>confdefs.h <<\EOF + #define USE_GETCAP 1 + EOF + +- echo "$as_me:9340: checking if translated termcaps will be cached in ~/.terminfo" >&5 ++ echo "$as_me:9343: checking if translated termcaps will be cached in ~/.terminfo" >&5 + echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6 + + # Check whether --enable-getcap-cache or --disable-getcap-cache was given. +@@ -9347,7 +9350,7 @@ + else + with_getcap_cache=no + fi; +- echo "$as_me:9350: result: $with_getcap_cache" >&5 ++ echo "$as_me:9353: result: $with_getcap_cache" >&5 + echo "${ECHO_T}$with_getcap_cache" >&6 + test "x$with_getcap_cache" = "xyes" && + cat >>confdefs.h <<\EOF +@@ -9357,7 +9360,7 @@ + fi + + ### Use option --disable-home-terminfo to completely remove ~/.terminfo +-echo "$as_me:9360: checking if ~/.terminfo is wanted" >&5 ++echo "$as_me:9363: checking if ~/.terminfo is wanted" >&5 + echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6 + + # Check whether --enable-home-terminfo or --disable-home-terminfo was given. +@@ -9367,14 +9370,14 @@ + else + with_home_terminfo=yes + fi; +-echo "$as_me:9370: result: $with_home_terminfo" >&5 ++echo "$as_me:9373: result: $with_home_terminfo" >&5 + echo "${ECHO_T}$with_home_terminfo" >&6 + test "x$with_home_terminfo" = "xyes" && + cat >>confdefs.h <<\EOF + #define USE_HOME_TERMINFO 1 + EOF + +-echo "$as_me:9377: checking if you want to permit root to use ncurses environment variables" >&5 ++echo "$as_me:9380: checking if you want to permit root to use ncurses environment variables" >&5 + echo $ECHO_N "checking if you want to permit root to use ncurses environment variables... $ECHO_C" >&6 + + # Check whether --enable-root-environ or --disable-root-environ was given. +@@ -9384,14 +9387,14 @@ + else + with_root_environ=yes + fi; +-echo "$as_me:9387: result: $with_root_environ" >&5 ++echo "$as_me:9390: result: $with_root_environ" >&5 + echo "${ECHO_T}$with_root_environ" >&6 + test "x$with_root_environ" = xyes && + cat >>confdefs.h <<\EOF + #define USE_ROOT_ENVIRON 1 + EOF + +-echo "$as_me:9394: checking if you want to permit setuid programs to access all files" >&5 ++echo "$as_me:9397: checking if you want to permit setuid programs to access all files" >&5 + echo $ECHO_N "checking if you want to permit setuid programs to access all files... $ECHO_C" >&6 + + # Check whether --enable-root-environ or --disable-root-environ was given. +@@ -9401,7 +9404,7 @@ + else + with_root_access=yes + fi; +-echo "$as_me:9404: result: $with_root_access" >&5 ++echo "$as_me:9407: result: $with_root_access" >&5 + echo "${ECHO_T}$with_root_access" >&6 + test "x$with_root_access" = xyes && + cat >>confdefs.h <<\EOF +@@ -9416,23 +9419,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:9419: checking for $ac_header" >&5 ++echo "$as_me:9422: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9425 "configure" ++#line 9428 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:9429: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:9432: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:9435: \$? = $ac_status" >&5 ++ echo "$as_me:9438: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -9451,7 +9454,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:9454: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:9457: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:9472: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9475 "configure" ++#line 9478 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -9503,16 +9506,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:9506: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9509: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9509: \$? = $ac_status" >&5 ++ echo "$as_me:9512: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:9512: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9515: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9515: \$? = $ac_status" >&5 ++ echo "$as_me:9518: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -9522,7 +9525,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:9525: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:9528: result: `eval echo '${'"$as_ac_var"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 + if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:9545: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9548 "configure" ++#line 9551 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -9576,16 +9579,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:9579: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9582: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9582: \$? = $ac_status" >&5 ++ echo "$as_me:9585: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:9585: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9588: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9588: \$? = $ac_status" >&5 ++ echo "$as_me:9591: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -9595,7 +9598,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:9598: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:9601: result: `eval echo '${'"$as_ac_var"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 + if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then + cat >>confdefs.h <&5 ++ echo "$as_me:9612: checking if link/symlink functions work" >&5 + echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6 + if test "${cf_cv_link_funcs+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -9619,7 +9622,7 @@ + eval 'ac_cv_func_'$cf_func'=error' + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9622 "configure" ++#line 9625 "configure" + #include "confdefs.h" + + #include +@@ -9657,15 +9660,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:9660: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9663: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9663: \$? = $ac_status" >&5 ++ echo "$as_me:9666: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:9665: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9668: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9668: \$? = $ac_status" >&5 ++ echo "$as_me:9671: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_link_funcs="$cf_cv_link_funcs $cf_func" +@@ -9683,7 +9686,7 @@ + test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no + + fi +-echo "$as_me:9686: result: $cf_cv_link_funcs" >&5 ++echo "$as_me:9689: result: $cf_cv_link_funcs" >&5 + echo "${ECHO_T}$cf_cv_link_funcs" >&6 + test "$ac_cv_func_link" = yes && + cat >>confdefs.h <<\EOF +@@ -9703,7 +9706,7 @@ + # soft links (symbolic links) are useful for some systems where hard links do + # not work, or to make it simpler to copy terminfo trees around. + if test "x$ac_cv_func_symlink" = xyes ; then +- echo "$as_me:9706: checking if tic should use symbolic links" >&5 ++ echo "$as_me:9709: checking if tic should use symbolic links" >&5 + echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6 + + # Check whether --enable-symlinks or --disable-symlinks was given. +@@ -9713,21 +9716,21 @@ + else + with_symlinks=no + fi; +- echo "$as_me:9716: result: $with_symlinks" >&5 ++ echo "$as_me:9719: result: $with_symlinks" >&5 + echo "${ECHO_T}$with_symlinks" >&6 + fi + + # If we have hard links and did not choose to use soft links instead, there is + # no reason to make this choice optional - use the hard links. + if test "$with_symlinks" = no ; then +- echo "$as_me:9723: checking if tic should use hard links" >&5 ++ echo "$as_me:9726: checking if tic should use hard links" >&5 + echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6 + if test "x$ac_cv_func_link" = xyes ; then + with_links=yes + else + with_links=no + fi +- echo "$as_me:9730: result: $with_links" >&5 ++ echo "$as_me:9733: result: $with_links" >&5 + echo "${ECHO_T}$with_links" >&6 + fi + +@@ -9743,7 +9746,7 @@ + + ### use option --enable-broken-linker to force on use of broken-linker support + +-echo "$as_me:9746: checking if you want broken-linker support code" >&5 ++echo "$as_me:9749: checking if you want broken-linker support code" >&5 + echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6 + + # Check whether --enable-broken_linker or --disable-broken_linker was given. +@@ -9753,7 +9756,7 @@ + else + with_broken_linker=no + fi; +-echo "$as_me:9756: result: $with_broken_linker" >&5 ++echo "$as_me:9759: result: $with_broken_linker" >&5 + echo "${ECHO_T}$with_broken_linker" >&6 + + : "${BROKEN_LINKER:=0}" +@@ -9767,7 +9770,7 @@ + fi + + ### use option --enable-bsdpad to have tputs process BSD-style prefix padding +-echo "$as_me:9770: checking if tputs should process BSD-style prefix padding" >&5 ++echo "$as_me:9773: checking if tputs should process BSD-style prefix padding" >&5 + echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6 + + # Check whether --enable-bsdpad or --disable-bsdpad was given. +@@ -9777,7 +9780,7 @@ + else + with_bsdpad=no + fi; +-echo "$as_me:9780: result: $with_bsdpad" >&5 ++echo "$as_me:9783: result: $with_bsdpad" >&5 + echo "${ECHO_T}$with_bsdpad" >&6 + test "x$with_bsdpad" = xyes && + cat >>confdefs.h <<\EOF +@@ -9796,14 +9799,14 @@ + # Check to define _XOPEN_SOURCE "automatically" + CPPFLAGS_before_XOPEN="$CPPFLAGS" + +-echo "$as_me:9799: checking if the POSIX test-macros are already defined" >&5 ++echo "$as_me:9802: checking if the POSIX test-macros are already defined" >&5 + echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6 + if test "${cf_cv_posix_visible+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9806 "configure" ++#line 9809 "configure" + #include "confdefs.h" + #include + int +@@ -9822,16 +9825,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:9825: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9828: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9828: \$? = $ac_status" >&5 ++ echo "$as_me:9831: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:9831: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9834: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9834: \$? = $ac_status" >&5 ++ echo "$as_me:9837: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_posix_visible=no + else +@@ -9842,7 +9845,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:9845: result: $cf_cv_posix_visible" >&5 ++echo "$as_me:9848: result: $cf_cv_posix_visible" >&5 + echo "${ECHO_T}$cf_cv_posix_visible" >&6 + + if test "$cf_cv_posix_visible" = no; then +@@ -9887,14 +9890,14 @@ + + cf_gnu_xopen_source=$cf_XOPEN_SOURCE + +-echo "$as_me:9890: checking if this is the GNU C library" >&5 ++echo "$as_me:9893: checking if this is the GNU C library" >&5 + echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6 + if test "${cf_cv_gnu_library+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9897 "configure" ++#line 9900 "configure" + #include "confdefs.h" + #include + int +@@ -9913,16 +9916,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:9916: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9919: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9919: \$? = $ac_status" >&5 ++ echo "$as_me:9922: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:9922: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9925: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9925: \$? = $ac_status" >&5 ++ echo "$as_me:9928: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_library=yes + else +@@ -9933,7 +9936,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:9936: result: $cf_cv_gnu_library" >&5 ++echo "$as_me:9939: result: $cf_cv_gnu_library" >&5 + echo "${ECHO_T}$cf_cv_gnu_library" >&6 + + if test x$cf_cv_gnu_library = xyes; then +@@ -9941,7 +9944,7 @@ + # With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE + # was changed to help a little. newlib incorporated the change about 4 + # years later. +- echo "$as_me:9944: checking if _DEFAULT_SOURCE can be used as a basis" >&5 ++ echo "$as_me:9947: checking if _DEFAULT_SOURCE can be used as a basis" >&5 + echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6 + if test "${cf_cv_gnu_library_219+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -9953,7 +9956,7 @@ + CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9956 "configure" ++#line 9959 "configure" + #include "confdefs.h" + #include + int +@@ -9972,16 +9975,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:9975: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9978: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9978: \$? = $ac_status" >&5 ++ echo "$as_me:9981: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:9981: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9984: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9984: \$? = $ac_status" >&5 ++ echo "$as_me:9987: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_library_219=yes + else +@@ -9993,12 +9996,12 @@ + CPPFLAGS="$cf_save" + + fi +-echo "$as_me:9996: result: $cf_cv_gnu_library_219" >&5 ++echo "$as_me:9999: result: $cf_cv_gnu_library_219" >&5 + echo "${ECHO_T}$cf_cv_gnu_library_219" >&6 + + if test "x$cf_cv_gnu_library_219" = xyes; then + cf_save="$CPPFLAGS" +- echo "$as_me:10001: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 ++ echo "$as_me:10004: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 + echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_gnu_dftsrc_219+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10103,7 +10106,7 @@ + fi + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10106 "configure" ++#line 10109 "configure" + #include "confdefs.h" + + #include +@@ -10123,16 +10126,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10126: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10129: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10129: \$? = $ac_status" >&5 ++ echo "$as_me:10132: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10132: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10135: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10135: \$? = $ac_status" >&5 ++ echo "$as_me:10138: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_dftsrc_219=yes + else +@@ -10143,7 +10146,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:10146: result: $cf_cv_gnu_dftsrc_219" >&5 ++echo "$as_me:10149: result: $cf_cv_gnu_dftsrc_219" >&5 + echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6 + test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save" + else +@@ -10152,14 +10155,14 @@ + + if test "x$cf_cv_gnu_dftsrc_219" != xyes; then + +- echo "$as_me:10155: checking if we must define _GNU_SOURCE" >&5 ++ echo "$as_me:10158: checking if we must define _GNU_SOURCE" >&5 + echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_gnu_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10162 "configure" ++#line 10165 "configure" + #include "confdefs.h" + #include + int +@@ -10174,16 +10177,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10177: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10180: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10180: \$? = $ac_status" >&5 ++ echo "$as_me:10183: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10183: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10186: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10186: \$? = $ac_status" >&5 ++ echo "$as_me:10189: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_source=no + else +@@ -10290,7 +10293,7 @@ + fi + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10293 "configure" ++#line 10296 "configure" + #include "confdefs.h" + #include + int +@@ -10305,16 +10308,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10308: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10311: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10311: \$? = $ac_status" >&5 ++ echo "$as_me:10314: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10314: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10317: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10317: \$? = $ac_status" >&5 ++ echo "$as_me:10320: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_source=no + else +@@ -10329,12 +10332,12 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:10332: result: $cf_cv_gnu_source" >&5 ++echo "$as_me:10335: result: $cf_cv_gnu_source" >&5 + echo "${ECHO_T}$cf_cv_gnu_source" >&6 + + if test "$cf_cv_gnu_source" = yes + then +- echo "$as_me:10337: checking if we should also define _DEFAULT_SOURCE" >&5 ++ echo "$as_me:10340: checking if we should also define _DEFAULT_SOURCE" >&5 + echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_default_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10344,7 +10347,7 @@ + CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10347 "configure" ++#line 10350 "configure" + #include "confdefs.h" + #include + int +@@ -10359,16 +10362,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10362: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10365: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10365: \$? = $ac_status" >&5 ++ echo "$as_me:10368: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10368: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10371: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10371: \$? = $ac_status" >&5 ++ echo "$as_me:10374: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_default_source=no + else +@@ -10379,7 +10382,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:10382: result: $cf_cv_default_source" >&5 ++echo "$as_me:10385: result: $cf_cv_default_source" >&5 + echo "${ECHO_T}$cf_cv_default_source" >&6 + if test "$cf_cv_default_source" = yes + then +@@ -10416,16 +10419,16 @@ + sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` + +-echo "$as_me:10419: checking if we should define _POSIX_C_SOURCE" >&5 ++echo "$as_me:10422: checking if we should define _POSIX_C_SOURCE" >&5 + echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_posix_c_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + +-echo "${as_me:-configure}:10425: testing if the symbol is already defined go no further ..." 1>&5 ++echo "${as_me:-configure}:10428: testing if the symbol is already defined go no further ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10428 "configure" ++#line 10431 "configure" + #include "confdefs.h" + #include + int +@@ -10440,16 +10443,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10443: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10446: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10446: \$? = $ac_status" >&5 ++ echo "$as_me:10449: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10449: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10452: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10452: \$? = $ac_status" >&5 ++ echo "$as_me:10455: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_posix_c_source=no + else +@@ -10470,7 +10473,7 @@ + esac + if test "$cf_want_posix_source" = yes ; then + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10473 "configure" ++#line 10476 "configure" + #include "confdefs.h" + #include + int +@@ -10485,16 +10488,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10488: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10491: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10491: \$? = $ac_status" >&5 ++ echo "$as_me:10494: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10494: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10497: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10497: \$? = $ac_status" >&5 ++ echo "$as_me:10500: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -10505,7 +10508,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi + +-echo "${as_me:-configure}:10508: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 ++echo "${as_me:-configure}:10511: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 + + CFLAGS="$cf_trim_CFLAGS" + CPPFLAGS="$cf_trim_CPPFLAGS" +@@ -10513,10 +10516,10 @@ + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" + +-echo "${as_me:-configure}:10516: testing if the second compile does not leave our definition intact error ..." 1>&5 ++echo "${as_me:-configure}:10519: testing if the second compile does not leave our definition intact error ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10519 "configure" ++#line 10522 "configure" + #include "confdefs.h" + #include + int +@@ -10531,16 +10534,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10534: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10537: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10537: \$? = $ac_status" >&5 ++ echo "$as_me:10540: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10540: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10543: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10543: \$? = $ac_status" >&5 ++ echo "$as_me:10546: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -10556,7 +10559,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:10559: result: $cf_cv_posix_c_source" >&5 ++echo "$as_me:10562: result: $cf_cv_posix_c_source" >&5 + echo "${ECHO_T}$cf_cv_posix_c_source" >&6 + + if test "$cf_cv_posix_c_source" != no ; then +@@ -10673,7 +10676,7 @@ + # OpenBSD 6.x has broken locale support, both compile-time and runtime. + # see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html + # Abusing the conformance level is a workaround. +- { echo "$as_me:10676: WARNING: this system does not provide usable locale support" >&5 ++ { echo "$as_me:10679: WARNING: this system does not provide usable locale support" >&5 + echo "$as_me: WARNING: this system does not provide usable locale support" >&2;} + cf_xopen_source="-D_BSD_SOURCE" + cf_XOPEN_SOURCE=700 +@@ -10705,14 +10708,14 @@ + ;; + (*) + +-echo "$as_me:10708: checking if we should define _XOPEN_SOURCE" >&5 ++echo "$as_me:10711: checking if we should define _XOPEN_SOURCE" >&5 + echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_xopen_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10715 "configure" ++#line 10718 "configure" + #include "confdefs.h" + + #include +@@ -10731,16 +10734,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10734: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10737: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10737: \$? = $ac_status" >&5 ++ echo "$as_me:10740: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10740: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10743: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10743: \$? = $ac_status" >&5 ++ echo "$as_me:10746: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_xopen_source=no + else +@@ -10752,7 +10755,7 @@ + CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10755 "configure" ++#line 10758 "configure" + #include "confdefs.h" + + #include +@@ -10771,16 +10774,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10774: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10777: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10777: \$? = $ac_status" >&5 ++ echo "$as_me:10780: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10780: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10783: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10783: \$? = $ac_status" >&5 ++ echo "$as_me:10786: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_xopen_source=no + else +@@ -10795,7 +10798,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:10798: result: $cf_cv_xopen_source" >&5 ++echo "$as_me:10801: result: $cf_cv_xopen_source" >&5 + echo "${ECHO_T}$cf_cv_xopen_source" >&6 + + if test "$cf_cv_xopen_source" != no ; then +@@ -10953,16 +10956,16 @@ + sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` + +-echo "$as_me:10956: checking if we should define _POSIX_C_SOURCE" >&5 ++echo "$as_me:10959: checking if we should define _POSIX_C_SOURCE" >&5 + echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_posix_c_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + +-echo "${as_me:-configure}:10962: testing if the symbol is already defined go no further ..." 1>&5 ++echo "${as_me:-configure}:10965: testing if the symbol is already defined go no further ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10965 "configure" ++#line 10968 "configure" + #include "confdefs.h" + #include + int +@@ -10977,16 +10980,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10980: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10983: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10983: \$? = $ac_status" >&5 ++ echo "$as_me:10986: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10986: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10989: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10989: \$? = $ac_status" >&5 ++ echo "$as_me:10992: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_posix_c_source=no + else +@@ -11007,7 +11010,7 @@ + esac + if test "$cf_want_posix_source" = yes ; then + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11010 "configure" ++#line 11013 "configure" + #include "confdefs.h" + #include + int +@@ -11022,16 +11025,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11025: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11028: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11028: \$? = $ac_status" >&5 ++ echo "$as_me:11031: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11031: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11034: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11034: \$? = $ac_status" >&5 ++ echo "$as_me:11037: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -11042,7 +11045,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi + +-echo "${as_me:-configure}:11045: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 ++echo "${as_me:-configure}:11048: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 + + CFLAGS="$cf_trim_CFLAGS" + CPPFLAGS="$cf_trim_CPPFLAGS" +@@ -11050,10 +11053,10 @@ + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" + +-echo "${as_me:-configure}:11053: testing if the second compile does not leave our definition intact error ..." 1>&5 ++echo "${as_me:-configure}:11056: testing if the second compile does not leave our definition intact error ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11056 "configure" ++#line 11059 "configure" + #include "confdefs.h" + #include + int +@@ -11068,16 +11071,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11071: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11074: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11074: \$? = $ac_status" >&5 ++ echo "$as_me:11077: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11077: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11080: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11080: \$? = $ac_status" >&5 ++ echo "$as_me:11083: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -11093,7 +11096,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:11096: result: $cf_cv_posix_c_source" >&5 ++echo "$as_me:11099: result: $cf_cv_posix_c_source" >&5 + echo "${ECHO_T}$cf_cv_posix_c_source" >&6 + + if test "$cf_cv_posix_c_source" != no ; then +@@ -11219,7 +11222,7 @@ + test "$CFLAGS" != "$cf_old_cflag" || break + test -n "$verbose" && echo " removing old option $cf_add_cflags from CFLAGS" 1>&6 + +-echo "${as_me:-configure}:11222: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:11225: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5 + + CFLAGS="$cf_old_cflag" + done +@@ -11231,7 +11234,7 @@ + test "$CPPFLAGS" != "$cf_old_cflag" || break + test -n "$verbose" && echo " removing old option $cf_add_cflags from CPPFLAGS" 1>&6 + +-echo "${as_me:-configure}:11234: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5 ++echo "${as_me:-configure}:11237: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5 + + CPPFLAGS="$cf_old_cflag" + done +@@ -11319,7 +11322,7 @@ + if test -n "$cf_new_cflags" ; then + test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 + +-echo "${as_me:-configure}:11322: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 ++echo "${as_me:-configure}:11325: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" +@@ -11329,7 +11332,7 @@ + if test -n "$cf_new_cppflags" ; then + test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 + +-echo "${as_me:-configure}:11332: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 ++echo "${as_me:-configure}:11335: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" +@@ -11339,7 +11342,7 @@ + if test -n "$cf_new_extra_cppflags" ; then + test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 + +-echo "${as_me:-configure}:11342: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 ++echo "${as_me:-configure}:11345: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 + + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" +@@ -11351,10 +11354,10 @@ + fi + + if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then +- echo "$as_me:11354: checking if _XOPEN_SOURCE really is set" >&5 ++ echo "$as_me:11357: checking if _XOPEN_SOURCE really is set" >&5 + echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11357 "configure" ++#line 11360 "configure" + #include "confdefs.h" + #include + int +@@ -11369,16 +11372,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11372: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11375: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11375: \$? = $ac_status" >&5 ++ echo "$as_me:11378: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11378: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11381: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11381: \$? = $ac_status" >&5 ++ echo "$as_me:11384: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_XOPEN_SOURCE_set=yes + else +@@ -11387,12 +11390,12 @@ + cf_XOPEN_SOURCE_set=no + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +- echo "$as_me:11390: result: $cf_XOPEN_SOURCE_set" >&5 ++ echo "$as_me:11393: result: $cf_XOPEN_SOURCE_set" >&5 + echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6 + if test "$cf_XOPEN_SOURCE_set" = yes + then + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11395 "configure" ++#line 11398 "configure" + #include "confdefs.h" + #include + int +@@ -11407,16 +11410,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11410: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11413: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11413: \$? = $ac_status" >&5 ++ echo "$as_me:11416: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11416: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11419: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11419: \$? = $ac_status" >&5 ++ echo "$as_me:11422: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_XOPEN_SOURCE_set_ok=yes + else +@@ -11427,19 +11430,19 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + if test "$cf_XOPEN_SOURCE_set_ok" = no + then +- { echo "$as_me:11430: WARNING: _XOPEN_SOURCE is lower than requested" >&5 ++ { echo "$as_me:11433: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} + fi + else + +-echo "$as_me:11435: checking if we should define _XOPEN_SOURCE" >&5 ++echo "$as_me:11438: checking if we should define _XOPEN_SOURCE" >&5 + echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_xopen_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11442 "configure" ++#line 11445 "configure" + #include "confdefs.h" + + #include +@@ -11458,16 +11461,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11461: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11464: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11464: \$? = $ac_status" >&5 ++ echo "$as_me:11467: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11467: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11470: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11470: \$? = $ac_status" >&5 ++ echo "$as_me:11473: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_xopen_source=no + else +@@ -11479,7 +11482,7 @@ + CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11482 "configure" ++#line 11485 "configure" + #include "confdefs.h" + + #include +@@ -11498,16 +11501,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11501: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11504: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11504: \$? = $ac_status" >&5 ++ echo "$as_me:11507: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11507: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11510: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11510: \$? = $ac_status" >&5 ++ echo "$as_me:11513: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_xopen_source=no + else +@@ -11522,7 +11525,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:11525: result: $cf_cv_xopen_source" >&5 ++echo "$as_me:11528: result: $cf_cv_xopen_source" >&5 + echo "${ECHO_T}$cf_cv_xopen_source" >&6 + + if test "$cf_cv_xopen_source" != no ; then +@@ -11673,14 +11676,14 @@ + + # Work around breakage on OS X + +-echo "$as_me:11676: checking if SIGWINCH is defined" >&5 ++echo "$as_me:11679: checking if SIGWINCH is defined" >&5 + echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6 + if test "${cf_cv_define_sigwinch+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11683 "configure" ++#line 11686 "configure" + #include "confdefs.h" + + #include +@@ -11695,23 +11698,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11698: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11701: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11701: \$? = $ac_status" >&5 ++ echo "$as_me:11704: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11704: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11707: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11707: \$? = $ac_status" >&5 ++ echo "$as_me:11710: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_define_sigwinch=yes + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11714 "configure" ++#line 11717 "configure" + #include "confdefs.h" + + #undef _XOPEN_SOURCE +@@ -11729,16 +11732,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11732: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11735: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11735: \$? = $ac_status" >&5 ++ echo "$as_me:11738: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11738: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11741: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11741: \$? = $ac_status" >&5 ++ echo "$as_me:11744: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_define_sigwinch=maybe + else +@@ -11752,11 +11755,11 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:11755: result: $cf_cv_define_sigwinch" >&5 ++echo "$as_me:11758: result: $cf_cv_define_sigwinch" >&5 + echo "${ECHO_T}$cf_cv_define_sigwinch" >&6 + + if test "$cf_cv_define_sigwinch" = maybe ; then +-echo "$as_me:11759: checking for actual SIGWINCH definition" >&5 ++echo "$as_me:11762: checking for actual SIGWINCH definition" >&5 + echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6 + if test "${cf_cv_fixup_sigwinch+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -11767,7 +11770,7 @@ + while test "$cf_sigwinch" != 1 + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11770 "configure" ++#line 11773 "configure" + #include "confdefs.h" + + #undef _XOPEN_SOURCE +@@ -11789,16 +11792,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11792: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11795: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11795: \$? = $ac_status" >&5 ++ echo "$as_me:11798: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11798: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11801: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11801: \$? = $ac_status" >&5 ++ echo "$as_me:11804: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_fixup_sigwinch=$cf_sigwinch + break +@@ -11812,7 +11815,7 @@ + done + + fi +-echo "$as_me:11815: result: $cf_cv_fixup_sigwinch" >&5 ++echo "$as_me:11818: result: $cf_cv_fixup_sigwinch" >&5 + echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 + + if test "$cf_cv_fixup_sigwinch" != unknown ; then +@@ -11822,13 +11825,13 @@ + + # Checks for CODESET support. + +-echo "$as_me:11825: checking for nl_langinfo and CODESET" >&5 ++echo "$as_me:11828: checking for nl_langinfo and CODESET" >&5 + echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6 + if test "${am_cv_langinfo_codeset+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11831 "configure" ++#line 11834 "configure" + #include "confdefs.h" + #include + int +@@ -11840,16 +11843,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:11843: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11846: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11846: \$? = $ac_status" >&5 ++ echo "$as_me:11849: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:11849: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11852: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11852: \$? = $ac_status" >&5 ++ echo "$as_me:11855: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + am_cv_langinfo_codeset=yes + else +@@ -11860,7 +11863,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + fi +-echo "$as_me:11863: result: $am_cv_langinfo_codeset" >&5 ++echo "$as_me:11866: result: $am_cv_langinfo_codeset" >&5 + echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 + if test "$am_cv_langinfo_codeset" = yes; then + +@@ -11874,7 +11877,7 @@ + NCURSES_OK_WCHAR_T= + NCURSES_OK_WINT_T= + +-echo "$as_me:11877: checking if you want wide-character code" >&5 ++echo "$as_me:11880: checking if you want wide-character code" >&5 + echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6 + + # Check whether --enable-widec or --disable-widec was given. +@@ -11884,7 +11887,7 @@ + else + with_widec=no + fi; +-echo "$as_me:11887: result: $with_widec" >&5 ++echo "$as_me:11890: result: $with_widec" >&5 + echo "${ECHO_T}$with_widec" >&6 + + NCURSES_WCWIDTH_GRAPHICS=1 +@@ -11908,23 +11911,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:11911: checking for $ac_header" >&5 ++echo "$as_me:11914: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11917 "configure" ++#line 11920 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:11921: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:11924: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:11927: \$? = $ac_status" >&5 ++ echo "$as_me:11930: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -11943,7 +11946,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:11946: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:11949: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:11959: checking if wchar.h can be used as is" >&5 + echo $ECHO_N "checking if wchar.h can be used as is... $ECHO_C" >&6 + if test "${cf_cv_wchar_h_okay+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11963 "configure" ++#line 11966 "configure" + #include "confdefs.h" + + #include +@@ -11982,16 +11985,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11985: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11988: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11988: \$? = $ac_status" >&5 ++ echo "$as_me:11991: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11991: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11994: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11994: \$? = $ac_status" >&5 ++ echo "$as_me:11997: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_wchar_h_okay=yes + else +@@ -12001,16 +12004,16 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:12004: result: $cf_cv_wchar_h_okay" >&5 ++echo "$as_me:12007: result: $cf_cv_wchar_h_okay" >&5 + echo "${ECHO_T}$cf_cv_wchar_h_okay" >&6 + + if test "$cf_cv_wchar_h_okay" = no + then + +-echo "$as_me:12010: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 ++echo "$as_me:12013: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 + echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12013 "configure" ++#line 12016 "configure" + #include "confdefs.h" + #include + +@@ -12026,16 +12029,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12029: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12032: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12032: \$? = $ac_status" >&5 ++ echo "$as_me:12035: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12035: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12038: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12038: \$? = $ac_status" >&5 ++ echo "$as_me:12041: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_result=no + else +@@ -12044,16 +12047,16 @@ + cf_result=yes + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +-echo "$as_me:12047: result: $cf_result" >&5 ++echo "$as_me:12050: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + + if test "$cf_result" = yes ; then + CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" + elif test "x" != "x" ; then +- echo "$as_me:12053: checking checking for compatible value versus " >&5 ++ echo "$as_me:12056: checking checking for compatible value versus " >&5 + echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12056 "configure" ++#line 12059 "configure" + #include "confdefs.h" + #include + +@@ -12069,16 +12072,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12072: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12075: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12075: \$? = $ac_status" >&5 ++ echo "$as_me:12078: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12078: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12081: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12081: \$? = $ac_status" >&5 ++ echo "$as_me:12084: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_result=yes + else +@@ -12087,7 +12090,7 @@ + cf_result=no + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +- echo "$as_me:12090: result: $cf_result" >&5 ++ echo "$as_me:12093: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test "$cf_result" = no ; then + # perhaps we can override it - try... +@@ -12097,7 +12100,7 @@ + + fi + +-echo "$as_me:12100: checking if wcwidth agrees graphics are single-width" >&5 ++echo "$as_me:12103: checking if wcwidth agrees graphics are single-width" >&5 + echo $ECHO_N "checking if wcwidth agrees graphics are single-width... $ECHO_C" >&6 + if test "${cf_cv_wcwidth_graphics+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -12168,7 +12171,7 @@ + cf_cv_wcwidth_graphics=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12171 "configure" ++#line 12174 "configure" + #include "confdefs.h" + + #include +@@ -12212,15 +12215,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:12215: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12218: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12218: \$? = $ac_status" >&5 ++ echo "$as_me:12221: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:12220: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12223: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12223: \$? = $ac_status" >&5 ++ echo "$as_me:12226: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_wcwidth_graphics=yes + else +@@ -12233,7 +12236,7 @@ + fi + + fi +-echo "$as_me:12236: result: $cf_cv_wcwidth_graphics" >&5 ++echo "$as_me:12239: result: $cf_cv_wcwidth_graphics" >&5 + echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6 + + test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0 +@@ -12244,13 +12247,13 @@ + for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:12247: checking for $ac_func" >&5 ++echo "$as_me:12250: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12253 "configure" ++#line 12256 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -12281,16 +12284,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:12284: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12287: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12287: \$? = $ac_status" >&5 ++ echo "$as_me:12290: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:12290: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12293: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12293: \$? = $ac_status" >&5 ++ echo "$as_me:12296: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -12300,7 +12303,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:12303: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:12306: result: `eval echo '${'"$as_ac_var"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 + if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:12321: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12324 "configure" ++#line 12327 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:12328: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:12331: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:12334: \$? = $ac_status" >&5 ++ echo "$as_me:12337: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -12350,7 +12353,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:12353: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:12356: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:12366: checking for multibyte character support" >&5 + echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6 + if test "${cf_cv_utf8_lib+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -12368,7 +12371,7 @@ + + cf_save_LIBS="$LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12371 "configure" ++#line 12374 "configure" + #include "confdefs.h" + + #include +@@ -12386,16 +12389,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:12389: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12392: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12392: \$? = $ac_status" >&5 ++ echo "$as_me:12395: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:12395: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12398: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12398: \$? = $ac_status" >&5 ++ echo "$as_me:12401: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_utf8_lib=yes + else +@@ -12407,12 +12410,12 @@ + cf_cv_header_path_utf8= + cf_cv_library_path_utf8= + +-echo "${as_me:-configure}:12410: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:12413: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12415 "configure" ++#line 12418 "configure" + #include "confdefs.h" + + #include +@@ -12425,16 +12428,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:12428: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12431: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12431: \$? = $ac_status" >&5 ++ echo "$as_me:12434: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:12434: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12437: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12437: \$? = $ac_status" >&5 ++ echo "$as_me:12440: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_find_linkage_utf8=yes +@@ -12448,7 +12451,7 @@ + LIBS="-lutf8 $cf_save_LIBS" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12451 "configure" ++#line 12454 "configure" + #include "confdefs.h" + + #include +@@ -12461,16 +12464,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:12464: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12467: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12467: \$? = $ac_status" >&5 ++ echo "$as_me:12470: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:12470: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12473: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12473: \$? = $ac_status" >&5 ++ echo "$as_me:12476: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_find_linkage_utf8=yes +@@ -12487,9 +12490,9 @@ + + test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 + +-echo "${as_me:-configure}:12490: testing find linkage for utf8 library ..." 1>&5 ++echo "${as_me:-configure}:12493: testing find linkage for utf8 library ..." 1>&5 + +-echo "${as_me:-configure}:12492: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:12495: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_CPPFLAGS="$CPPFLAGS" + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -12580,7 +12583,7 @@ + if test -d "$cf_cv_header_path_utf8" ; then + test -n "$verbose" && echo " ... testing $cf_cv_header_path_utf8" 1>&6 + +-echo "${as_me:-configure}:12583: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:12586: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 + + CPPFLAGS="$cf_save_CPPFLAGS" + +@@ -12588,7 +12591,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12591 "configure" ++#line 12594 "configure" + #include "confdefs.h" + + #include +@@ -12601,21 +12604,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12604: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12607: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12607: \$? = $ac_status" >&5 ++ echo "$as_me:12610: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12610: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12613: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12613: \$? = $ac_status" >&5 ++ echo "$as_me:12616: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + test -n "$verbose" && echo " ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6 + +-echo "${as_me:-configure}:12618: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:12621: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 + + cf_cv_find_linkage_utf8=maybe + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -12633,7 +12636,7 @@ + + if test "$cf_cv_find_linkage_utf8" = maybe ; then + +-echo "${as_me:-configure}:12636: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:12639: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + cf_save_LDFLAGS="$LDFLAGS" +@@ -12708,13 +12711,13 @@ + if test -d "$cf_cv_library_path_utf8" ; then + test -n "$verbose" && echo " ... testing $cf_cv_library_path_utf8" 1>&6 + +-echo "${as_me:-configure}:12711: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:12714: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 + + CPPFLAGS="$cf_test_CPPFLAGS" + LIBS="-lutf8 $cf_save_LIBS" + LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12717 "configure" ++#line 12720 "configure" + #include "confdefs.h" + + #include +@@ -12727,21 +12730,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:12730: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12733: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12733: \$? = $ac_status" >&5 ++ echo "$as_me:12736: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:12736: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12739: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12739: \$? = $ac_status" >&5 ++ echo "$as_me:12742: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + test -n "$verbose" && echo " ... found utf8 library in $cf_cv_library_path_utf8" 1>&6 + +-echo "${as_me:-configure}:12744: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:12747: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 + + cf_cv_find_linkage_utf8=yes + cf_cv_library_file_utf8="-lutf8" +@@ -12783,7 +12786,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:12786: result: $cf_cv_utf8_lib" >&5 ++echo "$as_me:12789: result: $cf_cv_utf8_lib" >&5 + echo "${ECHO_T}$cf_cv_utf8_lib" >&6 + + # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between +@@ -12821,7 +12824,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12824 "configure" ++#line 12827 "configure" + #include "confdefs.h" + #include + int +@@ -12833,16 +12836,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12836: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12839: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12839: \$? = $ac_status" >&5 ++ echo "$as_me:12842: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12842: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12845: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12845: \$? = $ac_status" >&5 ++ echo "$as_me:12848: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -12859,7 +12862,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:12862: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:12865: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -12895,7 +12898,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me:-configure}:12898: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:12901: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -12927,14 +12930,14 @@ + fi + + # This is needed on Tru64 5.0 to declare mbstate_t +-echo "$as_me:12930: checking if we must include wchar.h to declare mbstate_t" >&5 ++echo "$as_me:12933: checking if we must include wchar.h to declare mbstate_t" >&5 + echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6 + if test "${cf_cv_mbstate_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12937 "configure" ++#line 12940 "configure" + #include "confdefs.h" + + #include +@@ -12952,23 +12955,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12955: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12958: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12958: \$? = $ac_status" >&5 ++ echo "$as_me:12961: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12961: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12964: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12964: \$? = $ac_status" >&5 ++ echo "$as_me:12967: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_mbstate_t=no + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12971 "configure" ++#line 12974 "configure" + #include "confdefs.h" + + #include +@@ -12987,16 +12990,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12990: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12993: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12993: \$? = $ac_status" >&5 ++ echo "$as_me:12996: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12996: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12999: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12999: \$? = $ac_status" >&5 ++ echo "$as_me:13002: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_mbstate_t=yes + else +@@ -13008,7 +13011,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:13011: result: $cf_cv_mbstate_t" >&5 ++echo "$as_me:13014: result: $cf_cv_mbstate_t" >&5 + echo "${ECHO_T}$cf_cv_mbstate_t" >&6 + + if test "$cf_cv_mbstate_t" = yes ; then +@@ -13026,14 +13029,14 @@ + fi + + # This is needed on Tru64 5.0 to declare wchar_t +-echo "$as_me:13029: checking if we must include wchar.h to declare wchar_t" >&5 ++echo "$as_me:13032: checking if we must include wchar.h to declare wchar_t" >&5 + echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6 + if test "${cf_cv_wchar_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13036 "configure" ++#line 13039 "configure" + #include "confdefs.h" + + #include +@@ -13051,23 +13054,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13054: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13057: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13057: \$? = $ac_status" >&5 ++ echo "$as_me:13060: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13060: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13063: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13063: \$? = $ac_status" >&5 ++ echo "$as_me:13066: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_wchar_t=no + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13070 "configure" ++#line 13073 "configure" + #include "confdefs.h" + + #include +@@ -13086,16 +13089,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13089: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13092: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13092: \$? = $ac_status" >&5 ++ echo "$as_me:13095: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13095: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13098: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13098: \$? = $ac_status" >&5 ++ echo "$as_me:13101: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_wchar_t=yes + else +@@ -13107,7 +13110,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:13110: result: $cf_cv_wchar_t" >&5 ++echo "$as_me:13113: result: $cf_cv_wchar_t" >&5 + echo "${ECHO_T}$cf_cv_wchar_t" >&6 + + if test "$cf_cv_wchar_t" = yes ; then +@@ -13130,14 +13133,14 @@ + fi + + # This is needed on Tru64 5.0 to declare wint_t +-echo "$as_me:13133: checking if we must include wchar.h to declare wint_t" >&5 ++echo "$as_me:13136: checking if we must include wchar.h to declare wint_t" >&5 + echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6 + if test "${cf_cv_wint_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13140 "configure" ++#line 13143 "configure" + #include "confdefs.h" + + #include +@@ -13155,23 +13158,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13158: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13161: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13161: \$? = $ac_status" >&5 ++ echo "$as_me:13164: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13164: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13167: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13167: \$? = $ac_status" >&5 ++ echo "$as_me:13170: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_wint_t=no + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13174 "configure" ++#line 13177 "configure" + #include "confdefs.h" + + #include +@@ -13190,16 +13193,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13193: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13196: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13196: \$? = $ac_status" >&5 ++ echo "$as_me:13199: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13199: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13202: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13202: \$? = $ac_status" >&5 ++ echo "$as_me:13205: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_wint_t=yes + else +@@ -13211,7 +13214,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:13214: result: $cf_cv_wint_t" >&5 ++echo "$as_me:13217: result: $cf_cv_wint_t" >&5 + echo "${ECHO_T}$cf_cv_wint_t" >&6 + + if test "$cf_cv_wint_t" = yes ; then +@@ -13243,7 +13246,7 @@ + fi + + ### use option --disable-lp64 to allow long chtype +-echo "$as_me:13246: checking whether to enable _LP64 definition in curses.h" >&5 ++echo "$as_me:13249: checking whether to enable _LP64 definition in curses.h" >&5 + echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6 + + # Check whether --enable-lp64 or --disable-lp64 was given. +@@ -13253,7 +13256,7 @@ + else + with_lp64=$cf_dft_with_lp64 + fi; +-echo "$as_me:13256: result: $with_lp64" >&5 ++echo "$as_me:13259: result: $with_lp64" >&5 + echo "${ECHO_T}$with_lp64" >&6 + + if test "x$with_lp64" = xyes ; then +@@ -13269,7 +13272,7 @@ + fi; + if test "$enable_largefile" != no; then + +- echo "$as_me:13272: checking for special C compiler options needed for large files" >&5 ++ echo "$as_me:13275: checking for special C compiler options needed for large files" >&5 + echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 + if test "${ac_cv_sys_largefile_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -13281,7 +13284,7 @@ + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13284 "configure" ++#line 13287 "configure" + #include "confdefs.h" + #include + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -13301,16 +13304,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13304: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13307: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13307: \$? = $ac_status" >&5 ++ echo "$as_me:13310: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13310: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13313: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13313: \$? = $ac_status" >&5 ++ echo "$as_me:13316: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -13320,16 +13323,16 @@ + rm -f "conftest.$ac_objext" + CC="$CC -n32" + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13323: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13326: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13326: \$? = $ac_status" >&5 ++ echo "$as_me:13329: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13329: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13332: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13332: \$? = $ac_status" >&5 ++ echo "$as_me:13335: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sys_largefile_CC=' -n32'; break + else +@@ -13343,13 +13346,13 @@ + rm -f "conftest.$ac_ext" + fi + fi +-echo "$as_me:13346: result: $ac_cv_sys_largefile_CC" >&5 ++echo "$as_me:13349: result: $ac_cv_sys_largefile_CC" >&5 + echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 + if test "$ac_cv_sys_largefile_CC" != no; then + CC=$CC$ac_cv_sys_largefile_CC + fi + +- echo "$as_me:13352: checking for _FILE_OFFSET_BITS value needed for large files" >&5 ++ echo "$as_me:13355: checking for _FILE_OFFSET_BITS value needed for large files" >&5 + echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 + if test "${ac_cv_sys_file_offset_bits+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -13357,7 +13360,7 @@ + while :; do + ac_cv_sys_file_offset_bits=no + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13360 "configure" ++#line 13363 "configure" + #include "confdefs.h" + #include + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -13377,16 +13380,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13380: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13383: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13383: \$? = $ac_status" >&5 ++ echo "$as_me:13386: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13386: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13389: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13389: \$? = $ac_status" >&5 ++ echo "$as_me:13392: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -13395,7 +13398,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13398 "configure" ++#line 13401 "configure" + #include "confdefs.h" + #define _FILE_OFFSET_BITS 64 + #include +@@ -13416,16 +13419,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13419: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13422: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13422: \$? = $ac_status" >&5 ++ echo "$as_me:13425: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13425: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13428: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13428: \$? = $ac_status" >&5 ++ echo "$as_me:13431: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sys_file_offset_bits=64; break + else +@@ -13436,7 +13439,7 @@ + break + done + fi +-echo "$as_me:13439: result: $ac_cv_sys_file_offset_bits" >&5 ++echo "$as_me:13442: result: $ac_cv_sys_file_offset_bits" >&5 + echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 + if test "$ac_cv_sys_file_offset_bits" != no; then + +@@ -13446,7 +13449,7 @@ + + fi + rm -rf conftest* +- echo "$as_me:13449: checking for _LARGE_FILES value needed for large files" >&5 ++ echo "$as_me:13452: checking for _LARGE_FILES value needed for large files" >&5 + echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 + if test "${ac_cv_sys_large_files+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -13454,7 +13457,7 @@ + while :; do + ac_cv_sys_large_files=no + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13457 "configure" ++#line 13460 "configure" + #include "confdefs.h" + #include + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -13474,16 +13477,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13477: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13480: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13480: \$? = $ac_status" >&5 ++ echo "$as_me:13483: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13483: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13486: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13486: \$? = $ac_status" >&5 ++ echo "$as_me:13489: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -13492,7 +13495,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13495 "configure" ++#line 13498 "configure" + #include "confdefs.h" + #define _LARGE_FILES 1 + #include +@@ -13513,16 +13516,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13516: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13519: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13519: \$? = $ac_status" >&5 ++ echo "$as_me:13522: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13522: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13525: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13525: \$? = $ac_status" >&5 ++ echo "$as_me:13528: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sys_large_files=1; break + else +@@ -13533,7 +13536,7 @@ + break + done + fi +-echo "$as_me:13536: result: $ac_cv_sys_large_files" >&5 ++echo "$as_me:13539: result: $ac_cv_sys_large_files" >&5 + echo "${ECHO_T}$ac_cv_sys_large_files" >&6 + if test "$ac_cv_sys_large_files" != no; then + +@@ -13546,7 +13549,7 @@ + fi + + if test "$enable_largefile" != no ; then +- echo "$as_me:13549: checking for _LARGEFILE_SOURCE value needed for large files" >&5 ++ echo "$as_me:13552: checking for _LARGEFILE_SOURCE value needed for large files" >&5 + echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6 + if test "${ac_cv_sys_largefile_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -13554,7 +13557,7 @@ + while :; do + ac_cv_sys_largefile_source=no + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13557 "configure" ++#line 13560 "configure" + #include "confdefs.h" + #include + int +@@ -13566,16 +13569,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13569: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13572: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13572: \$? = $ac_status" >&5 ++ echo "$as_me:13575: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13575: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13578: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13578: \$? = $ac_status" >&5 ++ echo "$as_me:13581: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -13584,7 +13587,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13587 "configure" ++#line 13590 "configure" + #include "confdefs.h" + #define _LARGEFILE_SOURCE 1 + #include +@@ -13597,16 +13600,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13600: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13603: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13603: \$? = $ac_status" >&5 ++ echo "$as_me:13606: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13606: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13609: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13609: \$? = $ac_status" >&5 ++ echo "$as_me:13612: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sys_largefile_source=1; break + else +@@ -13617,7 +13620,7 @@ + break + done + fi +-echo "$as_me:13620: result: $ac_cv_sys_largefile_source" >&5 ++echo "$as_me:13623: result: $ac_cv_sys_largefile_source" >&5 + echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6 + if test "$ac_cv_sys_largefile_source" != no; then + +@@ -13631,13 +13634,13 @@ + # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug + # in glibc 2.1.3, but that breaks too many other things. + # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. +-echo "$as_me:13634: checking for fseeko" >&5 ++echo "$as_me:13637: checking for fseeko" >&5 + echo $ECHO_N "checking for fseeko... $ECHO_C" >&6 + if test "${ac_cv_func_fseeko+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13640 "configure" ++#line 13643 "configure" + #include "confdefs.h" + #include + int +@@ -13649,16 +13652,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:13652: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:13655: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:13655: \$? = $ac_status" >&5 ++ echo "$as_me:13658: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:13658: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13661: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13661: \$? = $ac_status" >&5 ++ echo "$as_me:13664: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_fseeko=yes + else +@@ -13668,7 +13671,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:13671: result: $ac_cv_func_fseeko" >&5 ++echo "$as_me:13674: result: $ac_cv_func_fseeko" >&5 + echo "${ECHO_T}$ac_cv_func_fseeko" >&6 + if test $ac_cv_func_fseeko = yes; then + +@@ -13707,14 +13710,14 @@ + + fi + +- echo "$as_me:13710: checking whether to use struct dirent64" >&5 ++ echo "$as_me:13713: checking whether to use struct dirent64" >&5 + echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6 + if test "${cf_cv_struct_dirent64+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13717 "configure" ++#line 13720 "configure" + #include "confdefs.h" + + #pragma GCC diagnostic error "-Wincompatible-pointer-types" +@@ -13737,16 +13740,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13740: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13743: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13743: \$? = $ac_status" >&5 ++ echo "$as_me:13746: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13746: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13749: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13749: \$? = $ac_status" >&5 ++ echo "$as_me:13752: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_struct_dirent64=yes + else +@@ -13757,7 +13760,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:13760: result: $cf_cv_struct_dirent64" >&5 ++echo "$as_me:13763: result: $cf_cv_struct_dirent64" >&5 + echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 + test "$cf_cv_struct_dirent64" = yes && + cat >>confdefs.h <<\EOF +@@ -13767,7 +13770,7 @@ + fi + + ### use option --disable-tparm-varargs to make tparm() conform to X/Open +-echo "$as_me:13770: checking if you want tparm not to use X/Open fixed-parameter list" >&5 ++echo "$as_me:13773: checking if you want tparm not to use X/Open fixed-parameter list" >&5 + echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6 + + # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given. +@@ -13777,14 +13780,14 @@ + else + with_tparm_varargs=yes + fi; +-echo "$as_me:13780: result: $with_tparm_varargs" >&5 ++echo "$as_me:13783: result: $with_tparm_varargs" >&5 + echo "${ECHO_T}$with_tparm_varargs" >&6 + NCURSES_TPARM_VARARGS=0 + test "x$with_tparm_varargs" = xyes && NCURSES_TPARM_VARARGS=1 + + ### use option --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw + if test "$with_ticlib" != no ; then +-echo "$as_me:13787: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5 ++echo "$as_me:13790: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5 + echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6 + + # Check whether --enable-tic-depends or --disable-tic-depends was given. +@@ -13794,14 +13797,14 @@ + else + with_tic_depends=yes + fi; +-echo "$as_me:13797: result: $with_tic_depends" >&5 ++echo "$as_me:13800: result: $with_tic_depends" >&5 + echo "${ECHO_T}$with_tic_depends" >&6 + else + with_tic_depends=no + fi + + ### use option --enable-wattr-macros to enable wattr* macros in curses.h +-echo "$as_me:13804: checking if you want to enable wattr* macros" >&5 ++echo "$as_me:13807: checking if you want to enable wattr* macros" >&5 + echo $ECHO_N "checking if you want to enable wattr* macros... $ECHO_C" >&6 + + # Check whether --enable-wattr-macros or --disable-wattr-macros was given. +@@ -13813,15 +13816,15 @@ + fi; + if [ "x$with_wattr_macros" != xyes ]; then + NCURSES_WATTR_MACROS=0 +- echo "$as_me:13816: result: no" >&5 ++ echo "$as_me:13819: result: no" >&5 + echo "${ECHO_T}no" >&6 + else + NCURSES_WATTR_MACROS=1 +- echo "$as_me:13820: result: yes" >&5 ++ echo "$as_me:13823: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + fi + +-echo "$as_me:13824: checking for X11 rgb file" >&5 ++echo "$as_me:13827: checking for X11 rgb file" >&5 + echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6 + + # Check whether --with-x11-rgb or --without-x11-rgb was given. +@@ -13885,7 +13888,7 @@ + cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:13888: error: expected a pathname, not \"$cf_path\"" >&5 ++ { { echo "$as_me:13891: error: expected a pathname, not \"$cf_path\"" >&5 + echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -13893,7 +13896,7 @@ + + fi + +-echo "$as_me:13896: result: $RGB_PATH" >&5 ++echo "$as_me:13899: result: $RGB_PATH" >&5 + echo "${ECHO_T}$RGB_PATH" >&6 + + cat >>confdefs.h <&5 ++echo "$as_me:13913: checking for type of bool" >&5 + echo $ECHO_N "checking for type of bool... $ECHO_C" >&6 + + # Check whether --with-bool or --without-bool was given. +@@ -13917,10 +13920,10 @@ + else + NCURSES_BOOL=auto + fi; +-echo "$as_me:13920: result: $NCURSES_BOOL" >&5 ++echo "$as_me:13923: result: $NCURSES_BOOL" >&5 + echo "${ECHO_T}$NCURSES_BOOL" >&6 + +-echo "$as_me:13923: checking for alternate terminal capabilities file" >&5 ++echo "$as_me:13926: checking for alternate terminal capabilities file" >&5 + echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6 + + # Check whether --with-caps or --without-caps was given. +@@ -13931,11 +13934,11 @@ + TERMINFO_CAPS=Caps + fi; + test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps +-echo "$as_me:13934: result: $TERMINFO_CAPS" >&5 ++echo "$as_me:13937: result: $TERMINFO_CAPS" >&5 + echo "${ECHO_T}$TERMINFO_CAPS" >&6 + + ### use option --with-chtype to override chtype's type +-echo "$as_me:13938: checking for type of chtype" >&5 ++echo "$as_me:13941: checking for type of chtype" >&5 + echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 + + # Check whether --with-chtype or --without-chtype was given. +@@ -13945,11 +13948,11 @@ + else + NCURSES_CHTYPE=$cf_dft_chtype + fi; +-echo "$as_me:13948: result: $NCURSES_CHTYPE" >&5 ++echo "$as_me:13951: result: $NCURSES_CHTYPE" >&5 + echo "${ECHO_T}$NCURSES_CHTYPE" >&6 + + ### use option --with-ospeed to override ospeed's type +-echo "$as_me:13952: checking for type of ospeed" >&5 ++echo "$as_me:13955: checking for type of ospeed" >&5 + echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6 + + # Check whether --with-ospeed or --without-ospeed was given. +@@ -13959,11 +13962,11 @@ + else + NCURSES_OSPEED=short + fi; +-echo "$as_me:13962: result: $NCURSES_OSPEED" >&5 ++echo "$as_me:13965: result: $NCURSES_OSPEED" >&5 + echo "${ECHO_T}$NCURSES_OSPEED" >&6 + + ### use option --with-mmask-t to override mmask_t's type +-echo "$as_me:13966: checking for type of mmask_t" >&5 ++echo "$as_me:13969: checking for type of mmask_t" >&5 + echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6 + + # Check whether --with-mmask-t or --without-mmask-t was given. +@@ -13973,11 +13976,11 @@ + else + NCURSES_MMASK_T=$cf_dft_mmask_t + fi; +-echo "$as_me:13976: result: $NCURSES_MMASK_T" >&5 ++echo "$as_me:13979: result: $NCURSES_MMASK_T" >&5 + echo "${ECHO_T}$NCURSES_MMASK_T" >&6 + + ### use option --with-ccharw-max to override CCHARW_MAX size +-echo "$as_me:13980: checking for size CCHARW_MAX" >&5 ++echo "$as_me:13983: checking for size CCHARW_MAX" >&5 + echo $ECHO_N "checking for size CCHARW_MAX... $ECHO_C" >&6 + + # Check whether --with-ccharw-max or --without-ccharw-max was given. +@@ -13987,16 +13990,16 @@ + else + NCURSES_CCHARW_MAX=5 + fi; +-echo "$as_me:13990: result: $NCURSES_CCHARW_MAX" >&5 ++echo "$as_me:13993: result: $NCURSES_CCHARW_MAX" >&5 + echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6 + +-echo "$as_me:13993: checking for ANSI C header files" >&5 ++echo "$as_me:13996: checking for ANSI C header files" >&5 + echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 + if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13999 "configure" ++#line 14002 "configure" + #include "confdefs.h" + #include + #include +@@ -14004,13 +14007,13 @@ + #include + + _ACEOF +-if { (eval echo "$as_me:14007: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:14010: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:14013: \$? = $ac_status" >&5 ++ echo "$as_me:14016: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -14032,7 +14035,7 @@ + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14035 "configure" ++#line 14038 "configure" + #include "confdefs.h" + #include + +@@ -14050,7 +14053,7 @@ + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14053 "configure" ++#line 14056 "configure" + #include "confdefs.h" + #include + +@@ -14071,7 +14074,7 @@ + : + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14074 "configure" ++#line 14077 "configure" + #include "confdefs.h" + #include + #if ((' ' & 0x0FF) == 0x020) +@@ -14097,15 +14100,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:14100: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14103: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14103: \$? = $ac_status" >&5 ++ echo "$as_me:14106: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:14105: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14108: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14108: \$? = $ac_status" >&5 ++ echo "$as_me:14111: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -14118,7 +14121,7 @@ + fi + fi + fi +-echo "$as_me:14121: result: $ac_cv_header_stdc" >&5 ++echo "$as_me:14124: result: $ac_cv_header_stdc" >&5 + echo "${ECHO_T}$ac_cv_header_stdc" >&6 + if test $ac_cv_header_stdc = yes; then + +@@ -14134,28 +14137,28 @@ + inttypes.h stdint.h unistd.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:14137: checking for $ac_header" >&5 ++echo "$as_me:14140: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14143 "configure" ++#line 14146 "configure" + #include "confdefs.h" + $ac_includes_default + #include <$ac_header> + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14149: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14152: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14152: \$? = $ac_status" >&5 ++ echo "$as_me:14155: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14155: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14158: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14158: \$? = $ac_status" >&5 ++ echo "$as_me:14161: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_Header=yes" + else +@@ -14165,7 +14168,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:14168: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:14171: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:14181: checking for signed char" >&5 + echo $ECHO_N "checking for signed char... $ECHO_C" >&6 + if test "${ac_cv_type_signed_char+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14184 "configure" ++#line 14187 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -14196,16 +14199,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14199: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14202: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14202: \$? = $ac_status" >&5 ++ echo "$as_me:14205: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14205: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14208: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14208: \$? = $ac_status" >&5 ++ echo "$as_me:14211: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_signed_char=yes + else +@@ -14215,10 +14218,10 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:14218: result: $ac_cv_type_signed_char" >&5 ++echo "$as_me:14221: result: $ac_cv_type_signed_char" >&5 + echo "${ECHO_T}$ac_cv_type_signed_char" >&6 + +-echo "$as_me:14221: checking size of signed char" >&5 ++echo "$as_me:14224: checking size of signed char" >&5 + echo $ECHO_N "checking size of signed char... $ECHO_C" >&6 + if test "${ac_cv_sizeof_signed_char+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -14227,7 +14230,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14230 "configure" ++#line 14233 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -14239,21 +14242,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14242: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14245: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14245: \$? = $ac_status" >&5 ++ echo "$as_me:14248: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14248: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14251: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14251: \$? = $ac_status" >&5 ++ echo "$as_me:14254: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14256 "configure" ++#line 14259 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -14265,16 +14268,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14268: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14271: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14271: \$? = $ac_status" >&5 ++ echo "$as_me:14274: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14274: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14277: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14277: \$? = $ac_status" >&5 ++ echo "$as_me:14280: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid; break + else +@@ -14290,7 +14293,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14293 "configure" ++#line 14296 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -14302,16 +14305,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14305: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14308: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14308: \$? = $ac_status" >&5 ++ echo "$as_me:14311: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14311: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14314: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14314: \$? = $ac_status" >&5 ++ echo "$as_me:14317: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=$ac_mid; break + else +@@ -14327,7 +14330,7 @@ + while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14330 "configure" ++#line 14333 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -14339,16 +14342,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14342: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14345: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14345: \$? = $ac_status" >&5 ++ echo "$as_me:14348: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14348: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14351: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14351: \$? = $ac_status" >&5 ++ echo "$as_me:14354: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid + else +@@ -14361,12 +14364,12 @@ + ac_cv_sizeof_signed_char=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:14364: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:14367: error: cannot run test program while cross compiling" >&5 + echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14369 "configure" ++#line 14372 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -14382,15 +14385,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:14385: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14388: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14388: \$? = $ac_status" >&5 ++ echo "$as_me:14391: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:14390: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14393: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14393: \$? = $ac_status" >&5 ++ echo "$as_me:14396: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sizeof_signed_char=`cat conftest.val` + else +@@ -14406,7 +14409,7 @@ + ac_cv_sizeof_signed_char=0 + fi + fi +-echo "$as_me:14409: result: $ac_cv_sizeof_signed_char" >&5 ++echo "$as_me:14412: result: $ac_cv_sizeof_signed_char" >&5 + echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 + cat >>confdefs.h <&5 ++echo "$as_me:14423: checking if you want to use signed Boolean array in term.h" >&5 + echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6 + + # Check whether --enable-signed-char or --disable-signed-char was given. +@@ -14427,12 +14430,12 @@ + else + with_signed_char=no + fi; +-echo "$as_me:14430: result: $with_signed_char" >&5 ++echo "$as_me:14433: result: $with_signed_char" >&5 + echo "${ECHO_T}$with_signed_char" >&6 + test "x$with_signed_char" != xyes && NCURSES_SBOOL="char" + + ### use option --with-tparm-arg to override tparm's argument type +-echo "$as_me:14435: checking for type of tparm args" >&5 ++echo "$as_me:14438: checking for type of tparm args" >&5 + echo $ECHO_N "checking for type of tparm args... $ECHO_C" >&6 + + # Check whether --with-tparm-arg or --without-tparm-arg was given. +@@ -14442,11 +14445,11 @@ + else + NCURSES_TPARM_ARG=$cf_dft_tparm_arg + fi; +-echo "$as_me:14445: result: $NCURSES_TPARM_ARG" >&5 ++echo "$as_me:14448: result: $NCURSES_TPARM_ARG" >&5 + echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6 + + ### Enable compiling-in rcs id's +-echo "$as_me:14449: checking if RCS identifiers should be compiled-in" >&5 ++echo "$as_me:14452: checking if RCS identifiers should be compiled-in" >&5 + echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6 + + # Check whether --with-rcs-ids or --without-rcs-ids was given. +@@ -14456,7 +14459,7 @@ + else + with_rcs_ids=no + fi; +-echo "$as_me:14459: result: $with_rcs_ids" >&5 ++echo "$as_me:14462: result: $with_rcs_ids" >&5 + echo "${ECHO_T}$with_rcs_ids" >&6 + test "x$with_rcs_ids" = xyes && + cat >>confdefs.h <<\EOF +@@ -14465,7 +14468,7 @@ + + ############################################################################### + +-echo "$as_me:14468: checking format of man-pages" >&5 ++echo "$as_me:14471: checking format of man-pages" >&5 + echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6 + + # Check whether --with-manpage-format or --without-manpage-format was given. +@@ -14554,14 +14557,14 @@ + ;; + esac + +-echo "$as_me:14557: result: $MANPAGE_FORMAT" >&5 ++echo "$as_me:14560: result: $MANPAGE_FORMAT" >&5 + echo "${ECHO_T}$MANPAGE_FORMAT" >&6 + if test -n "$cf_unknown" ; then +- { echo "$as_me:14560: WARNING: Unexpected manpage-format $cf_unknown" >&5 ++ { echo "$as_me:14563: WARNING: Unexpected manpage-format $cf_unknown" >&5 + echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;} + fi + +-echo "$as_me:14564: checking for manpage renaming" >&5 ++echo "$as_me:14567: checking for manpage renaming" >&5 + echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6 + + # Check whether --with-manpage-renames or --without-manpage-renames was given. +@@ -14589,7 +14592,7 @@ + if test -f "$srcdir/man/$MANPAGE_RENAMES" ; then + MANPAGE_RENAMES=`cd "$srcdir/man" && pwd`/$MANPAGE_RENAMES + elif test ! -f "$MANPAGE_RENAMES" ; then +- { { echo "$as_me:14592: error: not a filename: $MANPAGE_RENAMES" >&5 ++ { { echo "$as_me:14595: error: not a filename: $MANPAGE_RENAMES" >&5 + echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -14603,10 +14606,10 @@ + fi + fi + +-echo "$as_me:14606: result: $MANPAGE_RENAMES" >&5 ++echo "$as_me:14609: result: $MANPAGE_RENAMES" >&5 + echo "${ECHO_T}$MANPAGE_RENAMES" >&6 + +-echo "$as_me:14609: checking if manpage aliases will be installed" >&5 ++echo "$as_me:14612: checking if manpage aliases will be installed" >&5 + echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6 + + # Check whether --with-manpage-aliases or --without-manpage-aliases was given. +@@ -14617,7 +14620,7 @@ + MANPAGE_ALIASES=yes + fi; + +-echo "$as_me:14620: result: $MANPAGE_ALIASES" >&5 ++echo "$as_me:14623: result: $MANPAGE_ALIASES" >&5 + echo "${ECHO_T}$MANPAGE_ALIASES" >&6 + + case "x$LN_S" in +@@ -14631,7 +14634,7 @@ + + MANPAGE_SYMLINKS=no + if test "$MANPAGE_ALIASES" = yes ; then +-echo "$as_me:14634: checking if manpage symlinks should be used" >&5 ++echo "$as_me:14637: checking if manpage symlinks should be used" >&5 + echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6 + + # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given. +@@ -14644,17 +14647,17 @@ + + if test "$$cf_use_symlinks" = no; then + if test "$MANPAGE_SYMLINKS" = yes ; then +- { echo "$as_me:14647: WARNING: cannot make symlinks" >&5 ++ { echo "$as_me:14650: WARNING: cannot make symlinks" >&5 + echo "$as_me: WARNING: cannot make symlinks" >&2;} + MANPAGE_SYMLINKS=no + fi + fi + +-echo "$as_me:14653: result: $MANPAGE_SYMLINKS" >&5 ++echo "$as_me:14656: result: $MANPAGE_SYMLINKS" >&5 + echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6 + fi + +-echo "$as_me:14657: checking for manpage tbl" >&5 ++echo "$as_me:14660: checking for manpage tbl" >&5 + echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6 + + # Check whether --with-manpage-tbl or --without-manpage-tbl was given. +@@ -14665,7 +14668,7 @@ + MANPAGE_TBL=no + fi; + +-echo "$as_me:14668: result: $MANPAGE_TBL" >&5 ++echo "$as_me:14671: result: $MANPAGE_TBL" >&5 + echo "${ECHO_T}$MANPAGE_TBL" >&6 + + if test "$prefix" = "NONE" ; then +@@ -14998,7 +15001,7 @@ + ############################################################################### + + ### Note that some functions (such as const) are normally disabled anyway. +-echo "$as_me:15001: checking if you want to build with function extensions" >&5 ++echo "$as_me:15004: checking if you want to build with function extensions" >&5 + echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6 + + # Check whether --enable-ext-funcs or --disable-ext-funcs was given. +@@ -15008,7 +15011,7 @@ + else + with_ext_funcs=yes + fi; +-echo "$as_me:15011: result: $with_ext_funcs" >&5 ++echo "$as_me:15014: result: $with_ext_funcs" >&5 + echo "${ECHO_T}$with_ext_funcs" >&6 + if test "x$with_ext_funcs" = xyes ; then + NCURSES_EXT_FUNCS=1 +@@ -15068,7 +15071,7 @@ + GENERATED_EXT_FUNCS= + fi + +-echo "$as_me:15071: checking if you want to build with SCREEN extensions" >&5 ++echo "$as_me:15074: checking if you want to build with SCREEN extensions" >&5 + echo $ECHO_N "checking if you want to build with SCREEN extensions... $ECHO_C" >&6 + + # Check whether --enable-sp-funcs or --disable-sp-funcs was given. +@@ -15078,7 +15081,7 @@ + else + with_sp_funcs=$cf_dft_ext_spfuncs + fi; +-echo "$as_me:15081: result: $with_sp_funcs" >&5 ++echo "$as_me:15084: result: $with_sp_funcs" >&5 + echo "${ECHO_T}$with_sp_funcs" >&6 + if test "x$with_sp_funcs" = xyes ; then + NCURSES_SP_FUNCS=1 +@@ -15097,7 +15100,7 @@ + GENERATED_SP_FUNCS= + fi + +-echo "$as_me:15100: checking if you want to build with terminal-driver" >&5 ++echo "$as_me:15103: checking if you want to build with terminal-driver" >&5 + echo $ECHO_N "checking if you want to build with terminal-driver... $ECHO_C" >&6 + + # Check whether --enable-term-driver or --disable-term-driver was given. +@@ -15107,7 +15110,7 @@ + else + with_term_driver=no + fi; +-echo "$as_me:15110: result: $with_term_driver" >&5 ++echo "$as_me:15113: result: $with_term_driver" >&5 + echo "${ECHO_T}$with_term_driver" >&6 + if test "x$with_term_driver" = xyes ; then + +@@ -15116,19 +15119,19 @@ + EOF + + if test "x$with_termlib" != xno ; then +- { { echo "$as_me:15119: error: The term-driver option conflicts with the termlib option" >&5 ++ { { echo "$as_me:15122: error: The term-driver option conflicts with the termlib option" >&5 + echo "$as_me: error: The term-driver option conflicts with the termlib option" >&2;} + { (exit 1); exit 1; }; } + fi + if test "x$with_sp_funcs" != xyes ; then +- { { echo "$as_me:15124: error: The term-driver option relies upon sp-funcs" >&5 ++ { { echo "$as_me:15127: error: The term-driver option relies upon sp-funcs" >&5 + echo "$as_me: error: The term-driver option relies upon sp-funcs" >&2;} + { (exit 1); exit 1; }; } + fi + fi + + ### use option --enable-const to turn on use of const beyond that in XSI. +-echo "$as_me:15131: checking for extended use of const keyword" >&5 ++echo "$as_me:15134: checking for extended use of const keyword" >&5 + echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6 + + # Check whether --enable-const or --disable-const was given. +@@ -15138,7 +15141,7 @@ + else + with_ext_const=$cf_dft_ext_const + fi; +-echo "$as_me:15141: result: $with_ext_const" >&5 ++echo "$as_me:15144: result: $with_ext_const" >&5 + echo "${ECHO_T}$with_ext_const" >&6 + NCURSES_CONST='/*nothing*/' + if test "x$with_ext_const" = xyes ; then +@@ -15146,7 +15149,7 @@ + fi + + ### use option --enable-ext-colors to turn on use of colors beyond 16. +-echo "$as_me:15149: checking if you want to use extended colors" >&5 ++echo "$as_me:15152: checking if you want to use extended colors" >&5 + echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6 + + # Check whether --enable-ext-colors or --disable-ext-colors was given. +@@ -15156,12 +15159,12 @@ + else + with_ext_colors=$cf_dft_ext_colors + fi; +-echo "$as_me:15159: result: $with_ext_colors" >&5 ++echo "$as_me:15162: result: $with_ext_colors" >&5 + echo "${ECHO_T}$with_ext_colors" >&6 + NCURSES_EXT_COLORS=0 + if test "x$with_ext_colors" = xyes ; then + if test "x$with_widec" != xyes ; then +- { echo "$as_me:15164: WARNING: This option applies only to wide-character library" >&5 ++ { echo "$as_me:15167: WARNING: This option applies only to wide-character library" >&5 + echo "$as_me: WARNING: This option applies only to wide-character library" >&2;} + else + # cannot be ABI 5 since it changes sizeof(cchar_t) +@@ -15171,7 +15174,7 @@ + (5.*) + cf_cv_rel_version=6.0 + cf_cv_abi_version=6 +- { echo "$as_me:15174: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 ++ { echo "$as_me:15177: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 + echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;} + ;; + esac +@@ -15199,7 +15202,7 @@ + fi + + ### use option --enable-ext-mouse to modify coding to support 5-button mice +-echo "$as_me:15202: checking if you want to use extended mouse encoding" >&5 ++echo "$as_me:15205: checking if you want to use extended mouse encoding" >&5 + echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6 + + # Check whether --enable-ext-mouse or --disable-ext-mouse was given. +@@ -15209,7 +15212,7 @@ + else + with_ext_mouse=$cf_dft_ext_mouse + fi; +-echo "$as_me:15212: result: $with_ext_mouse" >&5 ++echo "$as_me:15215: result: $with_ext_mouse" >&5 + echo "${ECHO_T}$with_ext_mouse" >&6 + NCURSES_MOUSE_VERSION=1 + if test "x$with_ext_mouse" = xyes ; then +@@ -15220,7 +15223,7 @@ + (5.*) + cf_cv_rel_version=6.0 + cf_cv_abi_version=6 +- { echo "$as_me:15223: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 ++ { echo "$as_me:15226: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 + echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;} + ;; + esac +@@ -15229,7 +15232,7 @@ + fi + + ### use option --enable-ext-putwin to turn on extended screendumps +-echo "$as_me:15232: checking if you want to use extended putwin/screendump" >&5 ++echo "$as_me:15235: checking if you want to use extended putwin/screendump" >&5 + echo $ECHO_N "checking if you want to use extended putwin/screendump... $ECHO_C" >&6 + + # Check whether --enable-ext-putwin or --disable-ext-putwin was given. +@@ -15239,7 +15242,7 @@ + else + with_ext_putwin=$cf_dft_ext_putwin + fi; +-echo "$as_me:15242: result: $with_ext_putwin" >&5 ++echo "$as_me:15245: result: $with_ext_putwin" >&5 + echo "${ECHO_T}$with_ext_putwin" >&6 + if test "x$with_ext_putwin" = xyes ; then + +@@ -15249,7 +15252,7 @@ + + fi + +-echo "$as_me:15252: checking if you want \$NCURSES_NO_PADDING code" >&5 ++echo "$as_me:15255: checking if you want \$NCURSES_NO_PADDING code" >&5 + echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6 + + # Check whether --enable-no-padding or --disable-no-padding was given. +@@ -15259,7 +15262,7 @@ + else + with_no_padding=$with_ext_funcs + fi; +-echo "$as_me:15262: result: $with_no_padding" >&5 ++echo "$as_me:15265: result: $with_no_padding" >&5 + echo "${ECHO_T}$with_no_padding" >&6 + test "x$with_no_padding" = xyes && + cat >>confdefs.h <<\EOF +@@ -15267,7 +15270,7 @@ + EOF + + ### use option --enable-sigwinch to turn on use of SIGWINCH logic +-echo "$as_me:15270: checking if you want SIGWINCH handler" >&5 ++echo "$as_me:15273: checking if you want SIGWINCH handler" >&5 + echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6 + + # Check whether --enable-sigwinch or --disable-sigwinch was given. +@@ -15277,7 +15280,7 @@ + else + with_sigwinch=$with_ext_funcs + fi; +-echo "$as_me:15280: result: $with_sigwinch" >&5 ++echo "$as_me:15283: result: $with_sigwinch" >&5 + echo "${ECHO_T}$with_sigwinch" >&6 + test "x$with_sigwinch" = xyes && + cat >>confdefs.h <<\EOF +@@ -15285,7 +15288,7 @@ + EOF + + ### use option --enable-tcap-names to allow user to define new capabilities +-echo "$as_me:15288: checking if you want user-definable terminal capabilities like termcap" >&5 ++echo "$as_me:15291: checking if you want user-definable terminal capabilities like termcap" >&5 + echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6 + + # Check whether --enable-tcap-names or --disable-tcap-names was given. +@@ -15295,14 +15298,14 @@ + else + with_tcap_names=$with_ext_funcs + fi; +-echo "$as_me:15298: result: $with_tcap_names" >&5 ++echo "$as_me:15301: result: $with_tcap_names" >&5 + echo "${ECHO_T}$with_tcap_names" >&6 + NCURSES_XNAMES=0 + test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1 + + ############################################################################## + +-echo "$as_me:15305: checking if you want to link with the pthread library" >&5 ++echo "$as_me:15308: checking if you want to link with the pthread library" >&5 + echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6 + + # Check whether --with-pthread or --without-pthread was given. +@@ -15312,27 +15315,27 @@ + else + with_pthread=no + fi; +-echo "$as_me:15315: result: $with_pthread" >&5 ++echo "$as_me:15318: result: $with_pthread" >&5 + echo "${ECHO_T}$with_pthread" >&6 + + if test "$with_pthread" != no ; then +- echo "$as_me:15319: checking for pthread.h" >&5 ++ echo "$as_me:15322: checking for pthread.h" >&5 + echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 + if test "${ac_cv_header_pthread_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 15325 "configure" ++#line 15328 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:15329: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:15332: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:15335: \$? = $ac_status" >&5 ++ echo "$as_me:15338: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -15351,7 +15354,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:15354: result: $ac_cv_header_pthread_h" >&5 ++echo "$as_me:15357: result: $ac_cv_header_pthread_h" >&5 + echo "${ECHO_T}$ac_cv_header_pthread_h" >&6 + if test "$ac_cv_header_pthread_h" = yes; then + +@@ -15361,7 +15364,7 @@ + + for cf_lib_pthread in pthread c_r + do +- echo "$as_me:15364: checking if we can link with the $cf_lib_pthread library" >&5 ++ echo "$as_me:15367: checking if we can link with the $cf_lib_pthread library" >&5 + echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6 + cf_save_LIBS="$LIBS" + +@@ -15382,7 +15385,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 15385 "configure" ++#line 15388 "configure" + #include "confdefs.h" + + #include +@@ -15399,16 +15402,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:15402: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15405: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15405: \$? = $ac_status" >&5 ++ echo "$as_me:15408: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:15408: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15411: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15411: \$? = $ac_status" >&5 ++ echo "$as_me:15414: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + with_pthread=yes + else +@@ -15418,7 +15421,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS="$cf_save_LIBS" +- echo "$as_me:15421: result: $with_pthread" >&5 ++ echo "$as_me:15424: result: $with_pthread" >&5 + echo "${ECHO_T}$with_pthread" >&6 + test "$with_pthread" = yes && break + done +@@ -15446,7 +15449,7 @@ + EOF + + else +- { { echo "$as_me:15449: error: Cannot link with pthread library" >&5 ++ { { echo "$as_me:15452: error: Cannot link with pthread library" >&5 + echo "$as_me: error: Cannot link with pthread library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -15456,13 +15459,13 @@ + fi + + if test "x$with_pthread" != xno; then +- echo "$as_me:15459: checking for pthread_kill" >&5 ++ echo "$as_me:15462: checking for pthread_kill" >&5 + echo $ECHO_N "checking for pthread_kill... $ECHO_C" >&6 + if test "${ac_cv_func_pthread_kill+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 15465 "configure" ++#line 15468 "configure" + #include "confdefs.h" + #define pthread_kill autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -15493,16 +15496,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:15496: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15499: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15499: \$? = $ac_status" >&5 ++ echo "$as_me:15502: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:15502: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15505: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15505: \$? = $ac_status" >&5 ++ echo "$as_me:15508: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_pthread_kill=yes + else +@@ -15512,11 +15515,11 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:15515: result: $ac_cv_func_pthread_kill" >&5 ++echo "$as_me:15518: result: $ac_cv_func_pthread_kill" >&5 + echo "${ECHO_T}$ac_cv_func_pthread_kill" >&6 + if test "$ac_cv_func_pthread_kill" = yes; then + +- echo "$as_me:15519: checking if you want to allow EINTR in wgetch with pthreads" >&5 ++ echo "$as_me:15522: checking if you want to allow EINTR in wgetch with pthreads" >&5 + echo $ECHO_N "checking if you want to allow EINTR in wgetch with pthreads... $ECHO_C" >&6 + + # Check whether --enable-pthreads-eintr or --disable-pthreads-eintr was given. +@@ -15526,7 +15529,7 @@ + else + use_pthreads_eintr=no + fi; +- echo "$as_me:15529: result: $use_pthreads_eintr" >&5 ++ echo "$as_me:15532: result: $use_pthreads_eintr" >&5 + echo "${ECHO_T}$use_pthreads_eintr" >&6 + if test "x$use_pthreads_eintr" = xyes ; then + +@@ -15537,7 +15540,7 @@ + fi + fi + +- echo "$as_me:15540: checking if you want to use weak-symbols for pthreads" >&5 ++ echo "$as_me:15543: checking if you want to use weak-symbols for pthreads" >&5 + echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6 + + # Check whether --enable-weak-symbols or --disable-weak-symbols was given. +@@ -15547,18 +15550,18 @@ + else + use_weak_symbols=no + fi; +- echo "$as_me:15550: result: $use_weak_symbols" >&5 ++ echo "$as_me:15553: result: $use_weak_symbols" >&5 + echo "${ECHO_T}$use_weak_symbols" >&6 + if test "x$use_weak_symbols" = xyes ; then + +-echo "$as_me:15554: checking if $CC supports weak symbols" >&5 ++echo "$as_me:15557: checking if $CC supports weak symbols" >&5 + echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6 + if test "${cf_cv_weak_symbols+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 15561 "configure" ++#line 15564 "configure" + #include "confdefs.h" + + #include +@@ -15584,16 +15587,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:15587: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15590: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15590: \$? = $ac_status" >&5 ++ echo "$as_me:15593: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:15593: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15596: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15596: \$? = $ac_status" >&5 ++ echo "$as_me:15599: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_weak_symbols=yes + else +@@ -15604,7 +15607,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:15607: result: $cf_cv_weak_symbols" >&5 ++echo "$as_me:15610: result: $cf_cv_weak_symbols" >&5 + echo "${ECHO_T}$cf_cv_weak_symbols" >&6 + + else +@@ -15654,7 +15657,7 @@ + # opaque outside of that, so there is no --enable-opaque option. We can use + # this option without --with-pthreads, but this will be always set for + # pthreads. +-echo "$as_me:15657: checking if you want reentrant code" >&5 ++echo "$as_me:15660: checking if you want reentrant code" >&5 + echo $ECHO_N "checking if you want reentrant code... $ECHO_C" >&6 + + # Check whether --enable-reentrant or --disable-reentrant was given. +@@ -15664,7 +15667,7 @@ + else + with_reentrant=no + fi; +-echo "$as_me:15667: result: $with_reentrant" >&5 ++echo "$as_me:15670: result: $with_reentrant" >&5 + echo "${ECHO_T}$with_reentrant" >&6 + if test "x$with_reentrant" = xyes ; then + cf_cv_enable_reentrant=1 +@@ -15752,7 +15755,7 @@ + (5.*) + cf_cv_rel_version=6.0 + cf_cv_abi_version=6 +- { echo "$as_me:15755: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 ++ { echo "$as_me:15758: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 + echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;} + ;; + esac +@@ -15764,7 +15767,7 @@ + NCURSES_SIZE_T=short + fi + +-echo "$as_me:15767: checking if you want opaque curses-library structures" >&5 ++echo "$as_me:15770: checking if you want opaque curses-library structures" >&5 + echo $ECHO_N "checking if you want opaque curses-library structures... $ECHO_C" >&6 + + # Check whether --enable-opaque-curses or --disable-opaque-curses was given. +@@ -15786,16 +15789,16 @@ + test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=no + + fi; +-echo "$as_me:15789: result: $enable_opaque_curses" >&5 ++echo "$as_me:15792: result: $enable_opaque_curses" >&5 + echo "${ECHO_T}$enable_opaque_curses" >&6 + + test "$cf_cv_enable_reentrant" = 1 && \ + test "$enable_opaque_curses" = no && \ +-{ { echo "$as_me:15794: error: reentrant configuration requires opaque library" >&5 ++{ { echo "$as_me:15797: error: reentrant configuration requires opaque library" >&5 + echo "$as_me: error: reentrant configuration requires opaque library" >&2;} + { (exit 1); exit 1; }; } + +-echo "$as_me:15798: checking if you want opaque form-library structures" >&5 ++echo "$as_me:15801: checking if you want opaque form-library structures" >&5 + echo $ECHO_N "checking if you want opaque form-library structures... $ECHO_C" >&6 + + # Check whether --enable-opaque-form or --disable-opaque-form was given. +@@ -15805,10 +15808,10 @@ + else + enable_opaque_form=no + fi; +-echo "$as_me:15808: result: $enable_opaque_form" >&5 ++echo "$as_me:15811: result: $enable_opaque_form" >&5 + echo "${ECHO_T}$enable_opaque_form" >&6 + +-echo "$as_me:15811: checking if you want opaque menu-library structures" >&5 ++echo "$as_me:15814: checking if you want opaque menu-library structures" >&5 + echo $ECHO_N "checking if you want opaque menu-library structures... $ECHO_C" >&6 + + # Check whether --enable-opaque-menu or --disable-opaque-menu was given. +@@ -15818,10 +15821,10 @@ + else + enable_opaque_menu=no + fi; +-echo "$as_me:15821: result: $enable_opaque_menu" >&5 ++echo "$as_me:15824: result: $enable_opaque_menu" >&5 + echo "${ECHO_T}$enable_opaque_menu" >&6 + +-echo "$as_me:15824: checking if you want opaque panel-library structures" >&5 ++echo "$as_me:15827: checking if you want opaque panel-library structures" >&5 + echo $ECHO_N "checking if you want opaque panel-library structures... $ECHO_C" >&6 + + # Check whether --enable-opaque-panel or --disable-opaque-panel was given. +@@ -15831,7 +15834,7 @@ + else + enable_opaque_panel=no + fi; +-echo "$as_me:15834: result: $enable_opaque_panel" >&5 ++echo "$as_me:15837: result: $enable_opaque_panel" >&5 + echo "${ECHO_T}$enable_opaque_panel" >&6 + + NCURSES_OPAQUE=0; test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1 +@@ -15841,7 +15844,7 @@ + + ### Allow using a different wrap-prefix + if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then +- echo "$as_me:15844: checking for prefix used to wrap public variables" >&5 ++ echo "$as_me:15847: checking for prefix used to wrap public variables" >&5 + echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6 + + # Check whether --with-wrap-prefix or --without-wrap-prefix was given. +@@ -15851,7 +15854,7 @@ + else + NCURSES_WRAP_PREFIX=_nc_ + fi; +- echo "$as_me:15854: result: $NCURSES_WRAP_PREFIX" >&5 ++ echo "$as_me:15857: result: $NCURSES_WRAP_PREFIX" >&5 + echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 + else + NCURSES_WRAP_PREFIX=_nc_ +@@ -15864,7 +15867,7 @@ + ############################################################################### + # These options are relatively safe to experiment with. + +-echo "$as_me:15867: checking if you want all development code" >&5 ++echo "$as_me:15870: checking if you want all development code" >&5 + echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6 + + # Check whether --with-develop or --without-develop was given. +@@ -15874,11 +15877,11 @@ + else + with_develop=no + fi; +-echo "$as_me:15877: result: $with_develop" >&5 ++echo "$as_me:15880: result: $with_develop" >&5 + echo "${ECHO_T}$with_develop" >&6 + + ### use option --enable-hard-tabs to turn on use of hard-tabs optimize +-echo "$as_me:15881: checking if you want hard-tabs code" >&5 ++echo "$as_me:15884: checking if you want hard-tabs code" >&5 + echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6 + + # Check whether --enable-hard-tabs or --disable-hard-tabs was given. +@@ -15888,7 +15891,7 @@ + else + enable_hard_tabs=$with_develop + fi; +-echo "$as_me:15891: result: $enable_hard_tabs" >&5 ++echo "$as_me:15894: result: $enable_hard_tabs" >&5 + echo "${ECHO_T}$enable_hard_tabs" >&6 + test "x$enable_hard_tabs" = xyes && + cat >>confdefs.h <<\EOF +@@ -15896,7 +15899,7 @@ + EOF + + ### use option --enable-xmc-glitch to turn on use of magic-cookie optimize +-echo "$as_me:15899: checking if you want limited support for xmc" >&5 ++echo "$as_me:15902: checking if you want limited support for xmc" >&5 + echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6 + + # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given. +@@ -15906,7 +15909,7 @@ + else + enable_xmc_glitch=$with_develop + fi; +-echo "$as_me:15909: result: $enable_xmc_glitch" >&5 ++echo "$as_me:15912: result: $enable_xmc_glitch" >&5 + echo "${ECHO_T}$enable_xmc_glitch" >&6 + test "x$enable_xmc_glitch" = xyes && + cat >>confdefs.h <<\EOF +@@ -15916,7 +15919,7 @@ + ############################################################################### + # These are just experimental, probably should not be in a package: + +-echo "$as_me:15919: checking if you do not want to assume colors are white-on-black" >&5 ++echo "$as_me:15922: checking if you do not want to assume colors are white-on-black" >&5 + echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6 + + # Check whether --enable-assumed-color or --disable-assumed-color was given. +@@ -15926,7 +15929,7 @@ + else + with_assumed_color=yes + fi; +-echo "$as_me:15929: result: $with_assumed_color" >&5 ++echo "$as_me:15932: result: $with_assumed_color" >&5 + echo "${ECHO_T}$with_assumed_color" >&6 + test "x$with_assumed_color" = xyes && + cat >>confdefs.h <<\EOF +@@ -15934,7 +15937,7 @@ + EOF + + ### use option --enable-hashmap to turn on use of hashmap scrolling logic +-echo "$as_me:15937: checking if you want hashmap scrolling-optimization code" >&5 ++echo "$as_me:15940: checking if you want hashmap scrolling-optimization code" >&5 + echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6 + + # Check whether --enable-hashmap or --disable-hashmap was given. +@@ -15944,7 +15947,7 @@ + else + with_hashmap=yes + fi; +-echo "$as_me:15947: result: $with_hashmap" >&5 ++echo "$as_me:15950: result: $with_hashmap" >&5 + echo "${ECHO_T}$with_hashmap" >&6 + test "x$with_hashmap" = xyes && + cat >>confdefs.h <<\EOF +@@ -15952,7 +15955,7 @@ + EOF + + ### use option --enable-colorfgbg to turn on use of $COLORFGBG environment +-echo "$as_me:15955: checking if you want colorfgbg code" >&5 ++echo "$as_me:15958: checking if you want colorfgbg code" >&5 + echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6 + + # Check whether --enable-colorfgbg or --disable-colorfgbg was given. +@@ -15962,7 +15965,7 @@ + else + with_colorfgbg=no + fi; +-echo "$as_me:15965: result: $with_colorfgbg" >&5 ++echo "$as_me:15968: result: $with_colorfgbg" >&5 + echo "${ECHO_T}$with_colorfgbg" >&6 + test "x$with_colorfgbg" = xyes && + cat >>confdefs.h <<\EOF +@@ -15970,7 +15973,7 @@ + EOF + + ### use option --enable-fvisibility to turn on use of gcc-specific feature +-echo "$as_me:15973: checking if you want to use gcc -fvisibility option" >&5 ++echo "$as_me:15976: checking if you want to use gcc -fvisibility option" >&5 + echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6 + + # Check whether --enable-fvisibility or --disable-fvisibility was given. +@@ -15980,14 +15983,14 @@ + else + cf_with_fvisibility=no + fi; +-echo "$as_me:15983: result: $cf_with_fvisibility" >&5 ++echo "$as_me:15986: result: $cf_with_fvisibility" >&5 + echo "${ECHO_T}$cf_with_fvisibility" >&6 + + NCURSES_IMPEXP= + NCURSES_CXX_IMPEXP= + if test "x$cf_with_fvisibility" = xyes; then + +-echo "$as_me:15990: checking if $CC -fvisibility=hidden option works" >&5 ++echo "$as_me:15993: checking if $CC -fvisibility=hidden option works" >&5 + echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6 + if test "${cf_cv_fvisibility_hidden+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -15996,7 +15999,7 @@ + cf_save_cflags="$CFLAGS" + CFLAGS="$CFLAGS -fvisibility=hidden" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 15999 "configure" ++#line 16002 "configure" + #include "confdefs.h" + + __attribute__ ((visibility("default"))) int somefunc() {return 42;} +@@ -16012,16 +16015,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:16015: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16018: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16018: \$? = $ac_status" >&5 ++ echo "$as_me:16021: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:16021: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16024: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16024: \$? = $ac_status" >&5 ++ echo "$as_me:16027: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_fvisibility_hidden=yes + else +@@ -16033,7 +16036,7 @@ + CFLAGS=$cf_save_cflags + + fi +-echo "$as_me:16036: result: $cf_cv_fvisibility_hidden" >&5 ++echo "$as_me:16039: result: $cf_cv_fvisibility_hidden" >&5 + echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6 + + if test "x$cf_cv_fvisibility_hidden" = xyes +@@ -16148,7 +16151,7 @@ + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + ac_main_return="return" + +-echo "$as_me:16151: checking if $CXX -fvisibility=hidden option works" >&5 ++echo "$as_me:16154: checking if $CXX -fvisibility=hidden option works" >&5 + echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6 + if test "${cf_cv_fvisibility_hidden2+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -16157,7 +16160,7 @@ + cf_save_cflags="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -fvisibility=hidden" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16160 "configure" ++#line 16163 "configure" + #include "confdefs.h" + + __attribute__ ((visibility("default"))) int somefunc() {return 42;} +@@ -16173,16 +16176,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:16176: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16179: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16179: \$? = $ac_status" >&5 ++ echo "$as_me:16182: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:16182: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16185: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16185: \$? = $ac_status" >&5 ++ echo "$as_me:16188: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_fvisibility_hidden2=yes + else +@@ -16194,7 +16197,7 @@ + CXXFLAGS=$cf_save_cflags + + fi +-echo "$as_me:16197: result: $cf_cv_fvisibility_hidden2" >&5 ++echo "$as_me:16200: result: $cf_cv_fvisibility_hidden2" >&5 + echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6 + + if test "x$cf_cv_fvisibility_hidden2" = xyes +@@ -16317,7 +16320,7 @@ + fi + + ### use option --enable-interop to turn on use of bindings used for interop +-echo "$as_me:16320: checking if you want interop bindings" >&5 ++echo "$as_me:16323: checking if you want interop bindings" >&5 + echo $ECHO_N "checking if you want interop bindings... $ECHO_C" >&6 + + # Check whether --enable-interop or --disable-interop was given. +@@ -16327,13 +16330,13 @@ + else + with_exp_interop=$cf_dft_interop + fi; +-echo "$as_me:16330: result: $with_exp_interop" >&5 ++echo "$as_me:16333: result: $with_exp_interop" >&5 + echo "${ECHO_T}$with_exp_interop" >&6 + + NCURSES_INTEROP_FUNCS=0 + test "x$with_exp_interop" = xyes && NCURSES_INTEROP_FUNCS=1 + +-echo "$as_me:16336: checking if you want experimental safe-sprintf code" >&5 ++echo "$as_me:16339: checking if you want experimental safe-sprintf code" >&5 + echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6 + + # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given. +@@ -16343,13 +16346,13 @@ + else + with_safe_sprintf=no + fi; +-echo "$as_me:16346: result: $with_safe_sprintf" >&5 ++echo "$as_me:16349: result: $with_safe_sprintf" >&5 + echo "${ECHO_T}$with_safe_sprintf" >&6 + + ### use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic + # when hashmap is used scroll hints are useless + if test "$with_hashmap" = no ; then +-echo "$as_me:16352: checking if you want to experiment without scrolling-hints code" >&5 ++echo "$as_me:16355: checking if you want to experiment without scrolling-hints code" >&5 + echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6 + + # Check whether --enable-scroll-hints or --disable-scroll-hints was given. +@@ -16359,7 +16362,7 @@ + else + with_scroll_hints=yes + fi; +-echo "$as_me:16362: result: $with_scroll_hints" >&5 ++echo "$as_me:16365: result: $with_scroll_hints" >&5 + echo "${ECHO_T}$with_scroll_hints" >&6 + test "x$with_scroll_hints" = xyes && + cat >>confdefs.h <<\EOF +@@ -16368,7 +16371,7 @@ + + fi + +-echo "$as_me:16371: checking if you want wgetch-events code" >&5 ++echo "$as_me:16374: checking if you want wgetch-events code" >&5 + echo $ECHO_N "checking if you want wgetch-events code... $ECHO_C" >&6 + + # Check whether --enable-wgetch-events or --disable-wgetch-events was given. +@@ -16378,7 +16381,7 @@ + else + with_wgetch_events=no + fi; +-echo "$as_me:16381: result: $with_wgetch_events" >&5 ++echo "$as_me:16384: result: $with_wgetch_events" >&5 + echo "${ECHO_T}$with_wgetch_events" >&6 + if test "x$with_wgetch_events" = xyes ; then + +@@ -16393,7 +16396,7 @@ + + case "$cf_cv_system_name" in + (*mingw32*|*mingw64*|*-msvc*) +- echo "$as_me:16396: checking if you want experimental-Windows driver" >&5 ++ echo "$as_me:16399: checking if you want experimental-Windows driver" >&5 + echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6 + + # Check whether --enable-exp-win32 or --disable-exp-win32 was given. +@@ -16403,7 +16406,7 @@ + else + with_exp_win32=no + fi; +- echo "$as_me:16406: result: $with_exp_win32" >&5 ++ echo "$as_me:16409: result: $with_exp_win32" >&5 + echo "${ECHO_T}$with_exp_win32" >&6 + if test "x$with_exp_win32" = xyes + then +@@ -16429,7 +16432,7 @@ + + ### use option --disable-echo to suppress full display compiling commands + +-echo "$as_me:16432: checking if you want to see long compiling messages" >&5 ++echo "$as_me:16435: checking if you want to see long compiling messages" >&5 + echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6 + + # Check whether --enable-echo or --disable-echo was given. +@@ -16463,7 +16466,7 @@ + ECHO_CC='' + + fi; +-echo "$as_me:16466: result: $enableval" >&5 ++echo "$as_me:16469: result: $enableval" >&5 + echo "${ECHO_T}$enableval" >&6 + + if test "x$enable_echo" = xyes; then +@@ -16476,7 +16479,7 @@ + + # --disable-stripping is used for debugging + +-echo "$as_me:16479: checking if you want to install stripped executables" >&5 ++echo "$as_me:16482: checking if you want to install stripped executables" >&5 + echo $ECHO_N "checking if you want to install stripped executables... $ECHO_C" >&6 + + # Check whether --enable-stripping or --disable-stripping was given. +@@ -16493,7 +16496,7 @@ + enable_stripping=yes + + fi; +-echo "$as_me:16496: result: $enable_stripping" >&5 ++echo "$as_me:16499: result: $enable_stripping" >&5 + echo "${ECHO_T}$enable_stripping" >&6 + + if test "$enable_stripping" = yes +@@ -16504,7 +16507,7 @@ + fi + + : "${INSTALL:=install}" +-echo "$as_me:16507: checking if install accepts -p option" >&5 ++echo "$as_me:16510: checking if install accepts -p option" >&5 + echo $ECHO_N "checking if install accepts -p option... $ECHO_C" >&6 + if test "${cf_cv_install_p+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -16535,10 +16538,10 @@ + rm -rf ./conftest* + + fi +-echo "$as_me:16538: result: $cf_cv_install_p" >&5 ++echo "$as_me:16541: result: $cf_cv_install_p" >&5 + echo "${ECHO_T}$cf_cv_install_p" >&6 + +-echo "$as_me:16541: checking if install needs to be told about ownership" >&5 ++echo "$as_me:16544: checking if install needs to be told about ownership" >&5 + echo $ECHO_N "checking if install needs to be told about ownership... $ECHO_C" >&6 + case `$ac_config_guess` in + (*minix) +@@ -16549,7 +16552,7 @@ + ;; + esac + +-echo "$as_me:16552: result: $with_install_o" >&5 ++echo "$as_me:16555: result: $with_install_o" >&5 + echo "${ECHO_T}$with_install_o" >&6 + if test "x$with_install_o" = xyes + then +@@ -16574,7 +16577,7 @@ + + ### use option --enable-warnings to turn on all gcc warnings + +-echo "$as_me:16577: checking if you want to use C11 _Noreturn feature" >&5 ++echo "$as_me:16580: checking if you want to use C11 _Noreturn feature" >&5 + echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6 + + # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given. +@@ -16591,17 +16594,17 @@ + enable_stdnoreturn=no + + fi; +-echo "$as_me:16594: result: $enable_stdnoreturn" >&5 ++echo "$as_me:16597: result: $enable_stdnoreturn" >&5 + echo "${ECHO_T}$enable_stdnoreturn" >&6 + + if test $enable_stdnoreturn = yes; then +-echo "$as_me:16598: checking for C11 _Noreturn feature" >&5 ++echo "$as_me:16601: checking for C11 _Noreturn feature" >&5 + echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6 + if test "${cf_cv_c11_noreturn+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16604 "configure" ++#line 16607 "configure" + #include "confdefs.h" + + #include +@@ -16618,16 +16621,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16621: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16624: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16624: \$? = $ac_status" >&5 ++ echo "$as_me:16627: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16627: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16630: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16630: \$? = $ac_status" >&5 ++ echo "$as_me:16633: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_c11_noreturn=yes + else +@@ -16638,7 +16641,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:16641: result: $cf_cv_c11_noreturn" >&5 ++echo "$as_me:16644: result: $cf_cv_c11_noreturn" >&5 + echo "${ECHO_T}$cf_cv_c11_noreturn" >&6 + else + cf_cv_c11_noreturn=no, +@@ -16668,7 +16671,7 @@ + (*-Werror=*) + test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 + +-echo "${as_me:-configure}:16671: testing repairing CFLAGS: $CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:16674: testing repairing CFLAGS: $CFLAGS ..." 1>&5 + + cf_temp_flags= + for cf_temp_scan in $CFLAGS +@@ -16691,11 +16694,11 @@ + CFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 + +-echo "${as_me:-configure}:16694: testing ... fixed $CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:16697: testing ... fixed $CFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +-echo "${as_me:-configure}:16698: testing ... extra $EXTRA_CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:16701: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + ;; + esac +@@ -16707,7 +16710,7 @@ + (*-Werror=*) + test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 + +-echo "${as_me:-configure}:16710: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 ++echo "${as_me:-configure}:16713: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 + + cf_temp_flags= + for cf_temp_scan in $CPPFLAGS +@@ -16730,11 +16733,11 @@ + CPPFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 + +-echo "${as_me:-configure}:16733: testing ... fixed $CPPFLAGS ..." 1>&5 ++echo "${as_me:-configure}:16736: testing ... fixed $CPPFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +-echo "${as_me:-configure}:16737: testing ... extra $EXTRA_CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:16740: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + ;; + esac +@@ -16746,7 +16749,7 @@ + (*-Werror=*) + test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:16749: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:16752: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 + + cf_temp_flags= + for cf_temp_scan in $LDFLAGS +@@ -16769,17 +16772,17 @@ + LDFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:16772: testing ... fixed $LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:16775: testing ... fixed $LDFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +-echo "${as_me:-configure}:16776: testing ... extra $EXTRA_CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:16779: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + ;; + esac + fi + +-echo "$as_me:16782: checking if you want to turn on gcc warnings" >&5 ++echo "$as_me:16785: checking if you want to turn on gcc warnings" >&5 + echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6 + + # Check whether --enable-warnings or --disable-warnings was given. +@@ -16796,7 +16799,7 @@ + enable_warnings=no + + fi; +-echo "$as_me:16799: result: $enable_warnings" >&5 ++echo "$as_me:16802: result: $enable_warnings" >&5 + echo "${ECHO_T}$enable_warnings" >&6 + if test "$enable_warnings" = "yes" + then +@@ -16820,7 +16823,7 @@ + done + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16823 "configure" ++#line 16826 "configure" + #include "confdefs.h" + + #include +@@ -16835,26 +16838,26 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16838: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16841: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16841: \$? = $ac_status" >&5 ++ echo "$as_me:16844: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16844: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16847: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16847: \$? = $ac_status" >&5 ++ echo "$as_me:16850: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + +-echo "$as_me:16850: checking for X11/Xt const-feature" >&5 ++echo "$as_me:16853: checking for X11/Xt const-feature" >&5 + echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6 + if test "${cf_cv_const_x_string+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16857 "configure" ++#line 16860 "configure" + #include "confdefs.h" + + #define _CONST_X_STRING /* X11R7.8 (perhaps) */ +@@ -16871,16 +16874,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16874: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16877: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16877: \$? = $ac_status" >&5 ++ echo "$as_me:16880: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16880: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16883: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16883: \$? = $ac_status" >&5 ++ echo "$as_me:16886: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_const_x_string=no +@@ -16895,7 +16898,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:16898: result: $cf_cv_const_x_string" >&5 ++echo "$as_me:16901: result: $cf_cv_const_x_string" >&5 + echo "${ECHO_T}$cf_cv_const_x_string" >&6 + + LIBS="$cf_save_LIBS_CF_CONST_X_STRING" +@@ -16924,7 +16927,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi + cat > "conftest.$ac_ext" <&5 ++ { echo "$as_me:16946: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" +@@ -16956,12 +16959,12 @@ + wd981 + do + CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" +- if { (eval echo "$as_me:16959: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:16962: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16962: \$? = $ac_status" >&5 ++ echo "$as_me:16965: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- test -n "$verbose" && echo "$as_me:16964: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:16967: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" + fi +@@ -16969,7 +16972,7 @@ + CFLAGS="$cf_save_CFLAGS" + elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" + then +- { echo "$as_me:16972: checking for $CC warning options..." >&5 ++ { echo "$as_me:16975: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + cf_warn_CONST="" +@@ -16992,12 +16995,12 @@ + Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum + do + CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" +- if { (eval echo "$as_me:16995: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:16998: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16998: \$? = $ac_status" >&5 ++ echo "$as_me:17001: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- test -n "$verbose" && echo "$as_me:17000: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:17003: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + case "$cf_opt" in + (Winline) +@@ -17005,7 +17008,7 @@ + ([34].*) + test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 + +-echo "${as_me:-configure}:17008: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 ++echo "${as_me:-configure}:17011: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 + + continue;; + esac +@@ -17015,7 +17018,7 @@ + ([12].*) + test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 + +-echo "${as_me:-configure}:17018: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 ++echo "${as_me:-configure}:17021: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 + + continue;; + esac +@@ -17048,10 +17051,10 @@ + EOF + if test "$GCC" = yes + then +- { echo "$as_me:17051: checking for $CC __attribute__ directives..." >&5 ++ { echo "$as_me:17054: checking for $CC __attribute__ directives..." >&5 + echo "$as_me: checking for $CC __attribute__ directives..." >&6;} + cat > "conftest.$ac_ext" <&5 ++ if { (eval echo "$as_me:17106: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17106: \$? = $ac_status" >&5 ++ echo "$as_me:17109: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- test -n "$verbose" && echo "$as_me:17108: result: ... $cf_attribute" >&5 ++ test -n "$verbose" && echo "$as_me:17111: result: ... $cf_attribute" >&5 + echo "${ECHO_T}... $cf_attribute" >&6 + cat conftest.h >>confdefs.h + case "$cf_attribute" in +@@ -17177,12 +17180,12 @@ + if test "$GCC" = yes ; then + case "$host_os" in + (linux*|gnu*) +- echo "$as_me:17180: checking if this is really Intel C++ compiler" >&5 ++ echo "$as_me:17183: checking if this is really Intel C++ compiler" >&5 + echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6 + cf_save_CFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -no-gcc" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17185 "configure" ++#line 17188 "configure" + #include "confdefs.h" + + int +@@ -17199,16 +17202,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:17202: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17205: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17205: \$? = $ac_status" >&5 ++ echo "$as_me:17208: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:17208: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17211: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17211: \$? = $ac_status" >&5 ++ echo "$as_me:17214: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + INTEL_CPLUSPLUS=yes + cf_save_CFLAGS="$cf_save_CFLAGS -we147" +@@ -17219,7 +17222,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + CXXFLAGS="$cf_save_CFLAGS" +- echo "$as_me:17222: result: $INTEL_CPLUSPLUS" >&5 ++ echo "$as_me:17225: result: $INTEL_CPLUSPLUS" >&5 + echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6 + ;; + esac +@@ -17228,11 +17231,11 @@ + CLANG_CPLUSPLUS=no + + if test "$GCC" = yes ; then +- echo "$as_me:17231: checking if this is really Clang C++ compiler" >&5 ++ echo "$as_me:17234: checking if this is really Clang C++ compiler" >&5 + echo $ECHO_N "checking if this is really Clang C++ compiler... $ECHO_C" >&6 + cf_save_CFLAGS="$CXXFLAGS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17235 "configure" ++#line 17238 "configure" + #include "confdefs.h" + + int +@@ -17249,16 +17252,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:17252: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17255: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17255: \$? = $ac_status" >&5 ++ echo "$as_me:17258: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:17258: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17261: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17261: \$? = $ac_status" >&5 ++ echo "$as_me:17264: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + CLANG_CPLUSPLUS=yes + +@@ -17268,7 +17271,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + CXXFLAGS="$cf_save_CFLAGS" +- echo "$as_me:17271: result: $CLANG_CPLUSPLUS" >&5 ++ echo "$as_me:17274: result: $CLANG_CPLUSPLUS" >&5 + echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6 + fi + +@@ -17277,30 +17280,30 @@ + if test "x$CLANG_CPLUSPLUS" = "xyes" ; then + case "$CC" in + (c[1-9][0-9]|*/c[1-9][0-9]) +- { echo "$as_me:17280: WARNING: replacing broken compiler alias $CC" >&5 ++ { echo "$as_me:17283: WARNING: replacing broken compiler alias $CC" >&5 + echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;} + CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`" + CC=clang + ;; + esac + +- echo "$as_me:17287: checking version of $CC" >&5 ++ echo "$as_me:17290: checking version of $CC" >&5 + echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 + CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" + test -z "$CLANG_VERSION" && CLANG_VERSION=unknown +- echo "$as_me:17291: result: $CLANG_VERSION" >&5 ++ echo "$as_me:17294: result: $CLANG_VERSION" >&5 + echo "${ECHO_T}$CLANG_VERSION" >&6 + + for cf_clang_opt in \ + -Qunused-arguments \ + -Wno-error=implicit-function-declaration + do +- echo "$as_me:17298: checking if option $cf_clang_opt works" >&5 ++ echo "$as_me:17301: checking if option $cf_clang_opt works" >&5 + echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6 + cf_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $cf_clang_opt" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17303 "configure" ++#line 17306 "configure" + #include "confdefs.h" + + #include +@@ -17314,16 +17317,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:17317: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17320: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17320: \$? = $ac_status" >&5 ++ echo "$as_me:17323: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:17323: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17326: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17326: \$? = $ac_status" >&5 ++ echo "$as_me:17329: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_clang_optok=yes +@@ -17334,13 +17337,13 @@ + cf_clang_optok=no + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +- echo "$as_me:17337: result: $cf_clang_optok" >&5 ++ echo "$as_me:17340: result: $cf_clang_optok" >&5 + echo "${ECHO_T}$cf_clang_optok" >&6 + CFLAGS="$cf_save_CFLAGS" + if test "$cf_clang_optok" = yes; then + test -n "$verbose" && echo " adding option $cf_clang_opt" 1>&6 + +-echo "${as_me:-configure}:17343: testing adding option $cf_clang_opt ..." 1>&5 ++echo "${as_me:-configure}:17346: testing adding option $cf_clang_opt ..." 1>&5 + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_clang_opt" +@@ -17357,7 +17360,7 @@ + ac_main_return="return" + + cat > conftest.$ac_ext <&5 ++ { echo "$as_me:17381: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CXXFLAGS="$CXXFLAGS" + EXTRA_CXXFLAGS="-Wall" +@@ -17392,12 +17395,12 @@ + wd981 + do + CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt" +- if { (eval echo "$as_me:17395: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:17398: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17398: \$? = $ac_status" >&5 ++ echo "$as_me:17401: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- test -n "$verbose" && echo "$as_me:17400: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:17403: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" + fi +@@ -17406,7 +17409,7 @@ + + elif test "$GXX" = yes + then +- { echo "$as_me:17409: checking for $CXX warning options..." >&5 ++ { echo "$as_me:17412: checking for $CXX warning options..." >&5 + echo "$as_me: checking for $CXX warning options..." >&6;} + cf_save_CXXFLAGS="$CXXFLAGS" + EXTRA_CXXFLAGS="-W -Wall" +@@ -17436,16 +17439,16 @@ + Wundef $cf_gxx_extra_warnings Wno-unused + do + CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt" +- if { (eval echo "$as_me:17439: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:17442: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17442: \$? = $ac_status" >&5 ++ echo "$as_me:17445: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- test -n "$verbose" && echo "$as_me:17444: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:17447: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" + else +- test -n "$verbose" && echo "$as_me:17448: result: ... no -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:17451: result: ... no -$cf_opt" >&5 + echo "${ECHO_T}... no -$cf_opt" >&6 + fi + done +@@ -17463,7 +17466,7 @@ + fi + fi + +-echo "$as_me:17466: checking if you want to work around bogus compiler/loader warnings" >&5 ++echo "$as_me:17469: checking if you want to work around bogus compiler/loader warnings" >&5 + echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6 + + # Check whether --enable-string-hacks or --disable-string-hacks was given. +@@ -17473,7 +17476,7 @@ + else + enable_string_hacks=no + fi; +-echo "$as_me:17476: result: $enable_string_hacks" >&5 ++echo "$as_me:17479: result: $enable_string_hacks" >&5 + echo "${ECHO_T}$enable_string_hacks" >&6 + + if test "x$enable_string_hacks" = "xyes"; then +@@ -17482,15 +17485,15 @@ + #define USE_STRING_HACKS 1 + EOF + +- { echo "$as_me:17485: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 ++ { echo "$as_me:17488: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 + echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;} +- echo "$as_me:17487: checking for strlcat" >&5 ++ echo "$as_me:17490: checking for strlcat" >&5 + echo $ECHO_N "checking for strlcat... $ECHO_C" >&6 + if test "${ac_cv_func_strlcat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17493 "configure" ++#line 17496 "configure" + #include "confdefs.h" + #define strlcat autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -17521,16 +17524,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:17524: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17527: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17527: \$? = $ac_status" >&5 ++ echo "$as_me:17530: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:17530: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17533: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17533: \$? = $ac_status" >&5 ++ echo "$as_me:17536: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_strlcat=yes + else +@@ -17540,7 +17543,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:17543: result: $ac_cv_func_strlcat" >&5 ++echo "$as_me:17546: result: $ac_cv_func_strlcat" >&5 + echo "${ECHO_T}$ac_cv_func_strlcat" >&6 + if test "$ac_cv_func_strlcat" = yes; then + +@@ -17550,7 +17553,7 @@ + + else + +- echo "$as_me:17553: checking for strlcat in -lbsd" >&5 ++ echo "$as_me:17556: checking for strlcat in -lbsd" >&5 + echo $ECHO_N "checking for strlcat in -lbsd... $ECHO_C" >&6 + if test "${ac_cv_lib_bsd_strlcat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17558,7 +17561,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17561 "configure" ++#line 17564 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -17577,16 +17580,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:17580: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17583: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17583: \$? = $ac_status" >&5 ++ echo "$as_me:17586: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:17586: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17589: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17589: \$? = $ac_status" >&5 ++ echo "$as_me:17592: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_bsd_strlcat=yes + else +@@ -17597,7 +17600,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:17600: result: $ac_cv_lib_bsd_strlcat" >&5 ++echo "$as_me:17603: result: $ac_cv_lib_bsd_strlcat" >&5 + echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6 + if test "$ac_cv_lib_bsd_strlcat" = yes; then + +@@ -17620,23 +17623,23 @@ + for ac_header in bsd/string.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:17623: checking for $ac_header" >&5 ++echo "$as_me:17626: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17629 "configure" ++#line 17632 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:17633: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:17636: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:17639: \$? = $ac_status" >&5 ++ echo "$as_me:17642: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -17655,7 +17658,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:17658: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:17661: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:17682: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17685 "configure" ++#line 17688 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -17713,16 +17716,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:17716: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17719: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17719: \$? = $ac_status" >&5 ++ echo "$as_me:17722: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:17722: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17725: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17725: \$? = $ac_status" >&5 ++ echo "$as_me:17728: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -17732,7 +17735,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:17735: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:17738: result: `eval echo '${'"$as_ac_var"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 + if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:17751: checking if you want to enable runtime assertions" >&5 + echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6 + + # Check whether --enable-assertions or --disable-assertions was given. +@@ -17755,7 +17758,7 @@ + else + with_assertions=no + fi; +-echo "$as_me:17758: result: $with_assertions" >&5 ++echo "$as_me:17761: result: $with_assertions" >&5 + echo "${ECHO_T}$with_assertions" >&6 + if test -n "$GCC" + then +@@ -17771,7 +17774,7 @@ + + ### use option --disable-leaks to suppress "permanent" leaks, for testing + +-echo "$as_me:17774: checking if you want to use dmalloc for testing" >&5 ++echo "$as_me:17777: checking if you want to use dmalloc for testing" >&5 + echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6 + + # Check whether --with-dmalloc or --without-dmalloc was given. +@@ -17793,7 +17796,7 @@ + else + with_dmalloc= + fi; +-echo "$as_me:17796: result: ${with_dmalloc:-no}" >&5 ++echo "$as_me:17799: result: ${with_dmalloc:-no}" >&5 + echo "${ECHO_T}${with_dmalloc:-no}" >&6 + + case ".$with_cflags" in +@@ -17907,23 +17910,23 @@ + esac + + if test "$with_dmalloc" = yes ; then +- echo "$as_me:17910: checking for dmalloc.h" >&5 ++ echo "$as_me:17913: checking for dmalloc.h" >&5 + echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6 + if test "${ac_cv_header_dmalloc_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17916 "configure" ++#line 17919 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:17920: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:17923: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:17926: \$? = $ac_status" >&5 ++ echo "$as_me:17929: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -17942,11 +17945,11 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:17945: result: $ac_cv_header_dmalloc_h" >&5 ++echo "$as_me:17948: result: $ac_cv_header_dmalloc_h" >&5 + echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6 + if test "$ac_cv_header_dmalloc_h" = yes; then + +-echo "$as_me:17949: checking for dmalloc_debug in -ldmalloc" >&5 ++echo "$as_me:17952: checking for dmalloc_debug in -ldmalloc" >&5 + echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6 + if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17954,7 +17957,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldmalloc $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17957 "configure" ++#line 17960 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -17973,16 +17976,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:17976: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17979: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17979: \$? = $ac_status" >&5 ++ echo "$as_me:17982: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:17982: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17985: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17985: \$? = $ac_status" >&5 ++ echo "$as_me:17988: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_dmalloc_dmalloc_debug=yes + else +@@ -17993,7 +17996,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:17996: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 ++echo "$as_me:17999: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 + echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6 + if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:18014: checking if you want to use dbmalloc for testing" >&5 + echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6 + + # Check whether --with-dbmalloc or --without-dbmalloc was given. +@@ -18030,7 +18033,7 @@ + else + with_dbmalloc= + fi; +-echo "$as_me:18033: result: ${with_dbmalloc:-no}" >&5 ++echo "$as_me:18036: result: ${with_dbmalloc:-no}" >&5 + echo "${ECHO_T}${with_dbmalloc:-no}" >&6 + + case ".$with_cflags" in +@@ -18144,23 +18147,23 @@ + esac + + if test "$with_dbmalloc" = yes ; then +- echo "$as_me:18147: checking for dbmalloc.h" >&5 ++ echo "$as_me:18150: checking for dbmalloc.h" >&5 + echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6 + if test "${ac_cv_header_dbmalloc_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18153 "configure" ++#line 18156 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:18157: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:18160: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:18163: \$? = $ac_status" >&5 ++ echo "$as_me:18166: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -18179,11 +18182,11 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:18182: result: $ac_cv_header_dbmalloc_h" >&5 ++echo "$as_me:18185: result: $ac_cv_header_dbmalloc_h" >&5 + echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6 + if test "$ac_cv_header_dbmalloc_h" = yes; then + +-echo "$as_me:18186: checking for debug_malloc in -ldbmalloc" >&5 ++echo "$as_me:18189: checking for debug_malloc in -ldbmalloc" >&5 + echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6 + if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -18191,7 +18194,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldbmalloc $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18194 "configure" ++#line 18197 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -18210,16 +18213,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:18213: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18216: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18216: \$? = $ac_status" >&5 ++ echo "$as_me:18219: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:18219: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18222: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18222: \$? = $ac_status" >&5 ++ echo "$as_me:18225: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_dbmalloc_debug_malloc=yes + else +@@ -18230,7 +18233,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:18233: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 ++echo "$as_me:18236: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 + echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6 + if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:18251: checking if you want to use valgrind for testing" >&5 + echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6 + + # Check whether --with-valgrind or --without-valgrind was given. +@@ -18267,7 +18270,7 @@ + else + with_valgrind= + fi; +-echo "$as_me:18270: result: ${with_valgrind:-no}" >&5 ++echo "$as_me:18273: result: ${with_valgrind:-no}" >&5 + echo "${ECHO_T}${with_valgrind:-no}" >&6 + + case ".$with_cflags" in +@@ -18380,7 +18383,7 @@ + ;; + esac + +-echo "$as_me:18383: checking if you want to perform memory-leak testing" >&5 ++echo "$as_me:18386: checking if you want to perform memory-leak testing" >&5 + echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6 + + # Check whether --enable-leaks or --disable-leaks was given. +@@ -18391,7 +18394,7 @@ + enable_leaks=yes + fi; + if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi +-echo "$as_me:18394: result: $with_no_leaks" >&5 ++echo "$as_me:18397: result: $with_no_leaks" >&5 + echo "${ECHO_T}$with_no_leaks" >&6 + + if test "$enable_leaks" = no ; then +@@ -18443,7 +18446,7 @@ + ;; + esac + +-echo "$as_me:18446: checking whether to add trace feature to all models" >&5 ++echo "$as_me:18449: checking whether to add trace feature to all models" >&5 + echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6 + + # Check whether --with-trace or --without-trace was given. +@@ -18453,7 +18456,7 @@ + else + cf_with_trace=$cf_all_traces + fi; +-echo "$as_me:18456: result: $cf_with_trace" >&5 ++echo "$as_me:18459: result: $cf_with_trace" >&5 + echo "${ECHO_T}$cf_with_trace" >&6 + + if test "x$cf_with_trace" = xyes ; then +@@ -18567,7 +18570,7 @@ + ADA_TRACE=FALSE + fi + +-echo "$as_me:18570: checking if we want to use GNAT projects" >&5 ++echo "$as_me:18573: checking if we want to use GNAT projects" >&5 + echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6 + + # Check whether --enable-gnat-projects or --disable-gnat-projects was given. +@@ -18584,7 +18587,7 @@ + enable_gnat_projects=yes + + fi; +-echo "$as_me:18587: result: $enable_gnat_projects" >&5 ++echo "$as_me:18590: result: $enable_gnat_projects" >&5 + echo "${ECHO_T}$enable_gnat_projects" >&6 + + ### Checks for libraries. +@@ -18597,14 +18600,14 @@ + CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN" + fi + +-echo "$as_me:18600: checking if ssp library is needed" >&5 ++echo "$as_me:18603: checking if ssp library is needed" >&5 + echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6 + if test "${cf_cv_need_libssp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18607 "configure" ++#line 18610 "configure" + #include "confdefs.h" + + #include +@@ -18621,16 +18624,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:18624: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18627: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18627: \$? = $ac_status" >&5 ++ echo "$as_me:18630: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:18630: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18633: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18633: \$? = $ac_status" >&5 ++ echo "$as_me:18636: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_need_libssp=no + else +@@ -18640,7 +18643,7 @@ + cf_save_LIBS="$LIBS" + LIBS="$LIBS -lssp" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18643 "configure" ++#line 18646 "configure" + #include "confdefs.h" + + #include +@@ -18657,16 +18660,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:18660: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18663: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18663: \$? = $ac_status" >&5 ++ echo "$as_me:18666: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:18666: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18669: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18669: \$? = $ac_status" >&5 ++ echo "$as_me:18672: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_need_libssp=yes + else +@@ -18680,7 +18683,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:18683: result: $cf_cv_need_libssp" >&5 ++echo "$as_me:18686: result: $cf_cv_need_libssp" >&5 + echo "${ECHO_T}$cf_cv_need_libssp" >&6 + + if test "x$cf_cv_need_libssp" = xyes +@@ -18706,13 +18709,13 @@ + + ;; + (*) +-echo "$as_me:18709: checking for gettimeofday" >&5 ++echo "$as_me:18712: checking for gettimeofday" >&5 + echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6 + if test "${ac_cv_func_gettimeofday+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18715 "configure" ++#line 18718 "configure" + #include "confdefs.h" + #define gettimeofday autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -18743,16 +18746,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:18746: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18749: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18749: \$? = $ac_status" >&5 ++ echo "$as_me:18752: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:18752: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18755: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18755: \$? = $ac_status" >&5 ++ echo "$as_me:18758: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_gettimeofday=yes + else +@@ -18762,7 +18765,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:18765: result: $ac_cv_func_gettimeofday" >&5 ++echo "$as_me:18768: result: $ac_cv_func_gettimeofday" >&5 + echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 + if test "$ac_cv_func_gettimeofday" = yes; then + +@@ -18772,7 +18775,7 @@ + + else + +-echo "$as_me:18775: checking for gettimeofday in -lbsd" >&5 ++echo "$as_me:18778: checking for gettimeofday in -lbsd" >&5 + echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6 + if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -18780,7 +18783,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18783 "configure" ++#line 18786 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -18799,16 +18802,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:18802: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18805: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18805: \$? = $ac_status" >&5 ++ echo "$as_me:18808: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:18808: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18811: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18811: \$? = $ac_status" >&5 ++ echo "$as_me:18814: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_bsd_gettimeofday=yes + else +@@ -18819,7 +18822,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:18822: result: $ac_cv_lib_bsd_gettimeofday" >&5 ++echo "$as_me:18825: result: $ac_cv_lib_bsd_gettimeofday" >&5 + echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6 + if test "$ac_cv_lib_bsd_gettimeofday" = yes; then + +@@ -18849,14 +18852,14 @@ + ;; + esac + +-echo "$as_me:18852: checking if -lm needed for math functions" >&5 ++echo "$as_me:18855: checking if -lm needed for math functions" >&5 + echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6 + if test "${cf_cv_need_libm+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18859 "configure" ++#line 18862 "configure" + #include "confdefs.h" + + #include +@@ -18872,16 +18875,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:18875: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18878: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18878: \$? = $ac_status" >&5 ++ echo "$as_me:18881: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:18881: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18884: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18884: \$? = $ac_status" >&5 ++ echo "$as_me:18887: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_need_libm=no + else +@@ -18891,7 +18894,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:18894: result: $cf_cv_need_libm" >&5 ++echo "$as_me:18897: result: $cf_cv_need_libm" >&5 + echo "${ECHO_T}$cf_cv_need_libm" >&6 + if test "$cf_cv_need_libm" = yes + then +@@ -18899,13 +18902,13 @@ + fi + + ### Checks for header files. +-echo "$as_me:18902: checking for ANSI C header files" >&5 ++echo "$as_me:18905: checking for ANSI C header files" >&5 + echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 + if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18908 "configure" ++#line 18911 "configure" + #include "confdefs.h" + #include + #include +@@ -18913,13 +18916,13 @@ + #include + + _ACEOF +-if { (eval echo "$as_me:18916: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:18919: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:18922: \$? = $ac_status" >&5 ++ echo "$as_me:18925: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -18941,7 +18944,7 @@ + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18944 "configure" ++#line 18947 "configure" + #include "confdefs.h" + #include + +@@ -18959,7 +18962,7 @@ + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18962 "configure" ++#line 18965 "configure" + #include "confdefs.h" + #include + +@@ -18980,7 +18983,7 @@ + : + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18983 "configure" ++#line 18986 "configure" + #include "confdefs.h" + #include + #if ((' ' & 0x0FF) == 0x020) +@@ -19006,15 +19009,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:19009: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19012: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19012: \$? = $ac_status" >&5 ++ echo "$as_me:19015: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:19014: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19017: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19017: \$? = $ac_status" >&5 ++ echo "$as_me:19020: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -19027,7 +19030,7 @@ + fi + fi + fi +-echo "$as_me:19030: result: $ac_cv_header_stdc" >&5 ++echo "$as_me:19033: result: $ac_cv_header_stdc" >&5 + echo "${ECHO_T}$ac_cv_header_stdc" >&6 + if test $ac_cv_header_stdc = yes; then + +@@ -19040,13 +19043,13 @@ + ac_header_dirent=no + for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do + as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` +-echo "$as_me:19043: checking for $ac_hdr that defines DIR" >&5 ++echo "$as_me:19046: checking for $ac_hdr that defines DIR" >&5 + echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19049 "configure" ++#line 19052 "configure" + #include "confdefs.h" + #include + #include <$ac_hdr> +@@ -19061,16 +19064,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:19064: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19067: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19067: \$? = $ac_status" >&5 ++ echo "$as_me:19070: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:19070: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19073: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19073: \$? = $ac_status" >&5 ++ echo "$as_me:19076: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_Header=yes" + else +@@ -19080,7 +19083,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:19083: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:19086: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++ echo "$as_me:19099: checking for opendir in -ldir" >&5 + echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 + if test "${ac_cv_lib_dir_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19101,7 +19104,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldir $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19104 "configure" ++#line 19107 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19120,16 +19123,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19123: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19126: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19126: \$? = $ac_status" >&5 ++ echo "$as_me:19129: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19129: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19132: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19132: \$? = $ac_status" >&5 ++ echo "$as_me:19135: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_dir_opendir=yes + else +@@ -19140,14 +19143,14 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19143: result: $ac_cv_lib_dir_opendir" >&5 ++echo "$as_me:19146: result: $ac_cv_lib_dir_opendir" >&5 + echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 + if test "$ac_cv_lib_dir_opendir" = yes; then + LIBS="$LIBS -ldir" + fi + + else +- echo "$as_me:19150: checking for opendir in -lx" >&5 ++ echo "$as_me:19153: checking for opendir in -lx" >&5 + echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 + if test "${ac_cv_lib_x_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19155,7 +19158,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lx $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19158 "configure" ++#line 19161 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19174,16 +19177,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19177: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19180: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19180: \$? = $ac_status" >&5 ++ echo "$as_me:19183: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19183: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19186: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19186: \$? = $ac_status" >&5 ++ echo "$as_me:19189: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_x_opendir=yes + else +@@ -19194,7 +19197,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19197: result: $ac_cv_lib_x_opendir" >&5 ++echo "$as_me:19200: result: $ac_cv_lib_x_opendir" >&5 + echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 + if test "$ac_cv_lib_x_opendir" = yes; then + LIBS="$LIBS -lx" +@@ -19202,13 +19205,13 @@ + + fi + +-echo "$as_me:19205: checking whether time.h and sys/time.h may both be included" >&5 ++echo "$as_me:19208: checking whether time.h and sys/time.h may both be included" >&5 + echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 + if test "${ac_cv_header_time+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19211 "configure" ++#line 19214 "configure" + #include "confdefs.h" + #include + #include +@@ -19224,16 +19227,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:19227: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19230: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19230: \$? = $ac_status" >&5 ++ echo "$as_me:19233: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:19233: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19236: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19236: \$? = $ac_status" >&5 ++ echo "$as_me:19239: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_header_time=yes + else +@@ -19243,7 +19246,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:19246: result: $ac_cv_header_time" >&5 ++echo "$as_me:19249: result: $ac_cv_header_time" >&5 + echo "${ECHO_T}$ac_cv_header_time" >&6 + if test $ac_cv_header_time = yes; then + +@@ -19258,7 +19261,7 @@ + case "$host_os" in + (mingw*) + # -lsystre -ltre -lintl -liconv +- echo "$as_me:19261: checking for regcomp in -lsystre" >&5 ++ echo "$as_me:19264: checking for regcomp in -lsystre" >&5 + echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6 + if test "${ac_cv_lib_systre_regcomp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19266,7 +19269,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lsystre $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19269 "configure" ++#line 19272 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19285,16 +19288,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19288: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19291: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19291: \$? = $ac_status" >&5 ++ echo "$as_me:19294: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19294: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19297: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19297: \$? = $ac_status" >&5 ++ echo "$as_me:19300: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_systre_regcomp=yes + else +@@ -19305,11 +19308,11 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19308: result: $ac_cv_lib_systre_regcomp" >&5 ++echo "$as_me:19311: result: $ac_cv_lib_systre_regcomp" >&5 + echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6 + if test "$ac_cv_lib_systre_regcomp" = yes; then + +- echo "$as_me:19312: checking for libiconv_open in -liconv" >&5 ++ echo "$as_me:19315: checking for libiconv_open in -liconv" >&5 + echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6 + if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19317,7 +19320,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-liconv $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19320 "configure" ++#line 19323 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19336,16 +19339,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19339: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19342: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19342: \$? = $ac_status" >&5 ++ echo "$as_me:19345: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19345: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19348: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19348: \$? = $ac_status" >&5 ++ echo "$as_me:19351: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_iconv_libiconv_open=yes + else +@@ -19356,7 +19359,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19359: result: $ac_cv_lib_iconv_libiconv_open" >&5 ++echo "$as_me:19362: result: $ac_cv_lib_iconv_libiconv_open" >&5 + echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6 + if test "$ac_cv_lib_iconv_libiconv_open" = yes; then + +@@ -19378,7 +19381,7 @@ + + fi + +- echo "$as_me:19381: checking for libintl_gettext in -lintl" >&5 ++ echo "$as_me:19384: checking for libintl_gettext in -lintl" >&5 + echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6 + if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19386,7 +19389,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19389 "configure" ++#line 19392 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19405,16 +19408,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19408: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19411: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19411: \$? = $ac_status" >&5 ++ echo "$as_me:19414: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19414: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19417: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19417: \$? = $ac_status" >&5 ++ echo "$as_me:19420: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_intl_libintl_gettext=yes + else +@@ -19425,7 +19428,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19428: result: $ac_cv_lib_intl_libintl_gettext" >&5 ++echo "$as_me:19431: result: $ac_cv_lib_intl_libintl_gettext" >&5 + echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6 + if test "$ac_cv_lib_intl_libintl_gettext" = yes; then + +@@ -19447,7 +19450,7 @@ + + fi + +- echo "$as_me:19450: checking for tre_regcomp in -ltre" >&5 ++ echo "$as_me:19453: checking for tre_regcomp in -ltre" >&5 + echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6 + if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19455,7 +19458,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ltre $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19458 "configure" ++#line 19461 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19474,16 +19477,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19477: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19480: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19480: \$? = $ac_status" >&5 ++ echo "$as_me:19483: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19483: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19486: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19486: \$? = $ac_status" >&5 ++ echo "$as_me:19489: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_tre_tre_regcomp=yes + else +@@ -19494,7 +19497,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19497: result: $ac_cv_lib_tre_tre_regcomp" >&5 ++echo "$as_me:19500: result: $ac_cv_lib_tre_tre_regcomp" >&5 + echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6 + if test "$ac_cv_lib_tre_tre_regcomp" = yes; then + +@@ -19536,7 +19539,7 @@ + + else + +- echo "$as_me:19539: checking for regcomp in -lgnurx" >&5 ++ echo "$as_me:19542: checking for regcomp in -lgnurx" >&5 + echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6 + if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19544,7 +19547,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgnurx $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19547 "configure" ++#line 19550 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19563,16 +19566,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19566: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19569: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19569: \$? = $ac_status" >&5 ++ echo "$as_me:19572: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19572: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19575: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19575: \$? = $ac_status" >&5 ++ echo "$as_me:19578: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gnurx_regcomp=yes + else +@@ -19583,7 +19586,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19586: result: $ac_cv_lib_gnurx_regcomp" >&5 ++echo "$as_me:19589: result: $ac_cv_lib_gnurx_regcomp" >&5 + echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6 + if test "$ac_cv_lib_gnurx_regcomp" = yes; then + +@@ -19611,13 +19614,13 @@ + ;; + (*) + cf_regex_libs="regex re" +- echo "$as_me:19614: checking for regcomp" >&5 ++ echo "$as_me:19617: checking for regcomp" >&5 + echo $ECHO_N "checking for regcomp... $ECHO_C" >&6 + if test "${ac_cv_func_regcomp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19620 "configure" ++#line 19623 "configure" + #include "confdefs.h" + #define regcomp autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -19648,16 +19651,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19651: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19654: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19654: \$? = $ac_status" >&5 ++ echo "$as_me:19657: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19657: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19660: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19660: \$? = $ac_status" >&5 ++ echo "$as_me:19663: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_regcomp=yes + else +@@ -19667,7 +19670,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:19670: result: $ac_cv_func_regcomp" >&5 ++echo "$as_me:19673: result: $ac_cv_func_regcomp" >&5 + echo "${ECHO_T}$ac_cv_func_regcomp" >&6 + if test "$ac_cv_func_regcomp" = yes; then + cf_regex_func=regcomp +@@ -19676,7 +19679,7 @@ + for cf_regex_lib in $cf_regex_libs + do + as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh` +-echo "$as_me:19679: checking for regcomp in -l$cf_regex_lib" >&5 ++echo "$as_me:19682: checking for regcomp in -l$cf_regex_lib" >&5 + echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Lib+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19684,7 +19687,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-l$cf_regex_lib $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19687 "configure" ++#line 19690 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19703,16 +19706,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19706: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19709: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19709: \$? = $ac_status" >&5 ++ echo "$as_me:19712: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19712: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19715: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19715: \$? = $ac_status" >&5 ++ echo "$as_me:19718: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_Lib=yes" + else +@@ -19723,7 +19726,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19726: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 ++echo "$as_me:19729: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then + +@@ -19755,13 +19758,13 @@ + esac + + if test "$cf_regex_func" = no ; then +- echo "$as_me:19758: checking for compile" >&5 ++ echo "$as_me:19761: checking for compile" >&5 + echo $ECHO_N "checking for compile... $ECHO_C" >&6 + if test "${ac_cv_func_compile+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19764 "configure" ++#line 19767 "configure" + #include "confdefs.h" + #define compile autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -19792,16 +19795,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19795: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19798: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19798: \$? = $ac_status" >&5 ++ echo "$as_me:19801: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19801: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19804: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19804: \$? = $ac_status" >&5 ++ echo "$as_me:19807: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_compile=yes + else +@@ -19811,13 +19814,13 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:19814: result: $ac_cv_func_compile" >&5 ++echo "$as_me:19817: result: $ac_cv_func_compile" >&5 + echo "${ECHO_T}$ac_cv_func_compile" >&6 + if test "$ac_cv_func_compile" = yes; then + cf_regex_func=compile + else + +- echo "$as_me:19820: checking for compile in -lgen" >&5 ++ echo "$as_me:19823: checking for compile in -lgen" >&5 + echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6 + if test "${ac_cv_lib_gen_compile+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19825,7 +19828,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgen $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19828 "configure" ++#line 19831 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19844,16 +19847,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19847: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19850: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19850: \$? = $ac_status" >&5 ++ echo "$as_me:19853: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19853: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19856: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19856: \$? = $ac_status" >&5 ++ echo "$as_me:19859: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gen_compile=yes + else +@@ -19864,7 +19867,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19867: result: $ac_cv_lib_gen_compile" >&5 ++echo "$as_me:19870: result: $ac_cv_lib_gen_compile" >&5 + echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6 + if test "$ac_cv_lib_gen_compile" = yes; then + +@@ -19892,11 +19895,11 @@ + fi + + if test "$cf_regex_func" = no ; then +- { echo "$as_me:19895: WARNING: cannot find regular expression library" >&5 ++ { echo "$as_me:19898: WARNING: cannot find regular expression library" >&5 + echo "$as_me: WARNING: cannot find regular expression library" >&2;} + fi + +-echo "$as_me:19899: checking for regular-expression headers" >&5 ++echo "$as_me:19902: checking for regular-expression headers" >&5 + echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6 + if test "${cf_cv_regex_hdrs+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19908,7 +19911,7 @@ + for cf_regex_hdr in regexp.h regexpr.h + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19911 "configure" ++#line 19914 "configure" + #include "confdefs.h" + #include <$cf_regex_hdr> + int +@@ -19925,16 +19928,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19928: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19931: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19931: \$? = $ac_status" >&5 ++ echo "$as_me:19934: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19934: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19937: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19937: \$? = $ac_status" >&5 ++ echo "$as_me:19940: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_regex_hdrs=$cf_regex_hdr +@@ -19951,7 +19954,7 @@ + for cf_regex_hdr in regex.h + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19954 "configure" ++#line 19957 "configure" + #include "confdefs.h" + #include + #include <$cf_regex_hdr> +@@ -19971,16 +19974,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19974: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19977: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19977: \$? = $ac_status" >&5 ++ echo "$as_me:19980: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19980: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19983: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19983: \$? = $ac_status" >&5 ++ echo "$as_me:19986: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_regex_hdrs=$cf_regex_hdr +@@ -19996,11 +19999,11 @@ + esac + + fi +-echo "$as_me:19999: result: $cf_cv_regex_hdrs" >&5 ++echo "$as_me:20002: result: $cf_cv_regex_hdrs" >&5 + echo "${ECHO_T}$cf_cv_regex_hdrs" >&6 + + case "$cf_cv_regex_hdrs" in +- (no) { echo "$as_me:20003: WARNING: no regular expression header found" >&5 ++ (no) { echo "$as_me:20006: WARNING: no regular expression header found" >&5 + echo "$as_me: WARNING: no regular expression header found" >&2;} ;; + (regex.h) + cat >>confdefs.h <<\EOF +@@ -20038,23 +20041,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:20041: checking for $ac_header" >&5 ++echo "$as_me:20044: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20047 "configure" ++#line 20050 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:20051: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:20054: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:20057: \$? = $ac_status" >&5 ++ echo "$as_me:20060: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -20073,7 +20076,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:20076: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:20079: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:20092: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20095 "configure" ++#line 20098 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:20099: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:20102: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:20105: \$? = $ac_status" >&5 ++ echo "$as_me:20108: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -20121,7 +20124,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:20124: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:20127: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:20137: checking for header declaring getopt variables" >&5 + echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6 + if test "${cf_cv_getopt_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -20141,7 +20144,7 @@ + for cf_header in stdio.h stdlib.h unistd.h getopt.h + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20144 "configure" ++#line 20147 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -20154,16 +20157,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20157: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20160: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20160: \$? = $ac_status" >&5 ++ echo "$as_me:20163: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20163: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20166: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20166: \$? = $ac_status" >&5 ++ echo "$as_me:20169: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_getopt_header=$cf_header + break +@@ -20175,7 +20178,7 @@ + done + + fi +-echo "$as_me:20178: result: $cf_cv_getopt_header" >&5 ++echo "$as_me:20181: result: $cf_cv_getopt_header" >&5 + echo "${ECHO_T}$cf_cv_getopt_header" >&6 + if test "$cf_cv_getopt_header" != none ; then + +@@ -20192,14 +20195,14 @@ + + fi + +-echo "$as_me:20195: checking if external environ is declared" >&5 ++echo "$as_me:20198: checking if external environ is declared" >&5 + echo $ECHO_N "checking if external environ is declared... $ECHO_C" >&6 + if test "${cf_cv_dcl_environ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20202 "configure" ++#line 20205 "configure" + #include "confdefs.h" + + #ifdef HAVE_STDLIB_H +@@ -20215,16 +20218,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20218: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20221: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20221: \$? = $ac_status" >&5 ++ echo "$as_me:20224: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20224: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20227: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20227: \$? = $ac_status" >&5 ++ echo "$as_me:20230: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_dcl_environ=yes + else +@@ -20235,7 +20238,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:20238: result: $cf_cv_dcl_environ" >&5 ++echo "$as_me:20241: result: $cf_cv_dcl_environ" >&5 + echo "${ECHO_T}$cf_cv_dcl_environ" >&6 + + if test "$cf_cv_dcl_environ" = no ; then +@@ -20250,14 +20253,14 @@ + + # It's possible (for near-UNIX clones) that the data doesn't exist + +-echo "$as_me:20253: checking if external environ exists" >&5 ++echo "$as_me:20256: checking if external environ exists" >&5 + echo $ECHO_N "checking if external environ exists... $ECHO_C" >&6 + if test "${cf_cv_have_environ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20260 "configure" ++#line 20263 "configure" + #include "confdefs.h" + + #undef environ +@@ -20272,16 +20275,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:20275: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20278: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20278: \$? = $ac_status" >&5 ++ echo "$as_me:20281: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:20281: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20284: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20284: \$? = $ac_status" >&5 ++ echo "$as_me:20287: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have_environ=yes + else +@@ -20292,7 +20295,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + fi +-echo "$as_me:20295: result: $cf_cv_have_environ" >&5 ++echo "$as_me:20298: result: $cf_cv_have_environ" >&5 + echo "${ECHO_T}$cf_cv_have_environ" >&6 + + if test "$cf_cv_have_environ" = yes ; then +@@ -20305,13 +20308,13 @@ + + fi + +-echo "$as_me:20308: checking for getenv" >&5 ++echo "$as_me:20311: checking for getenv" >&5 + echo $ECHO_N "checking for getenv... $ECHO_C" >&6 + if test "${ac_cv_func_getenv+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20314 "configure" ++#line 20317 "configure" + #include "confdefs.h" + #define getenv autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -20342,16 +20345,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:20345: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20348: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20348: \$? = $ac_status" >&5 ++ echo "$as_me:20351: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:20351: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20354: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20354: \$? = $ac_status" >&5 ++ echo "$as_me:20357: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_getenv=yes + else +@@ -20361,19 +20364,19 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:20364: result: $ac_cv_func_getenv" >&5 ++echo "$as_me:20367: result: $ac_cv_func_getenv" >&5 + echo "${ECHO_T}$ac_cv_func_getenv" >&6 + + for ac_func in putenv setenv strdup + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:20370: checking for $ac_func" >&5 ++echo "$as_me:20373: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20376 "configure" ++#line 20379 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -20404,16 +20407,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:20407: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20410: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20410: \$? = $ac_status" >&5 ++ echo "$as_me:20413: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:20413: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20416: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20416: \$? = $ac_status" >&5 ++ echo "$as_me:20419: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -20423,7 +20426,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:20426: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:20429: result: `eval echo '${'"$as_ac_var"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 + if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:20439: checking if getenv returns consistent values" >&5 + echo $ECHO_N "checking if getenv returns consistent values... $ECHO_C" >&6 + if test "${cf_cv_consistent_getenv+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -20443,7 +20446,7 @@ + cf_cv_consistent_getenv=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20446 "configure" ++#line 20449 "configure" + #include "confdefs.h" + + #include +@@ -20552,15 +20555,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:20555: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20558: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20558: \$? = $ac_status" >&5 ++ echo "$as_me:20561: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:20560: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20563: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20563: \$? = $ac_status" >&5 ++ echo "$as_me:20566: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_consistent_getenv=yes + else +@@ -20573,7 +20576,7 @@ + fi + + fi +-echo "$as_me:20576: result: $cf_cv_consistent_getenv" >&5 ++echo "$as_me:20579: result: $cf_cv_consistent_getenv" >&5 + echo "${ECHO_T}$cf_cv_consistent_getenv" >&6 + + if test "x$cf_cv_consistent_getenv" = xno +@@ -20588,18 +20591,18 @@ + if test "x$cf_cv_consistent_getenv" = xno && \ + test "x$cf_with_trace" = xyes + then +- { echo "$as_me:20591: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5 ++ { echo "$as_me:20594: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5 + echo "$as_me: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&2;} + fi + +-echo "$as_me:20595: checking if sys/time.h works with sys/select.h" >&5 ++echo "$as_me:20598: checking if sys/time.h works with sys/select.h" >&5 + echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6 + if test "${cf_cv_sys_time_select+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20602 "configure" ++#line 20605 "configure" + #include "confdefs.h" + + #include +@@ -20619,16 +20622,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20622: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20625: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20625: \$? = $ac_status" >&5 ++ echo "$as_me:20628: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20628: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20631: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20631: \$? = $ac_status" >&5 ++ echo "$as_me:20634: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_sys_time_select=yes + else +@@ -20640,7 +20643,7 @@ + + fi + +-echo "$as_me:20643: result: $cf_cv_sys_time_select" >&5 ++echo "$as_me:20646: result: $cf_cv_sys_time_select" >&5 + echo "${ECHO_T}$cf_cv_sys_time_select" >&6 + test "$cf_cv_sys_time_select" = yes && + cat >>confdefs.h <<\EOF +@@ -20655,13 +20658,13 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_main_return="return" + +-echo "$as_me:20658: checking for an ANSI C-conforming const" >&5 ++echo "$as_me:20661: checking for an ANSI C-conforming const" >&5 + echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 + if test "${ac_cv_c_const+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20664 "configure" ++#line 20667 "configure" + #include "confdefs.h" + + int +@@ -20719,16 +20722,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20722: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20725: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20725: \$? = $ac_status" >&5 ++ echo "$as_me:20728: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20728: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20731: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20731: \$? = $ac_status" >&5 ++ echo "$as_me:20734: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_c_const=yes + else +@@ -20738,7 +20741,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:20741: result: $ac_cv_c_const" >&5 ++echo "$as_me:20744: result: $ac_cv_c_const" >&5 + echo "${ECHO_T}$ac_cv_c_const" >&6 + if test $ac_cv_c_const = no; then + +@@ -20748,7 +20751,7 @@ + + fi + +-echo "$as_me:20751: checking for inline" >&5 ++echo "$as_me:20754: checking for inline" >&5 + echo $ECHO_N "checking for inline... $ECHO_C" >&6 + if test "${ac_cv_c_inline+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -20756,7 +20759,7 @@ + ac_cv_c_inline=no + for ac_kw in inline __inline__ __inline; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20759 "configure" ++#line 20762 "configure" + #include "confdefs.h" + #ifndef __cplusplus + static $ac_kw int static_foo () {return 0; } +@@ -20765,16 +20768,16 @@ + + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20768: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20771: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20771: \$? = $ac_status" >&5 ++ echo "$as_me:20774: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20774: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20777: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20777: \$? = $ac_status" >&5 ++ echo "$as_me:20780: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_c_inline=$ac_kw; break + else +@@ -20785,7 +20788,7 @@ + done + + fi +-echo "$as_me:20788: result: $ac_cv_c_inline" >&5 ++echo "$as_me:20791: result: $ac_cv_c_inline" >&5 + echo "${ECHO_T}$ac_cv_c_inline" >&6 + case $ac_cv_c_inline in + inline | yes) ;; +@@ -20811,7 +20814,7 @@ + : + elif test "$GCC" = yes + then +- echo "$as_me:20814: checking if $CC supports options to tune inlining" >&5 ++ echo "$as_me:20817: checking if $CC supports options to tune inlining" >&5 + echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6 + if test "${cf_cv_gcc_inline+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -20820,7 +20823,7 @@ + cf_save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS --param max-inline-insns-single=1200" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20823 "configure" ++#line 20826 "configure" + #include "confdefs.h" + inline int foo(void) { return 1; } + int +@@ -20832,16 +20835,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20835: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20838: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20838: \$? = $ac_status" >&5 ++ echo "$as_me:20841: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20841: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20844: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20844: \$? = $ac_status" >&5 ++ echo "$as_me:20847: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gcc_inline=yes + else +@@ -20853,7 +20856,7 @@ + CFLAGS=$cf_save_CFLAGS + + fi +-echo "$as_me:20856: result: $cf_cv_gcc_inline" >&5 ++echo "$as_me:20859: result: $cf_cv_gcc_inline" >&5 + echo "${ECHO_T}$cf_cv_gcc_inline" >&6 + if test "$cf_cv_gcc_inline" = yes ; then + +@@ -20959,7 +20962,7 @@ + fi + fi + +-echo "$as_me:20962: checking for signal global datatype" >&5 ++echo "$as_me:20965: checking for signal global datatype" >&5 + echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6 + if test "${cf_cv_sig_atomic_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -20971,7 +20974,7 @@ + "int" + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20974 "configure" ++#line 20977 "configure" + #include "confdefs.h" + + #include +@@ -20995,16 +20998,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20998: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21001: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21001: \$? = $ac_status" >&5 ++ echo "$as_me:21004: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:21004: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21007: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21007: \$? = $ac_status" >&5 ++ echo "$as_me:21010: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_sig_atomic_t=$cf_type + else +@@ -21018,7 +21021,7 @@ + + fi + +-echo "$as_me:21021: result: $cf_cv_sig_atomic_t" >&5 ++echo "$as_me:21024: result: $cf_cv_sig_atomic_t" >&5 + echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6 + test "$cf_cv_sig_atomic_t" != no && + cat >>confdefs.h <&5 ++echo "$as_me:21033: checking for type of chtype" >&5 + echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 + if test "${cf_cv_typeof_chtype+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -21037,7 +21040,7 @@ + cf_cv_typeof_chtype=long + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21040 "configure" ++#line 21043 "configure" + #include "confdefs.h" + + #define WANT_BITS 31 +@@ -21072,15 +21075,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:21075: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21078: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21078: \$? = $ac_status" >&5 ++ echo "$as_me:21081: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:21080: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21083: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21083: \$? = $ac_status" >&5 ++ echo "$as_me:21086: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_typeof_chtype=`cat cf_test.out` + else +@@ -21095,7 +21098,7 @@ + + fi + +-echo "$as_me:21098: result: $cf_cv_typeof_chtype" >&5 ++echo "$as_me:21101: result: $cf_cv_typeof_chtype" >&5 + echo "${ECHO_T}$cf_cv_typeof_chtype" >&6 + + cat >>confdefs.h <&5 ++echo "$as_me:21113: checking if unsigned literals are legal" >&5 + echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6 + if test "${cf_cv_unsigned_literals+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21117 "configure" ++#line 21120 "configure" + #include "confdefs.h" + + int +@@ -21126,16 +21129,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:21129: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21132: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21132: \$? = $ac_status" >&5 ++ echo "$as_me:21135: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:21135: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21138: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21138: \$? = $ac_status" >&5 ++ echo "$as_me:21141: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_unsigned_literals=yes + else +@@ -21147,7 +21150,7 @@ + + fi + +-echo "$as_me:21150: result: $cf_cv_unsigned_literals" >&5 ++echo "$as_me:21153: result: $cf_cv_unsigned_literals" >&5 + echo "${ECHO_T}$cf_cv_unsigned_literals" >&6 + + cf_cv_1UL="1" +@@ -21163,14 +21166,14 @@ + + ### Checks for external-data + +-echo "$as_me:21166: checking if external errno is declared" >&5 ++echo "$as_me:21169: checking if external errno is declared" >&5 + echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6 + if test "${cf_cv_dcl_errno+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21173 "configure" ++#line 21176 "configure" + #include "confdefs.h" + + #ifdef HAVE_STDLIB_H +@@ -21188,16 +21191,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:21191: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21194: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21194: \$? = $ac_status" >&5 ++ echo "$as_me:21197: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:21197: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21200: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21200: \$? = $ac_status" >&5 ++ echo "$as_me:21203: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_dcl_errno=yes + else +@@ -21208,7 +21211,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:21211: result: $cf_cv_dcl_errno" >&5 ++echo "$as_me:21214: result: $cf_cv_dcl_errno" >&5 + echo "${ECHO_T}$cf_cv_dcl_errno" >&6 + + if test "$cf_cv_dcl_errno" = no ; then +@@ -21223,14 +21226,14 @@ + + # It's possible (for near-UNIX clones) that the data doesn't exist + +-echo "$as_me:21226: checking if external errno exists" >&5 ++echo "$as_me:21229: checking if external errno exists" >&5 + echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6 + if test "${cf_cv_have_errno+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21233 "configure" ++#line 21236 "configure" + #include "confdefs.h" + + #undef errno +@@ -21245,16 +21248,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21248: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21251: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21251: \$? = $ac_status" >&5 ++ echo "$as_me:21254: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21254: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21257: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21257: \$? = $ac_status" >&5 ++ echo "$as_me:21260: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have_errno=yes + else +@@ -21265,7 +21268,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + fi +-echo "$as_me:21268: result: $cf_cv_have_errno" >&5 ++echo "$as_me:21271: result: $cf_cv_have_errno" >&5 + echo "${ECHO_T}$cf_cv_have_errno" >&6 + + if test "$cf_cv_have_errno" = yes ; then +@@ -21278,7 +21281,7 @@ + + fi + +-echo "$as_me:21281: checking if data-only library module links" >&5 ++echo "$as_me:21284: checking if data-only library module links" >&5 + echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6 + if test "${cf_cv_link_dataonly+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -21286,20 +21289,20 @@ + + rm -f conftest.a + cat >conftest.$ac_ext <&5 ++ if { (eval echo "$as_me:21295: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21295: \$? = $ac_status" >&5 ++ echo "$as_me:21298: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then + mv conftest.o data.o && \ + ( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null + fi + rm -f conftest.$ac_ext data.o + cat >conftest.$ac_ext <&5 ++ if { (eval echo "$as_me:21318: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21318: \$? = $ac_status" >&5 ++ echo "$as_me:21321: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then + mv conftest.o func.o && \ + ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null +@@ -21328,7 +21331,7 @@ + cf_cv_link_dataonly=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21331 "configure" ++#line 21334 "configure" + #include "confdefs.h" + + int main(void) +@@ -21339,15 +21342,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:21342: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21345: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21345: \$? = $ac_status" >&5 ++ echo "$as_me:21348: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:21347: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21350: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21350: \$? = $ac_status" >&5 ++ echo "$as_me:21353: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_link_dataonly=yes + else +@@ -21362,7 +21365,7 @@ + + fi + +-echo "$as_me:21365: result: $cf_cv_link_dataonly" >&5 ++echo "$as_me:21368: result: $cf_cv_link_dataonly" >&5 + echo "${ECHO_T}$cf_cv_link_dataonly" >&6 + + if test "$cf_cv_link_dataonly" = no ; then +@@ -21406,13 +21409,13 @@ + + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:21409: checking for $ac_func" >&5 ++echo "$as_me:21412: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21415 "configure" ++#line 21418 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -21443,16 +21446,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21446: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21449: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21449: \$? = $ac_status" >&5 ++ echo "$as_me:21452: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21452: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21455: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21455: \$? = $ac_status" >&5 ++ echo "$as_me:21458: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -21462,7 +21465,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:21465: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:21468: result: `eval echo '${'"$as_ac_var"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 + if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then + cat >>confdefs.h <&5 ++ { { echo "$as_me:21480: error: getopt is required for building programs" >&5 + echo "$as_me: error: getopt is required for building programs" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -21483,7 +21486,7 @@ + then + if test "x$ac_cv_func_vsnprintf" = xyes + then +- { echo "$as_me:21486: WARNING: will use vsnprintf instead of safe-sprintf option" >&5 ++ { echo "$as_me:21489: WARNING: will use vsnprintf instead of safe-sprintf option" >&5 + echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;} + else + +@@ -21496,14 +21499,14 @@ + + if test "x$with_getcap" = "xyes" ; then + +-echo "$as_me:21499: checking for terminal-capability database functions" >&5 ++echo "$as_me:21502: checking for terminal-capability database functions" >&5 + echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6 + if test "${cf_cv_cgetent+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21506 "configure" ++#line 21509 "configure" + #include "confdefs.h" + + #include +@@ -21523,16 +21526,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21526: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21529: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21529: \$? = $ac_status" >&5 ++ echo "$as_me:21532: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21532: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21535: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21535: \$? = $ac_status" >&5 ++ echo "$as_me:21538: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_cgetent=yes + else +@@ -21543,7 +21546,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + fi +-echo "$as_me:21546: result: $cf_cv_cgetent" >&5 ++echo "$as_me:21549: result: $cf_cv_cgetent" >&5 + echo "${ECHO_T}$cf_cv_cgetent" >&6 + + if test "$cf_cv_cgetent" = yes +@@ -21553,14 +21556,14 @@ + #define HAVE_BSD_CGETENT 1 + EOF + +-echo "$as_me:21556: checking if cgetent uses const parameter" >&5 ++echo "$as_me:21559: checking if cgetent uses const parameter" >&5 + echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6 + if test "${cf_cv_cgetent_const+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21563 "configure" ++#line 21566 "configure" + #include "confdefs.h" + + #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers" +@@ -21583,16 +21586,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21586: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21589: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21589: \$? = $ac_status" >&5 ++ echo "$as_me:21592: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21592: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21595: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21595: \$? = $ac_status" >&5 ++ echo "$as_me:21598: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_cgetent_const=yes + else +@@ -21603,7 +21606,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + fi +-echo "$as_me:21606: result: $cf_cv_cgetent_const" >&5 ++echo "$as_me:21609: result: $cf_cv_cgetent_const" >&5 + echo "${ECHO_T}$cf_cv_cgetent_const" >&6 + if test "$cf_cv_cgetent_const" = yes + then +@@ -21617,14 +21620,14 @@ + + fi + +-echo "$as_me:21620: checking for isascii" >&5 ++echo "$as_me:21623: checking for isascii" >&5 + echo $ECHO_N "checking for isascii... $ECHO_C" >&6 + if test "${cf_cv_have_isascii+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21627 "configure" ++#line 21630 "configure" + #include "confdefs.h" + #include + int +@@ -21636,16 +21639,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21639: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21642: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21642: \$? = $ac_status" >&5 ++ echo "$as_me:21645: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21645: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21648: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21648: \$? = $ac_status" >&5 ++ echo "$as_me:21651: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have_isascii=yes + else +@@ -21656,7 +21659,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + fi +-echo "$as_me:21659: result: $cf_cv_have_isascii" >&5 ++echo "$as_me:21662: result: $cf_cv_have_isascii" >&5 + echo "${ECHO_T}$cf_cv_have_isascii" >&6 + test "$cf_cv_have_isascii" = yes && + cat >>confdefs.h <<\EOF +@@ -21664,10 +21667,10 @@ + EOF + + if test "$ac_cv_func_sigaction" = yes; then +-echo "$as_me:21667: checking whether sigaction needs _POSIX_SOURCE" >&5 ++echo "$as_me:21670: checking whether sigaction needs _POSIX_SOURCE" >&5 + echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21670 "configure" ++#line 21673 "configure" + #include "confdefs.h" + + #include +@@ -21681,16 +21684,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:21684: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21687: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21687: \$? = $ac_status" >&5 ++ echo "$as_me:21690: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:21690: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21693: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21693: \$? = $ac_status" >&5 ++ echo "$as_me:21696: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + sigact_bad=no + else +@@ -21698,7 +21701,7 @@ + cat "conftest.$ac_ext" >&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21701 "configure" ++#line 21704 "configure" + #include "confdefs.h" + + #define _POSIX_SOURCE +@@ -21713,16 +21716,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:21716: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21719: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21719: \$? = $ac_status" >&5 ++ echo "$as_me:21722: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:21722: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21725: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21725: \$? = $ac_status" >&5 ++ echo "$as_me:21728: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + sigact_bad=yes + +@@ -21738,11 +21741,11 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +-echo "$as_me:21741: result: $sigact_bad" >&5 ++echo "$as_me:21744: result: $sigact_bad" >&5 + echo "${ECHO_T}$sigact_bad" >&6 + fi + +-echo "$as_me:21745: checking if nanosleep really works" >&5 ++echo "$as_me:21748: checking if nanosleep really works" >&5 + echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6 + if test "${cf_cv_func_nanosleep+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -21752,7 +21755,7 @@ + cf_cv_func_nanosleep=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21755 "configure" ++#line 21758 "configure" + #include "confdefs.h" + + #include +@@ -21777,15 +21780,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:21780: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21783: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21783: \$? = $ac_status" >&5 ++ echo "$as_me:21786: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:21785: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21788: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21788: \$? = $ac_status" >&5 ++ echo "$as_me:21791: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_nanosleep=yes + else +@@ -21797,7 +21800,7 @@ + rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" + fi + fi +-echo "$as_me:21800: result: $cf_cv_func_nanosleep" >&5 ++echo "$as_me:21803: result: $cf_cv_func_nanosleep" >&5 + echo "${ECHO_T}$cf_cv_func_nanosleep" >&6 + + test "$cf_cv_func_nanosleep" = "yes" && +@@ -21814,23 +21817,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:21817: checking for $ac_header" >&5 ++echo "$as_me:21820: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21823 "configure" ++#line 21826 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:21827: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:21830: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:21833: \$? = $ac_status" >&5 ++ echo "$as_me:21836: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -21849,7 +21852,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:21852: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:21855: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++ echo "$as_me:21872: checking whether termios.h needs _POSIX_SOURCE" >&5 + echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21872 "configure" ++#line 21875 "configure" + #include "confdefs.h" + #include + int +@@ -21881,16 +21884,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:21884: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21887: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21887: \$? = $ac_status" >&5 ++ echo "$as_me:21890: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:21890: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21893: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21893: \$? = $ac_status" >&5 ++ echo "$as_me:21896: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + termios_bad=no + else +@@ -21898,7 +21901,7 @@ + cat "conftest.$ac_ext" >&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21901 "configure" ++#line 21904 "configure" + #include "confdefs.h" + + #define _POSIX_SOURCE +@@ -21912,16 +21915,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:21915: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21918: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21918: \$? = $ac_status" >&5 ++ echo "$as_me:21921: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:21921: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21924: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21924: \$? = $ac_status" >&5 ++ echo "$as_me:21927: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + termios_bad=unknown + else +@@ -21937,19 +21940,19 @@ + + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +- echo "$as_me:21940: result: $termios_bad" >&5 ++ echo "$as_me:21943: result: $termios_bad" >&5 + echo "${ECHO_T}$termios_bad" >&6 + fi + fi + +-echo "$as_me:21945: checking for tcgetattr" >&5 ++echo "$as_me:21948: checking for tcgetattr" >&5 + echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6 + if test "${cf_cv_have_tcgetattr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21952 "configure" ++#line 21955 "configure" + #include "confdefs.h" + + #include +@@ -21977,16 +21980,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21980: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21983: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21983: \$? = $ac_status" >&5 ++ echo "$as_me:21986: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21986: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21989: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21989: \$? = $ac_status" >&5 ++ echo "$as_me:21992: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have_tcgetattr=yes + else +@@ -21996,21 +21999,21 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:21999: result: $cf_cv_have_tcgetattr" >&5 ++echo "$as_me:22002: result: $cf_cv_have_tcgetattr" >&5 + echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6 + test "$cf_cv_have_tcgetattr" = yes && + cat >>confdefs.h <<\EOF + #define HAVE_TCGETATTR 1 + EOF + +-echo "$as_me:22006: checking for vsscanf function or workaround" >&5 ++echo "$as_me:22009: checking for vsscanf function or workaround" >&5 + echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6 + if test "${cf_cv_func_vsscanf+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22013 "configure" ++#line 22016 "configure" + #include "confdefs.h" + + #include +@@ -22026,16 +22029,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22029: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22032: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22032: \$? = $ac_status" >&5 ++ echo "$as_me:22035: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22035: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22038: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22038: \$? = $ac_status" >&5 ++ echo "$as_me:22041: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_vsscanf=vsscanf + else +@@ -22043,7 +22046,7 @@ + cat "conftest.$ac_ext" >&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22046 "configure" ++#line 22049 "configure" + #include "confdefs.h" + + #include +@@ -22065,16 +22068,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22068: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22071: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22071: \$? = $ac_status" >&5 ++ echo "$as_me:22074: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22074: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22077: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22077: \$? = $ac_status" >&5 ++ echo "$as_me:22080: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_vsscanf=vfscanf + else +@@ -22082,7 +22085,7 @@ + cat "conftest.$ac_ext" >&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22085 "configure" ++#line 22088 "configure" + #include "confdefs.h" + + #include +@@ -22104,16 +22107,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22107: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22110: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22110: \$? = $ac_status" >&5 ++ echo "$as_me:22113: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22113: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22116: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22116: \$? = $ac_status" >&5 ++ echo "$as_me:22119: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_vsscanf=_doscan + else +@@ -22128,7 +22131,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:22131: result: $cf_cv_func_vsscanf" >&5 ++echo "$as_me:22134: result: $cf_cv_func_vsscanf" >&5 + echo "${ECHO_T}$cf_cv_func_vsscanf" >&6 + + case "$cf_cv_func_vsscanf" in +@@ -22154,23 +22157,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:22157: checking for $ac_header" >&5 ++echo "$as_me:22160: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22163 "configure" ++#line 22166 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:22167: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:22170: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:22173: \$? = $ac_status" >&5 ++ echo "$as_me:22176: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -22189,7 +22192,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:22192: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:22195: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:22205: checking for working mkstemp" >&5 + echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 + if test "${cf_cv_func_mkstemp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -22210,7 +22213,7 @@ + cf_cv_func_mkstemp=maybe + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22213 "configure" ++#line 22216 "configure" + #include "confdefs.h" + + #include +@@ -22251,15 +22254,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:22254: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22257: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22257: \$? = $ac_status" >&5 ++ echo "$as_me:22260: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:22259: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22262: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22262: \$? = $ac_status" >&5 ++ echo "$as_me:22265: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_mkstemp=yes + +@@ -22274,16 +22277,16 @@ + fi + + fi +-echo "$as_me:22277: result: $cf_cv_func_mkstemp" >&5 ++echo "$as_me:22280: result: $cf_cv_func_mkstemp" >&5 + echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 + if test "x$cf_cv_func_mkstemp" = xmaybe ; then +- echo "$as_me:22280: checking for mkstemp" >&5 ++ echo "$as_me:22283: checking for mkstemp" >&5 + echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 + if test "${ac_cv_func_mkstemp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22286 "configure" ++#line 22289 "configure" + #include "confdefs.h" + #define mkstemp autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -22314,16 +22317,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22317: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22320: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22320: \$? = $ac_status" >&5 ++ echo "$as_me:22323: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22323: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22326: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22326: \$? = $ac_status" >&5 ++ echo "$as_me:22329: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_mkstemp=yes + else +@@ -22333,7 +22336,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:22336: result: $ac_cv_func_mkstemp" >&5 ++echo "$as_me:22339: result: $ac_cv_func_mkstemp" >&5 + echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 + + fi +@@ -22354,21 +22357,21 @@ + fi + + if test "x$cross_compiling" = xyes ; then +- { echo "$as_me:22357: WARNING: cross compiling: assume setvbuf params not reversed" >&5 ++ { echo "$as_me:22360: WARNING: cross compiling: assume setvbuf params not reversed" >&5 + echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;} + else +- echo "$as_me:22360: checking whether setvbuf arguments are reversed" >&5 ++ echo "$as_me:22363: checking whether setvbuf arguments are reversed" >&5 + echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6 + if test "${ac_cv_func_setvbuf_reversed+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:22366: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:22369: error: cannot run test program while cross compiling" >&5 + echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22371 "configure" ++#line 22374 "configure" + #include "confdefs.h" + #include + /* If setvbuf has the reversed format, exit 0. */ +@@ -22385,15 +22388,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:22388: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22391: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22391: \$? = $ac_status" >&5 ++ echo "$as_me:22394: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:22393: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22396: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22396: \$? = $ac_status" >&5 ++ echo "$as_me:22399: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_setvbuf_reversed=yes + else +@@ -22406,7 +22409,7 @@ + fi + rm -f core ./core.* ./*.core + fi +-echo "$as_me:22409: result: $ac_cv_func_setvbuf_reversed" >&5 ++echo "$as_me:22412: result: $ac_cv_func_setvbuf_reversed" >&5 + echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6 + if test $ac_cv_func_setvbuf_reversed = yes; then + +@@ -22417,13 +22420,13 @@ + fi + + fi +-echo "$as_me:22420: checking for intptr_t" >&5 ++echo "$as_me:22423: checking for intptr_t" >&5 + echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6 + if test "${ac_cv_type_intptr_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22426 "configure" ++#line 22429 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -22438,16 +22441,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:22441: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:22444: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:22444: \$? = $ac_status" >&5 ++ echo "$as_me:22447: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:22447: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22450: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22450: \$? = $ac_status" >&5 ++ echo "$as_me:22453: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_intptr_t=yes + else +@@ -22457,7 +22460,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:22460: result: $ac_cv_type_intptr_t" >&5 ++echo "$as_me:22463: result: $ac_cv_type_intptr_t" >&5 + echo "${ECHO_T}$ac_cv_type_intptr_t" >&6 + if test "$ac_cv_type_intptr_t" = yes; then + : +@@ -22469,13 +22472,13 @@ + + fi + +-echo "$as_me:22472: checking for ssize_t" >&5 ++echo "$as_me:22475: checking for ssize_t" >&5 + echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6 + if test "${ac_cv_type_ssize_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22478 "configure" ++#line 22481 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -22490,16 +22493,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:22493: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:22496: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:22496: \$? = $ac_status" >&5 ++ echo "$as_me:22499: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:22499: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22502: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22502: \$? = $ac_status" >&5 ++ echo "$as_me:22505: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_ssize_t=yes + else +@@ -22509,7 +22512,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:22512: result: $ac_cv_type_ssize_t" >&5 ++echo "$as_me:22515: result: $ac_cv_type_ssize_t" >&5 + echo "${ECHO_T}$ac_cv_type_ssize_t" >&6 + if test "$ac_cv_type_ssize_t" = yes; then + : +@@ -22521,14 +22524,14 @@ + + fi + +-echo "$as_me:22524: checking for type sigaction_t" >&5 ++echo "$as_me:22527: checking for type sigaction_t" >&5 + echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6 + if test "${cf_cv_type_sigaction+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22531 "configure" ++#line 22534 "configure" + #include "confdefs.h" + + #include +@@ -22541,16 +22544,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:22544: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:22547: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:22547: \$? = $ac_status" >&5 ++ echo "$as_me:22550: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:22550: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22553: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22553: \$? = $ac_status" >&5 ++ echo "$as_me:22556: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_type_sigaction=yes + else +@@ -22561,14 +22564,14 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi + +-echo "$as_me:22564: result: $cf_cv_type_sigaction" >&5 ++echo "$as_me:22567: result: $cf_cv_type_sigaction" >&5 + echo "${ECHO_T}$cf_cv_type_sigaction" >&6 + test "$cf_cv_type_sigaction" = yes && + cat >>confdefs.h <<\EOF + #define HAVE_TYPE_SIGACTION 1 + EOF + +-echo "$as_me:22571: checking declaration of size-change" >&5 ++echo "$as_me:22574: checking declaration of size-change" >&5 + echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6 + if test "${cf_cv_sizechange+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -22589,7 +22592,7 @@ + + fi + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22592 "configure" ++#line 22595 "configure" + #include "confdefs.h" + #include + #ifdef HAVE_TERMIOS_H +@@ -22639,16 +22642,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:22642: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:22645: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:22645: \$? = $ac_status" >&5 ++ echo "$as_me:22648: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:22648: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22651: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22651: \$? = $ac_status" >&5 ++ echo "$as_me:22654: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_sizechange=yes + else +@@ -22667,7 +22670,7 @@ + done + + fi +-echo "$as_me:22670: result: $cf_cv_sizechange" >&5 ++echo "$as_me:22673: result: $cf_cv_sizechange" >&5 + echo "${ECHO_T}$cf_cv_sizechange" >&6 + if test "$cf_cv_sizechange" != no ; then + +@@ -22685,13 +22688,13 @@ + esac + fi + +-echo "$as_me:22688: checking for memmove" >&5 ++echo "$as_me:22691: checking for memmove" >&5 + echo $ECHO_N "checking for memmove... $ECHO_C" >&6 + if test "${ac_cv_func_memmove+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22694 "configure" ++#line 22697 "configure" + #include "confdefs.h" + #define memmove autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -22722,16 +22725,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22725: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22728: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22728: \$? = $ac_status" >&5 ++ echo "$as_me:22731: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22731: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22734: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22734: \$? = $ac_status" >&5 ++ echo "$as_me:22737: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_memmove=yes + else +@@ -22741,19 +22744,19 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:22744: result: $ac_cv_func_memmove" >&5 ++echo "$as_me:22747: result: $ac_cv_func_memmove" >&5 + echo "${ECHO_T}$ac_cv_func_memmove" >&6 + if test "$ac_cv_func_memmove" = yes; then + : + else + +-echo "$as_me:22750: checking for bcopy" >&5 ++echo "$as_me:22753: checking for bcopy" >&5 + echo $ECHO_N "checking for bcopy... $ECHO_C" >&6 + if test "${ac_cv_func_bcopy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22756 "configure" ++#line 22759 "configure" + #include "confdefs.h" + #define bcopy autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -22784,16 +22787,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22787: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22790: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22790: \$? = $ac_status" >&5 ++ echo "$as_me:22793: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22793: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22796: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22796: \$? = $ac_status" >&5 ++ echo "$as_me:22799: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_bcopy=yes + else +@@ -22803,11 +22806,11 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:22806: result: $ac_cv_func_bcopy" >&5 ++echo "$as_me:22809: result: $ac_cv_func_bcopy" >&5 + echo "${ECHO_T}$ac_cv_func_bcopy" >&6 + if test "$ac_cv_func_bcopy" = yes; then + +- echo "$as_me:22810: checking if bcopy does overlapping moves" >&5 ++ echo "$as_me:22813: checking if bcopy does overlapping moves" >&5 + echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6 + if test "${cf_cv_good_bcopy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -22817,7 +22820,7 @@ + cf_cv_good_bcopy=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22820 "configure" ++#line 22823 "configure" + #include "confdefs.h" + + int main(void) { +@@ -22831,15 +22834,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:22834: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22837: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22837: \$? = $ac_status" >&5 ++ echo "$as_me:22840: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:22839: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22842: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22842: \$? = $ac_status" >&5 ++ echo "$as_me:22845: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_good_bcopy=yes + else +@@ -22852,7 +22855,7 @@ + fi + + fi +-echo "$as_me:22855: result: $cf_cv_good_bcopy" >&5 ++echo "$as_me:22858: result: $cf_cv_good_bcopy" >&5 + echo "${ECHO_T}$cf_cv_good_bcopy" >&6 + + else +@@ -22879,13 +22882,13 @@ + for ac_func in posix_openpt + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:22882: checking for $ac_func" >&5 ++echo "$as_me:22885: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22888 "configure" ++#line 22891 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -22916,16 +22919,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22919: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22922: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22922: \$? = $ac_status" >&5 ++ echo "$as_me:22925: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22925: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22928: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22928: \$? = $ac_status" >&5 ++ echo "$as_me:22931: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -22935,7 +22938,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:22938: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:22941: result: `eval echo '${'"$as_ac_var"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 + if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:22951: checking if poll really works" >&5 + echo $ECHO_N "checking if poll really works... $ECHO_C" >&6 + if test "${cf_cv_working_poll+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -22955,7 +22958,7 @@ + cf_cv_working_poll=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22958 "configure" ++#line 22961 "configure" + #include "confdefs.h" + + #include +@@ -23007,15 +23010,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:23010: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23013: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23013: \$? = $ac_status" >&5 ++ echo "$as_me:23016: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:23015: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23018: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23018: \$? = $ac_status" >&5 ++ echo "$as_me:23021: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_working_poll=yes + else +@@ -23027,21 +23030,21 @@ + rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" + fi + fi +-echo "$as_me:23030: result: $cf_cv_working_poll" >&5 ++echo "$as_me:23033: result: $cf_cv_working_poll" >&5 + echo "${ECHO_T}$cf_cv_working_poll" >&6 + test "$cf_cv_working_poll" = "yes" && + cat >>confdefs.h <<\EOF + #define HAVE_WORKING_POLL 1 + EOF + +-echo "$as_me:23037: checking for va_copy" >&5 ++echo "$as_me:23040: checking for va_copy" >&5 + echo $ECHO_N "checking for va_copy... $ECHO_C" >&6 + if test "${cf_cv_have_va_copy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23044 "configure" ++#line 23047 "configure" + #include "confdefs.h" + + #include +@@ -23058,16 +23061,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23061: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23064: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23064: \$? = $ac_status" >&5 ++ echo "$as_me:23067: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23067: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23070: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23070: \$? = $ac_status" >&5 ++ echo "$as_me:23073: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have_va_copy=yes + else +@@ -23077,7 +23080,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:23080: result: $cf_cv_have_va_copy" >&5 ++echo "$as_me:23083: result: $cf_cv_have_va_copy" >&5 + echo "${ECHO_T}$cf_cv_have_va_copy" >&6 + + if test "$cf_cv_have_va_copy" = yes; +@@ -23089,14 +23092,14 @@ + + else # !cf_cv_have_va_copy + +-echo "$as_me:23092: checking for __va_copy" >&5 ++echo "$as_me:23095: checking for __va_copy" >&5 + echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6 + if test "${cf_cv_have___va_copy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23099 "configure" ++#line 23102 "configure" + #include "confdefs.h" + + #include +@@ -23113,16 +23116,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23116: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23119: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23119: \$? = $ac_status" >&5 ++ echo "$as_me:23122: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23122: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23125: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23125: \$? = $ac_status" >&5 ++ echo "$as_me:23128: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have___va_copy=yes + else +@@ -23132,7 +23135,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:23135: result: $cf_cv_have___va_copy" >&5 ++echo "$as_me:23138: result: $cf_cv_have___va_copy" >&5 + echo "${ECHO_T}$cf_cv_have___va_copy" >&6 + + if test "$cf_cv_have___va_copy" = yes +@@ -23144,14 +23147,14 @@ + + else # !cf_cv_have___va_copy + +-echo "$as_me:23147: checking for __builtin_va_copy" >&5 ++echo "$as_me:23150: checking for __builtin_va_copy" >&5 + echo $ECHO_N "checking for __builtin_va_copy... $ECHO_C" >&6 + if test "${cf_cv_have___builtin_va_copy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23154 "configure" ++#line 23157 "configure" + #include "confdefs.h" + + #include +@@ -23168,16 +23171,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23171: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23174: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23174: \$? = $ac_status" >&5 ++ echo "$as_me:23177: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23177: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23180: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23180: \$? = $ac_status" >&5 ++ echo "$as_me:23183: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have___builtin_va_copy=yes + else +@@ -23187,7 +23190,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:23190: result: $cf_cv_have___builtin_va_copy" >&5 ++echo "$as_me:23193: result: $cf_cv_have___builtin_va_copy" >&5 + echo "${ECHO_T}$cf_cv_have___builtin_va_copy" >&6 + + test "$cf_cv_have___builtin_va_copy" = yes && +@@ -23205,14 +23208,14 @@ + ;; + + (*) +- echo "$as_me:23208: checking if we can simply copy va_list" >&5 ++ echo "$as_me:23211: checking if we can simply copy va_list" >&5 + echo $ECHO_N "checking if we can simply copy va_list... $ECHO_C" >&6 + if test "${cf_cv_pointer_va_list+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23215 "configure" ++#line 23218 "configure" + #include "confdefs.h" + + #include +@@ -23229,16 +23232,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23232: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23235: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23235: \$? = $ac_status" >&5 ++ echo "$as_me:23238: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23238: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23241: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23241: \$? = $ac_status" >&5 ++ echo "$as_me:23244: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_pointer_va_list=yes + else +@@ -23248,19 +23251,19 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:23251: result: $cf_cv_pointer_va_list" >&5 ++echo "$as_me:23254: result: $cf_cv_pointer_va_list" >&5 + echo "${ECHO_T}$cf_cv_pointer_va_list" >&6 + + if test "$cf_cv_pointer_va_list" = no + then +- echo "$as_me:23256: checking if we can copy va_list indirectly" >&5 ++ echo "$as_me:23259: checking if we can copy va_list indirectly" >&5 + echo $ECHO_N "checking if we can copy va_list indirectly... $ECHO_C" >&6 + if test "${cf_cv_array_va_list+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23263 "configure" ++#line 23266 "configure" + #include "confdefs.h" + + #include +@@ -23277,16 +23280,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23280: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23283: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23283: \$? = $ac_status" >&5 ++ echo "$as_me:23286: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23286: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23289: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23289: \$? = $ac_status" >&5 ++ echo "$as_me:23292: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_array_va_list=yes + else +@@ -23296,7 +23299,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:23299: result: $cf_cv_array_va_list" >&5 ++echo "$as_me:23302: result: $cf_cv_array_va_list" >&5 + echo "${ECHO_T}$cf_cv_array_va_list" >&6 + test "$cf_cv_array_va_list" = yes && + cat >>confdefs.h <<\EOF +@@ -23307,13 +23310,13 @@ + ;; + esac + +-echo "$as_me:23310: checking for pid_t" >&5 ++echo "$as_me:23313: checking for pid_t" >&5 + echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 + if test "${ac_cv_type_pid_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23316 "configure" ++#line 23319 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -23328,16 +23331,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:23331: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:23334: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:23334: \$? = $ac_status" >&5 ++ echo "$as_me:23337: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:23337: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23340: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23340: \$? = $ac_status" >&5 ++ echo "$as_me:23343: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_pid_t=yes + else +@@ -23347,7 +23350,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:23350: result: $ac_cv_type_pid_t" >&5 ++echo "$as_me:23353: result: $ac_cv_type_pid_t" >&5 + echo "${ECHO_T}$ac_cv_type_pid_t" >&6 + if test "$ac_cv_type_pid_t" = yes; then + : +@@ -23362,23 +23365,23 @@ + for ac_header in unistd.h vfork.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:23365: checking for $ac_header" >&5 ++echo "$as_me:23368: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23371 "configure" ++#line 23374 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:23375: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:23378: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:23381: \$? = $ac_status" >&5 ++ echo "$as_me:23384: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -23397,7 +23400,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:23400: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:23403: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:23416: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23419 "configure" ++#line 23422 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -23447,16 +23450,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23450: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23453: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23453: \$? = $ac_status" >&5 ++ echo "$as_me:23456: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23456: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23459: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23459: \$? = $ac_status" >&5 ++ echo "$as_me:23462: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -23466,7 +23469,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:23469: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:23472: result: `eval echo '${'"$as_ac_var"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 + if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then + cat >>confdefs.h <&5 ++ echo "$as_me:23484: checking for working fork" >&5 + echo $ECHO_N "checking for working fork... $ECHO_C" >&6 + if test "${ac_cv_func_fork_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -23501,15 +23504,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:23504: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23507: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23507: \$? = $ac_status" >&5 ++ echo "$as_me:23510: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:23509: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23512: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23512: \$? = $ac_status" >&5 ++ echo "$as_me:23515: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_fork_works=yes + else +@@ -23521,7 +23524,7 @@ + rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" + fi + fi +-echo "$as_me:23524: result: $ac_cv_func_fork_works" >&5 ++echo "$as_me:23527: result: $ac_cv_func_fork_works" >&5 + echo "${ECHO_T}$ac_cv_func_fork_works" >&6 + + fi +@@ -23535,12 +23538,12 @@ + ac_cv_func_fork_works=yes + ;; + esac +- { echo "$as_me:23538: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 ++ { echo "$as_me:23541: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 + echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;} + fi + ac_cv_func_vfork_works=$ac_cv_func_vfork + if test "x$ac_cv_func_vfork" = xyes; then +- echo "$as_me:23543: checking for working vfork" >&5 ++ echo "$as_me:23546: checking for working vfork" >&5 + echo $ECHO_N "checking for working vfork... $ECHO_C" >&6 + if test "${ac_cv_func_vfork_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -23549,7 +23552,7 @@ + ac_cv_func_vfork_works=cross + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23552 "configure" ++#line 23555 "configure" + #include "confdefs.h" + /* Thanks to Paul Eggert for this test. */ + #include +@@ -23646,15 +23649,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:23649: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23652: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23652: \$? = $ac_status" >&5 ++ echo "$as_me:23655: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:23654: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23657: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23657: \$? = $ac_status" >&5 ++ echo "$as_me:23660: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_vfork_works=yes + else +@@ -23666,13 +23669,13 @@ + rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" + fi + fi +-echo "$as_me:23669: result: $ac_cv_func_vfork_works" >&5 ++echo "$as_me:23672: result: $ac_cv_func_vfork_works" >&5 + echo "${ECHO_T}$ac_cv_func_vfork_works" >&6 + + fi; + if test "x$ac_cv_func_fork_works" = xcross; then + ac_cv_func_vfork_works=ac_cv_func_vfork +- { echo "$as_me:23675: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 ++ { echo "$as_me:23678: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 + echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;} + fi + +@@ -23697,7 +23700,7 @@ + + fi + +-echo "$as_me:23700: checking if fopen accepts explicit binary mode" >&5 ++echo "$as_me:23703: checking if fopen accepts explicit binary mode" >&5 + echo $ECHO_N "checking if fopen accepts explicit binary mode... $ECHO_C" >&6 + if test "${cf_cv_fopen_bin_r+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -23707,7 +23710,7 @@ + cf_cv_fopen_bin_r=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23710 "configure" ++#line 23713 "configure" + #include "confdefs.h" + + #include +@@ -23740,15 +23743,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:23743: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23746: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23746: \$? = $ac_status" >&5 ++ echo "$as_me:23749: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:23748: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23751: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23751: \$? = $ac_status" >&5 ++ echo "$as_me:23754: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_fopen_bin_r=yes + else +@@ -23761,7 +23764,7 @@ + fi + + fi +-echo "$as_me:23764: result: $cf_cv_fopen_bin_r" >&5 ++echo "$as_me:23767: result: $cf_cv_fopen_bin_r" >&5 + echo "${ECHO_T}$cf_cv_fopen_bin_r" >&6 + test "x$cf_cv_fopen_bin_r" != xno && + cat >>confdefs.h <<\EOF +@@ -23770,7 +23773,7 @@ + + # special check for test/ditto.c + +-echo "$as_me:23773: checking for openpty in -lutil" >&5 ++echo "$as_me:23776: checking for openpty in -lutil" >&5 + echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6 + if test "${ac_cv_lib_util_openpty+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -23778,7 +23781,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lutil $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23781 "configure" ++#line 23784 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -23797,16 +23800,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23800: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23803: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23803: \$? = $ac_status" >&5 ++ echo "$as_me:23806: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23806: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23809: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23809: \$? = $ac_status" >&5 ++ echo "$as_me:23812: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_util_openpty=yes + else +@@ -23817,7 +23820,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:23820: result: $ac_cv_lib_util_openpty" >&5 ++echo "$as_me:23823: result: $ac_cv_lib_util_openpty" >&5 + echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6 + if test "$ac_cv_lib_util_openpty" = yes; then + cf_cv_lib_util=yes +@@ -23825,7 +23828,7 @@ + cf_cv_lib_util=no + fi + +-echo "$as_me:23828: checking for openpty header" >&5 ++echo "$as_me:23831: checking for openpty header" >&5 + echo $ECHO_N "checking for openpty header... $ECHO_C" >&6 + if test "${cf_cv_func_openpty+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -23852,7 +23855,7 @@ + for cf_header in pty.h libutil.h util.h + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23855 "configure" ++#line 23858 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -23869,16 +23872,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23872: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23875: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23875: \$? = $ac_status" >&5 ++ echo "$as_me:23878: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23878: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23881: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23881: \$? = $ac_status" >&5 ++ echo "$as_me:23884: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_func_openpty=$cf_header +@@ -23896,7 +23899,7 @@ + LIBS="$cf_save_LIBS" + + fi +-echo "$as_me:23899: result: $cf_cv_func_openpty" >&5 ++echo "$as_me:23902: result: $cf_cv_func_openpty" >&5 + echo "${ECHO_T}$cf_cv_func_openpty" >&6 + + if test "$cf_cv_func_openpty" != no ; then +@@ -23969,7 +23972,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23972 "configure" ++#line 23975 "configure" + #include "confdefs.h" + #include + int +@@ -23981,16 +23984,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:23984: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:23987: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:23987: \$? = $ac_status" >&5 ++ echo "$as_me:23990: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:23990: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23993: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23993: \$? = $ac_status" >&5 ++ echo "$as_me:23996: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -24007,7 +24010,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:24010: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:24013: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -24043,7 +24046,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me:-configure}:24046: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:24049: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -24054,7 +24057,7 @@ + else + case "$with_hashed_db" in + (./*|../*|/*) +- { echo "$as_me:24057: WARNING: no such directory $with_hashed_db" >&5 ++ { echo "$as_me:24060: WARNING: no such directory $with_hashed_db" >&5 + echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;} + ;; + (*) +@@ -24126,7 +24129,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24129 "configure" ++#line 24132 "configure" + #include "confdefs.h" + #include + int +@@ -24138,16 +24141,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:24141: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24144: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24144: \$? = $ac_status" >&5 ++ echo "$as_me:24147: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:24147: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24150: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24150: \$? = $ac_status" >&5 ++ echo "$as_me:24153: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -24164,7 +24167,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:24167: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:24170: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -24244,7 +24247,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me:-configure}:24247: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:24250: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -24261,23 +24264,23 @@ + fi + esac + +-echo "$as_me:24264: checking for db.h" >&5 ++echo "$as_me:24267: checking for db.h" >&5 + echo $ECHO_N "checking for db.h... $ECHO_C" >&6 + if test "${ac_cv_header_db_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24270 "configure" ++#line 24273 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:24274: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:24277: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:24280: \$? = $ac_status" >&5 ++ echo "$as_me:24283: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -24296,11 +24299,11 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:24299: result: $ac_cv_header_db_h" >&5 ++echo "$as_me:24302: result: $ac_cv_header_db_h" >&5 + echo "${ECHO_T}$ac_cv_header_db_h" >&6 + if test "$ac_cv_header_db_h" = yes; then + +-echo "$as_me:24303: checking for version of db" >&5 ++echo "$as_me:24306: checking for version of db" >&5 + echo $ECHO_N "checking for version of db... $ECHO_C" >&6 + if test "${cf_cv_hashed_db_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -24311,10 +24314,10 @@ + for cf_db_version in 1 2 3 4 5 6 + do + +-echo "${as_me:-configure}:24314: testing checking for db version $cf_db_version ..." 1>&5 ++echo "${as_me:-configure}:24317: testing checking for db version $cf_db_version ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24317 "configure" ++#line 24320 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -24344,16 +24347,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:24347: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24350: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24350: \$? = $ac_status" >&5 ++ echo "$as_me:24353: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:24353: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24356: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24356: \$? = $ac_status" >&5 ++ echo "$as_me:24359: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_hashed_db_version=$cf_db_version +@@ -24367,16 +24370,16 @@ + done + + fi +-echo "$as_me:24370: result: $cf_cv_hashed_db_version" >&5 ++echo "$as_me:24373: result: $cf_cv_hashed_db_version" >&5 + echo "${ECHO_T}$cf_cv_hashed_db_version" >&6 + + if test "$cf_cv_hashed_db_version" = unknown ; then +- { { echo "$as_me:24374: error: Cannot determine version of db" >&5 ++ { { echo "$as_me:24377: error: Cannot determine version of db" >&5 + echo "$as_me: error: Cannot determine version of db" >&2;} + { (exit 1); exit 1; }; } + else + +-echo "$as_me:24379: checking for db libraries" >&5 ++echo "$as_me:24382: checking for db libraries" >&5 + echo $ECHO_N "checking for db libraries... $ECHO_C" >&6 + if test "${cf_cv_hashed_db_libs+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -24406,10 +24409,10 @@ + + fi + +-echo "${as_me:-configure}:24409: testing checking for library $cf_db_libs ..." 1>&5 ++echo "${as_me:-configure}:24412: testing checking for library $cf_db_libs ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24412 "configure" ++#line 24415 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -24464,16 +24467,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:24467: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24470: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:24470: \$? = $ac_status" >&5 ++ echo "$as_me:24473: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:24473: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24476: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24476: \$? = $ac_status" >&5 ++ echo "$as_me:24479: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + if test -n "$cf_db_libs" ; then +@@ -24493,11 +24496,11 @@ + done + + fi +-echo "$as_me:24496: result: $cf_cv_hashed_db_libs" >&5 ++echo "$as_me:24499: result: $cf_cv_hashed_db_libs" >&5 + echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6 + + if test "$cf_cv_hashed_db_libs" = unknown ; then +- { { echo "$as_me:24500: error: Cannot determine library for db" >&5 ++ { { echo "$as_me:24503: error: Cannot determine library for db" >&5 + echo "$as_me: error: Cannot determine library for db" >&2;} + { (exit 1); exit 1; }; } + elif test "$cf_cv_hashed_db_libs" != default ; then +@@ -24523,7 +24526,7 @@ + + else + +- { { echo "$as_me:24526: error: Cannot find db.h" >&5 ++ { { echo "$as_me:24529: error: Cannot find db.h" >&5 + echo "$as_me: error: Cannot find db.h" >&2;} + { (exit 1); exit 1; }; } + +@@ -24538,7 +24541,7 @@ + + # Just in case, check if the C compiler has a bool type. + +-echo "$as_me:24541: checking if we should include stdbool.h" >&5 ++echo "$as_me:24544: checking if we should include stdbool.h" >&5 + echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 + + if test "${cf_cv_header_stdbool_h+set}" = set; then +@@ -24546,7 +24549,7 @@ + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24549 "configure" ++#line 24552 "configure" + #include "confdefs.h" + + int +@@ -24558,23 +24561,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:24561: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24564: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24564: \$? = $ac_status" >&5 ++ echo "$as_me:24567: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:24567: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24570: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24570: \$? = $ac_status" >&5 ++ echo "$as_me:24573: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_header_stdbool_h=0 + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24577 "configure" ++#line 24580 "configure" + #include "confdefs.h" + + #ifndef __BEOS__ +@@ -24590,16 +24593,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:24593: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24596: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24596: \$? = $ac_status" >&5 ++ echo "$as_me:24599: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:24599: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24602: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24602: \$? = $ac_status" >&5 ++ echo "$as_me:24605: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_header_stdbool_h=1 + else +@@ -24613,13 +24616,13 @@ + fi + + if test "$cf_cv_header_stdbool_h" = 1 +-then echo "$as_me:24616: result: yes" >&5 ++then echo "$as_me:24619: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +-else echo "$as_me:24618: result: no" >&5 ++else echo "$as_me:24621: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:24622: checking for builtin bool type" >&5 ++echo "$as_me:24625: checking for builtin bool type" >&5 + echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 + + if test "${cf_cv_cc_bool_type+set}" = set; then +@@ -24627,7 +24630,7 @@ + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24630 "configure" ++#line 24633 "configure" + #include "confdefs.h" + + #include +@@ -24642,16 +24645,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:24645: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24648: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24648: \$? = $ac_status" >&5 ++ echo "$as_me:24651: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:24651: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24654: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24654: \$? = $ac_status" >&5 ++ echo "$as_me:24657: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_cc_bool_type=1 + else +@@ -24664,9 +24667,9 @@ + fi + + if test "$cf_cv_cc_bool_type" = 1 +-then echo "$as_me:24667: result: yes" >&5 ++then echo "$as_me:24670: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +-else echo "$as_me:24669: result: no" >&5 ++else echo "$as_me:24672: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -24683,10 +24686,10 @@ + + cf_save="$LIBS" + LIBS="$LIBS $CXXLIBS" +- echo "$as_me:24686: checking if we already have C++ library" >&5 ++ echo "$as_me:24689: checking if we already have C++ library" >&5 + echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24689 "configure" ++#line 24692 "configure" + #include "confdefs.h" + + #include +@@ -24700,16 +24703,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:24703: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24706: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:24706: \$? = $ac_status" >&5 ++ echo "$as_me:24709: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:24709: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24712: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24712: \$? = $ac_status" >&5 ++ echo "$as_me:24715: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_have_libstdcpp=yes + else +@@ -24718,7 +24721,7 @@ + cf_have_libstdcpp=no + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +- echo "$as_me:24721: result: $cf_have_libstdcpp" >&5 ++ echo "$as_me:24724: result: $cf_have_libstdcpp" >&5 + echo "${ECHO_T}$cf_have_libstdcpp" >&6 + LIBS="$cf_save" + +@@ -24737,7 +24740,7 @@ + ;; + esac + +- echo "$as_me:24740: checking for library $cf_stdcpp_libname" >&5 ++ echo "$as_me:24743: checking for library $cf_stdcpp_libname" >&5 + echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6 + if test "${cf_cv_libstdcpp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -24763,7 +24766,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24766 "configure" ++#line 24769 "configure" + #include "confdefs.h" + + #include +@@ -24777,16 +24780,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:24780: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24783: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:24783: \$? = $ac_status" >&5 ++ echo "$as_me:24786: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:24786: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24789: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24789: \$? = $ac_status" >&5 ++ echo "$as_me:24792: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_libstdcpp=yes + else +@@ -24798,7 +24801,7 @@ + LIBS="$cf_save" + + fi +-echo "$as_me:24801: result: $cf_cv_libstdcpp" >&5 ++echo "$as_me:24804: result: $cf_cv_libstdcpp" >&5 + echo "${ECHO_T}$cf_cv_libstdcpp" >&6 + test "$cf_cv_libstdcpp" = yes && { + cf_add_libs="$CXXLIBS" +@@ -24820,7 +24823,7 @@ + fi + fi + +- echo "$as_me:24823: checking whether $CXX understands -c and -o together" >&5 ++ echo "$as_me:24826: checking whether $CXX understands -c and -o together" >&5 + echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6 + if test "${cf_cv_prog_CXX_c_o+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -24835,15 +24838,15 @@ + # We do the test twice because some compilers refuse to overwrite an + # existing .o file with -o, though they will create one. + ac_try='$CXX $CXXFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5' +-if { (eval echo "$as_me:24838: \"$ac_try\"") >&5 ++if { (eval echo "$as_me:24841: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24841: \$? = $ac_status" >&5 ++ echo "$as_me:24844: \$? = $ac_status" >&5 + (exit "$ac_status"); } && +- test -f conftest2.$ac_objext && { (eval echo "$as_me:24843: \"$ac_try\"") >&5 ++ test -f conftest2.$ac_objext && { (eval echo "$as_me:24846: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24846: \$? = $ac_status" >&5 ++ echo "$as_me:24849: \$? = $ac_status" >&5 + (exit "$ac_status"); }; + then + eval cf_cv_prog_CXX_c_o=yes +@@ -24854,10 +24857,10 @@ + + fi + if test "$cf_cv_prog_CXX_c_o" = yes; then +- echo "$as_me:24857: result: yes" >&5 ++ echo "$as_me:24860: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:24860: result: no" >&5 ++ echo "$as_me:24863: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -24877,7 +24880,7 @@ + ;; + esac + if test "$GXX" = yes; then +- echo "$as_me:24880: checking for lib$cf_gpp_libname" >&5 ++ echo "$as_me:24883: checking for lib$cf_gpp_libname" >&5 + echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6 + cf_save="$LIBS" + +@@ -24898,7 +24901,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24901 "configure" ++#line 24904 "configure" + #include "confdefs.h" + + #include <$cf_gpp_libname/builtin.h> +@@ -24912,16 +24915,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:24915: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24918: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:24918: \$? = $ac_status" >&5 ++ echo "$as_me:24921: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:24921: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24924: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24924: \$? = $ac_status" >&5 ++ echo "$as_me:24927: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cxx_library=yes + +@@ -24958,7 +24961,7 @@ + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24961 "configure" ++#line 24964 "configure" + #include "confdefs.h" + + #include +@@ -24972,16 +24975,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:24975: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24978: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:24978: \$? = $ac_status" >&5 ++ echo "$as_me:24981: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:24981: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24984: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24984: \$? = $ac_status" >&5 ++ echo "$as_me:24987: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cxx_library=yes + +@@ -25014,7 +25017,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS="$cf_save" +- echo "$as_me:25017: result: $cf_cxx_library" >&5 ++ echo "$as_me:25020: result: $cf_cxx_library" >&5 + echo "${ECHO_T}$cf_cxx_library" >&6 + fi + +@@ -25030,7 +25033,7 @@ + ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + ac_main_return="return" +-echo "$as_me:25033: checking how to run the C++ preprocessor" >&5 ++echo "$as_me:25036: checking how to run the C++ preprocessor" >&5 + echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 + if test -z "$CXXCPP"; then + if test "${ac_cv_prog_CXXCPP+set}" = set; then +@@ -25047,18 +25050,18 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25050 "configure" ++#line 25053 "configure" + #include "confdefs.h" + #include + Syntax error + _ACEOF +-if { (eval echo "$as_me:25055: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:25058: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:25061: \$? = $ac_status" >&5 ++ echo "$as_me:25064: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -25081,17 +25084,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25084 "configure" ++#line 25087 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:25088: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:25091: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:25094: \$? = $ac_status" >&5 ++ echo "$as_me:25097: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -25128,7 +25131,7 @@ + else + ac_cv_prog_CXXCPP=$CXXCPP + fi +-echo "$as_me:25131: result: $CXXCPP" >&5 ++echo "$as_me:25134: result: $CXXCPP" >&5 + echo "${ECHO_T}$CXXCPP" >&6 + ac_preproc_ok=false + for ac_cxx_preproc_warn_flag in '' yes +@@ -25138,18 +25141,18 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25141 "configure" ++#line 25144 "configure" + #include "confdefs.h" + #include + Syntax error + _ACEOF +-if { (eval echo "$as_me:25146: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:25149: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:25152: \$? = $ac_status" >&5 ++ echo "$as_me:25155: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -25172,17 +25175,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25175 "configure" ++#line 25178 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:25179: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:25182: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:25185: \$? = $ac_status" >&5 ++ echo "$as_me:25188: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -25210,7 +25213,7 @@ + if $ac_preproc_ok; then + : + else +- { { echo "$as_me:25213: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 ++ { { echo "$as_me:25216: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 + echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -25225,23 +25228,23 @@ + for ac_header in typeinfo + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:25228: checking for $ac_header" >&5 ++echo "$as_me:25231: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25234 "configure" ++#line 25237 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:25238: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:25241: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:25244: \$? = $ac_status" >&5 ++ echo "$as_me:25247: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -25260,7 +25263,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:25263: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:25266: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:25279: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25282 "configure" ++#line 25285 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:25286: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:25289: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:25292: \$? = $ac_status" >&5 ++ echo "$as_me:25295: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -25308,7 +25311,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:25311: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:25314: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++ echo "$as_me:25325: checking if iostream uses std-namespace" >&5 + echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25325 "configure" ++#line 25328 "configure" + #include "confdefs.h" + + #include +@@ -25339,16 +25342,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25342: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25345: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25345: \$? = $ac_status" >&5 ++ echo "$as_me:25348: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25348: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25351: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25351: \$? = $ac_status" >&5 ++ echo "$as_me:25354: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_iostream_namespace=yes + else +@@ -25357,7 +25360,7 @@ + cf_iostream_namespace=no + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +- echo "$as_me:25360: result: $cf_iostream_namespace" >&5 ++ echo "$as_me:25363: result: $cf_iostream_namespace" >&5 + echo "${ECHO_T}$cf_iostream_namespace" >&6 + if test "$cf_iostream_namespace" = yes ; then + +@@ -25368,7 +25371,7 @@ + fi + fi + +-echo "$as_me:25371: checking if we should include stdbool.h" >&5 ++echo "$as_me:25374: checking if we should include stdbool.h" >&5 + echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 + + if test "${cf_cv_header_stdbool_h+set}" = set; then +@@ -25376,7 +25379,7 @@ + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25379 "configure" ++#line 25382 "configure" + #include "confdefs.h" + + int +@@ -25388,23 +25391,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25391: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25394: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25394: \$? = $ac_status" >&5 ++ echo "$as_me:25397: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25397: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25400: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25400: \$? = $ac_status" >&5 ++ echo "$as_me:25403: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_header_stdbool_h=0 + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25407 "configure" ++#line 25410 "configure" + #include "confdefs.h" + + #ifndef __BEOS__ +@@ -25420,16 +25423,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25423: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25426: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25426: \$? = $ac_status" >&5 ++ echo "$as_me:25429: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25429: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25432: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25432: \$? = $ac_status" >&5 ++ echo "$as_me:25435: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_header_stdbool_h=1 + else +@@ -25443,13 +25446,13 @@ + fi + + if test "$cf_cv_header_stdbool_h" = 1 +-then echo "$as_me:25446: result: yes" >&5 ++then echo "$as_me:25449: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +-else echo "$as_me:25448: result: no" >&5 ++else echo "$as_me:25451: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:25452: checking for builtin bool type" >&5 ++echo "$as_me:25455: checking for builtin bool type" >&5 + echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 + + if test "${cf_cv_builtin_bool+set}" = set; then +@@ -25457,7 +25460,7 @@ + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25460 "configure" ++#line 25463 "configure" + #include "confdefs.h" + + #include +@@ -25472,16 +25475,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25475: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25478: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25478: \$? = $ac_status" >&5 ++ echo "$as_me:25481: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25481: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25484: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25484: \$? = $ac_status" >&5 ++ echo "$as_me:25487: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_builtin_bool=1 + else +@@ -25494,19 +25497,19 @@ + fi + + if test "$cf_cv_builtin_bool" = 1 +-then echo "$as_me:25497: result: yes" >&5 ++then echo "$as_me:25500: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +-else echo "$as_me:25499: result: no" >&5 ++else echo "$as_me:25502: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:25503: checking for bool" >&5 ++echo "$as_me:25506: checking for bool" >&5 + echo $ECHO_N "checking for bool... $ECHO_C" >&6 + if test "${ac_cv_type_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25509 "configure" ++#line 25512 "configure" + #include "confdefs.h" + + #include +@@ -25542,16 +25545,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25545: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25548: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25548: \$? = $ac_status" >&5 ++ echo "$as_me:25551: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25551: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25554: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25554: \$? = $ac_status" >&5 ++ echo "$as_me:25557: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_bool=yes + else +@@ -25561,10 +25564,10 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:25564: result: $ac_cv_type_bool" >&5 ++echo "$as_me:25567: result: $ac_cv_type_bool" >&5 + echo "${ECHO_T}$ac_cv_type_bool" >&6 + +-echo "$as_me:25567: checking size of bool" >&5 ++echo "$as_me:25570: checking size of bool" >&5 + echo $ECHO_N "checking size of bool... $ECHO_C" >&6 + if test "${ac_cv_sizeof_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -25573,7 +25576,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25576 "configure" ++#line 25579 "configure" + #include "confdefs.h" + + #include +@@ -25606,21 +25609,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25609: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25612: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25612: \$? = $ac_status" >&5 ++ echo "$as_me:25615: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25615: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25618: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25618: \$? = $ac_status" >&5 ++ echo "$as_me:25621: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25623 "configure" ++#line 25626 "configure" + #include "confdefs.h" + + #include +@@ -25653,16 +25656,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25656: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25659: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25659: \$? = $ac_status" >&5 ++ echo "$as_me:25662: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25662: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25665: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25665: \$? = $ac_status" >&5 ++ echo "$as_me:25668: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid; break + else +@@ -25678,7 +25681,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25681 "configure" ++#line 25684 "configure" + #include "confdefs.h" + + #include +@@ -25711,16 +25714,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25714: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25717: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25717: \$? = $ac_status" >&5 ++ echo "$as_me:25720: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25720: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25723: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25723: \$? = $ac_status" >&5 ++ echo "$as_me:25726: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=$ac_mid; break + else +@@ -25736,7 +25739,7 @@ + while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25739 "configure" ++#line 25742 "configure" + #include "confdefs.h" + + #include +@@ -25769,16 +25772,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25772: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25775: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25775: \$? = $ac_status" >&5 ++ echo "$as_me:25778: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25778: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25781: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25781: \$? = $ac_status" >&5 ++ echo "$as_me:25784: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid + else +@@ -25791,12 +25794,12 @@ + ac_cv_sizeof_bool=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:25794: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:25797: error: cannot run test program while cross compiling" >&5 + echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25799 "configure" ++#line 25802 "configure" + #include "confdefs.h" + + #include +@@ -25833,15 +25836,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:25836: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:25839: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:25839: \$? = $ac_status" >&5 ++ echo "$as_me:25842: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:25841: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25844: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25844: \$? = $ac_status" >&5 ++ echo "$as_me:25847: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sizeof_bool=`cat conftest.val` + else +@@ -25857,13 +25860,13 @@ + ac_cv_sizeof_bool=0 + fi + fi +-echo "$as_me:25860: result: $ac_cv_sizeof_bool" >&5 ++echo "$as_me:25863: result: $ac_cv_sizeof_bool" >&5 + echo "${ECHO_T}$ac_cv_sizeof_bool" >&6 + cat >>confdefs.h <&5 ++echo "$as_me:25869: checking for type of bool" >&5 + echo $ECHO_N "checking for type of bool... $ECHO_C" >&6 + if test "${cf_cv_type_of_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -25882,7 +25885,7 @@ + + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25885 "configure" ++#line 25888 "configure" + #include "confdefs.h" + + #include +@@ -25924,15 +25927,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:25927: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:25930: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:25930: \$? = $ac_status" >&5 ++ echo "$as_me:25933: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:25932: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25935: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25935: \$? = $ac_status" >&5 ++ echo "$as_me:25938: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_type_of_bool=`cat cf_test.out` + if test -z "$cf_cv_type_of_bool"; then +@@ -25949,19 +25952,19 @@ + rm -f cf_test.out + + fi +-echo "$as_me:25952: result: $cf_cv_type_of_bool" >&5 ++echo "$as_me:25955: result: $cf_cv_type_of_bool" >&5 + echo "${ECHO_T}$cf_cv_type_of_bool" >&6 + + if test "$cf_cv_type_of_bool" = unknown ; then + case .$NCURSES_BOOL in + (.auto|.) NCURSES_BOOL=unsigned;; + esac +- { echo "$as_me:25959: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 ++ { echo "$as_me:25962: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} + cf_cv_type_of_bool=$NCURSES_BOOL + fi + +-echo "$as_me:25964: checking for special defines needed for etip.h" >&5 ++echo "$as_me:25967: checking for special defines needed for etip.h" >&5 + echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6 + cf_save_CXXFLAGS="$CXXFLAGS" + cf_result="none" +@@ -25979,7 +25982,7 @@ + test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}" + test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25982 "configure" ++#line 25985 "configure" + #include "confdefs.h" + + #include +@@ -25993,16 +25996,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25996: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25999: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25999: \$? = $ac_status" >&5 ++ echo "$as_me:26002: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26002: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26005: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26005: \$? = $ac_status" >&5 ++ echo "$as_me:26008: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + test -n "$cf_math" && cat >>confdefs.h <&5 ++echo "$as_me:26029: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + CXXFLAGS="$cf_save_CXXFLAGS" + + if test -n "$CXX"; then +-echo "$as_me:26031: checking if $CXX accepts parameter initialization" >&5 ++echo "$as_me:26034: checking if $CXX accepts parameter initialization" >&5 + echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6 + if test "${cf_cv_cpp_param_init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26045,7 +26048,7 @@ + cf_cv_cpp_param_init=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26048 "configure" ++#line 26051 "configure" + #include "confdefs.h" + + class TEST { +@@ -26064,15 +26067,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:26067: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:26070: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:26070: \$? = $ac_status" >&5 ++ echo "$as_me:26073: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:26072: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26075: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26075: \$? = $ac_status" >&5 ++ echo "$as_me:26078: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_cpp_param_init=yes + else +@@ -26091,7 +26094,7 @@ + ac_main_return="return" + + fi +-echo "$as_me:26094: result: $cf_cv_cpp_param_init" >&5 ++echo "$as_me:26097: result: $cf_cv_cpp_param_init" >&5 + echo "${ECHO_T}$cf_cv_cpp_param_init" >&6 + fi + test "$cf_cv_cpp_param_init" = yes && +@@ -26101,7 +26104,7 @@ + + if test -n "$CXX"; then + +-echo "$as_me:26104: checking if $CXX accepts static_cast" >&5 ++echo "$as_me:26107: checking if $CXX accepts static_cast" >&5 + echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6 + if test "${cf_cv_cpp_static_cast+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26115,7 +26118,7 @@ + ac_main_return="return" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26118 "configure" ++#line 26121 "configure" + #include "confdefs.h" + + class NCursesPanel +@@ -26159,16 +26162,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26162: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26165: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26165: \$? = $ac_status" >&5 ++ echo "$as_me:26168: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26168: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26171: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26171: \$? = $ac_status" >&5 ++ echo "$as_me:26174: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_cpp_static_cast=yes + else +@@ -26186,7 +26189,7 @@ + ac_main_return="return" + + fi +-echo "$as_me:26189: result: $cf_cv_cpp_static_cast" >&5 ++echo "$as_me:26192: result: $cf_cv_cpp_static_cast" >&5 + echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6 + + fi +@@ -26235,13 +26238,13 @@ + else + if test "$cf_cv_header_stdbool_h" = 1 ; then + +-echo "$as_me:26238: checking for bool" >&5 ++echo "$as_me:26241: checking for bool" >&5 + echo $ECHO_N "checking for bool... $ECHO_C" >&6 + if test "${ac_cv_type_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26244 "configure" ++#line 26247 "configure" + #include "confdefs.h" + + #include +@@ -26277,16 +26280,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26280: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26283: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26283: \$? = $ac_status" >&5 ++ echo "$as_me:26286: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26286: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26289: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26289: \$? = $ac_status" >&5 ++ echo "$as_me:26292: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_bool=yes + else +@@ -26296,10 +26299,10 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:26299: result: $ac_cv_type_bool" >&5 ++echo "$as_me:26302: result: $ac_cv_type_bool" >&5 + echo "${ECHO_T}$ac_cv_type_bool" >&6 + +-echo "$as_me:26302: checking size of bool" >&5 ++echo "$as_me:26305: checking size of bool" >&5 + echo $ECHO_N "checking size of bool... $ECHO_C" >&6 + if test "${ac_cv_sizeof_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26308,7 +26311,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26311 "configure" ++#line 26314 "configure" + #include "confdefs.h" + + #include +@@ -26341,21 +26344,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26344: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26347: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26347: \$? = $ac_status" >&5 ++ echo "$as_me:26350: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26350: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26353: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26353: \$? = $ac_status" >&5 ++ echo "$as_me:26356: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26358 "configure" ++#line 26361 "configure" + #include "confdefs.h" + + #include +@@ -26388,16 +26391,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26391: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26394: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26394: \$? = $ac_status" >&5 ++ echo "$as_me:26397: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26397: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26400: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26400: \$? = $ac_status" >&5 ++ echo "$as_me:26403: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid; break + else +@@ -26413,7 +26416,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26416 "configure" ++#line 26419 "configure" + #include "confdefs.h" + + #include +@@ -26446,16 +26449,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26449: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26452: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26452: \$? = $ac_status" >&5 ++ echo "$as_me:26455: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26455: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26458: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26458: \$? = $ac_status" >&5 ++ echo "$as_me:26461: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=$ac_mid; break + else +@@ -26471,7 +26474,7 @@ + while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26474 "configure" ++#line 26477 "configure" + #include "confdefs.h" + + #include +@@ -26504,16 +26507,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26507: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26510: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26510: \$? = $ac_status" >&5 ++ echo "$as_me:26513: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26513: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26516: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26516: \$? = $ac_status" >&5 ++ echo "$as_me:26519: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid + else +@@ -26526,12 +26529,12 @@ + ac_cv_sizeof_bool=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:26529: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:26532: error: cannot run test program while cross compiling" >&5 + echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26534 "configure" ++#line 26537 "configure" + #include "confdefs.h" + + #include +@@ -26568,15 +26571,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:26571: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:26574: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:26574: \$? = $ac_status" >&5 ++ echo "$as_me:26577: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:26576: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26579: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26579: \$? = $ac_status" >&5 ++ echo "$as_me:26582: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sizeof_bool=`cat conftest.val` + else +@@ -26592,13 +26595,13 @@ + ac_cv_sizeof_bool=0 + fi + fi +-echo "$as_me:26595: result: $ac_cv_sizeof_bool" >&5 ++echo "$as_me:26598: result: $ac_cv_sizeof_bool" >&5 + echo "${ECHO_T}$ac_cv_sizeof_bool" >&6 + cat >>confdefs.h <&5 ++echo "$as_me:26604: checking for type of bool" >&5 + echo $ECHO_N "checking for type of bool... $ECHO_C" >&6 + if test "${cf_cv_type_of_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26617,7 +26620,7 @@ + + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26620 "configure" ++#line 26623 "configure" + #include "confdefs.h" + + #include +@@ -26659,15 +26662,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:26662: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:26665: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:26665: \$? = $ac_status" >&5 ++ echo "$as_me:26668: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:26667: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26670: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26670: \$? = $ac_status" >&5 ++ echo "$as_me:26673: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_type_of_bool=`cat cf_test.out` + if test -z "$cf_cv_type_of_bool"; then +@@ -26684,26 +26687,26 @@ + rm -f cf_test.out + + fi +-echo "$as_me:26687: result: $cf_cv_type_of_bool" >&5 ++echo "$as_me:26690: result: $cf_cv_type_of_bool" >&5 + echo "${ECHO_T}$cf_cv_type_of_bool" >&6 + + if test "$cf_cv_type_of_bool" = unknown ; then + case .$NCURSES_BOOL in + (.auto|.) NCURSES_BOOL=unsigned;; + esac +- { echo "$as_me:26694: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 ++ { echo "$as_me:26697: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} + cf_cv_type_of_bool=$NCURSES_BOOL + fi + + else +- echo "$as_me:26700: checking for fallback type of bool" >&5 ++ echo "$as_me:26703: checking for fallback type of bool" >&5 + echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6 + case "$host_cpu" in + (i?86) cf_cv_type_of_bool=char ;; + (*) cf_cv_type_of_bool=int ;; + esac +- echo "$as_me:26706: result: $cf_cv_type_of_bool" >&5 ++ echo "$as_me:26709: result: $cf_cv_type_of_bool" >&5 + echo "${ECHO_T}$cf_cv_type_of_bool" >&6 + fi + fi +@@ -26732,7 +26735,7 @@ + + if test "$cf_with_ada" != "no" ; then + if test "$with_libtool" != "no"; then +- { echo "$as_me:26735: WARNING: libtool does not support Ada - disabling feature" >&5 ++ { echo "$as_me:26738: WARNING: libtool does not support Ada - disabling feature" >&5 + echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;} + cf_with_ada=no + fi +@@ -26749,7 +26752,7 @@ + unset cf_TEMP_gnat + # Extract the first word of "$cf_prog_gnat", so it can be a program name with args. + set dummy $cf_prog_gnat; ac_word=$2 +-echo "$as_me:26752: checking for $ac_word" >&5 ++echo "$as_me:26755: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26766,7 +26769,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word" +- echo "$as_me:26769: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:26772: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -26778,10 +26781,10 @@ + cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat + + if test -n "$cf_TEMP_gnat"; then +- echo "$as_me:26781: result: $cf_TEMP_gnat" >&5 ++ echo "$as_me:26784: result: $cf_TEMP_gnat" >&5 + echo "${ECHO_T}$cf_TEMP_gnat" >&6 + else +- echo "$as_me:26784: result: no" >&5 ++ echo "$as_me:26787: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -26791,7 +26794,7 @@ + unset cf_cv_gnat_version + unset cf_TEMP_gnat + +-echo "$as_me:26794: checking for $cf_prog_gnat version" >&5 ++echo "$as_me:26797: checking for $cf_prog_gnat version" >&5 + echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6 + if test "${cf_cv_gnat_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26802,7 +26805,7 @@ + sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` + + fi +-echo "$as_me:26805: result: $cf_cv_gnat_version" >&5 ++echo "$as_me:26808: result: $cf_cv_gnat_version" >&5 + echo "${ECHO_T}$cf_cv_gnat_version" >&6 + test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no + eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version +@@ -26831,7 +26834,7 @@ + cd conftest.src + for cf_gprconfig in Ada C + do +- echo "$as_me:26834: checking for gprconfig name for $cf_gprconfig" >&5 ++ echo "$as_me:26837: checking for gprconfig name for $cf_gprconfig" >&5 + echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6 + if test "$cf_gprconfig" = C + then +@@ -26850,10 +26853,10 @@ + if test -n "$cf_gprconfig_value" + then + eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value" +- echo "$as_me:26853: result: $cf_gprconfig_value" >&5 ++ echo "$as_me:26856: result: $cf_gprconfig_value" >&5 + echo "${ECHO_T}$cf_gprconfig_value" >&6 + else +- echo "$as_me:26856: result: missing" >&5 ++ echo "$as_me:26859: result: missing" >&5 + echo "${ECHO_T}missing" >&6 + cf_ada_config="#" + break +@@ -26866,7 +26869,7 @@ + if test "x$cf_ada_config" != "x#" + then + +-echo "$as_me:26869: checking for gnat version" >&5 ++echo "$as_me:26872: checking for gnat version" >&5 + echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 + if test "${cf_cv_gnat_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26877,7 +26880,7 @@ + sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` + + fi +-echo "$as_me:26880: result: $cf_cv_gnat_version" >&5 ++echo "$as_me:26883: result: $cf_cv_gnat_version" >&5 + echo "${ECHO_T}$cf_cv_gnat_version" >&6 + test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no + +@@ -26886,7 +26889,7 @@ + cf_cv_prog_gnat_correct=yes + ;; + (*) +- { echo "$as_me:26889: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 ++ { echo "$as_me:26892: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 + echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} + cf_cv_prog_gnat_correct=no + ;; +@@ -26894,7 +26897,7 @@ + + # Extract the first word of "m4", so it can be a program name with args. + set dummy m4; ac_word=$2 +-echo "$as_me:26897: checking for $ac_word" >&5 ++echo "$as_me:26900: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_M4_exists+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26909,7 +26912,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_M4_exists="yes" +-echo "$as_me:26912: found $ac_dir/$ac_word" >&5 ++echo "$as_me:26915: found $ac_dir/$ac_word" >&5 + break + done + +@@ -26918,20 +26921,20 @@ + fi + M4_exists=$ac_cv_prog_M4_exists + if test -n "$M4_exists"; then +- echo "$as_me:26921: result: $M4_exists" >&5 ++ echo "$as_me:26924: result: $M4_exists" >&5 + echo "${ECHO_T}$M4_exists" >&6 + else +- echo "$as_me:26924: result: no" >&5 ++ echo "$as_me:26927: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + if test "$ac_cv_prog_M4_exists" = no; then + cf_cv_prog_gnat_correct=no +- { echo "$as_me:26930: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 ++ { echo "$as_me:26933: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 + echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;} + fi + if test "$cf_cv_prog_gnat_correct" = yes; then +- echo "$as_me:26934: checking if GNAT works" >&5 ++ echo "$as_me:26937: checking if GNAT works" >&5 + echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 + + rm -rf ./conftest* ./*~conftest* +@@ -26959,7 +26962,7 @@ + fi + rm -rf ./conftest* ./*~conftest* + +- echo "$as_me:26962: result: $cf_cv_prog_gnat_correct" >&5 ++ echo "$as_me:26965: result: $cf_cv_prog_gnat_correct" >&5 + echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 + fi + else +@@ -26971,7 +26974,7 @@ + + ADAFLAGS="$ADAFLAGS -gnatpn" + +- echo "$as_me:26974: checking optimization options for ADAFLAGS" >&5 ++ echo "$as_me:26977: checking optimization options for ADAFLAGS" >&5 + echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 + case "$CFLAGS" in + (*-g*) +@@ -26988,10 +26991,10 @@ + + ;; + esac +- echo "$as_me:26991: result: $ADAFLAGS" >&5 ++ echo "$as_me:26994: result: $ADAFLAGS" >&5 + echo "${ECHO_T}$ADAFLAGS" >&6 + +-echo "$as_me:26994: checking if GNATPREP supports -T option" >&5 ++echo "$as_me:26997: checking if GNATPREP supports -T option" >&5 + echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6 + if test "${cf_cv_gnatprep_opt_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -27001,11 +27004,11 @@ + gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes + + fi +-echo "$as_me:27004: result: $cf_cv_gnatprep_opt_t" >&5 ++echo "$as_me:27007: result: $cf_cv_gnatprep_opt_t" >&5 + echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6 + test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS" + +-echo "$as_me:27008: checking if GNAT supports generics" >&5 ++echo "$as_me:27011: checking if GNAT supports generics" >&5 + echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 + case "$cf_cv_gnat_version" in + (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9]) +@@ -27015,7 +27018,7 @@ + cf_gnat_generics=no + ;; + esac +-echo "$as_me:27018: result: $cf_gnat_generics" >&5 ++echo "$as_me:27021: result: $cf_gnat_generics" >&5 + echo "${ECHO_T}$cf_gnat_generics" >&6 + + if test "$cf_gnat_generics" = yes +@@ -27027,7 +27030,7 @@ + cf_generic_objects= + fi + +-echo "$as_me:27030: checking if GNAT supports SIGINT" >&5 ++echo "$as_me:27033: checking if GNAT supports SIGINT" >&5 + echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6 + if test "${cf_cv_gnat_sigint+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -27075,7 +27078,7 @@ + rm -rf ./conftest* ./*~conftest* + + fi +-echo "$as_me:27078: result: $cf_cv_gnat_sigint" >&5 ++echo "$as_me:27081: result: $cf_cv_gnat_sigint" >&5 + echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 + + if test "$cf_cv_gnat_sigint" = yes ; then +@@ -27088,7 +27091,7 @@ + cf_gnat_projects=no + + if test "$enable_gnat_projects" != no ; then +-echo "$as_me:27091: checking if GNAT supports project files" >&5 ++echo "$as_me:27094: checking if GNAT supports project files" >&5 + echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 + case "$cf_cv_gnat_version" in + (3.[0-9]*) +@@ -27151,15 +27154,15 @@ + esac + ;; + esac +-echo "$as_me:27154: result: $cf_gnat_projects" >&5 ++echo "$as_me:27157: result: $cf_gnat_projects" >&5 + echo "${ECHO_T}$cf_gnat_projects" >&6 + fi # enable_gnat_projects + + if test "$cf_gnat_projects" = yes + then +- echo "$as_me:27160: checking if GNAT supports libraries" >&5 ++ echo "$as_me:27163: checking if GNAT supports libraries" >&5 + echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 +- echo "$as_me:27162: result: $cf_gnat_libraries" >&5 ++ echo "$as_me:27165: result: $cf_gnat_libraries" >&5 + echo "${ECHO_T}$cf_gnat_libraries" >&6 + fi + +@@ -27179,7 +27182,7 @@ + then + USE_GNAT_MAKE_GPR="" + else +- { echo "$as_me:27182: WARNING: use old makefile rules since tools are missing" >&5 ++ { echo "$as_me:27185: WARNING: use old makefile rules since tools are missing" >&5 + echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;} + fi + fi +@@ -27191,7 +27194,7 @@ + USE_GNAT_LIBRARIES="#" + fi + +-echo "$as_me:27194: checking for ada-compiler" >&5 ++echo "$as_me:27197: checking for ada-compiler" >&5 + echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6 + + # Check whether --with-ada-compiler or --without-ada-compiler was given. +@@ -27202,12 +27205,12 @@ + cf_ada_compiler=gnatmake + fi; + +-echo "$as_me:27205: result: $cf_ada_compiler" >&5 ++echo "$as_me:27208: result: $cf_ada_compiler" >&5 + echo "${ECHO_T}$cf_ada_compiler" >&6 + + cf_ada_package=terminal_interface + +-echo "$as_me:27210: checking for ada-include" >&5 ++echo "$as_me:27213: checking for ada-include" >&5 + echo $ECHO_N "checking for ada-include... $ECHO_C" >&6 + + # Check whether --with-ada-include or --without-ada-include was given. +@@ -27243,7 +27246,7 @@ + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:27246: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:27249: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -27252,10 +27255,10 @@ + fi + eval ADA_INCLUDE="$withval" + +-echo "$as_me:27255: result: $ADA_INCLUDE" >&5 ++echo "$as_me:27258: result: $ADA_INCLUDE" >&5 + echo "${ECHO_T}$ADA_INCLUDE" >&6 + +-echo "$as_me:27258: checking for ada-objects" >&5 ++echo "$as_me:27261: checking for ada-objects" >&5 + echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6 + + # Check whether --with-ada-objects or --without-ada-objects was given. +@@ -27291,7 +27294,7 @@ + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:27294: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:27297: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -27300,10 +27303,10 @@ + fi + eval ADA_OBJECTS="$withval" + +-echo "$as_me:27303: result: $ADA_OBJECTS" >&5 ++echo "$as_me:27306: result: $ADA_OBJECTS" >&5 + echo "${ECHO_T}$ADA_OBJECTS" >&6 + +-echo "$as_me:27306: checking if an Ada95 shared-library should be built" >&5 ++echo "$as_me:27309: checking if an Ada95 shared-library should be built" >&5 + echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6 + + # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given. +@@ -27313,14 +27316,14 @@ + else + with_ada_sharedlib=no + fi; +-echo "$as_me:27316: result: $with_ada_sharedlib" >&5 ++echo "$as_me:27319: result: $with_ada_sharedlib" >&5 + echo "${ECHO_T}$with_ada_sharedlib" >&6 + + if test "x$with_ada_sharedlib" != xno + then + if test "x$cf_gnat_projects" != xyes + then +- { echo "$as_me:27323: WARNING: disabling shared-library since GNAT projects are not supported" >&5 ++ { echo "$as_me:27326: WARNING: disabling shared-library since GNAT projects are not supported" >&5 + echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;} + with_ada_sharedlib=no + fi +@@ -27340,7 +27343,7 @@ + + # allow the Ada binding to be renamed + +-echo "$as_me:27343: checking for ada-libname" >&5 ++echo "$as_me:27346: checking for ada-libname" >&5 + echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6 + + # Check whether --with-ada-libname or --without-ada-libname was given. +@@ -27356,7 +27359,7 @@ + ;; + esac + +-echo "$as_me:27359: result: $ADA_LIBNAME" >&5 ++echo "$as_me:27362: result: $ADA_LIBNAME" >&5 + echo "${ECHO_T}$ADA_LIBNAME" >&6 + + fi +@@ -27367,13 +27370,13 @@ + + # do this "late" to avoid conflict with header-checks + if test "x$with_widec" = xyes ; then +- echo "$as_me:27370: checking for wchar_t" >&5 ++ echo "$as_me:27373: checking for wchar_t" >&5 + echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6 + if test "${ac_cv_type_wchar_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27376 "configure" ++#line 27379 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -27388,16 +27391,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:27391: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27394: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27394: \$? = $ac_status" >&5 ++ echo "$as_me:27397: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:27397: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27400: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27400: \$? = $ac_status" >&5 ++ echo "$as_me:27403: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_wchar_t=yes + else +@@ -27407,10 +27410,10 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:27410: result: $ac_cv_type_wchar_t" >&5 ++echo "$as_me:27413: result: $ac_cv_type_wchar_t" >&5 + echo "${ECHO_T}$ac_cv_type_wchar_t" >&6 + +-echo "$as_me:27413: checking size of wchar_t" >&5 ++echo "$as_me:27416: checking size of wchar_t" >&5 + echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6 + if test "${ac_cv_sizeof_wchar_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -27419,7 +27422,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27422 "configure" ++#line 27425 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -27431,21 +27434,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:27434: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27437: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27437: \$? = $ac_status" >&5 ++ echo "$as_me:27440: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:27440: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27443: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27443: \$? = $ac_status" >&5 ++ echo "$as_me:27446: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27448 "configure" ++#line 27451 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -27457,16 +27460,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:27460: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27463: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27463: \$? = $ac_status" >&5 ++ echo "$as_me:27466: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:27466: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27469: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27469: \$? = $ac_status" >&5 ++ echo "$as_me:27472: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid; break + else +@@ -27482,7 +27485,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27485 "configure" ++#line 27488 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -27494,16 +27497,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:27497: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27500: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27500: \$? = $ac_status" >&5 ++ echo "$as_me:27503: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:27503: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27506: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27506: \$? = $ac_status" >&5 ++ echo "$as_me:27509: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=$ac_mid; break + else +@@ -27519,7 +27522,7 @@ + while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27522 "configure" ++#line 27525 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -27531,16 +27534,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:27534: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27537: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27537: \$? = $ac_status" >&5 ++ echo "$as_me:27540: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:27540: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27543: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27543: \$? = $ac_status" >&5 ++ echo "$as_me:27546: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid + else +@@ -27553,12 +27556,12 @@ + ac_cv_sizeof_wchar_t=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:27556: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:27559: error: cannot run test program while cross compiling" >&5 + echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27561 "configure" ++#line 27564 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -27574,15 +27577,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:27577: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:27580: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:27580: \$? = $ac_status" >&5 ++ echo "$as_me:27583: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:27582: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27585: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27585: \$? = $ac_status" >&5 ++ echo "$as_me:27588: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sizeof_wchar_t=`cat conftest.val` + else +@@ -27598,7 +27601,7 @@ + ac_cv_sizeof_wchar_t=0 + fi + fi +-echo "$as_me:27601: result: $ac_cv_sizeof_wchar_t" >&5 ++echo "$as_me:27604: result: $ac_cv_sizeof_wchar_t" >&5 + echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6 + cat >>confdefs.h <&6 + +-echo "${as_me:-configure}:27614: testing test failed (assume 2) ..." 1>&5 ++echo "${as_me:-configure}:27617: testing test failed (assume 2) ..." 1>&5 + + sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp + mv confdefs.tmp confdefs.h +@@ -27629,7 +27632,7 @@ + ### chooses to split module lists into libraries. + ### + ### (see CF_LIB_RULES). +-echo "$as_me:27632: checking for library subsets" >&5 ++echo "$as_me:27635: checking for library subsets" >&5 + echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 + LIB_SUBSETS= + +@@ -27683,7 +27686,7 @@ + test "x$with_widec" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar" + test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs" + +-echo "$as_me:27686: result: $LIB_SUBSETS" >&5 ++echo "$as_me:27689: result: $LIB_SUBSETS" >&5 + echo "${ECHO_T}$LIB_SUBSETS" >&6 + + ### Construct the list of include-directories to be generated +@@ -27714,7 +27717,7 @@ + fi + + ### Build up pieces for makefile rules +-echo "$as_me:27717: checking default library suffix" >&5 ++echo "$as_me:27720: checking default library suffix" >&5 + echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -27725,10 +27728,10 @@ + (shared) DFT_ARG_SUFFIX='' ;; + esac + test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" +-echo "$as_me:27728: result: $DFT_ARG_SUFFIX" >&5 ++echo "$as_me:27731: result: $DFT_ARG_SUFFIX" >&5 + echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 + +-echo "$as_me:27731: checking default library-dependency suffix" >&5 ++echo "$as_me:27734: checking default library-dependency suffix" >&5 + echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 + + case X$DFT_LWR_MODEL in +@@ -27811,10 +27814,10 @@ + DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}" + DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}" + fi +-echo "$as_me:27814: result: $DFT_DEP_SUFFIX" >&5 ++echo "$as_me:27817: result: $DFT_DEP_SUFFIX" >&5 + echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 + +-echo "$as_me:27817: checking default object directory" >&5 ++echo "$as_me:27820: checking default object directory" >&5 + echo $ECHO_N "checking default object directory... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -27830,11 +27833,11 @@ + DFT_OBJ_SUBDIR='obj_s' ;; + esac + esac +-echo "$as_me:27833: result: $DFT_OBJ_SUBDIR" >&5 ++echo "$as_me:27836: result: $DFT_OBJ_SUBDIR" >&5 + echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 + + if test "x$cf_with_cxx" = xyes ; then +-echo "$as_me:27837: checking c++ library-dependency suffix" >&5 ++echo "$as_me:27840: checking c++ library-dependency suffix" >&5 + echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6 + if test "$with_libtool" != "no"; then + # libtool thinks it can make c++ shared libraries (perhaps only g++) +@@ -27927,7 +27930,7 @@ + fi + + fi +-echo "$as_me:27930: result: $CXX_LIB_SUFFIX" >&5 ++echo "$as_me:27933: result: $CXX_LIB_SUFFIX" >&5 + echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 + + fi +@@ -28103,19 +28106,19 @@ + + if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED" + then +- echo "$as_me:28106: checking if linker supports switching between static/dynamic" >&5 ++ echo "$as_me:28109: checking if linker supports switching between static/dynamic" >&5 + echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6 + + rm -f libconftest.a + cat >conftest.$ac_ext < + int cf_ldflags_static(FILE *fp) { return fflush(fp); } + EOF +- if { (eval echo "$as_me:28115: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:28118: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:28118: \$? = $ac_status" >&5 ++ echo "$as_me:28121: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then + ( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null + ( eval $RANLIB libconftest.a ) 2>&5 >/dev/null +@@ -28126,10 +28129,10 @@ + + LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 28129 "configure" ++#line 28132 "configure" + #include "confdefs.h" + +-#line 28132 "configure" ++#line 28135 "configure" + #include + int cf_ldflags_static(FILE *fp); + +@@ -28144,16 +28147,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:28147: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:28150: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:28150: \$? = $ac_status" >&5 ++ echo "$as_me:28153: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:28153: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:28156: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:28156: \$? = $ac_status" >&5 ++ echo "$as_me:28159: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + # some linkers simply ignore the -dynamic +@@ -28176,7 +28179,7 @@ + rm -f libconftest.* + LIBS="$cf_save_LIBS" + +- echo "$as_me:28179: result: $cf_ldflags_static" >&5 ++ echo "$as_me:28182: result: $cf_ldflags_static" >&5 + echo "${ECHO_T}$cf_ldflags_static" >&6 + + if test "$cf_ldflags_static" != yes +@@ -28192,7 +28195,7 @@ + ;; + esac + +-echo "$as_me:28195: checking where we will install curses.h" >&5 ++echo "$as_me:28198: checking where we will install curses.h" >&5 + echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 + + includesubdir= +@@ -28202,7 +28205,7 @@ + then + includesubdir="/ncurses${USE_LIB_SUFFIX}" + fi +-echo "$as_me:28205: result: ${includedir}${includesubdir}" >&5 ++echo "$as_me:28208: result: ${includedir}${includesubdir}" >&5 + echo "${ECHO_T}${includedir}${includesubdir}" >&6 + + ### Resolve a conflict between normal and wide-curses by forcing applications +@@ -28210,7 +28213,7 @@ + if test "$with_overwrite" != no ; then + if test "$NCURSES_LIBUTF8" = 1 ; then + NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)' +- { echo "$as_me:28213: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 ++ { echo "$as_me:28216: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 + echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;} + fi + fi +@@ -28238,7 +28241,7 @@ + + # pkgsrc uses these + +-echo "$as_me:28241: checking for desired basename for form library" >&5 ++echo "$as_me:28244: checking for desired basename for form library" >&5 + echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6 + + # Check whether --with-form-libname or --without-form-libname was given. +@@ -28258,10 +28261,10 @@ + ;; + esac + +-echo "$as_me:28261: result: $FORM_NAME" >&5 ++echo "$as_me:28264: result: $FORM_NAME" >&5 + echo "${ECHO_T}$FORM_NAME" >&6 + +-echo "$as_me:28264: checking for desired basename for menu library" >&5 ++echo "$as_me:28267: checking for desired basename for menu library" >&5 + echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6 + + # Check whether --with-menu-libname or --without-menu-libname was given. +@@ -28281,10 +28284,10 @@ + ;; + esac + +-echo "$as_me:28284: result: $MENU_NAME" >&5 ++echo "$as_me:28287: result: $MENU_NAME" >&5 + echo "${ECHO_T}$MENU_NAME" >&6 + +-echo "$as_me:28287: checking for desired basename for panel library" >&5 ++echo "$as_me:28290: checking for desired basename for panel library" >&5 + echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6 + + # Check whether --with-panel-libname or --without-panel-libname was given. +@@ -28304,10 +28307,10 @@ + ;; + esac + +-echo "$as_me:28307: result: $PANEL_NAME" >&5 ++echo "$as_me:28310: result: $PANEL_NAME" >&5 + echo "${ECHO_T}$PANEL_NAME" >&6 + +-echo "$as_me:28310: checking for desired basename for cxx library" >&5 ++echo "$as_me:28313: checking for desired basename for cxx library" >&5 + echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6 + + # Check whether --with-cxx-libname or --without-cxx-libname was given. +@@ -28327,13 +28330,13 @@ + ;; + esac + +-echo "$as_me:28330: result: $CXX_NAME" >&5 ++echo "$as_me:28333: result: $CXX_NAME" >&5 + echo "${ECHO_T}$CXX_NAME" >&6 + + ### Construct the list of subdirectories for which we'll customize makefiles + ### with the appropriate compile-rules. + +-echo "$as_me:28336: checking for src modules" >&5 ++echo "$as_me:28339: checking for src modules" >&5 + echo $ECHO_N "checking for src modules... $ECHO_C" >&6 + + # dependencies and linker-arguments for test-programs +@@ -28402,7 +28405,7 @@ + fi + fi + done +-echo "$as_me:28405: result: $cf_cv_src_modules" >&5 ++echo "$as_me:28408: result: $cf_cv_src_modules" >&5 + echo "${ECHO_T}$cf_cv_src_modules" >&6 + + TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" +@@ -28563,7 +28566,7 @@ + (*-D_XOPEN_SOURCE_EXTENDED*) + test -n "$verbose" && echo " moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6 + +-echo "${as_me:-configure}:28566: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 ++echo "${as_me:-configure}:28569: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 + + CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED" + CPPFLAGS=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'` +@@ -28574,7 +28577,7 @@ + + # Help to automatically enable the extended curses features when using either + # the *-config or the ".pc" files by adding defines. +-echo "$as_me:28577: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5 ++echo "$as_me:28580: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5 + echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6 + PKG_CFLAGS= + for cf_loop1 in $CPPFLAGS_after_XOPEN +@@ -28590,7 +28593,7 @@ + done + test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1" + done +-echo "$as_me:28593: result: $PKG_CFLAGS" >&5 ++echo "$as_me:28596: result: $PKG_CFLAGS" >&5 + echo "${ECHO_T}$PKG_CFLAGS" >&6 + + # AC_CHECK_SIZEOF demands a literal parameter, no variables. So we do this. +@@ -28651,7 +28654,7 @@ + cf_filter_syms=$cf_dft_filter_syms + test -n "$verbose" && echo " will map symbols to ABI=$cf_cv_abi_version" 1>&6 + +-echo "${as_me:-configure}:28654: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 ++echo "${as_me:-configure}:28657: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 + + fi + +@@ -28678,7 +28681,7 @@ + + # This is used for the *-config script and *.pc data files. + +-echo "$as_me:28681: checking for linker search path" >&5 ++echo "$as_me:28684: checking for linker search path" >&5 + echo $ECHO_N "checking for linker search path... $ECHO_C" >&6 + if test "${cf_cv_ld_searchpath+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -28726,7 +28729,7 @@ + cf_pathlist="$cf_pathlist /lib /usr/lib" + ;; + (*) +- { echo "$as_me:28729: WARNING: problem with Solaris architecture" >&5 ++ { echo "$as_me:28732: WARNING: problem with Solaris architecture" >&5 + echo "$as_me: WARNING: problem with Solaris architecture" >&2;} + ;; + esac +@@ -28767,7 +28770,7 @@ + test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib + + fi +-echo "$as_me:28770: result: $cf_cv_ld_searchpath" >&5 ++echo "$as_me:28773: result: $cf_cv_ld_searchpath" >&5 + echo "${ECHO_T}$cf_cv_ld_searchpath" >&6 + + LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'` +@@ -28857,7 +28860,7 @@ + : "${CONFIG_STATUS=./config.status}" + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ echo "$as_me:28860: creating $CONFIG_STATUS" >&5 ++{ echo "$as_me:28863: creating $CONFIG_STATUS" >&5 + echo "$as_me: creating $CONFIG_STATUS" >&6;} + cat >"$CONFIG_STATUS" <<_ACEOF + #! $SHELL +@@ -29036,7 +29039,7 @@ + echo "$ac_cs_version"; exit 0 ;; + --he | --h) + # Conflict between --help and --header +- { { echo "$as_me:29039: error: ambiguous option: $1 ++ { { echo "$as_me:29042: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&5 + echo "$as_me: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&2;} +@@ -29055,7 +29058,7 @@ + ac_need_defaults=false;; + + # This is an error. +- -*) { { echo "$as_me:29058: error: unrecognized option: $1 ++ -*) { { echo "$as_me:29061: error: unrecognized option: $1 + Try \`$0 --help' for more information." >&5 + echo "$as_me: error: unrecognized option: $1 + Try \`$0 --help' for more information." >&2;} +@@ -29181,7 +29184,7 @@ + "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; + "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; +- *) { { echo "$as_me:29184: error: invalid argument: $ac_config_target" >&5 ++ *) { { echo "$as_me:29187: error: invalid argument: $ac_config_target" >&5 + echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +@@ -29693,7 +29696,7 @@ + esac + + if test x"$ac_file" != x-; then +- { echo "$as_me:29696: creating $ac_file" >&5 ++ { echo "$as_me:29699: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi +@@ -29711,7 +29714,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:29714: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:29717: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -29724,7 +29727,7 @@ + echo "$srcdir/$f" + else + # /dev/null tree +- { { echo "$as_me:29727: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:29730: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -29740,7 +29743,7 @@ + if test -n "$ac_seen"; then + ac_used=`grep '@datarootdir@' "$ac_item"` + if test -z "$ac_used"; then +- { echo "$as_me:29743: WARNING: datarootdir was used implicitly but not set: ++ { echo "$as_me:29746: WARNING: datarootdir was used implicitly but not set: + $ac_seen" >&5 + echo "$as_me: WARNING: datarootdir was used implicitly but not set: + $ac_seen" >&2;} +@@ -29749,7 +29752,7 @@ + fi + ac_seen=`grep '${datarootdir}' "$ac_item"` + if test -n "$ac_seen"; then +- { echo "$as_me:29752: WARNING: datarootdir was used explicitly but not set: ++ { echo "$as_me:29755: WARNING: datarootdir was used explicitly but not set: + $ac_seen" >&5 + echo "$as_me: WARNING: datarootdir was used explicitly but not set: + $ac_seen" >&2;} +@@ -29786,7 +29789,7 @@ + ac_init=`${EGREP-egrep} '[ ]*'$ac_name'[ ]*=' "$ac_file"` + if test -z "$ac_init"; then + ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` +- { echo "$as_me:29789: WARNING: Variable $ac_name is used but was not set: ++ { echo "$as_me:29792: WARNING: Variable $ac_name is used but was not set: + $ac_seen" >&5 + echo "$as_me: WARNING: Variable $ac_name is used but was not set: + $ac_seen" >&2;} +@@ -29797,7 +29800,7 @@ + ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out + if test -s $tmp/out; then + ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` +- { echo "$as_me:29800: WARNING: Some variables may not be substituted: ++ { echo "$as_me:29803: WARNING: Some variables may not be substituted: + $ac_seen" >&5 + echo "$as_me: WARNING: Some variables may not be substituted: + $ac_seen" >&2;} +@@ -29846,7 +29849,7 @@ + * ) ac_file_in=$ac_file.in ;; + esac + +- test x"$ac_file" != x- && { echo "$as_me:29849: creating $ac_file" >&5 ++ test x"$ac_file" != x- && { echo "$as_me:29852: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + + # First look for the input files in the build tree, otherwise in the +@@ -29857,7 +29860,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:29860: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:29863: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -29870,7 +29873,7 @@ + echo "$srcdir/$f" + else + # /dev/null tree +- { { echo "$as_me:29873: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:29876: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -29928,7 +29931,7 @@ + rm -f $tmp/in + if test x"$ac_file" != x-; then + if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then +- { echo "$as_me:29931: $ac_file is unchanged" >&5 ++ { echo "$as_me:29934: $ac_file is unchanged" >&5 + echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +@@ -30315,7 +30318,7 @@ + (cygdll|msysdll|mingw|msvcdll) + test "x$with_shared_cxx" = xno && test -n "$verbose" && echo " overriding CXX_MODEL to SHARED" 1>&6 + +-echo "${as_me:-configure}:30318: testing overriding CXX_MODEL to SHARED ..." 1>&5 ++echo "${as_me:-configure}:30321: testing overriding CXX_MODEL to SHARED ..." 1>&5 + + with_shared_cxx=yes + ;; +Index: dist.mk +Prereq: 1.1448 +--- ncurses-6.3-20211106+/dist.mk 2021-11-06 08:19:47.000000000 +0000 ++++ ncurses-6.3-20211113/dist.mk 2021-11-13 11:06:04.000000000 +0000 +@@ -26,7 +26,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: dist.mk,v 1.1448 2021/11/06 08:19:47 tom Exp $ ++# $Id: dist.mk,v 1.1449 2021/11/13 11:06:04 tom Exp $ + # Makefile for creating ncurses distributions. + # + # This only needs to be used directly as a makefile by developers, but +@@ -38,7 +38,7 @@ + # These define the major/minor/patch versions of ncurses. + NCURSES_MAJOR = 6 + NCURSES_MINOR = 3 +-NCURSES_PATCH = 20211106 ++NCURSES_PATCH = 20211113 + + # We don't append the patch to the version, since this only applies to releases + VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) +Index: man/clear.1 +Prereq: 1.23 +--- ncurses-6.3-20211106+/man/clear.1 2020-02-02 23:34:34.000000000 +0000 ++++ ncurses-6.3-20211113/man/clear.1 2021-11-14 00:33:00.000000000 +0000 +@@ -1,5 +1,5 @@ + .\"*************************************************************************** +-.\" Copyright 2018,2020 Thomas E. Dickey * ++.\" Copyright 2018-2020,2021 Thomas E. Dickey * + .\" Copyright 1998-2016,2017 Free Software Foundation, Inc. * + .\" * + .\" Permission is hereby granted, free of charge, to any person obtaining a * +@@ -27,7 +27,7 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: clear.1,v 1.23 2020/02/02 23:34:34 tom Exp $ ++.\" $Id: clear.1,v 1.24 2021/11/14 00:33:00 tom Exp $ + .TH @CLEAR@ 1 "" + .\" these would be fallbacks for DS/DE, + .\" but groff changed the meaning of the macros. +@@ -60,8 +60,8 @@ + \fB@CLEAR@\fR [\fB\-T\fR\fItype\fR] [\fB\-V\fP] [\fB\-x\fP] + .br + .SH DESCRIPTION +-\fB@CLEAR@\fR clears your screen if this is possible, +-including its scrollback buffer ++\fB@CLEAR@\fR clears your terminal's screen if this is possible, ++including the terminal's scrollback buffer + (if the extended \*(``E3\*('' capability is defined). + \fB@CLEAR@\fR looks in the environment for the terminal type + given by the environment variable \fBTERM\fP, +Index: misc/terminfo.src +--- ncurses-6.3-20211106+/misc/terminfo.src 2021-10-14 00:40:38.000000000 +0000 ++++ ncurses-6.3-20211113/misc/terminfo.src 2021-11-14 00:01:04.000000000 +0000 +@@ -6,8 +6,8 @@ + # Report bugs and new terminal descriptions to + # bug-ncurses@gnu.org + # +-# $Revision: 1.943 $ +-# $Date: 2021/10/14 00:40:38 $ ++# $Revision: 1.947 $ ++# $Date: 2021/11/14 00:01:04 $ + # + # The original header is preserved below for reference. It is noted that there + # is a "newer" version which differs in some cosmetic details (but actually +@@ -5493,6 +5493,24 @@ + # window managers such as twm (and possibly window managers descended from + # it such as tvtwm, ctwm, and vtwm) track windows by icon-name. Thus, you + # don't want to mess with icon-name when using those window managers. ++# c) fsl ends the escape sequence begun by tsl. Printable characters between ++# those (probably) will appear in the window title. Nonprintable characters ++# may cause the escape sequence to end with an error. ++# d) the BEL (^G or \007) used in the original title-as-statusline came from ++# David J. MacKenzie's "pseudo-color" entry in 20 Apr 1995. At that time ++# xterm used BEL as the string-terminator rather than ST (\E\\). Either ++# BEL or ST has worked since xterm patch #28 in 1996, but most uses of ++# this feature have been embedded in shell scripts. ++# ++# But that issue regarding the parameter for tsl means that applications may ++# not rely on it. The SVr4 documentation says tsl will "move to status line, ++# column #1". At the point in time when ESR added DJM's "pseudo-color" entry ++# with the split-up escape sequence for tsl/fsl, there were 65 entries using ++# tsl: ++# 32 used a parameter, matching the documentation (including x10term). ++# 21 used a parameterless control, exiting from the status line on ^M. ++# 6 used parameterless controls for tsl and fsl ++# 6 used a split-up escape sequence, e.g., the same approach. + # + # The extension "TS" is preferable, because it does not accept a parameter. + # However, if you are using a non-extended terminfo, "TS" is not visible. +@@ -5502,6 +5520,9 @@ + xterm+sl-twm|access X title line (pacify twm-descended window managers), + hs, + dsl=\E]2;\007, fsl=^G, tsl=\E]2;, TS=\E]2;, ++xterm+sl-alt|alternate access X title line, ++ hs, ++ dsl=\E]2;\E\\, fsl=\E\\, tsl=\E]2;, TS=\E]2;, + + # In contrast, this block can be used for a DEC vt320 and up. There are two + # controls used. +@@ -7680,6 +7701,7 @@ + use=ansi+tabs, use=ecma+index, use=ecma+italics, + use=ecma+strikeout, use=xterm+alt+title, + use=xterm+pcfkeys, use=xterm+sm+1006, use=xterm+tmux2, ++ use=xterm+sl-alt, + + ######## WEB CLIENTS + +@@ -8453,11 +8475,9 @@ + + # From: Tue Sep 24 13:14:44 1985 + sun-s|Sun Microsystems Workstation window with status line, +- hs, +- dsl=\E]l\E\\, fsl=\E\\, tsl=\E]l, use=sun, ++ use=sun+sl, use=sun, + sun-e-s|sun-s-e|Sun Microsystems Workstation with status hacked for emacs, +- hs, +- dsl=\E]l\E\\, fsl=\E\\, tsl=\E]l, use=sun-e, ++ use=sun+sl, use=sun-e, + sun-48|Sun 48-line window, + cols#80, lines#48, use=sun, + sun-34|Sun 34-line window, +@@ -27273,4 +27293,8 @@ + # 2021-10-13 + # + trim some redundant definitions -TD + # ++# 2021-11-13 ++# + add xterm+sl-alt, use that in foot+base (report by Jonas Grosse ++# Sundrup) -TD ++# + ######## SHANTIH! SHANTIH! SHANTIH! +Index: package/debian-mingw/changelog +--- ncurses-6.3-20211106+/package/debian-mingw/changelog 2021-11-06 08:19:47.000000000 +0000 ++++ ncurses-6.3-20211113/package/debian-mingw/changelog 2021-11-13 11:06:04.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20211106) unstable; urgency=low ++ncurses6 (6.3+20211113) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sat, 06 Nov 2021 04:19:47 -0400 ++ -- Thomas E. Dickey Sun, 07 Nov 2021 10:11:03 -0500 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian-mingw64/changelog +--- ncurses-6.3-20211106+/package/debian-mingw64/changelog 2021-11-06 08:19:47.000000000 +0000 ++++ ncurses-6.3-20211113/package/debian-mingw64/changelog 2021-11-13 11:06:04.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20211106) unstable; urgency=low ++ncurses6 (6.3+20211113) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sat, 06 Nov 2021 04:19:47 -0400 ++ -- Thomas E. Dickey Sun, 07 Nov 2021 10:11:03 -0500 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian/changelog +--- ncurses-6.3-20211106+/package/debian/changelog 2021-11-06 08:19:47.000000000 +0000 ++++ ncurses-6.3-20211113/package/debian/changelog 2021-11-13 11:06:04.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20211106) unstable; urgency=low ++ncurses6 (6.3+20211113) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sat, 06 Nov 2021 04:19:47 -0400 ++ -- Thomas E. Dickey Sun, 07 Nov 2021 10:11:03 -0500 + + ncurses6 (5.9-20120608) unstable; urgency=low + +Index: package/mingw-ncurses.nsi +Prereq: 1.490 +--- ncurses-6.3-20211106+/package/mingw-ncurses.nsi 2021-11-06 08:19:47.000000000 +0000 ++++ ncurses-6.3-20211113/package/mingw-ncurses.nsi 2021-11-13 11:06:04.000000000 +0000 +@@ -1,4 +1,4 @@ +-; $Id: mingw-ncurses.nsi,v 1.490 2021/11/06 08:19:47 tom Exp $ ++; $Id: mingw-ncurses.nsi,v 1.491 2021/11/13 11:06:04 tom Exp $ + + ; TODO add examples + ; TODO bump ABI to 6 +@@ -10,7 +10,7 @@ + !define VERSION_MAJOR "6" + !define VERSION_MINOR "3" + !define VERSION_YYYY "2021" +-!define VERSION_MMDD "1106" ++!define VERSION_MMDD "1113" + !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} + + !define MY_ABI "5" +Index: package/mingw-ncurses.spec +--- ncurses-6.3-20211106+/package/mingw-ncurses.spec 2021-11-06 08:19:47.000000000 +0000 ++++ ncurses-6.3-20211113/package/mingw-ncurses.spec 2021-11-13 11:06:04.000000000 +0000 +@@ -3,7 +3,7 @@ + Summary: shared libraries for terminal handling + Name: mingw32-ncurses6 + Version: 6.3 +-Release: 20211106 ++Release: 20211113 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncurses.spec +--- ncurses-6.3-20211106+/package/ncurses.spec 2021-11-06 08:19:47.000000000 +0000 ++++ ncurses-6.3-20211113/package/ncurses.spec 2021-11-13 11:06:04.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: shared libraries for terminal handling + Name: ncurses6 + Version: 6.3 +-Release: 20211106 ++Release: 20211113 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncursest.spec +--- ncurses-6.3-20211106+/package/ncursest.spec 2021-11-06 08:19:47.000000000 +0000 ++++ ncurses-6.3-20211113/package/ncursest.spec 2021-11-13 11:06:04.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: Curses library with POSIX thread support. + Name: ncursest6 + Version: 6.3 +-Release: 20211106 ++Release: 20211113 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz diff --git a/system/ncurses/ncurses-6.3-20211115.patch b/system/ncurses/ncurses-6.3-20211115.patch new file mode 100644 index 000000000..011e7d5a6 --- /dev/null +++ b/system/ncurses/ncurses-6.3-20211115.patch @@ -0,0 +1,225 @@ +# ncurses 6.3 - patch 20211115 - Thomas E. Dickey +# +# ------------------------------------------------------------------------------ +# +# Ncurses 6.3 is at +# ftp://ftp.invisible-island.net/ncurses/ +# https://invisible-mirror.net/archives/ncurses/ +# https://ftp.gnu.org/gnu/ncurses/ +# +# Patches for ncurses 6.3 can be found at +# ftp://ftp.invisible-island.net/ncurses//6.3 +# https://invisible-mirror.net/archives/ncurses//6.3 +# +# ------------------------------------------------------------------------------ +# ftp://ftp.invisible-island.net/ncurses//6.3/ncurses-6.3-20211115.patch.gz +# patch by Thomas E. Dickey +# created Tue Nov 16 00:54:00 UTC 2021 +# ------------------------------------------------------------------------------ +# NEWS | 6 +++++- +# VERSION | 2 +- +# dist.mk | 4 ++-- +# ncurses/base/lib_delwin.c | 4 ++-- +# ncurses/tinfo/lib_tparm.c | 4 +++- +# package/debian-mingw/changelog | 4 ++-- +# package/debian-mingw64/changelog | 4 ++-- +# package/debian/changelog | 4 ++-- +# package/mingw-ncurses.nsi | 4 ++-- +# package/mingw-ncurses.spec | 2 +- +# package/ncurses.spec | 2 +- +# package/ncursest.spec | 2 +- +# 12 files changed, 24 insertions(+), 18 deletions(-) +# ------------------------------------------------------------------------------ +Index: NEWS +Prereq: 1.3743 +--- ncurses-6.3-20211113+/NEWS 2021-11-14 00:34:58.000000000 +0000 ++++ ncurses-6.3-20211115/NEWS 2021-11-16 00:26:15.000000000 +0000 +@@ -26,7 +26,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: NEWS,v 1.3743 2021/11/14 00:34:58 tom Exp $ ++-- $Id: NEWS,v 1.3745 2021/11/16 00:26:15 tom Exp $ + ------------------------------------------------------------------------------- + + This is a log of changes that ncurses has gone through since Zeyd started +@@ -46,6 +46,10 @@ + Changes through 1.9.9e did not credit all contributions; + it is not possible to add this information. + ++20211115 ++ + fix memory-leak in delwin for pads (report by Werner Fink, OpenSUSE ++ #1192668, cf: 20211106), ++ + 20211113 + + minor clarification to clear.1 (Debian #999437). + + add xterm+sl-alt, use that in foot+base (report by Jonas Grosse +Index: VERSION +--- ncurses-6.3-20211113+/VERSION 2021-11-13 11:06:04.000000000 +0000 ++++ ncurses-6.3-20211115/VERSION 2021-11-15 23:51:41.000000000 +0000 +@@ -1 +1 @@ +-5:0:10 6.3 20211113 ++5:0:10 6.3 20211115 +Index: dist.mk +Prereq: 1.1449 +--- ncurses-6.3-20211113+/dist.mk 2021-11-13 11:06:04.000000000 +0000 ++++ ncurses-6.3-20211115/dist.mk 2021-11-15 23:51:41.000000000 +0000 +@@ -26,7 +26,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: dist.mk,v 1.1449 2021/11/13 11:06:04 tom Exp $ ++# $Id: dist.mk,v 1.1450 2021/11/15 23:51:41 tom Exp $ + # Makefile for creating ncurses distributions. + # + # This only needs to be used directly as a makefile by developers, but +@@ -38,7 +38,7 @@ + # These define the major/minor/patch versions of ncurses. + NCURSES_MAJOR = 6 + NCURSES_MINOR = 3 +-NCURSES_PATCH = 20211113 ++NCURSES_PATCH = 20211115 + + # We don't append the patch to the version, since this only applies to releases + VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) +Index: ncurses/base/lib_delwin.c +Prereq: 1.22 +--- ncurses-6.3-20211113+/ncurses/base/lib_delwin.c 2021-11-06 21:54:14.000000000 +0000 ++++ ncurses-6.3-20211115/ncurses/base/lib_delwin.c 2021-11-15 23:05:32.000000000 +0000 +@@ -43,7 +43,7 @@ + + #include + +-MODULE_ID("$Id: lib_delwin.c,v 1.22 2021/11/06 21:54:14 tom Exp $") ++MODULE_ID("$Id: lib_delwin.c,v 1.23 2021/11/15 23:05:32 tom Exp $") + + static bool + cannot_delete(WINDOW *win) +@@ -83,7 +83,7 @@ + result = ERR; + } else if (IS_PAD(win)) { + win->_parent = NULL; +- result = OK; ++ result = _nc_freewin(win); + } else { + #if NCURSES_SP_FUNCS + SCREEN *sp = _nc_screen_of(win); +Index: ncurses/tinfo/lib_tparm.c +Prereq: 1.134 +--- ncurses-6.3-20211113+/ncurses/tinfo/lib_tparm.c 2021-08-21 21:52:08.000000000 +0000 ++++ ncurses-6.3-20211115/ncurses/tinfo/lib_tparm.c 2021-11-15 23:31:31.000000000 +0000 +@@ -53,7 +53,7 @@ + #include + #include + +-MODULE_ID("$Id: lib_tparm.c,v 1.134 2021/08/21 21:52:08 tom Exp $") ++MODULE_ID("$Id: lib_tparm.c,v 1.135 2021/11/15 23:31:31 tom Exp $") + + /* + * char * +@@ -209,6 +209,8 @@ + static int + tparm_error(TPARM_STATE *tps, const char *message) + { ++ (void) tps; ++ (void) message; + DEBUG(2, ("%s: %s", message, _nc_visbuf(TPS(tparam_base)))); + return ++_nc_tparm_err; + } +Index: package/debian-mingw/changelog +--- ncurses-6.3-20211113+/package/debian-mingw/changelog 2021-11-13 11:06:04.000000000 +0000 ++++ ncurses-6.3-20211115/package/debian-mingw/changelog 2021-11-15 23:51:41.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20211113) unstable; urgency=low ++ncurses6 (6.3+20211115) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sun, 07 Nov 2021 10:11:03 -0500 ++ -- Thomas E. Dickey Mon, 15 Nov 2021 18:51:41 -0500 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian-mingw64/changelog +--- ncurses-6.3-20211113+/package/debian-mingw64/changelog 2021-11-13 11:06:04.000000000 +0000 ++++ ncurses-6.3-20211115/package/debian-mingw64/changelog 2021-11-15 23:51:41.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20211113) unstable; urgency=low ++ncurses6 (6.3+20211115) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sun, 07 Nov 2021 10:11:03 -0500 ++ -- Thomas E. Dickey Mon, 15 Nov 2021 18:51:41 -0500 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian/changelog +--- ncurses-6.3-20211113+/package/debian/changelog 2021-11-13 11:06:04.000000000 +0000 ++++ ncurses-6.3-20211115/package/debian/changelog 2021-11-15 23:51:41.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20211113) unstable; urgency=low ++ncurses6 (6.3+20211115) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sun, 07 Nov 2021 10:11:03 -0500 ++ -- Thomas E. Dickey Mon, 15 Nov 2021 18:51:41 -0500 + + ncurses6 (5.9-20120608) unstable; urgency=low + +Index: package/mingw-ncurses.nsi +Prereq: 1.491 +--- ncurses-6.3-20211113+/package/mingw-ncurses.nsi 2021-11-13 11:06:04.000000000 +0000 ++++ ncurses-6.3-20211115/package/mingw-ncurses.nsi 2021-11-15 23:51:41.000000000 +0000 +@@ -1,4 +1,4 @@ +-; $Id: mingw-ncurses.nsi,v 1.491 2021/11/13 11:06:04 tom Exp $ ++; $Id: mingw-ncurses.nsi,v 1.492 2021/11/15 23:51:41 tom Exp $ + + ; TODO add examples + ; TODO bump ABI to 6 +@@ -10,7 +10,7 @@ + !define VERSION_MAJOR "6" + !define VERSION_MINOR "3" + !define VERSION_YYYY "2021" +-!define VERSION_MMDD "1113" ++!define VERSION_MMDD "1115" + !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} + + !define MY_ABI "5" +Index: package/mingw-ncurses.spec +--- ncurses-6.3-20211113+/package/mingw-ncurses.spec 2021-11-13 11:06:04.000000000 +0000 ++++ ncurses-6.3-20211115/package/mingw-ncurses.spec 2021-11-15 23:51:41.000000000 +0000 +@@ -3,7 +3,7 @@ + Summary: shared libraries for terminal handling + Name: mingw32-ncurses6 + Version: 6.3 +-Release: 20211113 ++Release: 20211115 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncurses.spec +--- ncurses-6.3-20211113+/package/ncurses.spec 2021-11-13 11:06:04.000000000 +0000 ++++ ncurses-6.3-20211115/package/ncurses.spec 2021-11-15 23:51:41.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: shared libraries for terminal handling + Name: ncurses6 + Version: 6.3 +-Release: 20211113 ++Release: 20211115 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncursest.spec +--- ncurses-6.3-20211113+/package/ncursest.spec 2021-11-13 11:06:04.000000000 +0000 ++++ ncurses-6.3-20211115/package/ncursest.spec 2021-11-15 23:51:41.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: Curses library with POSIX thread support. + Name: ncursest6 + Version: 6.3 +-Release: 20211113 ++Release: 20211115 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz diff --git a/system/ncurses/ncurses-6.3-20211120.patch b/system/ncurses/ncurses-6.3-20211120.patch new file mode 100644 index 000000000..6e5b015df --- /dev/null +++ b/system/ncurses/ncurses-6.3-20211120.patch @@ -0,0 +1,23868 @@ +# ncurses 6.3 - patch 20211120 - Thomas E. Dickey +# +# ------------------------------------------------------------------------------ +# +# Ncurses 6.3 is at +# ftp://ftp.invisible-island.net/ncurses/ +# https://invisible-mirror.net/archives/ncurses/ +# https://ftp.gnu.org/gnu/ncurses/ +# +# Patches for ncurses 6.3 can be found at +# ftp://ftp.invisible-island.net/ncurses//6.3 +# https://invisible-mirror.net/archives/ncurses//6.3 +# +# ------------------------------------------------------------------------------ +# ftp://ftp.invisible-island.net/ncurses//6.3/ncurses-6.3-20211120.patch.gz +# patch by Thomas E. Dickey +# created Sun Nov 21 01:19:08 UTC 2021 +# ------------------------------------------------------------------------------ +# Ada95/aclocal.m4 | 102 +# Ada95/configure | 2492 ++++++++++----------- +# INSTALL | 5 +# NEWS | 12 +# VERSION | 2 +# aclocal.m4 | 107 +# configure | 4377 ++++++++++++++++++------------------- +# dist.mk | 4 +# include/nc_alloc.h | 3 +# misc/terminfo.src | 17 +# ncurses/term.priv.h | 5 +# ncurses/tinfo/entries.c | 6 +# ncurses/tinfo/lib_cur_term.c | 6 +# ncurses/tinfo/lib_data.c | 3 +# ncurses/tinfo/lib_setup.c | 3 +# ncurses/tinfo/lib_tparm.c | 12 +# package/debian-mingw/changelog | 4 +# package/debian-mingw64/changelog | 4 +# package/debian/changelog | 4 +# package/debian/control | 2 +# package/debian/rules | 16 +# package/mingw-ncurses.nsi | 4 +# package/mingw-ncurses.spec | 2 +# package/ncurses.spec | 2 +# package/ncursest.spec | 2 +# 25 files changed, 3645 insertions(+), 3551 deletions(-) +# ------------------------------------------------------------------------------ +Index: Ada95/aclocal.m4 +Prereq: 1.189 +--- ncurses-6.3-20211115+/Ada95/aclocal.m4 2021-11-07 15:35:59.000000000 +0000 ++++ ncurses-6.3-20211120/Ada95/aclocal.m4 2021-11-20 19:58:23.000000000 +0000 +@@ -29,7 +29,7 @@ + dnl + dnl Author: Thomas E. Dickey + dnl +-dnl $Id: aclocal.m4,v 1.189 2021/11/07 15:35:59 tom Exp $ ++dnl $Id: aclocal.m4,v 1.191 2021/11/20 19:58:23 tom Exp $ + dnl Macros used in NCURSES Ada95 auto-configuration script. + dnl + dnl These macros are maintained separately from NCURSES. The copyright on +@@ -4802,7 +4802,7 @@ + AC_SUBST($3)dnl + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_WITH_PKG_CONFIG_LIBDIR version: 17 updated: 2021/11/07 10:30:15 ++dnl CF_WITH_PKG_CONFIG_LIBDIR version: 19 updated: 2021/11/20 14:57:36 + dnl ------------------------- + dnl Allow the choice of the pkg-config library directory to be overridden. + dnl +@@ -4825,18 +4825,31 @@ + ;; + esac + ++# if $PKG_CONFIG_LIBDIR is set, try to use that + cf_search_path=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/:/ /g' -e 's,^[[ ]]*,,'` ++ ++# if the option is used, let that override. otherwise default to "libdir" + AC_ARG_WITH(pkg-config-libdir, + [ --with-pkg-config-libdir=XXX use given directory for installing pc-files], + [cf_search_path=$withval], +- [test "x$PKG_CONFIG" != xnone && cf_search_path=yes]) ++ [test "x$PKG_CONFIG" != xnone && test -z "$cf_search_path" && cf_search_path=libdir]) + + case x$cf_search_path in ++(xlibdir) ++ PKG_CONFIG_LIBDIR='${libdir}/pkgconfig' ++ AC_MSG_RESULT($PKG_CONFIG_LIBDIR) ++ cf_search_path= ++ ;; ++(x) ++ ;; + (x/*) ++ PKG_CONFIG_LIBDIR="$cf_search_path" ++ AC_MSG_RESULT($PKG_CONFIG_LIBDIR) ++ cf_search_path= + ;; +-(xyes) ++(xyes|xauto) ++ AC_MSG_RESULT(auto) + cf_search_path= +- CF_VERBOSE(auto...) + # Look for the library directory using the same prefix as the executable + AC_MSG_CHECKING(for search-list) + if test "x$PKG_CONFIG" != xnone +@@ -4865,54 +4878,57 @@ + fi + + AC_MSG_RESULT($cf_search_path) +- + ;; + (*) ++ AC_MSG_ERROR(Unexpected option value: $cf_search_path) + ;; + esac + +-AC_MSG_CHECKING(for first directory) +-cf_pkg_config_path=none +-for cf_config in $cf_search_path +-do +- if test -d "$cf_config" +- then +- cf_pkg_config_path=$cf_config +- break +- fi +-done +-AC_MSG_RESULT($cf_pkg_config_path) +- +-if test "x$cf_pkg_config_path" != xnone ; then +- # limit this to the first directory found +- PKG_CONFIG_LIBDIR="$cf_pkg_config_path" +-fi +- +-if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path" ++if test -n "$cf_search_path" + then +- AC_MSG_CHECKING(for workaround) +- if test "$prefix" = "NONE" ; then +- cf_prefix="$ac_default_prefix" +- else +- cf_prefix="$prefix" +- fi +- eval cf_libdir=$libdir +- cf_libdir=`echo "$cf_libdir" | sed -e "s,^NONE,$cf_prefix,"` +- cf_backup= ++ AC_MSG_CHECKING(for first directory) ++ cf_pkg_config_path=none + for cf_config in $cf_search_path + do +- case $cf_config in +- $cf_libdir/pkgconfig) +- PKG_CONFIG_LIBDIR=$cf_libdir/pkgconfig ++ if test -d "$cf_config" ++ then ++ cf_pkg_config_path=$cf_config + break +- ;; +- *) +- test -z "$cf_backup" && cf_backup=$cf_config +- ;; +- esac ++ fi + done +- test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup +- AC_MSG_RESULT($PKG_CONFIG_LIBDIR) ++ AC_MSG_RESULT($cf_pkg_config_path) ++ ++ if test "x$cf_pkg_config_path" != xnone ; then ++ # limit this to the first directory found ++ PKG_CONFIG_LIBDIR="$cf_pkg_config_path" ++ fi ++ ++ if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path" ++ then ++ AC_MSG_CHECKING(for workaround) ++ if test "$prefix" = "NONE" ; then ++ cf_prefix="$ac_default_prefix" ++ else ++ cf_prefix="$prefix" ++ fi ++ eval cf_libdir=$libdir ++ cf_libdir=`echo "$cf_libdir" | sed -e "s,^NONE,$cf_prefix,"` ++ cf_backup= ++ for cf_config in $cf_search_path ++ do ++ case $cf_config in ++ $cf_libdir/pkgconfig) ++ PKG_CONFIG_LIBDIR=$cf_libdir/pkgconfig ++ break ++ ;; ++ *) ++ test -z "$cf_backup" && cf_backup=$cf_config ++ ;; ++ esac ++ done ++ test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup ++ AC_MSG_RESULT($PKG_CONFIG_LIBDIR) ++ fi + fi + + AC_SUBST(PKG_CONFIG_LIBDIR) +Index: Ada95/configure +--- ncurses-6.3-20211115+/Ada95/configure 2021-11-07 15:36:29.000000000 +0000 ++++ ncurses-6.3-20211120/Ada95/configure 2021-11-20 19:58:46.000000000 +0000 +@@ -3279,27 +3279,40 @@ + ;; + esac + ++# if $PKG_CONFIG_LIBDIR is set, try to use that + cf_search_path=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/:/ /g' -e 's,^[ ]*,,'` + ++# if the option is used, let that override. otherwise default to "libdir" ++ + # Check whether --with-pkg-config-libdir or --without-pkg-config-libdir was given. + if test "${with_pkg_config_libdir+set}" = set; then + withval="$with_pkg_config_libdir" + cf_search_path=$withval + else +- test "x$PKG_CONFIG" != xnone && cf_search_path=yes ++ test "x$PKG_CONFIG" != xnone && test -z "$cf_search_path" && cf_search_path=libdir + fi; + + case x$cf_search_path in ++(xlibdir) ++ PKG_CONFIG_LIBDIR='${libdir}/pkgconfig' ++ echo "$as_me:3298: result: $PKG_CONFIG_LIBDIR" >&5 ++echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 ++ cf_search_path= ++ ;; ++(x) ++ ;; + (x/*) ++ PKG_CONFIG_LIBDIR="$cf_search_path" ++ echo "$as_me:3306: result: $PKG_CONFIG_LIBDIR" >&5 ++echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 ++ cf_search_path= + ;; +-(xyes) ++(xyes|xauto) ++ echo "$as_me:3311: result: auto" >&5 ++echo "${ECHO_T}auto" >&6 + cf_search_path= +- test -n "$verbose" && echo " auto..." 1>&6 +- +-echo "${as_me:-configure}:3299: testing auto... ..." 1>&5 +- + # Look for the library directory using the same prefix as the executable +- echo "$as_me:3302: checking for search-list" >&5 ++ echo "$as_me:3315: checking for search-list" >&5 + echo $ECHO_N "checking for search-list... $ECHO_C" >&6 + if test "x$PKG_CONFIG" != xnone + then +@@ -3326,63 +3339,68 @@ + "` + fi + +- echo "$as_me:3329: result: $cf_search_path" >&5 ++ echo "$as_me:3342: result: $cf_search_path" >&5 + echo "${ECHO_T}$cf_search_path" >&6 +- + ;; + (*) ++ { { echo "$as_me:3346: error: Unexpected option value: $cf_search_path" >&5 ++echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;} ++ { (exit 1); exit 1; }; } + ;; + esac + +-echo "$as_me:3337: checking for first directory" >&5 +-echo $ECHO_N "checking for first directory... $ECHO_C" >&6 +-cf_pkg_config_path=none +-for cf_config in $cf_search_path +-do +- if test -d "$cf_config" +- then +- cf_pkg_config_path=$cf_config +- break +- fi +-done +-echo "$as_me:3348: result: $cf_pkg_config_path" >&5 +-echo "${ECHO_T}$cf_pkg_config_path" >&6 +- +-if test "x$cf_pkg_config_path" != xnone ; then +- # limit this to the first directory found +- PKG_CONFIG_LIBDIR="$cf_pkg_config_path" +-fi +- +-if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path" ++if test -n "$cf_search_path" + then +- echo "$as_me:3358: checking for workaround" >&5 +-echo $ECHO_N "checking for workaround... $ECHO_C" >&6 +- if test "$prefix" = "NONE" ; then +- cf_prefix="$ac_default_prefix" +- else +- cf_prefix="$prefix" +- fi +- eval cf_libdir=$libdir +- cf_libdir=`echo "$cf_libdir" | sed -e "s,^NONE,$cf_prefix,"` +- cf_backup= ++ echo "$as_me:3354: checking for first directory" >&5 ++echo $ECHO_N "checking for first directory... $ECHO_C" >&6 ++ cf_pkg_config_path=none + for cf_config in $cf_search_path + do +- case $cf_config in +- $cf_libdir/pkgconfig) +- PKG_CONFIG_LIBDIR=$cf_libdir/pkgconfig ++ if test -d "$cf_config" ++ then ++ cf_pkg_config_path=$cf_config + break +- ;; +- *) +- test -z "$cf_backup" && cf_backup=$cf_config +- ;; +- esac ++ fi + done +- test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup +- echo "$as_me:3381: result: $PKG_CONFIG_LIBDIR" >&5 ++ echo "$as_me:3365: result: $cf_pkg_config_path" >&5 ++echo "${ECHO_T}$cf_pkg_config_path" >&6 ++ ++ if test "x$cf_pkg_config_path" != xnone ; then ++ # limit this to the first directory found ++ PKG_CONFIG_LIBDIR="$cf_pkg_config_path" ++ fi ++ ++ if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path" ++ then ++ echo "$as_me:3375: checking for workaround" >&5 ++echo $ECHO_N "checking for workaround... $ECHO_C" >&6 ++ if test "$prefix" = "NONE" ; then ++ cf_prefix="$ac_default_prefix" ++ else ++ cf_prefix="$prefix" ++ fi ++ eval cf_libdir=$libdir ++ cf_libdir=`echo "$cf_libdir" | sed -e "s,^NONE,$cf_prefix,"` ++ cf_backup= ++ for cf_config in $cf_search_path ++ do ++ case $cf_config in ++ $cf_libdir/pkgconfig) ++ PKG_CONFIG_LIBDIR=$cf_libdir/pkgconfig ++ break ++ ;; ++ *) ++ test -z "$cf_backup" && cf_backup=$cf_config ++ ;; ++ esac ++ done ++ test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup ++ echo "$as_me:3398: result: $PKG_CONFIG_LIBDIR" >&5 + echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 ++ fi + fi + +-echo "$as_me:3385: checking if you want to build test-programs" >&5 ++echo "$as_me:3403: checking if you want to build test-programs" >&5 + echo $ECHO_N "checking if you want to build test-programs... $ECHO_C" >&6 + + # Check whether --with-tests or --without-tests was given. +@@ -3392,10 +3410,10 @@ + else + cf_with_tests=yes + fi; +-echo "$as_me:3395: result: $cf_with_tests" >&5 ++echo "$as_me:3413: result: $cf_with_tests" >&5 + echo "${ECHO_T}$cf_with_tests" >&6 + +-echo "$as_me:3398: checking if we should assume mixed-case filenames" >&5 ++echo "$as_me:3416: checking if we should assume mixed-case filenames" >&5 + echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6 + + # Check whether --enable-mixed-case or --disable-mixed-case was given. +@@ -3405,11 +3423,11 @@ + else + enable_mixedcase=auto + fi; +-echo "$as_me:3408: result: $enable_mixedcase" >&5 ++echo "$as_me:3426: result: $enable_mixedcase" >&5 + echo "${ECHO_T}$enable_mixedcase" >&6 + if test "$enable_mixedcase" = "auto" ; then + +-echo "$as_me:3412: checking if filesystem supports mixed-case filenames" >&5 ++echo "$as_me:3430: checking if filesystem supports mixed-case filenames" >&5 + echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6 + if test "${cf_cv_mixedcase+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3436,7 +3454,7 @@ + fi + + fi +-echo "$as_me:3439: result: $cf_cv_mixedcase" >&5 ++echo "$as_me:3457: result: $cf_cv_mixedcase" >&5 + echo "${ECHO_T}$cf_cv_mixedcase" >&6 + test "$cf_cv_mixedcase" = yes && + cat >>confdefs.h <<\EOF +@@ -3454,7 +3472,7 @@ + fi + + # do this after mixed-case option (tags/TAGS is not as important as tic). +-echo "$as_me:3457: checking whether ${MAKE-make} sets \${MAKE}" >&5 ++echo "$as_me:3475: checking whether ${MAKE-make} sets \${MAKE}" >&5 + echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 + set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` + if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then +@@ -3474,16 +3492,16 @@ + rm -f conftest.make + fi + if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then +- echo "$as_me:3477: result: yes" >&5 ++ echo "$as_me:3495: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + SET_MAKE= + else +- echo "$as_me:3481: result: no" >&5 ++ echo "$as_me:3499: result: no" >&5 + echo "${ECHO_T}no" >&6 + SET_MAKE="MAKE=${MAKE-make}" + fi + +-echo "$as_me:3486: checking for \".PHONY\" make-support" >&5 ++echo "$as_me:3504: checking for \".PHONY\" make-support" >&5 + echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6 + if test "${cf_cv_make_PHONY+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3538,7 +3556,7 @@ + rm -rf conftest* + + fi +-echo "$as_me:3541: result: $cf_cv_make_PHONY" >&5 ++echo "$as_me:3559: result: $cf_cv_make_PHONY" >&5 + echo "${ECHO_T}$cf_cv_make_PHONY" >&6 + MAKE_NO_PHONY="#" + MAKE_PHONY="#" +@@ -3549,7 +3567,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:3552: checking for $ac_word" >&5 ++echo "$as_me:3570: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_CTAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3564,7 +3582,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_CTAGS="$ac_prog" +-echo "$as_me:3567: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3585: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3572,10 +3590,10 @@ + fi + CTAGS=$ac_cv_prog_CTAGS + if test -n "$CTAGS"; then +- echo "$as_me:3575: result: $CTAGS" >&5 ++ echo "$as_me:3593: result: $CTAGS" >&5 + echo "${ECHO_T}$CTAGS" >&6 + else +- echo "$as_me:3578: result: no" >&5 ++ echo "$as_me:3596: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3586,7 +3604,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:3589: checking for $ac_word" >&5 ++echo "$as_me:3607: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ETAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3601,7 +3619,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ETAGS="$ac_prog" +-echo "$as_me:3604: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3622: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3609,10 +3627,10 @@ + fi + ETAGS=$ac_cv_prog_ETAGS + if test -n "$ETAGS"; then +- echo "$as_me:3612: result: $ETAGS" >&5 ++ echo "$as_me:3630: result: $ETAGS" >&5 + echo "${ECHO_T}$ETAGS" >&6 + else +- echo "$as_me:3615: result: no" >&5 ++ echo "$as_me:3633: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3621,7 +3639,7 @@ + + # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args. + set dummy ${CTAGS:-ctags}; ac_word=$2 +-echo "$as_me:3624: checking for $ac_word" >&5 ++echo "$as_me:3642: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3636,7 +3654,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_MAKE_LOWER_TAGS="yes" +-echo "$as_me:3639: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3657: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3645,17 +3663,17 @@ + fi + MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS + if test -n "$MAKE_LOWER_TAGS"; then +- echo "$as_me:3648: result: $MAKE_LOWER_TAGS" >&5 ++ echo "$as_me:3666: result: $MAKE_LOWER_TAGS" >&5 + echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 + else +- echo "$as_me:3651: result: no" >&5 ++ echo "$as_me:3669: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + if test "$cf_cv_mixedcase" = yes ; then + # Extract the first word of "${ETAGS:-etags}", so it can be a program name with args. + set dummy ${ETAGS:-etags}; ac_word=$2 +-echo "$as_me:3658: checking for $ac_word" >&5 ++echo "$as_me:3676: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3670,7 +3688,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_MAKE_UPPER_TAGS="yes" +-echo "$as_me:3673: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3691: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3679,10 +3697,10 @@ + fi + MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS + if test -n "$MAKE_UPPER_TAGS"; then +- echo "$as_me:3682: result: $MAKE_UPPER_TAGS" >&5 ++ echo "$as_me:3700: result: $MAKE_UPPER_TAGS" >&5 + echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 + else +- echo "$as_me:3685: result: no" >&5 ++ echo "$as_me:3703: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3702,7 +3720,7 @@ + MAKE_LOWER_TAGS="#" + fi + +-echo "$as_me:3705: checking for makeflags variable" >&5 ++echo "$as_me:3723: checking for makeflags variable" >&5 + echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6 + if test "${cf_cv_makeflags+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3732,7 +3750,7 @@ + ;; + (*) + +-echo "${as_me:-configure}:3735: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 ++echo "${as_me:-configure}:3753: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 + + ;; + esac +@@ -3740,13 +3758,13 @@ + rm -f cf_makeflags.tmp + + fi +-echo "$as_me:3743: result: $cf_cv_makeflags" >&5 ++echo "$as_me:3761: result: $cf_cv_makeflags" >&5 + echo "${ECHO_T}$cf_cv_makeflags" >&6 + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. + set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +-echo "$as_me:3749: checking for $ac_word" >&5 ++echo "$as_me:3767: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3761,7 +3779,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" +-echo "$as_me:3764: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3782: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3769,10 +3787,10 @@ + fi + RANLIB=$ac_cv_prog_RANLIB + if test -n "$RANLIB"; then +- echo "$as_me:3772: result: $RANLIB" >&5 ++ echo "$as_me:3790: result: $RANLIB" >&5 + echo "${ECHO_T}$RANLIB" >&6 + else +- echo "$as_me:3775: result: no" >&5 ++ echo "$as_me:3793: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3781,7 +3799,7 @@ + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. + set dummy ranlib; ac_word=$2 +-echo "$as_me:3784: checking for $ac_word" >&5 ++echo "$as_me:3802: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3796,7 +3814,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_RANLIB="ranlib" +-echo "$as_me:3799: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3817: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3805,10 +3823,10 @@ + fi + ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB + if test -n "$ac_ct_RANLIB"; then +- echo "$as_me:3808: result: $ac_ct_RANLIB" >&5 ++ echo "$as_me:3826: result: $ac_ct_RANLIB" >&5 + echo "${ECHO_T}$ac_ct_RANLIB" >&6 + else +- echo "$as_me:3811: result: no" >&5 ++ echo "$as_me:3829: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3820,7 +3838,7 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. + set dummy ${ac_tool_prefix}ld; ac_word=$2 +-echo "$as_me:3823: checking for $ac_word" >&5 ++echo "$as_me:3841: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3835,7 +3853,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_LD="${ac_tool_prefix}ld" +-echo "$as_me:3838: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3856: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3843,10 +3861,10 @@ + fi + LD=$ac_cv_prog_LD + if test -n "$LD"; then +- echo "$as_me:3846: result: $LD" >&5 ++ echo "$as_me:3864: result: $LD" >&5 + echo "${ECHO_T}$LD" >&6 + else +- echo "$as_me:3849: result: no" >&5 ++ echo "$as_me:3867: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3855,7 +3873,7 @@ + ac_ct_LD=$LD + # Extract the first word of "ld", so it can be a program name with args. + set dummy ld; ac_word=$2 +-echo "$as_me:3858: checking for $ac_word" >&5 ++echo "$as_me:3876: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3870,7 +3888,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_LD="ld" +-echo "$as_me:3873: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3891: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3879,10 +3897,10 @@ + fi + ac_ct_LD=$ac_cv_prog_ac_ct_LD + if test -n "$ac_ct_LD"; then +- echo "$as_me:3882: result: $ac_ct_LD" >&5 ++ echo "$as_me:3900: result: $ac_ct_LD" >&5 + echo "${ECHO_T}$ac_ct_LD" >&6 + else +- echo "$as_me:3885: result: no" >&5 ++ echo "$as_me:3903: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3894,7 +3912,7 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. + set dummy ${ac_tool_prefix}ar; ac_word=$2 +-echo "$as_me:3897: checking for $ac_word" >&5 ++echo "$as_me:3915: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3909,7 +3927,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_AR="${ac_tool_prefix}ar" +-echo "$as_me:3912: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3930: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3917,10 +3935,10 @@ + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +- echo "$as_me:3920: result: $AR" >&5 ++ echo "$as_me:3938: result: $AR" >&5 + echo "${ECHO_T}$AR" >&6 + else +- echo "$as_me:3923: result: no" >&5 ++ echo "$as_me:3941: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3929,7 +3947,7 @@ + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. + set dummy ar; ac_word=$2 +-echo "$as_me:3932: checking for $ac_word" >&5 ++echo "$as_me:3950: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3944,7 +3962,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_AR="ar" +-echo "$as_me:3947: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3965: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3953,10 +3971,10 @@ + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +- echo "$as_me:3956: result: $ac_ct_AR" >&5 ++ echo "$as_me:3974: result: $ac_ct_AR" >&5 + echo "${ECHO_T}$ac_ct_AR" >&6 + else +- echo "$as_me:3959: result: no" >&5 ++ echo "$as_me:3977: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3968,7 +3986,7 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. + set dummy ${ac_tool_prefix}ar; ac_word=$2 +-echo "$as_me:3971: checking for $ac_word" >&5 ++echo "$as_me:3989: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3983,7 +4001,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_AR="${ac_tool_prefix}ar" +-echo "$as_me:3986: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4004: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3991,10 +4009,10 @@ + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +- echo "$as_me:3994: result: $AR" >&5 ++ echo "$as_me:4012: result: $AR" >&5 + echo "${ECHO_T}$AR" >&6 + else +- echo "$as_me:3997: result: no" >&5 ++ echo "$as_me:4015: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4003,7 +4021,7 @@ + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. + set dummy ar; ac_word=$2 +-echo "$as_me:4006: checking for $ac_word" >&5 ++echo "$as_me:4024: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4018,7 +4036,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_AR="ar" +-echo "$as_me:4021: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4039: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4027,10 +4045,10 @@ + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +- echo "$as_me:4030: result: $ac_ct_AR" >&5 ++ echo "$as_me:4048: result: $ac_ct_AR" >&5 + echo "${ECHO_T}$ac_ct_AR" >&6 + else +- echo "$as_me:4033: result: no" >&5 ++ echo "$as_me:4051: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4039,7 +4057,7 @@ + AR="$ac_cv_prog_AR" + fi + +-echo "$as_me:4042: checking for options to update archives" >&5 ++echo "$as_me:4060: checking for options to update archives" >&5 + echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6 + if test "${cf_cv_ar_flags+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4076,13 +4094,13 @@ + rm -f conftest.a + + cat >"conftest.$ac_ext" <&5 ++ if { (eval echo "$as_me:4100: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4085: \$? = $ac_status" >&5 ++ echo "$as_me:4103: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then + echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5 + $AR $ARFLAGS "$cf_ar_flags" conftest.a "conftest.$ac_cv_objext" 2>&5 1>/dev/null +@@ -4093,7 +4111,7 @@ + else + test -n "$verbose" && echo " cannot compile test-program" 1>&6 + +-echo "${as_me:-configure}:4096: testing cannot compile test-program ..." 1>&5 ++echo "${as_me:-configure}:4114: testing cannot compile test-program ..." 1>&5 + + break + fi +@@ -4103,7 +4121,7 @@ + esac + + fi +-echo "$as_me:4106: result: $cf_cv_ar_flags" >&5 ++echo "$as_me:4124: result: $cf_cv_ar_flags" >&5 + echo "${ECHO_T}$cf_cv_ar_flags" >&6 + + if test -n "$ARFLAGS" ; then +@@ -4114,17 +4132,17 @@ + ARFLAGS=$cf_cv_ar_flags + fi + +- echo "$as_me:4117: checking for PATH separator" >&5 ++ echo "$as_me:4135: checking for PATH separator" >&5 + echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6 + case "$cf_cv_system_name" in + (os2*) PATH_SEPARATOR=';' ;; + (*) ${PATH_SEPARATOR:=':'} ;; + esac + +- echo "$as_me:4124: result: $PATH_SEPARATOR" >&5 ++ echo "$as_me:4142: result: $PATH_SEPARATOR" >&5 + echo "${ECHO_T}$PATH_SEPARATOR" >&6 + +-echo "$as_me:4127: checking if you have specified an install-prefix" >&5 ++echo "$as_me:4145: checking if you have specified an install-prefix" >&5 + echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6 + + # Check whether --with-install-prefix or --without-install-prefix was given. +@@ -4137,7 +4155,7 @@ + ;; + esac + fi; +-echo "$as_me:4140: result: $DESTDIR" >&5 ++echo "$as_me:4158: result: $DESTDIR" >&5 + echo "${ECHO_T}$DESTDIR" >&6 + + ############################################################################### +@@ -4165,7 +4183,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:4168: checking for $ac_word" >&5 ++echo "$as_me:4186: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_BUILD_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4180,7 +4198,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_BUILD_CC="$ac_prog" +-echo "$as_me:4183: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4201: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4188,10 +4206,10 @@ + fi + BUILD_CC=$ac_cv_prog_BUILD_CC + if test -n "$BUILD_CC"; then +- echo "$as_me:4191: result: $BUILD_CC" >&5 ++ echo "$as_me:4209: result: $BUILD_CC" >&5 + echo "${ECHO_T}$BUILD_CC" >&6 + else +- echo "$as_me:4194: result: no" >&5 ++ echo "$as_me:4212: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4200,12 +4218,12 @@ + test -n "$BUILD_CC" || BUILD_CC="none" + + fi; +- echo "$as_me:4203: checking for native build C compiler" >&5 ++ echo "$as_me:4221: checking for native build C compiler" >&5 + echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6 +- echo "$as_me:4205: result: $BUILD_CC" >&5 ++ echo "$as_me:4223: result: $BUILD_CC" >&5 + echo "${ECHO_T}$BUILD_CC" >&6 + +- echo "$as_me:4208: checking for native build C preprocessor" >&5 ++ echo "$as_me:4226: checking for native build C preprocessor" >&5 + echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6 + + # Check whether --with-build-cpp or --without-build-cpp was given. +@@ -4215,10 +4233,10 @@ + else + BUILD_CPP='${BUILD_CC} -E' + fi; +- echo "$as_me:4218: result: $BUILD_CPP" >&5 ++ echo "$as_me:4236: result: $BUILD_CPP" >&5 + echo "${ECHO_T}$BUILD_CPP" >&6 + +- echo "$as_me:4221: checking for native build C flags" >&5 ++ echo "$as_me:4239: checking for native build C flags" >&5 + echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6 + + # Check whether --with-build-cflags or --without-build-cflags was given. +@@ -4226,10 +4244,10 @@ + withval="$with_build_cflags" + BUILD_CFLAGS="$withval" + fi; +- echo "$as_me:4229: result: $BUILD_CFLAGS" >&5 ++ echo "$as_me:4247: result: $BUILD_CFLAGS" >&5 + echo "${ECHO_T}$BUILD_CFLAGS" >&6 + +- echo "$as_me:4232: checking for native build C preprocessor-flags" >&5 ++ echo "$as_me:4250: checking for native build C preprocessor-flags" >&5 + echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6 + + # Check whether --with-build-cppflags or --without-build-cppflags was given. +@@ -4237,10 +4255,10 @@ + withval="$with_build_cppflags" + BUILD_CPPFLAGS="$withval" + fi; +- echo "$as_me:4240: result: $BUILD_CPPFLAGS" >&5 ++ echo "$as_me:4258: result: $BUILD_CPPFLAGS" >&5 + echo "${ECHO_T}$BUILD_CPPFLAGS" >&6 + +- echo "$as_me:4243: checking for native build linker-flags" >&5 ++ echo "$as_me:4261: checking for native build linker-flags" >&5 + echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6 + + # Check whether --with-build-ldflags or --without-build-ldflags was given. +@@ -4248,10 +4266,10 @@ + withval="$with_build_ldflags" + BUILD_LDFLAGS="$withval" + fi; +- echo "$as_me:4251: result: $BUILD_LDFLAGS" >&5 ++ echo "$as_me:4269: result: $BUILD_LDFLAGS" >&5 + echo "${ECHO_T}$BUILD_LDFLAGS" >&6 + +- echo "$as_me:4254: checking for native build linker-libraries" >&5 ++ echo "$as_me:4272: checking for native build linker-libraries" >&5 + echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6 + + # Check whether --with-build-libs or --without-build-libs was given. +@@ -4259,7 +4277,7 @@ + withval="$with_build_libs" + BUILD_LIBS="$withval" + fi; +- echo "$as_me:4262: result: $BUILD_LIBS" >&5 ++ echo "$as_me:4280: result: $BUILD_LIBS" >&5 + echo "${ECHO_T}$BUILD_LIBS" >&6 + + # this assumes we're on Unix. +@@ -4269,7 +4287,7 @@ + : ${BUILD_CC:='${CC}'} + + if { test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}'; } ; then +- { { echo "$as_me:4272: error: Cross-build requires two compilers. ++ { { echo "$as_me:4290: error: Cross-build requires two compilers. + Use --with-build-cc to specify the native compiler." >&5 + echo "$as_me: error: Cross-build requires two compilers. + Use --with-build-cc to specify the native compiler." >&2;} +@@ -4294,7 +4312,7 @@ + ### shared, for example. + cf_list_models="" + +-echo "$as_me:4297: checking if you want to build shared C-objects" >&5 ++echo "$as_me:4315: checking if you want to build shared C-objects" >&5 + echo $ECHO_N "checking if you want to build shared C-objects... $ECHO_C" >&6 + + # Check whether --with-shared or --without-shared was given. +@@ -4304,27 +4322,27 @@ + else + with_shared=no + fi; +-echo "$as_me:4307: result: $with_shared" >&5 ++echo "$as_me:4325: result: $with_shared" >&5 + echo "${ECHO_T}$with_shared" >&6 + test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared" + +-echo "$as_me:4311: checking for specified models" >&5 ++echo "$as_me:4329: checking for specified models" >&5 + echo $ECHO_N "checking for specified models... $ECHO_C" >&6 + test -z "$cf_list_models" && cf_list_models=normal +-echo "$as_me:4314: result: $cf_list_models" >&5 ++echo "$as_me:4332: result: $cf_list_models" >&5 + echo "${ECHO_T}$cf_list_models" >&6 + + ### Use the first model as the default, and save its suffix for use in building + ### up test-applications. +-echo "$as_me:4319: checking for default model" >&5 ++echo "$as_me:4337: checking for default model" >&5 + echo $ECHO_N "checking for default model... $ECHO_C" >&6 + DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'` +-echo "$as_me:4322: result: $DFT_LWR_MODEL" >&5 ++echo "$as_me:4340: result: $DFT_LWR_MODEL" >&5 + echo "${ECHO_T}$DFT_LWR_MODEL" >&6 + + DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + +-echo "$as_me:4327: checking for specific curses-directory" >&5 ++echo "$as_me:4345: checking for specific curses-directory" >&5 + echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6 + + # Check whether --with-curses-dir or --without-curses-dir was given. +@@ -4334,7 +4352,7 @@ + else + cf_cv_curses_dir=no + fi; +-echo "$as_me:4337: result: $cf_cv_curses_dir" >&5 ++echo "$as_me:4355: result: $cf_cv_curses_dir" >&5 + echo "${ECHO_T}$cf_cv_curses_dir" >&6 + + if test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" +@@ -4365,7 +4383,7 @@ + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:4368: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:4386: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -4401,7 +4419,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 4404 "configure" ++#line 4422 "configure" + #include "confdefs.h" + #include + int +@@ -4413,16 +4431,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:4416: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4434: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4419: \$? = $ac_status" >&5 ++ echo "$as_me:4437: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:4422: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4440: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4425: \$? = $ac_status" >&5 ++ echo "$as_me:4443: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -4439,7 +4457,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:4442: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:4460: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -4475,7 +4493,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me:-configure}:4478: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:4496: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -4490,13 +4508,13 @@ + cf_have_ncuconfig=no + + if test "x${PKG_CONFIG:=none}" != xnone; then +- echo "$as_me:4493: checking pkg-config for $cf_ncuconfig_root" >&5 ++ echo "$as_me:4511: checking pkg-config for $cf_ncuconfig_root" >&5 + echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6 + if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then +- echo "$as_me:4496: result: yes" >&5 ++ echo "$as_me:4514: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + +- echo "$as_me:4499: checking if the $cf_ncuconfig_root package files work" >&5 ++ echo "$as_me:4517: checking if the $cf_ncuconfig_root package files work" >&5 + echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 + cf_have_ncuconfig=unknown + +@@ -4629,7 +4647,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 4632 "configure" ++#line 4650 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -4641,37 +4659,37 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:4644: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:4662: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:4647: \$? = $ac_status" >&5 ++ echo "$as_me:4665: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:4650: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4668: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4653: \$? = $ac_status" >&5 ++ echo "$as_me:4671: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + if test "$cross_compiling" = yes; then + cf_test_ncuconfig=maybe + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 4659 "configure" ++#line 4677 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int main(void) + { const char *xx = curses_version(); return (xx == 0); } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:4666: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:4684: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:4669: \$? = $ac_status" >&5 ++ echo "$as_me:4687: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:4671: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4689: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4674: \$? = $ac_status" >&5 ++ echo "$as_me:4692: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_test_ncuconfig=yes + else +@@ -4845,7 +4863,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 4848 "configure" ++#line 4866 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -4857,37 +4875,37 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:4860: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:4878: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:4863: \$? = $ac_status" >&5 ++ echo "$as_me:4881: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:4866: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4884: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4869: \$? = $ac_status" >&5 ++ echo "$as_me:4887: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + if test "$cross_compiling" = yes; then + cf_have_ncuconfig=maybe + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 4875 "configure" ++#line 4893 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int main(void) + { const char *xx = curses_version(); return (xx == 0); } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:4882: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:4900: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:4885: \$? = $ac_status" >&5 ++ echo "$as_me:4903: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:4887: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4905: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4890: \$? = $ac_status" >&5 ++ echo "$as_me:4908: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_have_ncuconfig=yes + else +@@ -4904,7 +4922,7 @@ + cf_have_ncuconfig=no + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +- echo "$as_me:4907: result: $cf_have_ncuconfig" >&5 ++ echo "$as_me:4925: result: $cf_have_ncuconfig" >&5 + echo "${ECHO_T}$cf_have_ncuconfig" >&6 + test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes + if test "$cf_have_ncuconfig" != "yes" +@@ -4920,7 +4938,7 @@ + + NCURSES_CONFIG_PKG=$cf_ncuconfig_root + +-echo "$as_me:4923: checking for terminfo header" >&5 ++echo "$as_me:4941: checking for terminfo header" >&5 + echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 + if test "${cf_cv_term_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4938,7 +4956,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 4941 "configure" ++#line 4959 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -4953,16 +4971,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:4956: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4974: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4959: \$? = $ac_status" >&5 ++ echo "$as_me:4977: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:4962: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4980: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4965: \$? = $ac_status" >&5 ++ echo "$as_me:4983: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_term_header="$cf_test" +@@ -4978,7 +4996,7 @@ + done + + fi +-echo "$as_me:4981: result: $cf_cv_term_header" >&5 ++echo "$as_me:4999: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -5013,7 +5031,7 @@ + fi + + else +- echo "$as_me:5016: result: no" >&5 ++ echo "$as_me:5034: result: no" >&5 + echo "${ECHO_T}no" >&6 + NCURSES_CONFIG_PKG=none + fi +@@ -5029,7 +5047,7 @@ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-echo "$as_me:5032: checking for $ac_word" >&5 ++echo "$as_me:5050: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5044,7 +5062,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" +-echo "$as_me:5047: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5065: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5052,10 +5070,10 @@ + fi + NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG + if test -n "$NCURSES_CONFIG"; then +- echo "$as_me:5055: result: $NCURSES_CONFIG" >&5 ++ echo "$as_me:5073: result: $NCURSES_CONFIG" >&5 + echo "${ECHO_T}$NCURSES_CONFIG" >&6 + else +- echo "$as_me:5058: result: no" >&5 ++ echo "$as_me:5076: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5068,7 +5086,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:5071: checking for $ac_word" >&5 ++echo "$as_me:5089: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5083,7 +5101,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" +-echo "$as_me:5086: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5104: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5091,10 +5109,10 @@ + fi + ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG + if test -n "$ac_ct_NCURSES_CONFIG"; then +- echo "$as_me:5094: result: $ac_ct_NCURSES_CONFIG" >&5 ++ echo "$as_me:5112: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 + else +- echo "$as_me:5097: result: no" >&5 ++ echo "$as_me:5115: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5251,7 +5269,7 @@ + + # even with config script, some packages use no-override for curses.h + +-echo "$as_me:5254: checking if we have identified curses headers" >&5 ++echo "$as_me:5272: checking if we have identified curses headers" >&5 + echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 + if test "${cf_cv_ncurses_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5263,7 +5281,7 @@ + curses.h ncurses/curses.h + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 5266 "configure" ++#line 5284 "configure" + #include "confdefs.h" + #include <${cf_header}> + int +@@ -5275,16 +5293,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:5278: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5296: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5281: \$? = $ac_status" >&5 ++ echo "$as_me:5299: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:5284: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5302: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5287: \$? = $ac_status" >&5 ++ echo "$as_me:5305: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_header=$cf_header; break + else +@@ -5295,11 +5313,11 @@ + done + + fi +-echo "$as_me:5298: result: $cf_cv_ncurses_header" >&5 ++echo "$as_me:5316: result: $cf_cv_ncurses_header" >&5 + echo "${ECHO_T}$cf_cv_ncurses_header" >&6 + + if test "$cf_cv_ncurses_header" = none ; then +- { { echo "$as_me:5302: error: No curses header-files found" >&5 ++ { { echo "$as_me:5320: error: No curses header-files found" >&5 + echo "$as_me: error: No curses header-files found" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -5309,23 +5327,23 @@ + for ac_header in $cf_cv_ncurses_header + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:5312: checking for $ac_header" >&5 ++echo "$as_me:5330: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 5318 "configure" ++#line 5336 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:5322: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:5340: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:5328: \$? = $ac_status" >&5 ++ echo "$as_me:5346: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -5344,7 +5362,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:5347: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:5365: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF +-#line 5403 "configure" ++#line 5421 "configure" + #include "confdefs.h" + #include + int +@@ -5412,16 +5430,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:5415: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5433: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5418: \$? = $ac_status" >&5 ++ echo "$as_me:5436: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:5421: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5439: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5424: \$? = $ac_status" >&5 ++ echo "$as_me:5442: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -5438,7 +5456,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:5441: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:5459: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -5457,7 +5475,7 @@ + + } + +-echo "$as_me:5460: checking for $cf_ncuhdr_root header in include-path" >&5 ++echo "$as_me:5478: checking for $cf_ncuhdr_root header in include-path" >&5 + echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 + if test "${cf_cv_ncurses_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5469,7 +5487,7 @@ + do + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 5472 "configure" ++#line 5490 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -5493,16 +5511,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:5496: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5514: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5499: \$? = $ac_status" >&5 ++ echo "$as_me:5517: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:5502: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5520: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5505: \$? = $ac_status" >&5 ++ echo "$as_me:5523: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_h=$cf_header + +@@ -5517,14 +5535,14 @@ + done + + fi +-echo "$as_me:5520: result: $cf_cv_ncurses_h" >&5 ++echo "$as_me:5538: result: $cf_cv_ncurses_h" >&5 + echo "${ECHO_T}$cf_cv_ncurses_h" >&6 + + if test "$cf_cv_ncurses_h" != no ; then + cf_cv_ncurses_header=$cf_cv_ncurses_h + else + +-echo "$as_me:5527: checking for $cf_ncuhdr_root include-path" >&5 ++echo "$as_me:5545: checking for $cf_ncuhdr_root include-path" >&5 + echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 + if test "${cf_cv_ncurses_h2+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5645,7 +5663,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 5648 "configure" ++#line 5666 "configure" + #include "confdefs.h" + #include + int +@@ -5657,16 +5675,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:5660: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5678: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5663: \$? = $ac_status" >&5 ++ echo "$as_me:5681: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:5666: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5684: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5669: \$? = $ac_status" >&5 ++ echo "$as_me:5687: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -5683,7 +5701,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:5686: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:5704: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -5706,7 +5724,7 @@ + do + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 5709 "configure" ++#line 5727 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -5730,16 +5748,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:5733: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5751: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5736: \$? = $ac_status" >&5 ++ echo "$as_me:5754: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:5739: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5757: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5742: \$? = $ac_status" >&5 ++ echo "$as_me:5760: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_h2=$cf_header + +@@ -5760,12 +5778,12 @@ + CPPFLAGS="$cf_save2_CPPFLAGS" + test "$cf_cv_ncurses_h2" != no && break + done +- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5763: error: not found" >&5 ++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5781: error: not found" >&5 + echo "$as_me: error: not found" >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:5768: result: $cf_cv_ncurses_h2" >&5 ++echo "$as_me:5786: result: $cf_cv_ncurses_h2" >&5 + echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 + + cf_1st_incdir=`echo "$cf_cv_ncurses_h2" | sed -e 's%/[^/]*$%%'` +@@ -5801,7 +5819,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 5804 "configure" ++#line 5822 "configure" + #include "confdefs.h" + #include + int +@@ -5813,16 +5831,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:5816: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5834: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5819: \$? = $ac_status" >&5 ++ echo "$as_me:5837: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:5822: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5840: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5825: \$? = $ac_status" >&5 ++ echo "$as_me:5843: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -5839,7 +5857,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:5842: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:5860: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -5887,7 +5905,7 @@ + ;; + esac + +-echo "$as_me:5890: checking for terminfo header" >&5 ++echo "$as_me:5908: checking for terminfo header" >&5 + echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 + if test "${cf_cv_term_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5905,7 +5923,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 5908 "configure" ++#line 5926 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -5920,16 +5938,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:5923: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5941: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5926: \$? = $ac_status" >&5 ++ echo "$as_me:5944: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:5929: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5947: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5932: \$? = $ac_status" >&5 ++ echo "$as_me:5950: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_term_header="$cf_test" +@@ -5945,7 +5963,7 @@ + done + + fi +-echo "$as_me:5948: result: $cf_cv_term_header" >&5 ++echo "$as_me:5966: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -5983,7 +6001,7 @@ + #define NCURSES 1 + EOF + +-echo "$as_me:5986: checking for ncurses version" >&5 ++echo "$as_me:6004: checking for ncurses version" >&5 + echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 + if test "${cf_cv_ncurses_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6009,10 +6027,10 @@ + #endif + EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" +- { (eval echo "$as_me:6012: \"$cf_try\"") >&5 ++ { (eval echo "$as_me:6030: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? +- echo "$as_me:6015: \$? = $ac_status" >&5 ++ echo "$as_me:6033: \$? = $ac_status" >&5 + (exit "$ac_status"); } + if test -f conftest.out ; then + cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` +@@ -6022,7 +6040,7 @@ + + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6025 "configure" ++#line 6043 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -6047,15 +6065,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:6050: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6068: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6053: \$? = $ac_status" >&5 ++ echo "$as_me:6071: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:6055: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6073: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6058: \$? = $ac_status" >&5 ++ echo "$as_me:6076: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_ncurses_version=`cat $cf_tempfile` +@@ -6069,7 +6087,7 @@ + rm -f "$cf_tempfile" + + fi +-echo "$as_me:6072: result: $cf_cv_ncurses_version" >&5 ++echo "$as_me:6090: result: $cf_cv_ncurses_version" >&5 + echo "${ECHO_T}$cf_cv_ncurses_version" >&6 + test "$cf_cv_ncurses_version" = no || + cat >>confdefs.h <<\EOF +@@ -6082,7 +6100,7 @@ + # to link gpm. + cf_ncurses_LIBS="" + cf_ncurses_SAVE="$LIBS" +-echo "$as_me:6085: checking for Gpm_Open in -lgpm" >&5 ++echo "$as_me:6103: checking for Gpm_Open in -lgpm" >&5 + echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 + if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6090,7 +6108,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6093 "configure" ++#line 6111 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -6109,16 +6127,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6112: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6130: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6115: \$? = $ac_status" >&5 ++ echo "$as_me:6133: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6118: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6136: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6121: \$? = $ac_status" >&5 ++ echo "$as_me:6139: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gpm_Gpm_Open=yes + else +@@ -6129,10 +6147,10 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:6132: result: $ac_cv_lib_gpm_Gpm_Open" >&5 ++echo "$as_me:6150: result: $ac_cv_lib_gpm_Gpm_Open" >&5 + echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 + if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then +- echo "$as_me:6135: checking for initscr in -lgpm" >&5 ++ echo "$as_me:6153: checking for initscr in -lgpm" >&5 + echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 + if test "${ac_cv_lib_gpm_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6140,7 +6158,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6143 "configure" ++#line 6161 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -6159,16 +6177,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6162: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6180: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6165: \$? = $ac_status" >&5 ++ echo "$as_me:6183: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6168: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6186: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6171: \$? = $ac_status" >&5 ++ echo "$as_me:6189: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gpm_initscr=yes + else +@@ -6179,7 +6197,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:6182: result: $ac_cv_lib_gpm_initscr" >&5 ++echo "$as_me:6200: result: $ac_cv_lib_gpm_initscr" >&5 + echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 + if test "$ac_cv_lib_gpm_initscr" = yes; then + LIBS="$cf_ncurses_SAVE" +@@ -6194,7 +6212,7 @@ + # This is only necessary if you are linking against an obsolete + # version of ncurses (but it should do no harm, since it is static). + if test "$cf_nculib_root" = ncurses ; then +- echo "$as_me:6197: checking for tgoto in -lmytinfo" >&5 ++ echo "$as_me:6215: checking for tgoto in -lmytinfo" >&5 + echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 + if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6202,7 +6220,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmytinfo $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6205 "configure" ++#line 6223 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -6221,16 +6239,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6224: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6242: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6227: \$? = $ac_status" >&5 ++ echo "$as_me:6245: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6230: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6248: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6233: \$? = $ac_status" >&5 ++ echo "$as_me:6251: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_mytinfo_tgoto=yes + else +@@ -6241,7 +6259,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:6244: result: $ac_cv_lib_mytinfo_tgoto" >&5 ++echo "$as_me:6262: result: $ac_cv_lib_mytinfo_tgoto" >&5 + echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 + if test "$ac_cv_lib_mytinfo_tgoto" = yes; then + cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" +@@ -6290,13 +6308,13 @@ + + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' + cf_libdir="" +- echo "$as_me:6293: checking for initscr" >&5 ++ echo "$as_me:6311: checking for initscr" >&5 + echo $ECHO_N "checking for initscr... $ECHO_C" >&6 + if test "${ac_cv_func_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6299 "configure" ++#line 6317 "configure" + #include "confdefs.h" + #define initscr autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -6327,16 +6345,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6330: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6348: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6333: \$? = $ac_status" >&5 ++ echo "$as_me:6351: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6336: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6354: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6339: \$? = $ac_status" >&5 ++ echo "$as_me:6357: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_initscr=yes + else +@@ -6346,18 +6364,18 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:6349: result: $ac_cv_func_initscr" >&5 ++echo "$as_me:6367: result: $ac_cv_func_initscr" >&5 + echo "${ECHO_T}$ac_cv_func_initscr" >&6 + if test "$ac_cv_func_initscr" = yes; then + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' + else + + cf_save_LIBS="$LIBS" +- echo "$as_me:6356: checking for initscr in -l$cf_nculib_root" >&5 ++ echo "$as_me:6374: checking for initscr in -l$cf_nculib_root" >&5 + echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 + LIBS="-l$cf_nculib_root $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6360 "configure" ++#line 6378 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -6369,25 +6387,25 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6372: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6390: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6375: \$? = $ac_status" >&5 ++ echo "$as_me:6393: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6378: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6396: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6381: \$? = $ac_status" >&5 ++ echo "$as_me:6399: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then +- echo "$as_me:6383: result: yes" >&5 ++ echo "$as_me:6401: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' + + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 +-echo "$as_me:6390: result: no" >&5 ++echo "$as_me:6408: result: no" >&5 + echo "${ECHO_T}no" >&6 + + cf_search= +@@ -6455,11 +6473,11 @@ + + for cf_libdir in $cf_search + do +- echo "$as_me:6458: checking for -l$cf_nculib_root in $cf_libdir" >&5 ++ echo "$as_me:6476: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 + LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6462 "configure" ++#line 6480 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -6471,25 +6489,25 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6474: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6492: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6477: \$? = $ac_status" >&5 ++ echo "$as_me:6495: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6480: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6498: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6483: \$? = $ac_status" >&5 ++ echo "$as_me:6501: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then +- echo "$as_me:6485: result: yes" >&5 ++ echo "$as_me:6503: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' + break + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 +-echo "$as_me:6492: result: no" >&5 ++echo "$as_me:6510: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_save_LIBS" + fi +@@ -6504,7 +6522,7 @@ + eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" + + if test "$cf_found_library" = no ; then +- { { echo "$as_me:6507: error: Cannot link $cf_nculib_root library" >&5 ++ { { echo "$as_me:6525: error: Cannot link $cf_nculib_root library" >&5 + echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -6512,7 +6530,7 @@ + fi + + if test -n "$cf_ncurses_LIBS" ; then +- echo "$as_me:6515: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 ++ echo "$as_me:6533: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 + cf_ncurses_SAVE="$LIBS" + for p in $cf_ncurses_LIBS ; do +@@ -6522,7 +6540,7 @@ + fi + done + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6525 "configure" ++#line 6543 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -6534,23 +6552,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6537: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6555: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6540: \$? = $ac_status" >&5 ++ echo "$as_me:6558: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6543: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6561: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6546: \$? = $ac_status" >&5 ++ echo "$as_me:6564: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then +- echo "$as_me:6548: result: yes" >&5 ++ echo "$as_me:6566: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 +-echo "$as_me:6553: result: no" >&5 ++echo "$as_me:6571: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_ncurses_SAVE" + fi +@@ -6568,7 +6586,7 @@ + NCURSES_CONFIG=none + fi + +-echo "$as_me:6571: checking if you want wide-character code" >&5 ++echo "$as_me:6589: checking if you want wide-character code" >&5 + echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6 + + # Check whether --enable-widec or --disable-widec was given. +@@ -6578,30 +6596,30 @@ + else + with_widec=no + fi; +-echo "$as_me:6581: result: $with_widec" >&5 ++echo "$as_me:6599: result: $with_widec" >&5 + echo "${ECHO_T}$with_widec" >&6 + if test "$with_widec" = yes ; then + + for ac_header in wchar.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:6588: checking for $ac_header" >&5 ++echo "$as_me:6606: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6594 "configure" ++#line 6612 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:6598: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:6616: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:6604: \$? = $ac_status" >&5 ++ echo "$as_me:6622: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -6620,7 +6638,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:6623: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:6641: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:6651: checking for multibyte character support" >&5 + echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6 + if test "${cf_cv_utf8_lib+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6638,7 +6656,7 @@ + + cf_save_LIBS="$LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6641 "configure" ++#line 6659 "configure" + #include "confdefs.h" + + #include +@@ -6656,16 +6674,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6659: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6677: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6662: \$? = $ac_status" >&5 ++ echo "$as_me:6680: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6665: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6683: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6668: \$? = $ac_status" >&5 ++ echo "$as_me:6686: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_utf8_lib=yes + else +@@ -6677,12 +6695,12 @@ + cf_cv_header_path_utf8= + cf_cv_library_path_utf8= + +-echo "${as_me:-configure}:6680: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:6698: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6685 "configure" ++#line 6703 "configure" + #include "confdefs.h" + + #include +@@ -6695,16 +6713,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6698: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6716: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6701: \$? = $ac_status" >&5 ++ echo "$as_me:6719: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6704: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6722: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6707: \$? = $ac_status" >&5 ++ echo "$as_me:6725: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_find_linkage_utf8=yes +@@ -6718,7 +6736,7 @@ + LIBS="-lutf8 $cf_save_LIBS" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6721 "configure" ++#line 6739 "configure" + #include "confdefs.h" + + #include +@@ -6731,16 +6749,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6734: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6752: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6737: \$? = $ac_status" >&5 ++ echo "$as_me:6755: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6740: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6758: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6743: \$? = $ac_status" >&5 ++ echo "$as_me:6761: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_find_linkage_utf8=yes +@@ -6757,9 +6775,9 @@ + + test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 + +-echo "${as_me:-configure}:6760: testing find linkage for utf8 library ..." 1>&5 ++echo "${as_me:-configure}:6778: testing find linkage for utf8 library ..." 1>&5 + +-echo "${as_me:-configure}:6762: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:6780: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_CPPFLAGS="$CPPFLAGS" + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -6850,7 +6868,7 @@ + if test -d "$cf_cv_header_path_utf8" ; then + test -n "$verbose" && echo " ... testing $cf_cv_header_path_utf8" 1>&6 + +-echo "${as_me:-configure}:6853: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:6871: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 + + CPPFLAGS="$cf_save_CPPFLAGS" + +@@ -6858,7 +6876,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6861 "configure" ++#line 6879 "configure" + #include "confdefs.h" + + #include +@@ -6871,21 +6889,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:6874: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6892: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6877: \$? = $ac_status" >&5 ++ echo "$as_me:6895: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:6880: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6898: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6883: \$? = $ac_status" >&5 ++ echo "$as_me:6901: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + test -n "$verbose" && echo " ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6 + +-echo "${as_me:-configure}:6888: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:6906: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 + + cf_cv_find_linkage_utf8=maybe + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -6903,7 +6921,7 @@ + + if test "$cf_cv_find_linkage_utf8" = maybe ; then + +-echo "${as_me:-configure}:6906: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:6924: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + cf_save_LDFLAGS="$LDFLAGS" +@@ -6978,13 +6996,13 @@ + if test -d "$cf_cv_library_path_utf8" ; then + test -n "$verbose" && echo " ... testing $cf_cv_library_path_utf8" 1>&6 + +-echo "${as_me:-configure}:6981: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:6999: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 + + CPPFLAGS="$cf_test_CPPFLAGS" + LIBS="-lutf8 $cf_save_LIBS" + LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6987 "configure" ++#line 7005 "configure" + #include "confdefs.h" + + #include +@@ -6997,21 +7015,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7000: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7018: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7003: \$? = $ac_status" >&5 ++ echo "$as_me:7021: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7006: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7024: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7009: \$? = $ac_status" >&5 ++ echo "$as_me:7027: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + test -n "$verbose" && echo " ... found utf8 library in $cf_cv_library_path_utf8" 1>&6 + +-echo "${as_me:-configure}:7014: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:7032: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 + + cf_cv_find_linkage_utf8=yes + cf_cv_library_file_utf8="-lutf8" +@@ -7053,7 +7071,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:7056: result: $cf_cv_utf8_lib" >&5 ++echo "$as_me:7074: result: $cf_cv_utf8_lib" >&5 + echo "${ECHO_T}$cf_cv_utf8_lib" >&6 + + # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between +@@ -7091,7 +7109,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7094 "configure" ++#line 7112 "configure" + #include "confdefs.h" + #include + int +@@ -7103,16 +7121,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:7106: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:7124: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7109: \$? = $ac_status" >&5 ++ echo "$as_me:7127: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:7112: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7130: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7115: \$? = $ac_status" >&5 ++ echo "$as_me:7133: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -7129,7 +7147,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:7132: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:7150: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -7165,7 +7183,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me:-configure}:7168: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:7186: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -7195,13 +7213,13 @@ + cf_have_ncuconfig=no + + if test "x${PKG_CONFIG:=none}" != xnone; then +- echo "$as_me:7198: checking pkg-config for $cf_ncuconfig_root" >&5 ++ echo "$as_me:7216: checking pkg-config for $cf_ncuconfig_root" >&5 + echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6 + if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then +- echo "$as_me:7201: result: yes" >&5 ++ echo "$as_me:7219: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + +- echo "$as_me:7204: checking if the $cf_ncuconfig_root package files work" >&5 ++ echo "$as_me:7222: checking if the $cf_ncuconfig_root package files work" >&5 + echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 + cf_have_ncuconfig=unknown + +@@ -7334,7 +7352,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7337 "configure" ++#line 7355 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -7346,37 +7364,37 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7349: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7367: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7352: \$? = $ac_status" >&5 ++ echo "$as_me:7370: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7355: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7373: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7358: \$? = $ac_status" >&5 ++ echo "$as_me:7376: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + if test "$cross_compiling" = yes; then + cf_test_ncuconfig=maybe + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7364 "configure" ++#line 7382 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int main(void) + { const char *xx = curses_version(); return (xx == 0); } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:7371: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7389: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7374: \$? = $ac_status" >&5 ++ echo "$as_me:7392: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:7376: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7394: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7379: \$? = $ac_status" >&5 ++ echo "$as_me:7397: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_test_ncuconfig=yes + else +@@ -7550,7 +7568,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7553 "configure" ++#line 7571 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -7562,37 +7580,37 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7565: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7583: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7568: \$? = $ac_status" >&5 ++ echo "$as_me:7586: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7571: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7589: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7574: \$? = $ac_status" >&5 ++ echo "$as_me:7592: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + if test "$cross_compiling" = yes; then + cf_have_ncuconfig=maybe + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7580 "configure" ++#line 7598 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int main(void) + { const char *xx = curses_version(); return (xx == 0); } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:7587: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7605: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7590: \$? = $ac_status" >&5 ++ echo "$as_me:7608: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:7592: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7610: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7595: \$? = $ac_status" >&5 ++ echo "$as_me:7613: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_have_ncuconfig=yes + else +@@ -7609,7 +7627,7 @@ + cf_have_ncuconfig=no + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +- echo "$as_me:7612: result: $cf_have_ncuconfig" >&5 ++ echo "$as_me:7630: result: $cf_have_ncuconfig" >&5 + echo "${ECHO_T}$cf_have_ncuconfig" >&6 + test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes + if test "$cf_have_ncuconfig" != "yes" +@@ -7625,7 +7643,7 @@ + + NCURSES_CONFIG_PKG=$cf_ncuconfig_root + +-echo "$as_me:7628: checking for terminfo header" >&5 ++echo "$as_me:7646: checking for terminfo header" >&5 + echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 + if test "${cf_cv_term_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7643,7 +7661,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7646 "configure" ++#line 7664 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -7658,16 +7676,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:7661: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:7679: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7664: \$? = $ac_status" >&5 ++ echo "$as_me:7682: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:7667: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7685: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7670: \$? = $ac_status" >&5 ++ echo "$as_me:7688: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_term_header="$cf_test" +@@ -7683,7 +7701,7 @@ + done + + fi +-echo "$as_me:7686: result: $cf_cv_term_header" >&5 ++echo "$as_me:7704: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -7718,7 +7736,7 @@ + fi + + else +- echo "$as_me:7721: result: no" >&5 ++ echo "$as_me:7739: result: no" >&5 + echo "${ECHO_T}no" >&6 + NCURSES_CONFIG_PKG=none + fi +@@ -7734,7 +7752,7 @@ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-echo "$as_me:7737: checking for $ac_word" >&5 ++echo "$as_me:7755: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7749,7 +7767,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" +-echo "$as_me:7752: found $ac_dir/$ac_word" >&5 ++echo "$as_me:7770: found $ac_dir/$ac_word" >&5 + break + done + +@@ -7757,10 +7775,10 @@ + fi + NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG + if test -n "$NCURSES_CONFIG"; then +- echo "$as_me:7760: result: $NCURSES_CONFIG" >&5 ++ echo "$as_me:7778: result: $NCURSES_CONFIG" >&5 + echo "${ECHO_T}$NCURSES_CONFIG" >&6 + else +- echo "$as_me:7763: result: no" >&5 ++ echo "$as_me:7781: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -7773,7 +7791,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:7776: checking for $ac_word" >&5 ++echo "$as_me:7794: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7788,7 +7806,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" +-echo "$as_me:7791: found $ac_dir/$ac_word" >&5 ++echo "$as_me:7809: found $ac_dir/$ac_word" >&5 + break + done + +@@ -7796,10 +7814,10 @@ + fi + ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG + if test -n "$ac_ct_NCURSES_CONFIG"; then +- echo "$as_me:7799: result: $ac_ct_NCURSES_CONFIG" >&5 ++ echo "$as_me:7817: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 + else +- echo "$as_me:7802: result: no" >&5 ++ echo "$as_me:7820: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -7956,7 +7974,7 @@ + + # even with config script, some packages use no-override for curses.h + +-echo "$as_me:7959: checking if we have identified curses headers" >&5 ++echo "$as_me:7977: checking if we have identified curses headers" >&5 + echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 + if test "${cf_cv_ncurses_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7968,7 +7986,7 @@ + curses.h ncursesw/curses.h + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7971 "configure" ++#line 7989 "configure" + #include "confdefs.h" + #include <${cf_header}> + int +@@ -7980,16 +7998,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:7983: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8001: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7986: \$? = $ac_status" >&5 ++ echo "$as_me:8004: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:7989: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8007: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7992: \$? = $ac_status" >&5 ++ echo "$as_me:8010: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_header=$cf_header; break + else +@@ -8000,11 +8018,11 @@ + done + + fi +-echo "$as_me:8003: result: $cf_cv_ncurses_header" >&5 ++echo "$as_me:8021: result: $cf_cv_ncurses_header" >&5 + echo "${ECHO_T}$cf_cv_ncurses_header" >&6 + + if test "$cf_cv_ncurses_header" = none ; then +- { { echo "$as_me:8007: error: No curses header-files found" >&5 ++ { { echo "$as_me:8025: error: No curses header-files found" >&5 + echo "$as_me: error: No curses header-files found" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -8014,23 +8032,23 @@ + for ac_header in $cf_cv_ncurses_header + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:8017: checking for $ac_header" >&5 ++echo "$as_me:8035: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8023 "configure" ++#line 8041 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:8027: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:8045: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:8033: \$? = $ac_status" >&5 ++ echo "$as_me:8051: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -8049,7 +8067,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:8052: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:8070: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF +-#line 8108 "configure" ++#line 8126 "configure" + #include "confdefs.h" + #include + int +@@ -8117,16 +8135,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:8120: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8138: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8123: \$? = $ac_status" >&5 ++ echo "$as_me:8141: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:8126: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8144: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8129: \$? = $ac_status" >&5 ++ echo "$as_me:8147: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -8143,7 +8161,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:8146: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:8164: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -8162,7 +8180,7 @@ + + } + +-echo "$as_me:8165: checking for $cf_ncuhdr_root header in include-path" >&5 ++echo "$as_me:8183: checking for $cf_ncuhdr_root header in include-path" >&5 + echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 + if test "${cf_cv_ncurses_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8174,7 +8192,7 @@ + do + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8177 "configure" ++#line 8195 "configure" + #include "confdefs.h" + + #define _XOPEN_SOURCE_EXTENDED +@@ -8206,16 +8224,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:8209: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8227: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8212: \$? = $ac_status" >&5 ++ echo "$as_me:8230: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:8215: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8233: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8218: \$? = $ac_status" >&5 ++ echo "$as_me:8236: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_h=$cf_header + +@@ -8230,14 +8248,14 @@ + done + + fi +-echo "$as_me:8233: result: $cf_cv_ncurses_h" >&5 ++echo "$as_me:8251: result: $cf_cv_ncurses_h" >&5 + echo "${ECHO_T}$cf_cv_ncurses_h" >&6 + + if test "$cf_cv_ncurses_h" != no ; then + cf_cv_ncurses_header=$cf_cv_ncurses_h + else + +-echo "$as_me:8240: checking for $cf_ncuhdr_root include-path" >&5 ++echo "$as_me:8258: checking for $cf_ncuhdr_root include-path" >&5 + echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 + if test "${cf_cv_ncurses_h2+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8358,7 +8376,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8361 "configure" ++#line 8379 "configure" + #include "confdefs.h" + #include + int +@@ -8370,16 +8388,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:8373: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8391: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8376: \$? = $ac_status" >&5 ++ echo "$as_me:8394: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:8379: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8397: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8382: \$? = $ac_status" >&5 ++ echo "$as_me:8400: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -8396,7 +8414,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:8399: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:8417: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -8419,7 +8437,7 @@ + do + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8422 "configure" ++#line 8440 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -8443,16 +8461,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:8446: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8464: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8449: \$? = $ac_status" >&5 ++ echo "$as_me:8467: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:8452: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8470: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8455: \$? = $ac_status" >&5 ++ echo "$as_me:8473: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_h2=$cf_header + +@@ -8473,12 +8491,12 @@ + CPPFLAGS="$cf_save2_CPPFLAGS" + test "$cf_cv_ncurses_h2" != no && break + done +- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8476: error: not found" >&5 ++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8494: error: not found" >&5 + echo "$as_me: error: not found" >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:8481: result: $cf_cv_ncurses_h2" >&5 ++echo "$as_me:8499: result: $cf_cv_ncurses_h2" >&5 + echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 + + cf_1st_incdir=`echo "$cf_cv_ncurses_h2" | sed -e 's%/[^/]*$%%'` +@@ -8514,7 +8532,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8517 "configure" ++#line 8535 "configure" + #include "confdefs.h" + #include + int +@@ -8526,16 +8544,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:8529: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8547: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8532: \$? = $ac_status" >&5 ++ echo "$as_me:8550: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:8535: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8553: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8538: \$? = $ac_status" >&5 ++ echo "$as_me:8556: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -8552,7 +8570,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:8555: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:8573: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -8600,7 +8618,7 @@ + ;; + esac + +-echo "$as_me:8603: checking for terminfo header" >&5 ++echo "$as_me:8621: checking for terminfo header" >&5 + echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 + if test "${cf_cv_term_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8618,7 +8636,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8621 "configure" ++#line 8639 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -8633,16 +8651,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:8636: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8654: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8639: \$? = $ac_status" >&5 ++ echo "$as_me:8657: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:8642: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8660: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8645: \$? = $ac_status" >&5 ++ echo "$as_me:8663: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_term_header="$cf_test" +@@ -8658,7 +8676,7 @@ + done + + fi +-echo "$as_me:8661: result: $cf_cv_term_header" >&5 ++echo "$as_me:8679: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -8696,7 +8714,7 @@ + #define NCURSES 1 + EOF + +-echo "$as_me:8699: checking for ncurses version" >&5 ++echo "$as_me:8717: checking for ncurses version" >&5 + echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 + if test "${cf_cv_ncurses_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8722,10 +8740,10 @@ + #endif + EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" +- { (eval echo "$as_me:8725: \"$cf_try\"") >&5 ++ { (eval echo "$as_me:8743: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? +- echo "$as_me:8728: \$? = $ac_status" >&5 ++ echo "$as_me:8746: \$? = $ac_status" >&5 + (exit "$ac_status"); } + if test -f conftest.out ; then + cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` +@@ -8735,7 +8753,7 @@ + + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8738 "configure" ++#line 8756 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -8760,15 +8778,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:8763: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8781: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8766: \$? = $ac_status" >&5 ++ echo "$as_me:8784: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:8768: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8786: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8771: \$? = $ac_status" >&5 ++ echo "$as_me:8789: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_ncurses_version=`cat $cf_tempfile` +@@ -8782,7 +8800,7 @@ + rm -f "$cf_tempfile" + + fi +-echo "$as_me:8785: result: $cf_cv_ncurses_version" >&5 ++echo "$as_me:8803: result: $cf_cv_ncurses_version" >&5 + echo "${ECHO_T}$cf_cv_ncurses_version" >&6 + test "$cf_cv_ncurses_version" = no || + cat >>confdefs.h <<\EOF +@@ -8795,7 +8813,7 @@ + # to link gpm. + cf_ncurses_LIBS="" + cf_ncurses_SAVE="$LIBS" +-echo "$as_me:8798: checking for Gpm_Open in -lgpm" >&5 ++echo "$as_me:8816: checking for Gpm_Open in -lgpm" >&5 + echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 + if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8803,7 +8821,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8806 "configure" ++#line 8824 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -8822,16 +8840,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:8825: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8843: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8828: \$? = $ac_status" >&5 ++ echo "$as_me:8846: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:8831: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8849: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8834: \$? = $ac_status" >&5 ++ echo "$as_me:8852: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gpm_Gpm_Open=yes + else +@@ -8842,10 +8860,10 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:8845: result: $ac_cv_lib_gpm_Gpm_Open" >&5 ++echo "$as_me:8863: result: $ac_cv_lib_gpm_Gpm_Open" >&5 + echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 + if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then +- echo "$as_me:8848: checking for initscr in -lgpm" >&5 ++ echo "$as_me:8866: checking for initscr in -lgpm" >&5 + echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 + if test "${ac_cv_lib_gpm_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8853,7 +8871,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8856 "configure" ++#line 8874 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -8872,16 +8890,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:8875: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8893: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8878: \$? = $ac_status" >&5 ++ echo "$as_me:8896: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:8881: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8899: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8884: \$? = $ac_status" >&5 ++ echo "$as_me:8902: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gpm_initscr=yes + else +@@ -8892,7 +8910,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:8895: result: $ac_cv_lib_gpm_initscr" >&5 ++echo "$as_me:8913: result: $ac_cv_lib_gpm_initscr" >&5 + echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 + if test "$ac_cv_lib_gpm_initscr" = yes; then + LIBS="$cf_ncurses_SAVE" +@@ -8907,7 +8925,7 @@ + # This is only necessary if you are linking against an obsolete + # version of ncurses (but it should do no harm, since it is static). + if test "$cf_nculib_root" = ncurses ; then +- echo "$as_me:8910: checking for tgoto in -lmytinfo" >&5 ++ echo "$as_me:8928: checking for tgoto in -lmytinfo" >&5 + echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 + if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8915,7 +8933,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmytinfo $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8918 "configure" ++#line 8936 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -8934,16 +8952,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:8937: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8955: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8940: \$? = $ac_status" >&5 ++ echo "$as_me:8958: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:8943: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8961: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8946: \$? = $ac_status" >&5 ++ echo "$as_me:8964: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_mytinfo_tgoto=yes + else +@@ -8954,7 +8972,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:8957: result: $ac_cv_lib_mytinfo_tgoto" >&5 ++echo "$as_me:8975: result: $ac_cv_lib_mytinfo_tgoto" >&5 + echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 + if test "$ac_cv_lib_mytinfo_tgoto" = yes; then + cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" +@@ -9003,13 +9021,13 @@ + + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' + cf_libdir="" +- echo "$as_me:9006: checking for initscr" >&5 ++ echo "$as_me:9024: checking for initscr" >&5 + echo $ECHO_N "checking for initscr... $ECHO_C" >&6 + if test "${ac_cv_func_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9012 "configure" ++#line 9030 "configure" + #include "confdefs.h" + #define initscr autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -9040,16 +9058,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:9043: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9061: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9046: \$? = $ac_status" >&5 ++ echo "$as_me:9064: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:9049: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9067: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9052: \$? = $ac_status" >&5 ++ echo "$as_me:9070: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_initscr=yes + else +@@ -9059,18 +9077,18 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:9062: result: $ac_cv_func_initscr" >&5 ++echo "$as_me:9080: result: $ac_cv_func_initscr" >&5 + echo "${ECHO_T}$ac_cv_func_initscr" >&6 + if test "$ac_cv_func_initscr" = yes; then + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' + else + + cf_save_LIBS="$LIBS" +- echo "$as_me:9069: checking for initscr in -l$cf_nculib_root" >&5 ++ echo "$as_me:9087: checking for initscr in -l$cf_nculib_root" >&5 + echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 + LIBS="-l$cf_nculib_root $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9073 "configure" ++#line 9091 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -9082,25 +9100,25 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:9085: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9103: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9088: \$? = $ac_status" >&5 ++ echo "$as_me:9106: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:9091: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9109: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9094: \$? = $ac_status" >&5 ++ echo "$as_me:9112: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then +- echo "$as_me:9096: result: yes" >&5 ++ echo "$as_me:9114: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' + + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 +-echo "$as_me:9103: result: no" >&5 ++echo "$as_me:9121: result: no" >&5 + echo "${ECHO_T}no" >&6 + + cf_search= +@@ -9168,11 +9186,11 @@ + + for cf_libdir in $cf_search + do +- echo "$as_me:9171: checking for -l$cf_nculib_root in $cf_libdir" >&5 ++ echo "$as_me:9189: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 + LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9175 "configure" ++#line 9193 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -9184,25 +9202,25 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:9187: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9205: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9190: \$? = $ac_status" >&5 ++ echo "$as_me:9208: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:9193: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9211: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9196: \$? = $ac_status" >&5 ++ echo "$as_me:9214: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then +- echo "$as_me:9198: result: yes" >&5 ++ echo "$as_me:9216: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' + break + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 +-echo "$as_me:9205: result: no" >&5 ++echo "$as_me:9223: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_save_LIBS" + fi +@@ -9217,7 +9235,7 @@ + eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" + + if test "$cf_found_library" = no ; then +- { { echo "$as_me:9220: error: Cannot link $cf_nculib_root library" >&5 ++ { { echo "$as_me:9238: error: Cannot link $cf_nculib_root library" >&5 + echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -9225,7 +9243,7 @@ + fi + + if test -n "$cf_ncurses_LIBS" ; then +- echo "$as_me:9228: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 ++ echo "$as_me:9246: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 + cf_ncurses_SAVE="$LIBS" + for p in $cf_ncurses_LIBS ; do +@@ -9235,7 +9253,7 @@ + fi + done + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9238 "configure" ++#line 9256 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -9247,23 +9265,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:9250: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9268: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9253: \$? = $ac_status" >&5 ++ echo "$as_me:9271: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:9256: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9274: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9259: \$? = $ac_status" >&5 ++ echo "$as_me:9277: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then +- echo "$as_me:9261: result: yes" >&5 ++ echo "$as_me:9279: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 +-echo "$as_me:9266: result: no" >&5 ++echo "$as_me:9284: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_ncurses_SAVE" + fi +@@ -9287,13 +9305,13 @@ + cf_have_ncuconfig=no + + if test "x${PKG_CONFIG:=none}" != xnone; then +- echo "$as_me:9290: checking pkg-config for $cf_ncuconfig_root" >&5 ++ echo "$as_me:9308: checking pkg-config for $cf_ncuconfig_root" >&5 + echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6 + if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then +- echo "$as_me:9293: result: yes" >&5 ++ echo "$as_me:9311: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + +- echo "$as_me:9296: checking if the $cf_ncuconfig_root package files work" >&5 ++ echo "$as_me:9314: checking if the $cf_ncuconfig_root package files work" >&5 + echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 + cf_have_ncuconfig=unknown + +@@ -9426,7 +9444,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9429 "configure" ++#line 9447 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -9438,37 +9456,37 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:9441: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9459: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9444: \$? = $ac_status" >&5 ++ echo "$as_me:9462: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:9447: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9465: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9450: \$? = $ac_status" >&5 ++ echo "$as_me:9468: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + if test "$cross_compiling" = yes; then + cf_test_ncuconfig=maybe + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9456 "configure" ++#line 9474 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int main(void) + { const char *xx = curses_version(); return (xx == 0); } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:9463: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9481: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9466: \$? = $ac_status" >&5 ++ echo "$as_me:9484: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:9468: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9486: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9471: \$? = $ac_status" >&5 ++ echo "$as_me:9489: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_test_ncuconfig=yes + else +@@ -9642,7 +9660,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9645 "configure" ++#line 9663 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -9654,37 +9672,37 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:9657: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9675: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9660: \$? = $ac_status" >&5 ++ echo "$as_me:9678: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:9663: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9681: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9666: \$? = $ac_status" >&5 ++ echo "$as_me:9684: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + if test "$cross_compiling" = yes; then + cf_have_ncuconfig=maybe + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9672 "configure" ++#line 9690 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int main(void) + { const char *xx = curses_version(); return (xx == 0); } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:9679: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9697: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9682: \$? = $ac_status" >&5 ++ echo "$as_me:9700: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:9684: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9702: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9687: \$? = $ac_status" >&5 ++ echo "$as_me:9705: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_have_ncuconfig=yes + else +@@ -9701,7 +9719,7 @@ + cf_have_ncuconfig=no + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +- echo "$as_me:9704: result: $cf_have_ncuconfig" >&5 ++ echo "$as_me:9722: result: $cf_have_ncuconfig" >&5 + echo "${ECHO_T}$cf_have_ncuconfig" >&6 + test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes + if test "$cf_have_ncuconfig" != "yes" +@@ -9717,7 +9735,7 @@ + + NCURSES_CONFIG_PKG=$cf_ncuconfig_root + +-echo "$as_me:9720: checking for terminfo header" >&5 ++echo "$as_me:9738: checking for terminfo header" >&5 + echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 + if test "${cf_cv_term_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -9735,7 +9753,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9738 "configure" ++#line 9756 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -9750,16 +9768,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:9753: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9771: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9756: \$? = $ac_status" >&5 ++ echo "$as_me:9774: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:9759: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9777: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9762: \$? = $ac_status" >&5 ++ echo "$as_me:9780: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_term_header="$cf_test" +@@ -9775,7 +9793,7 @@ + done + + fi +-echo "$as_me:9778: result: $cf_cv_term_header" >&5 ++echo "$as_me:9796: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -9810,7 +9828,7 @@ + fi + + else +- echo "$as_me:9813: result: no" >&5 ++ echo "$as_me:9831: result: no" >&5 + echo "${ECHO_T}no" >&6 + NCURSES_CONFIG_PKG=none + fi +@@ -9826,7 +9844,7 @@ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-echo "$as_me:9829: checking for $ac_word" >&5 ++echo "$as_me:9847: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -9841,7 +9859,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" +-echo "$as_me:9844: found $ac_dir/$ac_word" >&5 ++echo "$as_me:9862: found $ac_dir/$ac_word" >&5 + break + done + +@@ -9849,10 +9867,10 @@ + fi + NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG + if test -n "$NCURSES_CONFIG"; then +- echo "$as_me:9852: result: $NCURSES_CONFIG" >&5 ++ echo "$as_me:9870: result: $NCURSES_CONFIG" >&5 + echo "${ECHO_T}$NCURSES_CONFIG" >&6 + else +- echo "$as_me:9855: result: no" >&5 ++ echo "$as_me:9873: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -9865,7 +9883,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:9868: checking for $ac_word" >&5 ++echo "$as_me:9886: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -9880,7 +9898,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" +-echo "$as_me:9883: found $ac_dir/$ac_word" >&5 ++echo "$as_me:9901: found $ac_dir/$ac_word" >&5 + break + done + +@@ -9888,10 +9906,10 @@ + fi + ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG + if test -n "$ac_ct_NCURSES_CONFIG"; then +- echo "$as_me:9891: result: $ac_ct_NCURSES_CONFIG" >&5 ++ echo "$as_me:9909: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 + else +- echo "$as_me:9894: result: no" >&5 ++ echo "$as_me:9912: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -10048,7 +10066,7 @@ + + # even with config script, some packages use no-override for curses.h + +-echo "$as_me:10051: checking if we have identified curses headers" >&5 ++echo "$as_me:10069: checking if we have identified curses headers" >&5 + echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 + if test "${cf_cv_ncurses_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10060,7 +10078,7 @@ + curses.h ncurses/curses.h + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10063 "configure" ++#line 10081 "configure" + #include "confdefs.h" + #include <${cf_header}> + int +@@ -10072,16 +10090,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10075: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10093: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10078: \$? = $ac_status" >&5 ++ echo "$as_me:10096: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10081: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10099: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10084: \$? = $ac_status" >&5 ++ echo "$as_me:10102: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_header=$cf_header; break + else +@@ -10092,11 +10110,11 @@ + done + + fi +-echo "$as_me:10095: result: $cf_cv_ncurses_header" >&5 ++echo "$as_me:10113: result: $cf_cv_ncurses_header" >&5 + echo "${ECHO_T}$cf_cv_ncurses_header" >&6 + + if test "$cf_cv_ncurses_header" = none ; then +- { { echo "$as_me:10099: error: No curses header-files found" >&5 ++ { { echo "$as_me:10117: error: No curses header-files found" >&5 + echo "$as_me: error: No curses header-files found" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -10106,23 +10124,23 @@ + for ac_header in $cf_cv_ncurses_header + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:10109: checking for $ac_header" >&5 ++echo "$as_me:10127: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10115 "configure" ++#line 10133 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:10119: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:10137: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:10125: \$? = $ac_status" >&5 ++ echo "$as_me:10143: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -10141,7 +10159,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:10144: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:10162: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF +-#line 10200 "configure" ++#line 10218 "configure" + #include "confdefs.h" + #include + int +@@ -10209,16 +10227,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10212: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10230: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10215: \$? = $ac_status" >&5 ++ echo "$as_me:10233: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10218: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10236: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10221: \$? = $ac_status" >&5 ++ echo "$as_me:10239: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -10235,7 +10253,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:10238: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:10256: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -10254,7 +10272,7 @@ + + } + +-echo "$as_me:10257: checking for $cf_ncuhdr_root header in include-path" >&5 ++echo "$as_me:10275: checking for $cf_ncuhdr_root header in include-path" >&5 + echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 + if test "${cf_cv_ncurses_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10266,7 +10284,7 @@ + do + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10269 "configure" ++#line 10287 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -10290,16 +10308,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10293: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10311: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10296: \$? = $ac_status" >&5 ++ echo "$as_me:10314: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10299: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10317: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10302: \$? = $ac_status" >&5 ++ echo "$as_me:10320: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_h=$cf_header + +@@ -10314,14 +10332,14 @@ + done + + fi +-echo "$as_me:10317: result: $cf_cv_ncurses_h" >&5 ++echo "$as_me:10335: result: $cf_cv_ncurses_h" >&5 + echo "${ECHO_T}$cf_cv_ncurses_h" >&6 + + if test "$cf_cv_ncurses_h" != no ; then + cf_cv_ncurses_header=$cf_cv_ncurses_h + else + +-echo "$as_me:10324: checking for $cf_ncuhdr_root include-path" >&5 ++echo "$as_me:10342: checking for $cf_ncuhdr_root include-path" >&5 + echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 + if test "${cf_cv_ncurses_h2+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10442,7 +10460,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10445 "configure" ++#line 10463 "configure" + #include "confdefs.h" + #include + int +@@ -10454,16 +10472,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10457: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10475: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10460: \$? = $ac_status" >&5 ++ echo "$as_me:10478: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10463: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10481: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10466: \$? = $ac_status" >&5 ++ echo "$as_me:10484: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -10480,7 +10498,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:10483: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:10501: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -10503,7 +10521,7 @@ + do + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10506 "configure" ++#line 10524 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -10527,16 +10545,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10530: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10548: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10533: \$? = $ac_status" >&5 ++ echo "$as_me:10551: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10536: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10554: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10539: \$? = $ac_status" >&5 ++ echo "$as_me:10557: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_h2=$cf_header + +@@ -10557,12 +10575,12 @@ + CPPFLAGS="$cf_save2_CPPFLAGS" + test "$cf_cv_ncurses_h2" != no && break + done +- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10560: error: not found" >&5 ++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10578: error: not found" >&5 + echo "$as_me: error: not found" >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:10565: result: $cf_cv_ncurses_h2" >&5 ++echo "$as_me:10583: result: $cf_cv_ncurses_h2" >&5 + echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 + + cf_1st_incdir=`echo "$cf_cv_ncurses_h2" | sed -e 's%/[^/]*$%%'` +@@ -10598,7 +10616,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10601 "configure" ++#line 10619 "configure" + #include "confdefs.h" + #include + int +@@ -10610,16 +10628,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10613: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10631: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10616: \$? = $ac_status" >&5 ++ echo "$as_me:10634: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10619: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10637: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10622: \$? = $ac_status" >&5 ++ echo "$as_me:10640: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -10636,7 +10654,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:10639: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:10657: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -10684,7 +10702,7 @@ + ;; + esac + +-echo "$as_me:10687: checking for terminfo header" >&5 ++echo "$as_me:10705: checking for terminfo header" >&5 + echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 + if test "${cf_cv_term_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10702,7 +10720,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10705 "configure" ++#line 10723 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -10717,16 +10735,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10720: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10738: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10723: \$? = $ac_status" >&5 ++ echo "$as_me:10741: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10726: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10744: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10729: \$? = $ac_status" >&5 ++ echo "$as_me:10747: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_term_header="$cf_test" +@@ -10742,7 +10760,7 @@ + done + + fi +-echo "$as_me:10745: result: $cf_cv_term_header" >&5 ++echo "$as_me:10763: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -10780,7 +10798,7 @@ + #define NCURSES 1 + EOF + +-echo "$as_me:10783: checking for ncurses version" >&5 ++echo "$as_me:10801: checking for ncurses version" >&5 + echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 + if test "${cf_cv_ncurses_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10806,10 +10824,10 @@ + #endif + EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" +- { (eval echo "$as_me:10809: \"$cf_try\"") >&5 ++ { (eval echo "$as_me:10827: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? +- echo "$as_me:10812: \$? = $ac_status" >&5 ++ echo "$as_me:10830: \$? = $ac_status" >&5 + (exit "$ac_status"); } + if test -f conftest.out ; then + cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` +@@ -10819,7 +10837,7 @@ + + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10822 "configure" ++#line 10840 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -10844,15 +10862,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:10847: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10865: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10850: \$? = $ac_status" >&5 ++ echo "$as_me:10868: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:10852: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10870: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10855: \$? = $ac_status" >&5 ++ echo "$as_me:10873: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_ncurses_version=`cat $cf_tempfile` +@@ -10866,7 +10884,7 @@ + rm -f "$cf_tempfile" + + fi +-echo "$as_me:10869: result: $cf_cv_ncurses_version" >&5 ++echo "$as_me:10887: result: $cf_cv_ncurses_version" >&5 + echo "${ECHO_T}$cf_cv_ncurses_version" >&6 + test "$cf_cv_ncurses_version" = no || + cat >>confdefs.h <<\EOF +@@ -10879,7 +10897,7 @@ + # to link gpm. + cf_ncurses_LIBS="" + cf_ncurses_SAVE="$LIBS" +-echo "$as_me:10882: checking for Gpm_Open in -lgpm" >&5 ++echo "$as_me:10900: checking for Gpm_Open in -lgpm" >&5 + echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 + if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10887,7 +10905,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10890 "configure" ++#line 10908 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -10906,16 +10924,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:10909: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10927: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10912: \$? = $ac_status" >&5 ++ echo "$as_me:10930: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:10915: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10933: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10918: \$? = $ac_status" >&5 ++ echo "$as_me:10936: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gpm_Gpm_Open=yes + else +@@ -10926,10 +10944,10 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:10929: result: $ac_cv_lib_gpm_Gpm_Open" >&5 ++echo "$as_me:10947: result: $ac_cv_lib_gpm_Gpm_Open" >&5 + echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 + if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then +- echo "$as_me:10932: checking for initscr in -lgpm" >&5 ++ echo "$as_me:10950: checking for initscr in -lgpm" >&5 + echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 + if test "${ac_cv_lib_gpm_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10937,7 +10955,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10940 "configure" ++#line 10958 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -10956,16 +10974,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:10959: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10977: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10962: \$? = $ac_status" >&5 ++ echo "$as_me:10980: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:10965: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10983: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10968: \$? = $ac_status" >&5 ++ echo "$as_me:10986: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gpm_initscr=yes + else +@@ -10976,7 +10994,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:10979: result: $ac_cv_lib_gpm_initscr" >&5 ++echo "$as_me:10997: result: $ac_cv_lib_gpm_initscr" >&5 + echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 + if test "$ac_cv_lib_gpm_initscr" = yes; then + LIBS="$cf_ncurses_SAVE" +@@ -10991,7 +11009,7 @@ + # This is only necessary if you are linking against an obsolete + # version of ncurses (but it should do no harm, since it is static). + if test "$cf_nculib_root" = ncurses ; then +- echo "$as_me:10994: checking for tgoto in -lmytinfo" >&5 ++ echo "$as_me:11012: checking for tgoto in -lmytinfo" >&5 + echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 + if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10999,7 +11017,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmytinfo $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11002 "configure" ++#line 11020 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -11018,16 +11036,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:11021: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11039: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11024: \$? = $ac_status" >&5 ++ echo "$as_me:11042: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:11027: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11045: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11030: \$? = $ac_status" >&5 ++ echo "$as_me:11048: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_mytinfo_tgoto=yes + else +@@ -11038,7 +11056,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:11041: result: $ac_cv_lib_mytinfo_tgoto" >&5 ++echo "$as_me:11059: result: $ac_cv_lib_mytinfo_tgoto" >&5 + echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 + if test "$ac_cv_lib_mytinfo_tgoto" = yes; then + cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" +@@ -11087,13 +11105,13 @@ + + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' + cf_libdir="" +- echo "$as_me:11090: checking for initscr" >&5 ++ echo "$as_me:11108: checking for initscr" >&5 + echo $ECHO_N "checking for initscr... $ECHO_C" >&6 + if test "${ac_cv_func_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11096 "configure" ++#line 11114 "configure" + #include "confdefs.h" + #define initscr autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -11124,16 +11142,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:11127: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11145: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11130: \$? = $ac_status" >&5 ++ echo "$as_me:11148: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:11133: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11151: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11136: \$? = $ac_status" >&5 ++ echo "$as_me:11154: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_initscr=yes + else +@@ -11143,18 +11161,18 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:11146: result: $ac_cv_func_initscr" >&5 ++echo "$as_me:11164: result: $ac_cv_func_initscr" >&5 + echo "${ECHO_T}$ac_cv_func_initscr" >&6 + if test "$ac_cv_func_initscr" = yes; then + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' + else + + cf_save_LIBS="$LIBS" +- echo "$as_me:11153: checking for initscr in -l$cf_nculib_root" >&5 ++ echo "$as_me:11171: checking for initscr in -l$cf_nculib_root" >&5 + echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 + LIBS="-l$cf_nculib_root $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11157 "configure" ++#line 11175 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -11166,25 +11184,25 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:11169: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11187: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11172: \$? = $ac_status" >&5 ++ echo "$as_me:11190: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:11175: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11193: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11178: \$? = $ac_status" >&5 ++ echo "$as_me:11196: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then +- echo "$as_me:11180: result: yes" >&5 ++ echo "$as_me:11198: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' + + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 +-echo "$as_me:11187: result: no" >&5 ++echo "$as_me:11205: result: no" >&5 + echo "${ECHO_T}no" >&6 + + cf_search= +@@ -11252,11 +11270,11 @@ + + for cf_libdir in $cf_search + do +- echo "$as_me:11255: checking for -l$cf_nculib_root in $cf_libdir" >&5 ++ echo "$as_me:11273: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 + LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11259 "configure" ++#line 11277 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -11268,25 +11286,25 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:11271: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11289: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11274: \$? = $ac_status" >&5 ++ echo "$as_me:11292: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:11277: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11295: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11280: \$? = $ac_status" >&5 ++ echo "$as_me:11298: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then +- echo "$as_me:11282: result: yes" >&5 ++ echo "$as_me:11300: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' + break + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 +-echo "$as_me:11289: result: no" >&5 ++echo "$as_me:11307: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_save_LIBS" + fi +@@ -11301,7 +11319,7 @@ + eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" + + if test "$cf_found_library" = no ; then +- { { echo "$as_me:11304: error: Cannot link $cf_nculib_root library" >&5 ++ { { echo "$as_me:11322: error: Cannot link $cf_nculib_root library" >&5 + echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -11309,7 +11327,7 @@ + fi + + if test -n "$cf_ncurses_LIBS" ; then +- echo "$as_me:11312: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 ++ echo "$as_me:11330: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 + cf_ncurses_SAVE="$LIBS" + for p in $cf_ncurses_LIBS ; do +@@ -11319,7 +11337,7 @@ + fi + done + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11322 "configure" ++#line 11340 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -11331,23 +11349,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:11334: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11352: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11337: \$? = $ac_status" >&5 ++ echo "$as_me:11355: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:11340: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11358: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11343: \$? = $ac_status" >&5 ++ echo "$as_me:11361: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then +- echo "$as_me:11345: result: yes" >&5 ++ echo "$as_me:11363: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 +-echo "$as_me:11350: result: no" >&5 ++echo "$as_me:11368: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_ncurses_SAVE" + fi +@@ -11400,10 +11418,10 @@ + AUTOCONF_$cf_name NCURSES_VERSION_$cf_name + CF_EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | fgrep AUTOCONF_$cf_name >conftest.out" +- { (eval echo "$as_me:11403: \"$cf_try\"") >&5 ++ { (eval echo "$as_me:11421: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? +- echo "$as_me:11406: \$? = $ac_status" >&5 ++ echo "$as_me:11424: \$? = $ac_status" >&5 + (exit "$ac_status"); } + if test -f conftest.out ; then + cf_result=`sed -e "s/^.*AUTOCONF_${cf_name}[ ][ ]*//" conftest.out` +@@ -11421,10 +11439,10 @@ + + cf_cv_timestamp=`date` + +-echo "$as_me:11424: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 ++echo "$as_me:11442: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 + echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6 + +-echo "$as_me:11427: checking if you want to have a library-prefix" >&5 ++echo "$as_me:11445: checking if you want to have a library-prefix" >&5 + echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6 + + # Check whether --with-lib-prefix or --without-lib-prefix was given. +@@ -11434,7 +11452,7 @@ + else + with_lib_prefix=auto + fi; +-echo "$as_me:11437: result: $with_lib_prefix" >&5 ++echo "$as_me:11455: result: $with_lib_prefix" >&5 + echo "${ECHO_T}$with_lib_prefix" >&6 + + if test "$with_lib_prefix" = auto +@@ -11472,7 +11490,7 @@ + test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT='' + fi + +-echo "$as_me:11475: checking for default loader flags" >&5 ++echo "$as_me:11493: checking for default loader flags" >&5 + echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6 + case $DFT_LWR_MODEL in + (normal) LD_MODEL='' ;; +@@ -11480,13 +11498,13 @@ + (profile) LD_MODEL='-pg';; + (shared) LD_MODEL='' ;; + esac +-echo "$as_me:11483: result: $LD_MODEL" >&5 ++echo "$as_me:11501: result: $LD_MODEL" >&5 + echo "${ECHO_T}$LD_MODEL" >&6 + + LD_RPATH_OPT= + if test "x$cf_cv_enable_rpath" != xno + then +- echo "$as_me:11489: checking for an rpath option" >&5 ++ echo "$as_me:11507: checking for an rpath option" >&5 + echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 + case "$cf_cv_system_name" in + (irix*) +@@ -11517,12 +11535,12 @@ + (*) + ;; + esac +- echo "$as_me:11520: result: $LD_RPATH_OPT" >&5 ++ echo "$as_me:11538: result: $LD_RPATH_OPT" >&5 + echo "${ECHO_T}$LD_RPATH_OPT" >&6 + + case "x$LD_RPATH_OPT" in + (x-R*) +- echo "$as_me:11525: checking if we need a space after rpath option" >&5 ++ echo "$as_me:11543: checking if we need a space after rpath option" >&5 + echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6 + cf_save_LIBS="$LIBS" + +@@ -11543,7 +11561,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11546 "configure" ++#line 11564 "configure" + #include "confdefs.h" + + int +@@ -11555,16 +11573,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:11558: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11576: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11561: \$? = $ac_status" >&5 ++ echo "$as_me:11579: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:11564: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11582: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11567: \$? = $ac_status" >&5 ++ echo "$as_me:11585: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_rpath_space=no + else +@@ -11574,7 +11592,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS="$cf_save_LIBS" +- echo "$as_me:11577: result: $cf_rpath_space" >&5 ++ echo "$as_me:11595: result: $cf_rpath_space" >&5 + echo "${ECHO_T}$cf_rpath_space" >&6 + test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " + ;; +@@ -11596,7 +11614,7 @@ + cf_ld_rpath_opt= + test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT" + +- echo "$as_me:11599: checking if release/abi version should be used for shared libs" >&5 ++ echo "$as_me:11617: checking if release/abi version should be used for shared libs" >&5 + echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6 + + # Check whether --with-shlib-version or --without-shlib-version was given. +@@ -11611,9 +11629,9 @@ + cf_cv_shlib_version=$withval + ;; + (*) +- echo "$as_me:11614: result: $withval" >&5 ++ echo "$as_me:11632: result: $withval" >&5 + echo "${ECHO_T}$withval" >&6 +- { { echo "$as_me:11616: error: option value must be one of: rel, abi, or auto" >&5 ++ { { echo "$as_me:11634: error: option value must be one of: rel, abi, or auto" >&5 + echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -11622,7 +11640,7 @@ + else + cf_cv_shlib_version=auto + fi; +- echo "$as_me:11625: result: $cf_cv_shlib_version" >&5 ++ echo "$as_me:11643: result: $cf_cv_shlib_version" >&5 + echo "${ECHO_T}$cf_cv_shlib_version" >&6 + + cf_cv_rm_so_locs=no +@@ -11645,14 +11663,14 @@ + + if test "$cf_try_fPIC" = yes + then +- echo "$as_me:11648: checking which $CC option to use" >&5 ++ echo "$as_me:11666: checking which $CC option to use" >&5 + echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6 + cf_save_CFLAGS="$CFLAGS" + for CC_SHARED_OPTS in -fPIC -fpic '' + do + CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11655 "configure" ++#line 11673 "configure" + #include "confdefs.h" + #include + int +@@ -11664,16 +11682,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11667: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11685: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11670: \$? = $ac_status" >&5 ++ echo "$as_me:11688: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11673: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11691: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11676: \$? = $ac_status" >&5 ++ echo "$as_me:11694: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -11682,7 +11700,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + done +- echo "$as_me:11685: result: $CC_SHARED_OPTS" >&5 ++ echo "$as_me:11703: result: $CC_SHARED_OPTS" >&5 + echo "${ECHO_T}$CC_SHARED_OPTS" >&6 + CFLAGS="$cf_save_CFLAGS" + fi +@@ -11753,7 +11771,7 @@ + MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@' + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi + cf_cv_shlib_version_infix=yes +- echo "$as_me:11756: checking if ld -search_paths_first works" >&5 ++ echo "$as_me:11774: checking if ld -search_paths_first works" >&5 + echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6 + if test "${cf_cv_ldflags_search_paths_first+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -11762,7 +11780,7 @@ + cf_save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -Wl,-search_paths_first" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11765 "configure" ++#line 11783 "configure" + #include "confdefs.h" + + int +@@ -11774,16 +11792,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:11777: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11795: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11780: \$? = $ac_status" >&5 ++ echo "$as_me:11798: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:11783: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11801: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11786: \$? = $ac_status" >&5 ++ echo "$as_me:11804: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ldflags_search_paths_first=yes + else +@@ -11794,7 +11812,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LDFLAGS=$cf_save_LDFLAGS + fi +-echo "$as_me:11797: result: $cf_cv_ldflags_search_paths_first" >&5 ++echo "$as_me:11815: result: $cf_cv_ldflags_search_paths_first" >&5 + echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 + if test "$cf_cv_ldflags_search_paths_first" = yes; then + LDFLAGS="$LDFLAGS -Wl,-search_paths_first" +@@ -12144,7 +12162,7 @@ + do + CFLAGS="$cf_shared_opts $cf_save_CFLAGS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12147 "configure" ++#line 12165 "configure" + #include "confdefs.h" + #include + int +@@ -12156,16 +12174,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12159: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12177: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12162: \$? = $ac_status" >&5 ++ echo "$as_me:12180: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12165: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12183: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12168: \$? = $ac_status" >&5 ++ echo "$as_me:12186: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -12202,7 +12220,7 @@ + test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes + ;; + (*) +- { echo "$as_me:12205: WARNING: ignored --with-shlib-version" >&5 ++ { echo "$as_me:12223: WARNING: ignored --with-shlib-version" >&5 + echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} + ;; + esac +@@ -12212,7 +12230,7 @@ + if test -n "$cf_try_cflags" + then + cat > conftest.$ac_ext < + int main(int argc, char *argv[]) + { +@@ -12224,18 +12242,18 @@ + for cf_opt in $cf_try_cflags + do + CFLAGS="$cf_save_CFLAGS -$cf_opt" +- echo "$as_me:12227: checking if CFLAGS option -$cf_opt works" >&5 ++ echo "$as_me:12245: checking if CFLAGS option -$cf_opt works" >&5 + echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6 +- if { (eval echo "$as_me:12229: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:12247: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12232: \$? = $ac_status" >&5 ++ echo "$as_me:12250: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- echo "$as_me:12234: result: yes" >&5 ++ echo "$as_me:12252: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + cf_save_CFLAGS="$CFLAGS" + else +- echo "$as_me:12238: result: no" >&5 ++ echo "$as_me:12256: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + done +@@ -12250,17 +12268,17 @@ + + test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6 + +-echo "${as_me:-configure}:12253: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 ++echo "${as_me:-configure}:12271: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 + + test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 + +-echo "${as_me:-configure}:12257: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 ++echo "${as_me:-configure}:12275: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 + + # The test/sample programs in the original tree link using rpath option. + # Make it optional for packagers. + if test -n "$LOCAL_LDFLAGS" + then +- echo "$as_me:12263: checking if you want to link sample programs with rpath option" >&5 ++ echo "$as_me:12281: checking if you want to link sample programs with rpath option" >&5 + echo $ECHO_N "checking if you want to link sample programs with rpath option... $ECHO_C" >&6 + + # Check whether --enable-rpath-link or --disable-rpath-link was given. +@@ -12270,7 +12288,7 @@ + else + with_rpath_link=yes + fi; +- echo "$as_me:12273: result: $with_rpath_link" >&5 ++ echo "$as_me:12291: result: $with_rpath_link" >&5 + echo "${ECHO_T}$with_rpath_link" >&6 + if test "$with_rpath_link" = no + then +@@ -12283,7 +12301,7 @@ + + ### use option --enable-broken-linker to force on use of broken-linker support + +-echo "$as_me:12286: checking if you want broken-linker support code" >&5 ++echo "$as_me:12304: checking if you want broken-linker support code" >&5 + echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6 + + # Check whether --enable-broken_linker or --disable-broken_linker was given. +@@ -12293,7 +12311,7 @@ + else + with_broken_linker=no + fi; +-echo "$as_me:12296: result: $with_broken_linker" >&5 ++echo "$as_me:12314: result: $with_broken_linker" >&5 + echo "${ECHO_T}$with_broken_linker" >&6 + + : "${BROKEN_LINKER:=0}" +@@ -12308,14 +12326,14 @@ + + # Check to define _XOPEN_SOURCE "automatically" + +-echo "$as_me:12311: checking if the POSIX test-macros are already defined" >&5 ++echo "$as_me:12329: checking if the POSIX test-macros are already defined" >&5 + echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6 + if test "${cf_cv_posix_visible+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12318 "configure" ++#line 12336 "configure" + #include "confdefs.h" + #include + int +@@ -12334,16 +12352,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12337: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12355: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12340: \$? = $ac_status" >&5 ++ echo "$as_me:12358: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12343: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12361: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12346: \$? = $ac_status" >&5 ++ echo "$as_me:12364: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_posix_visible=no + else +@@ -12354,7 +12372,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:12357: result: $cf_cv_posix_visible" >&5 ++echo "$as_me:12375: result: $cf_cv_posix_visible" >&5 + echo "${ECHO_T}$cf_cv_posix_visible" >&6 + + if test "$cf_cv_posix_visible" = no; then +@@ -12399,14 +12417,14 @@ + + cf_gnu_xopen_source=$cf_XOPEN_SOURCE + +-echo "$as_me:12402: checking if this is the GNU C library" >&5 ++echo "$as_me:12420: checking if this is the GNU C library" >&5 + echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6 + if test "${cf_cv_gnu_library+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12409 "configure" ++#line 12427 "configure" + #include "confdefs.h" + #include + int +@@ -12425,16 +12443,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12428: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12446: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12431: \$? = $ac_status" >&5 ++ echo "$as_me:12449: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12434: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12452: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12437: \$? = $ac_status" >&5 ++ echo "$as_me:12455: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_library=yes + else +@@ -12445,7 +12463,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:12448: result: $cf_cv_gnu_library" >&5 ++echo "$as_me:12466: result: $cf_cv_gnu_library" >&5 + echo "${ECHO_T}$cf_cv_gnu_library" >&6 + + if test x$cf_cv_gnu_library = xyes; then +@@ -12453,7 +12471,7 @@ + # With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE + # was changed to help a little. newlib incorporated the change about 4 + # years later. +- echo "$as_me:12456: checking if _DEFAULT_SOURCE can be used as a basis" >&5 ++ echo "$as_me:12474: checking if _DEFAULT_SOURCE can be used as a basis" >&5 + echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6 + if test "${cf_cv_gnu_library_219+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -12465,7 +12483,7 @@ + CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12468 "configure" ++#line 12486 "configure" + #include "confdefs.h" + #include + int +@@ -12484,16 +12502,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12487: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12505: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12490: \$? = $ac_status" >&5 ++ echo "$as_me:12508: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12493: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12511: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12496: \$? = $ac_status" >&5 ++ echo "$as_me:12514: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_library_219=yes + else +@@ -12505,12 +12523,12 @@ + CPPFLAGS="$cf_save" + + fi +-echo "$as_me:12508: result: $cf_cv_gnu_library_219" >&5 ++echo "$as_me:12526: result: $cf_cv_gnu_library_219" >&5 + echo "${ECHO_T}$cf_cv_gnu_library_219" >&6 + + if test "x$cf_cv_gnu_library_219" = xyes; then + cf_save="$CPPFLAGS" +- echo "$as_me:12513: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 ++ echo "$as_me:12531: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 + echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_gnu_dftsrc_219+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -12615,7 +12633,7 @@ + fi + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12618 "configure" ++#line 12636 "configure" + #include "confdefs.h" + + #include +@@ -12635,16 +12653,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12638: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12656: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12641: \$? = $ac_status" >&5 ++ echo "$as_me:12659: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12644: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12662: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12647: \$? = $ac_status" >&5 ++ echo "$as_me:12665: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_dftsrc_219=yes + else +@@ -12655,7 +12673,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:12658: result: $cf_cv_gnu_dftsrc_219" >&5 ++echo "$as_me:12676: result: $cf_cv_gnu_dftsrc_219" >&5 + echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6 + test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save" + else +@@ -12664,14 +12682,14 @@ + + if test "x$cf_cv_gnu_dftsrc_219" != xyes; then + +- echo "$as_me:12667: checking if we must define _GNU_SOURCE" >&5 ++ echo "$as_me:12685: checking if we must define _GNU_SOURCE" >&5 + echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_gnu_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12674 "configure" ++#line 12692 "configure" + #include "confdefs.h" + #include + int +@@ -12686,16 +12704,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12689: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12707: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12692: \$? = $ac_status" >&5 ++ echo "$as_me:12710: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12695: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12713: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12698: \$? = $ac_status" >&5 ++ echo "$as_me:12716: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_source=no + else +@@ -12802,7 +12820,7 @@ + fi + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12805 "configure" ++#line 12823 "configure" + #include "confdefs.h" + #include + int +@@ -12817,16 +12835,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12820: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12838: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12823: \$? = $ac_status" >&5 ++ echo "$as_me:12841: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12826: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12844: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12829: \$? = $ac_status" >&5 ++ echo "$as_me:12847: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_source=no + else +@@ -12841,12 +12859,12 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:12844: result: $cf_cv_gnu_source" >&5 ++echo "$as_me:12862: result: $cf_cv_gnu_source" >&5 + echo "${ECHO_T}$cf_cv_gnu_source" >&6 + + if test "$cf_cv_gnu_source" = yes + then +- echo "$as_me:12849: checking if we should also define _DEFAULT_SOURCE" >&5 ++ echo "$as_me:12867: checking if we should also define _DEFAULT_SOURCE" >&5 + echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_default_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -12856,7 +12874,7 @@ + CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12859 "configure" ++#line 12877 "configure" + #include "confdefs.h" + #include + int +@@ -12871,16 +12889,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12874: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12892: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12877: \$? = $ac_status" >&5 ++ echo "$as_me:12895: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12880: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12898: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12883: \$? = $ac_status" >&5 ++ echo "$as_me:12901: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_default_source=no + else +@@ -12891,7 +12909,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:12894: result: $cf_cv_default_source" >&5 ++echo "$as_me:12912: result: $cf_cv_default_source" >&5 + echo "${ECHO_T}$cf_cv_default_source" >&6 + if test "$cf_cv_default_source" = yes + then +@@ -12928,16 +12946,16 @@ + sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` + +-echo "$as_me:12931: checking if we should define _POSIX_C_SOURCE" >&5 ++echo "$as_me:12949: checking if we should define _POSIX_C_SOURCE" >&5 + echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_posix_c_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + +-echo "${as_me:-configure}:12937: testing if the symbol is already defined go no further ..." 1>&5 ++echo "${as_me:-configure}:12955: testing if the symbol is already defined go no further ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12940 "configure" ++#line 12958 "configure" + #include "confdefs.h" + #include + int +@@ -12952,16 +12970,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12955: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12973: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12958: \$? = $ac_status" >&5 ++ echo "$as_me:12976: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12961: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12979: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12964: \$? = $ac_status" >&5 ++ echo "$as_me:12982: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_posix_c_source=no + else +@@ -12982,7 +13000,7 @@ + esac + if test "$cf_want_posix_source" = yes ; then + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12985 "configure" ++#line 13003 "configure" + #include "confdefs.h" + #include + int +@@ -12997,16 +13015,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13000: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13018: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13003: \$? = $ac_status" >&5 ++ echo "$as_me:13021: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13006: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13024: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13009: \$? = $ac_status" >&5 ++ echo "$as_me:13027: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -13017,7 +13035,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi + +-echo "${as_me:-configure}:13020: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 ++echo "${as_me:-configure}:13038: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 + + CFLAGS="$cf_trim_CFLAGS" + CPPFLAGS="$cf_trim_CPPFLAGS" +@@ -13025,10 +13043,10 @@ + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" + +-echo "${as_me:-configure}:13028: testing if the second compile does not leave our definition intact error ..." 1>&5 ++echo "${as_me:-configure}:13046: testing if the second compile does not leave our definition intact error ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13031 "configure" ++#line 13049 "configure" + #include "confdefs.h" + #include + int +@@ -13043,16 +13061,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13046: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13064: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13049: \$? = $ac_status" >&5 ++ echo "$as_me:13067: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13052: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13070: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13055: \$? = $ac_status" >&5 ++ echo "$as_me:13073: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -13068,7 +13086,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:13071: result: $cf_cv_posix_c_source" >&5 ++echo "$as_me:13089: result: $cf_cv_posix_c_source" >&5 + echo "${ECHO_T}$cf_cv_posix_c_source" >&6 + + if test "$cf_cv_posix_c_source" != no ; then +@@ -13185,7 +13203,7 @@ + # OpenBSD 6.x has broken locale support, both compile-time and runtime. + # see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html + # Abusing the conformance level is a workaround. +- { echo "$as_me:13188: WARNING: this system does not provide usable locale support" >&5 ++ { echo "$as_me:13206: WARNING: this system does not provide usable locale support" >&5 + echo "$as_me: WARNING: this system does not provide usable locale support" >&2;} + cf_xopen_source="-D_BSD_SOURCE" + cf_XOPEN_SOURCE=700 +@@ -13217,14 +13235,14 @@ + ;; + (*) + +-echo "$as_me:13220: checking if we should define _XOPEN_SOURCE" >&5 ++echo "$as_me:13238: checking if we should define _XOPEN_SOURCE" >&5 + echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_xopen_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13227 "configure" ++#line 13245 "configure" + #include "confdefs.h" + + #include +@@ -13243,16 +13261,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13246: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13264: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13249: \$? = $ac_status" >&5 ++ echo "$as_me:13267: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13252: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13270: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13255: \$? = $ac_status" >&5 ++ echo "$as_me:13273: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_xopen_source=no + else +@@ -13264,7 +13282,7 @@ + CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13267 "configure" ++#line 13285 "configure" + #include "confdefs.h" + + #include +@@ -13283,16 +13301,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13286: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13304: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13289: \$? = $ac_status" >&5 ++ echo "$as_me:13307: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13292: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13310: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13295: \$? = $ac_status" >&5 ++ echo "$as_me:13313: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_xopen_source=no + else +@@ -13307,7 +13325,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:13310: result: $cf_cv_xopen_source" >&5 ++echo "$as_me:13328: result: $cf_cv_xopen_source" >&5 + echo "${ECHO_T}$cf_cv_xopen_source" >&6 + + if test "$cf_cv_xopen_source" != no ; then +@@ -13465,16 +13483,16 @@ + sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` + +-echo "$as_me:13468: checking if we should define _POSIX_C_SOURCE" >&5 ++echo "$as_me:13486: checking if we should define _POSIX_C_SOURCE" >&5 + echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_posix_c_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + +-echo "${as_me:-configure}:13474: testing if the symbol is already defined go no further ..." 1>&5 ++echo "${as_me:-configure}:13492: testing if the symbol is already defined go no further ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13477 "configure" ++#line 13495 "configure" + #include "confdefs.h" + #include + int +@@ -13489,16 +13507,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13492: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13510: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13495: \$? = $ac_status" >&5 ++ echo "$as_me:13513: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13498: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13516: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13501: \$? = $ac_status" >&5 ++ echo "$as_me:13519: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_posix_c_source=no + else +@@ -13519,7 +13537,7 @@ + esac + if test "$cf_want_posix_source" = yes ; then + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13522 "configure" ++#line 13540 "configure" + #include "confdefs.h" + #include + int +@@ -13534,16 +13552,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13537: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13555: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13540: \$? = $ac_status" >&5 ++ echo "$as_me:13558: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13543: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13561: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13546: \$? = $ac_status" >&5 ++ echo "$as_me:13564: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -13554,7 +13572,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi + +-echo "${as_me:-configure}:13557: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 ++echo "${as_me:-configure}:13575: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 + + CFLAGS="$cf_trim_CFLAGS" + CPPFLAGS="$cf_trim_CPPFLAGS" +@@ -13562,10 +13580,10 @@ + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" + +-echo "${as_me:-configure}:13565: testing if the second compile does not leave our definition intact error ..." 1>&5 ++echo "${as_me:-configure}:13583: testing if the second compile does not leave our definition intact error ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13568 "configure" ++#line 13586 "configure" + #include "confdefs.h" + #include + int +@@ -13580,16 +13598,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13583: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13601: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13586: \$? = $ac_status" >&5 ++ echo "$as_me:13604: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13589: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13607: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13592: \$? = $ac_status" >&5 ++ echo "$as_me:13610: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -13605,7 +13623,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:13608: result: $cf_cv_posix_c_source" >&5 ++echo "$as_me:13626: result: $cf_cv_posix_c_source" >&5 + echo "${ECHO_T}$cf_cv_posix_c_source" >&6 + + if test "$cf_cv_posix_c_source" != no ; then +@@ -13731,7 +13749,7 @@ + test "$CFLAGS" != "$cf_old_cflag" || break + test -n "$verbose" && echo " removing old option $cf_add_cflags from CFLAGS" 1>&6 + +-echo "${as_me:-configure}:13734: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:13752: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5 + + CFLAGS="$cf_old_cflag" + done +@@ -13743,7 +13761,7 @@ + test "$CPPFLAGS" != "$cf_old_cflag" || break + test -n "$verbose" && echo " removing old option $cf_add_cflags from CPPFLAGS" 1>&6 + +-echo "${as_me:-configure}:13746: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5 ++echo "${as_me:-configure}:13764: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5 + + CPPFLAGS="$cf_old_cflag" + done +@@ -13831,7 +13849,7 @@ + if test -n "$cf_new_cflags" ; then + test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 + +-echo "${as_me:-configure}:13834: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 ++echo "${as_me:-configure}:13852: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" +@@ -13841,7 +13859,7 @@ + if test -n "$cf_new_cppflags" ; then + test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 + +-echo "${as_me:-configure}:13844: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 ++echo "${as_me:-configure}:13862: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" +@@ -13851,7 +13869,7 @@ + if test -n "$cf_new_extra_cppflags" ; then + test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 + +-echo "${as_me:-configure}:13854: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 ++echo "${as_me:-configure}:13872: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 + + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" +@@ -13863,10 +13881,10 @@ + fi + + if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then +- echo "$as_me:13866: checking if _XOPEN_SOURCE really is set" >&5 ++ echo "$as_me:13884: checking if _XOPEN_SOURCE really is set" >&5 + echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13869 "configure" ++#line 13887 "configure" + #include "confdefs.h" + #include + int +@@ -13881,16 +13899,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13884: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13902: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13887: \$? = $ac_status" >&5 ++ echo "$as_me:13905: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13890: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13908: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13893: \$? = $ac_status" >&5 ++ echo "$as_me:13911: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_XOPEN_SOURCE_set=yes + else +@@ -13899,12 +13917,12 @@ + cf_XOPEN_SOURCE_set=no + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +- echo "$as_me:13902: result: $cf_XOPEN_SOURCE_set" >&5 ++ echo "$as_me:13920: result: $cf_XOPEN_SOURCE_set" >&5 + echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6 + if test "$cf_XOPEN_SOURCE_set" = yes + then + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13907 "configure" ++#line 13925 "configure" + #include "confdefs.h" + #include + int +@@ -13919,16 +13937,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13922: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13940: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13925: \$? = $ac_status" >&5 ++ echo "$as_me:13943: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13928: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13946: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13931: \$? = $ac_status" >&5 ++ echo "$as_me:13949: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_XOPEN_SOURCE_set_ok=yes + else +@@ -13939,19 +13957,19 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + if test "$cf_XOPEN_SOURCE_set_ok" = no + then +- { echo "$as_me:13942: WARNING: _XOPEN_SOURCE is lower than requested" >&5 ++ { echo "$as_me:13960: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} + fi + else + +-echo "$as_me:13947: checking if we should define _XOPEN_SOURCE" >&5 ++echo "$as_me:13965: checking if we should define _XOPEN_SOURCE" >&5 + echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_xopen_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13954 "configure" ++#line 13972 "configure" + #include "confdefs.h" + + #include +@@ -13970,16 +13988,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13973: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13991: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13976: \$? = $ac_status" >&5 ++ echo "$as_me:13994: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13979: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13997: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13982: \$? = $ac_status" >&5 ++ echo "$as_me:14000: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_xopen_source=no + else +@@ -13991,7 +14009,7 @@ + CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13994 "configure" ++#line 14012 "configure" + #include "confdefs.h" + + #include +@@ -14010,16 +14028,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14013: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14031: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14016: \$? = $ac_status" >&5 ++ echo "$as_me:14034: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14019: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14037: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14022: \$? = $ac_status" >&5 ++ echo "$as_me:14040: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_xopen_source=no + else +@@ -14034,7 +14052,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:14037: result: $cf_cv_xopen_source" >&5 ++echo "$as_me:14055: result: $cf_cv_xopen_source" >&5 + echo "${ECHO_T}$cf_cv_xopen_source" >&6 + + if test "$cf_cv_xopen_source" != no ; then +@@ -14188,7 +14206,7 @@ + fi; + if test "$enable_largefile" != no; then + +- echo "$as_me:14191: checking for special C compiler options needed for large files" >&5 ++ echo "$as_me:14209: checking for special C compiler options needed for large files" >&5 + echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 + if test "${ac_cv_sys_largefile_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -14200,7 +14218,7 @@ + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14203 "configure" ++#line 14221 "configure" + #include "confdefs.h" + #include + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -14220,16 +14238,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14223: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14241: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14226: \$? = $ac_status" >&5 ++ echo "$as_me:14244: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14229: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14247: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14232: \$? = $ac_status" >&5 ++ echo "$as_me:14250: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -14239,16 +14257,16 @@ + rm -f "conftest.$ac_objext" + CC="$CC -n32" + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14242: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14260: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14245: \$? = $ac_status" >&5 ++ echo "$as_me:14263: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14248: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14266: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14251: \$? = $ac_status" >&5 ++ echo "$as_me:14269: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sys_largefile_CC=' -n32'; break + else +@@ -14262,13 +14280,13 @@ + rm -f "conftest.$ac_ext" + fi + fi +-echo "$as_me:14265: result: $ac_cv_sys_largefile_CC" >&5 ++echo "$as_me:14283: result: $ac_cv_sys_largefile_CC" >&5 + echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 + if test "$ac_cv_sys_largefile_CC" != no; then + CC=$CC$ac_cv_sys_largefile_CC + fi + +- echo "$as_me:14271: checking for _FILE_OFFSET_BITS value needed for large files" >&5 ++ echo "$as_me:14289: checking for _FILE_OFFSET_BITS value needed for large files" >&5 + echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 + if test "${ac_cv_sys_file_offset_bits+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -14276,7 +14294,7 @@ + while :; do + ac_cv_sys_file_offset_bits=no + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14279 "configure" ++#line 14297 "configure" + #include "confdefs.h" + #include + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -14296,16 +14314,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14299: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14317: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14302: \$? = $ac_status" >&5 ++ echo "$as_me:14320: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14305: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14323: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14308: \$? = $ac_status" >&5 ++ echo "$as_me:14326: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -14314,7 +14332,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14317 "configure" ++#line 14335 "configure" + #include "confdefs.h" + #define _FILE_OFFSET_BITS 64 + #include +@@ -14335,16 +14353,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14338: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14356: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14341: \$? = $ac_status" >&5 ++ echo "$as_me:14359: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14344: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14362: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14347: \$? = $ac_status" >&5 ++ echo "$as_me:14365: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sys_file_offset_bits=64; break + else +@@ -14355,7 +14373,7 @@ + break + done + fi +-echo "$as_me:14358: result: $ac_cv_sys_file_offset_bits" >&5 ++echo "$as_me:14376: result: $ac_cv_sys_file_offset_bits" >&5 + echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 + if test "$ac_cv_sys_file_offset_bits" != no; then + +@@ -14365,7 +14383,7 @@ + + fi + rm -rf conftest* +- echo "$as_me:14368: checking for _LARGE_FILES value needed for large files" >&5 ++ echo "$as_me:14386: checking for _LARGE_FILES value needed for large files" >&5 + echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 + if test "${ac_cv_sys_large_files+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -14373,7 +14391,7 @@ + while :; do + ac_cv_sys_large_files=no + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14376 "configure" ++#line 14394 "configure" + #include "confdefs.h" + #include + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -14393,16 +14411,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14396: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14414: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14399: \$? = $ac_status" >&5 ++ echo "$as_me:14417: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14402: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14420: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14405: \$? = $ac_status" >&5 ++ echo "$as_me:14423: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -14411,7 +14429,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14414 "configure" ++#line 14432 "configure" + #include "confdefs.h" + #define _LARGE_FILES 1 + #include +@@ -14432,16 +14450,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14435: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14453: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14438: \$? = $ac_status" >&5 ++ echo "$as_me:14456: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14441: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14459: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14444: \$? = $ac_status" >&5 ++ echo "$as_me:14462: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sys_large_files=1; break + else +@@ -14452,7 +14470,7 @@ + break + done + fi +-echo "$as_me:14455: result: $ac_cv_sys_large_files" >&5 ++echo "$as_me:14473: result: $ac_cv_sys_large_files" >&5 + echo "${ECHO_T}$ac_cv_sys_large_files" >&6 + if test "$ac_cv_sys_large_files" != no; then + +@@ -14465,7 +14483,7 @@ + fi + + if test "$enable_largefile" != no ; then +- echo "$as_me:14468: checking for _LARGEFILE_SOURCE value needed for large files" >&5 ++ echo "$as_me:14486: checking for _LARGEFILE_SOURCE value needed for large files" >&5 + echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6 + if test "${ac_cv_sys_largefile_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -14473,7 +14491,7 @@ + while :; do + ac_cv_sys_largefile_source=no + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14476 "configure" ++#line 14494 "configure" + #include "confdefs.h" + #include + int +@@ -14485,16 +14503,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14488: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14506: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14491: \$? = $ac_status" >&5 ++ echo "$as_me:14509: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14494: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14512: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14497: \$? = $ac_status" >&5 ++ echo "$as_me:14515: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -14503,7 +14521,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14506 "configure" ++#line 14524 "configure" + #include "confdefs.h" + #define _LARGEFILE_SOURCE 1 + #include +@@ -14516,16 +14534,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14519: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14537: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14522: \$? = $ac_status" >&5 ++ echo "$as_me:14540: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14525: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14543: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14528: \$? = $ac_status" >&5 ++ echo "$as_me:14546: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sys_largefile_source=1; break + else +@@ -14536,7 +14554,7 @@ + break + done + fi +-echo "$as_me:14539: result: $ac_cv_sys_largefile_source" >&5 ++echo "$as_me:14557: result: $ac_cv_sys_largefile_source" >&5 + echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6 + if test "$ac_cv_sys_largefile_source" != no; then + +@@ -14550,13 +14568,13 @@ + # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug + # in glibc 2.1.3, but that breaks too many other things. + # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. +-echo "$as_me:14553: checking for fseeko" >&5 ++echo "$as_me:14571: checking for fseeko" >&5 + echo $ECHO_N "checking for fseeko... $ECHO_C" >&6 + if test "${ac_cv_func_fseeko+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14559 "configure" ++#line 14577 "configure" + #include "confdefs.h" + #include + int +@@ -14568,16 +14586,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:14571: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14589: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14574: \$? = $ac_status" >&5 ++ echo "$as_me:14592: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:14577: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14595: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14580: \$? = $ac_status" >&5 ++ echo "$as_me:14598: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_fseeko=yes + else +@@ -14587,7 +14605,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:14590: result: $ac_cv_func_fseeko" >&5 ++echo "$as_me:14608: result: $ac_cv_func_fseeko" >&5 + echo "${ECHO_T}$ac_cv_func_fseeko" >&6 + if test $ac_cv_func_fseeko = yes; then + +@@ -14626,14 +14644,14 @@ + + fi + +- echo "$as_me:14629: checking whether to use struct dirent64" >&5 ++ echo "$as_me:14647: checking whether to use struct dirent64" >&5 + echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6 + if test "${cf_cv_struct_dirent64+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14636 "configure" ++#line 14654 "configure" + #include "confdefs.h" + + #pragma GCC diagnostic error "-Wincompatible-pointer-types" +@@ -14656,16 +14674,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14659: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14677: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14662: \$? = $ac_status" >&5 ++ echo "$as_me:14680: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14665: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14683: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14668: \$? = $ac_status" >&5 ++ echo "$as_me:14686: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_struct_dirent64=yes + else +@@ -14676,7 +14694,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:14679: result: $cf_cv_struct_dirent64" >&5 ++echo "$as_me:14697: result: $cf_cv_struct_dirent64" >&5 + echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 + test "$cf_cv_struct_dirent64" = yes && + cat >>confdefs.h <<\EOF +@@ -14686,7 +14704,7 @@ + fi + + ### Enable compiling-in rcs id's +-echo "$as_me:14689: checking if RCS identifiers should be compiled-in" >&5 ++echo "$as_me:14707: checking if RCS identifiers should be compiled-in" >&5 + echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6 + + # Check whether --with-rcs-ids or --without-rcs-ids was given. +@@ -14696,7 +14714,7 @@ + else + with_rcs_ids=no + fi; +-echo "$as_me:14699: result: $with_rcs_ids" >&5 ++echo "$as_me:14717: result: $with_rcs_ids" >&5 + echo "${ECHO_T}$with_rcs_ids" >&6 + test "$with_rcs_ids" = yes && + cat >>confdefs.h <<\EOF +@@ -14706,7 +14724,7 @@ + ############################################################################### + + ### Note that some functions (such as const) are normally disabled anyway. +-echo "$as_me:14709: checking if you want to build with function extensions" >&5 ++echo "$as_me:14727: checking if you want to build with function extensions" >&5 + echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6 + + # Check whether --enable-ext-funcs or --disable-ext-funcs was given. +@@ -14716,7 +14734,7 @@ + else + with_ext_funcs=yes + fi; +-echo "$as_me:14719: result: $with_ext_funcs" >&5 ++echo "$as_me:14737: result: $with_ext_funcs" >&5 + echo "${ECHO_T}$with_ext_funcs" >&6 + if test "$with_ext_funcs" = yes ; then + NCURSES_EXT_FUNCS=1 +@@ -14734,7 +14752,7 @@ + fi + + ### use option --enable-const to turn on use of const beyond that in XSI. +-echo "$as_me:14737: checking for extended use of const keyword" >&5 ++echo "$as_me:14755: checking for extended use of const keyword" >&5 + echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6 + + # Check whether --enable-const or --disable-const was given. +@@ -14744,7 +14762,7 @@ + else + with_ext_const=no + fi; +-echo "$as_me:14747: result: $with_ext_const" >&5 ++echo "$as_me:14765: result: $with_ext_const" >&5 + echo "${ECHO_T}$with_ext_const" >&6 + NCURSES_CONST='/*nothing*/' + if test "$with_ext_const" = yes ; then +@@ -14754,7 +14772,7 @@ + ############################################################################### + # These options are relatively safe to experiment with. + +-echo "$as_me:14757: checking if you want all development code" >&5 ++echo "$as_me:14775: checking if you want all development code" >&5 + echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6 + + # Check whether --with-develop or --without-develop was given. +@@ -14764,7 +14782,7 @@ + else + with_develop=no + fi; +-echo "$as_me:14767: result: $with_develop" >&5 ++echo "$as_me:14785: result: $with_develop" >&5 + echo "${ECHO_T}$with_develop" >&6 + + ############################################################################### +@@ -14773,7 +14791,7 @@ + # This is still experimental (20080329), but should ultimately be moved to + # the script-block --with-normal, etc. + +-echo "$as_me:14776: checking if you want to link with the pthread library" >&5 ++echo "$as_me:14794: checking if you want to link with the pthread library" >&5 + echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6 + + # Check whether --with-pthread or --without-pthread was given. +@@ -14783,27 +14801,27 @@ + else + with_pthread=no + fi; +-echo "$as_me:14786: result: $with_pthread" >&5 ++echo "$as_me:14804: result: $with_pthread" >&5 + echo "${ECHO_T}$with_pthread" >&6 + + if test "$with_pthread" != no ; then +- echo "$as_me:14790: checking for pthread.h" >&5 ++ echo "$as_me:14808: checking for pthread.h" >&5 + echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 + if test "${ac_cv_header_pthread_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14796 "configure" ++#line 14814 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:14800: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:14818: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:14806: \$? = $ac_status" >&5 ++ echo "$as_me:14824: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -14822,7 +14840,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:14825: result: $ac_cv_header_pthread_h" >&5 ++echo "$as_me:14843: result: $ac_cv_header_pthread_h" >&5 + echo "${ECHO_T}$ac_cv_header_pthread_h" >&6 + if test "$ac_cv_header_pthread_h" = yes; then + +@@ -14832,7 +14850,7 @@ + + for cf_lib_pthread in pthread c_r + do +- echo "$as_me:14835: checking if we can link with the $cf_lib_pthread library" >&5 ++ echo "$as_me:14853: checking if we can link with the $cf_lib_pthread library" >&5 + echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6 + cf_save_LIBS="$LIBS" + +@@ -14853,7 +14871,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14856 "configure" ++#line 14874 "configure" + #include "confdefs.h" + + #include +@@ -14870,16 +14888,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:14873: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14891: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14876: \$? = $ac_status" >&5 ++ echo "$as_me:14894: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:14879: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14897: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14882: \$? = $ac_status" >&5 ++ echo "$as_me:14900: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + with_pthread=yes + else +@@ -14889,7 +14907,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS="$cf_save_LIBS" +- echo "$as_me:14892: result: $with_pthread" >&5 ++ echo "$as_me:14910: result: $with_pthread" >&5 + echo "${ECHO_T}$with_pthread" >&6 + test "$with_pthread" = yes && break + done +@@ -14917,7 +14935,7 @@ + EOF + + else +- { { echo "$as_me:14920: error: Cannot link with pthread library" >&5 ++ { { echo "$as_me:14938: error: Cannot link with pthread library" >&5 + echo "$as_me: error: Cannot link with pthread library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -14926,7 +14944,7 @@ + + fi + +-echo "$as_me:14929: checking if you want to use weak-symbols for pthreads" >&5 ++echo "$as_me:14947: checking if you want to use weak-symbols for pthreads" >&5 + echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6 + + # Check whether --enable-weak-symbols or --disable-weak-symbols was given. +@@ -14936,18 +14954,18 @@ + else + use_weak_symbols=no + fi; +-echo "$as_me:14939: result: $use_weak_symbols" >&5 ++echo "$as_me:14957: result: $use_weak_symbols" >&5 + echo "${ECHO_T}$use_weak_symbols" >&6 + if test "$use_weak_symbols" = yes ; then + +-echo "$as_me:14943: checking if $CC supports weak symbols" >&5 ++echo "$as_me:14961: checking if $CC supports weak symbols" >&5 + echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6 + if test "${cf_cv_weak_symbols+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14950 "configure" ++#line 14968 "configure" + #include "confdefs.h" + + #include +@@ -14973,16 +14991,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14976: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14994: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14979: \$? = $ac_status" >&5 ++ echo "$as_me:14997: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14982: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15000: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14985: \$? = $ac_status" >&5 ++ echo "$as_me:15003: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_weak_symbols=yes + else +@@ -14993,7 +15011,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:14996: result: $cf_cv_weak_symbols" >&5 ++echo "$as_me:15014: result: $cf_cv_weak_symbols" >&5 + echo "${ECHO_T}$cf_cv_weak_symbols" >&6 + + else +@@ -15022,13 +15040,13 @@ + fi + + # OpenSUSE is installing ncurses6, using reentrant option. +-echo "$as_me:15025: checking for _nc_TABSIZE" >&5 ++echo "$as_me:15043: checking for _nc_TABSIZE" >&5 + echo $ECHO_N "checking for _nc_TABSIZE... $ECHO_C" >&6 + if test "${ac_cv_func__nc_TABSIZE+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 15031 "configure" ++#line 15049 "configure" + #include "confdefs.h" + #define _nc_TABSIZE autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -15059,16 +15077,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:15062: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15080: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15065: \$? = $ac_status" >&5 ++ echo "$as_me:15083: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:15068: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15086: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15071: \$? = $ac_status" >&5 ++ echo "$as_me:15089: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func__nc_TABSIZE=yes + else +@@ -15078,7 +15096,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:15081: result: $ac_cv_func__nc_TABSIZE" >&5 ++echo "$as_me:15099: result: $ac_cv_func__nc_TABSIZE" >&5 + echo "${ECHO_T}$ac_cv_func__nc_TABSIZE" >&6 + if test "$ac_cv_func__nc_TABSIZE" = yes; then + assume_reentrant=yes +@@ -15090,7 +15108,7 @@ + # opaque outside of that, so there is no --enable-opaque option. We can use + # this option without --with-pthreads, but this will be always set for + # pthreads. +-echo "$as_me:15093: checking if you want experimental reentrant code" >&5 ++echo "$as_me:15111: checking if you want experimental reentrant code" >&5 + echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6 + + # Check whether --enable-reentrant or --disable-reentrant was given. +@@ -15100,7 +15118,7 @@ + else + with_reentrant=$assume_reentrant + fi; +-echo "$as_me:15103: result: $with_reentrant" >&5 ++echo "$as_me:15121: result: $with_reentrant" >&5 + echo "${ECHO_T}$with_reentrant" >&6 + if test "$with_reentrant" = yes ; then + cf_cv_enable_reentrant=1 +@@ -15123,7 +15141,7 @@ + + ### Allow using a different wrap-prefix + if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then +- echo "$as_me:15126: checking for prefix used to wrap public variables" >&5 ++ echo "$as_me:15144: checking for prefix used to wrap public variables" >&5 + echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6 + + # Check whether --with-wrap-prefix or --without-wrap-prefix was given. +@@ -15133,7 +15151,7 @@ + else + NCURSES_WRAP_PREFIX=_nc_ + fi; +- echo "$as_me:15136: result: $NCURSES_WRAP_PREFIX" >&5 ++ echo "$as_me:15154: result: $NCURSES_WRAP_PREFIX" >&5 + echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 + else + NCURSES_WRAP_PREFIX=_nc_ +@@ -15147,7 +15165,7 @@ + + ### use option --disable-echo to suppress full display compiling commands + +-echo "$as_me:15150: checking if you want to see long compiling messages" >&5 ++echo "$as_me:15168: checking if you want to see long compiling messages" >&5 + echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6 + + # Check whether --enable-echo or --disable-echo was given. +@@ -15181,10 +15199,10 @@ + ECHO_CC='' + + fi; +-echo "$as_me:15184: result: $enableval" >&5 ++echo "$as_me:15202: result: $enableval" >&5 + echo "${ECHO_T}$enableval" >&6 + +-echo "$as_me:15187: checking if you want to use C11 _Noreturn feature" >&5 ++echo "$as_me:15205: checking if you want to use C11 _Noreturn feature" >&5 + echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6 + + # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given. +@@ -15201,17 +15219,17 @@ + enable_stdnoreturn=no + + fi; +-echo "$as_me:15204: result: $enable_stdnoreturn" >&5 ++echo "$as_me:15222: result: $enable_stdnoreturn" >&5 + echo "${ECHO_T}$enable_stdnoreturn" >&6 + + if test $enable_stdnoreturn = yes; then +-echo "$as_me:15208: checking for C11 _Noreturn feature" >&5 ++echo "$as_me:15226: checking for C11 _Noreturn feature" >&5 + echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6 + if test "${cf_cv_c11_noreturn+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 15214 "configure" ++#line 15232 "configure" + #include "confdefs.h" + + #include +@@ -15228,16 +15246,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:15231: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15249: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15234: \$? = $ac_status" >&5 ++ echo "$as_me:15252: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:15237: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15255: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15240: \$? = $ac_status" >&5 ++ echo "$as_me:15258: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_c11_noreturn=yes + else +@@ -15248,7 +15266,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:15251: result: $cf_cv_c11_noreturn" >&5 ++echo "$as_me:15269: result: $cf_cv_c11_noreturn" >&5 + echo "${ECHO_T}$cf_cv_c11_noreturn" >&6 + else + cf_cv_c11_noreturn=no, +@@ -15278,7 +15296,7 @@ + (*-Werror=*) + test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 + +-echo "${as_me:-configure}:15281: testing repairing CFLAGS: $CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:15299: testing repairing CFLAGS: $CFLAGS ..." 1>&5 + + cf_temp_flags= + for cf_temp_scan in $CFLAGS +@@ -15301,11 +15319,11 @@ + CFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 + +-echo "${as_me:-configure}:15304: testing ... fixed $CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:15322: testing ... fixed $CFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +-echo "${as_me:-configure}:15308: testing ... extra $EXTRA_CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:15326: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + ;; + esac +@@ -15317,7 +15335,7 @@ + (*-Werror=*) + test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 + +-echo "${as_me:-configure}:15320: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 ++echo "${as_me:-configure}:15338: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 + + cf_temp_flags= + for cf_temp_scan in $CPPFLAGS +@@ -15340,11 +15358,11 @@ + CPPFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 + +-echo "${as_me:-configure}:15343: testing ... fixed $CPPFLAGS ..." 1>&5 ++echo "${as_me:-configure}:15361: testing ... fixed $CPPFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +-echo "${as_me:-configure}:15347: testing ... extra $EXTRA_CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:15365: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + ;; + esac +@@ -15356,7 +15374,7 @@ + (*-Werror=*) + test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:15359: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:15377: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 + + cf_temp_flags= + for cf_temp_scan in $LDFLAGS +@@ -15379,17 +15397,17 @@ + LDFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:15382: testing ... fixed $LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:15400: testing ... fixed $LDFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +-echo "${as_me:-configure}:15386: testing ... extra $EXTRA_CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:15404: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + ;; + esac + fi + +-echo "$as_me:15392: checking if you want to turn on gcc warnings" >&5 ++echo "$as_me:15410: checking if you want to turn on gcc warnings" >&5 + echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6 + + # Check whether --enable-warnings or --disable-warnings was given. +@@ -15406,7 +15424,7 @@ + enable_warnings=no + + fi; +-echo "$as_me:15409: result: $enable_warnings" >&5 ++echo "$as_me:15427: result: $enable_warnings" >&5 + echo "${ECHO_T}$enable_warnings" >&6 + if test "$enable_warnings" = "yes" + then +@@ -15430,7 +15448,7 @@ + done + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 15433 "configure" ++#line 15451 "configure" + #include "confdefs.h" + + #include +@@ -15445,26 +15463,26 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:15448: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15466: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15451: \$? = $ac_status" >&5 ++ echo "$as_me:15469: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:15454: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15472: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15457: \$? = $ac_status" >&5 ++ echo "$as_me:15475: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + +-echo "$as_me:15460: checking for X11/Xt const-feature" >&5 ++echo "$as_me:15478: checking for X11/Xt const-feature" >&5 + echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6 + if test "${cf_cv_const_x_string+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 15467 "configure" ++#line 15485 "configure" + #include "confdefs.h" + + #define _CONST_X_STRING /* X11R7.8 (perhaps) */ +@@ -15481,16 +15499,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:15484: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15502: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15487: \$? = $ac_status" >&5 ++ echo "$as_me:15505: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:15490: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15508: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15493: \$? = $ac_status" >&5 ++ echo "$as_me:15511: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_const_x_string=no +@@ -15505,7 +15523,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:15508: result: $cf_cv_const_x_string" >&5 ++echo "$as_me:15526: result: $cf_cv_const_x_string" >&5 + echo "${ECHO_T}$cf_cv_const_x_string" >&6 + + LIBS="$cf_save_LIBS_CF_CONST_X_STRING" +@@ -15534,7 +15552,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi + cat > "conftest.$ac_ext" <&5 ++ { echo "$as_me:15571: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" +@@ -15566,12 +15584,12 @@ + wd981 + do + CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" +- if { (eval echo "$as_me:15569: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:15587: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15572: \$? = $ac_status" >&5 ++ echo "$as_me:15590: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- test -n "$verbose" && echo "$as_me:15574: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:15592: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" + fi +@@ -15579,7 +15597,7 @@ + CFLAGS="$cf_save_CFLAGS" + elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" + then +- { echo "$as_me:15582: checking for $CC warning options..." >&5 ++ { echo "$as_me:15600: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + cf_warn_CONST="" +@@ -15602,12 +15620,12 @@ + Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum + do + CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" +- if { (eval echo "$as_me:15605: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:15623: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15608: \$? = $ac_status" >&5 ++ echo "$as_me:15626: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- test -n "$verbose" && echo "$as_me:15610: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:15628: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + case "$cf_opt" in + (Winline) +@@ -15615,7 +15633,7 @@ + ([34].*) + test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 + +-echo "${as_me:-configure}:15618: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 ++echo "${as_me:-configure}:15636: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 + + continue;; + esac +@@ -15625,7 +15643,7 @@ + ([12].*) + test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 + +-echo "${as_me:-configure}:15628: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 ++echo "${as_me:-configure}:15646: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 + + continue;; + esac +@@ -15658,10 +15676,10 @@ + EOF + if test "$GCC" = yes + then +- { echo "$as_me:15661: checking for $CC __attribute__ directives..." >&5 ++ { echo "$as_me:15679: checking for $CC __attribute__ directives..." >&5 + echo "$as_me: checking for $CC __attribute__ directives..." >&6;} + cat > "conftest.$ac_ext" <&5 ++ if { (eval echo "$as_me:15731: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15716: \$? = $ac_status" >&5 ++ echo "$as_me:15734: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- test -n "$verbose" && echo "$as_me:15718: result: ... $cf_attribute" >&5 ++ test -n "$verbose" && echo "$as_me:15736: result: ... $cf_attribute" >&5 + echo "${ECHO_T}... $cf_attribute" >&6 + cat conftest.h >>confdefs.h + case "$cf_attribute" in +@@ -15783,7 +15801,7 @@ + fi + + ### use option --enable-assertions to turn on generation of assertion code +-echo "$as_me:15786: checking if you want to enable runtime assertions" >&5 ++echo "$as_me:15804: checking if you want to enable runtime assertions" >&5 + echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6 + + # Check whether --enable-assertions or --disable-assertions was given. +@@ -15793,7 +15811,7 @@ + else + with_assertions=no + fi; +-echo "$as_me:15796: result: $with_assertions" >&5 ++echo "$as_me:15814: result: $with_assertions" >&5 + echo "${ECHO_T}$with_assertions" >&6 + if test -n "$GCC" + then +@@ -15846,7 +15864,7 @@ + ;; + esac + +-echo "$as_me:15849: checking whether to add trace feature to all models" >&5 ++echo "$as_me:15867: checking whether to add trace feature to all models" >&5 + echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6 + + # Check whether --with-trace or --without-trace was given. +@@ -15856,7 +15874,7 @@ + else + cf_with_trace=$cf_all_traces + fi; +-echo "$as_me:15859: result: $cf_with_trace" >&5 ++echo "$as_me:15877: result: $cf_with_trace" >&5 + echo "${ECHO_T}$cf_with_trace" >&6 + + if test "$cf_with_trace" = yes ; then +@@ -15964,7 +15982,7 @@ + ADA_TRACE=FALSE + fi + +-echo "$as_me:15967: checking if we want to use GNAT projects" >&5 ++echo "$as_me:15985: checking if we want to use GNAT projects" >&5 + echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6 + + # Check whether --enable-gnat-projects or --disable-gnat-projects was given. +@@ -15981,21 +15999,21 @@ + enable_gnat_projects=yes + + fi; +-echo "$as_me:15984: result: $enable_gnat_projects" >&5 ++echo "$as_me:16002: result: $enable_gnat_projects" >&5 + echo "${ECHO_T}$enable_gnat_projects" >&6 + + ### Checks for libraries. + case $cf_cv_system_name in + (*mingw32*) + +-echo "$as_me:15991: checking if ssp library is needed" >&5 ++echo "$as_me:16009: checking if ssp library is needed" >&5 + echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6 + if test "${cf_cv_need_libssp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 15998 "configure" ++#line 16016 "configure" + #include "confdefs.h" + + #include +@@ -16012,16 +16030,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:16015: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16033: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16018: \$? = $ac_status" >&5 ++ echo "$as_me:16036: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:16021: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16039: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16024: \$? = $ac_status" >&5 ++ echo "$as_me:16042: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_need_libssp=no + else +@@ -16031,7 +16049,7 @@ + cf_save_LIBS="$LIBS" + LIBS="$LIBS -lssp" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16034 "configure" ++#line 16052 "configure" + #include "confdefs.h" + + #include +@@ -16048,16 +16066,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:16051: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16069: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16054: \$? = $ac_status" >&5 ++ echo "$as_me:16072: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:16057: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16075: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16060: \$? = $ac_status" >&5 ++ echo "$as_me:16078: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_need_libssp=yes + else +@@ -16071,7 +16089,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:16074: result: $cf_cv_need_libssp" >&5 ++echo "$as_me:16092: result: $cf_cv_need_libssp" >&5 + echo "${ECHO_T}$cf_cv_need_libssp" >&6 + + if test "x$cf_cv_need_libssp" = xyes +@@ -16097,13 +16115,13 @@ + + ;; + (*) +-echo "$as_me:16100: checking for gettimeofday" >&5 ++echo "$as_me:16118: checking for gettimeofday" >&5 + echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6 + if test "${ac_cv_func_gettimeofday+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16106 "configure" ++#line 16124 "configure" + #include "confdefs.h" + #define gettimeofday autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -16134,16 +16152,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:16137: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16155: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16140: \$? = $ac_status" >&5 ++ echo "$as_me:16158: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:16143: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16161: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16146: \$? = $ac_status" >&5 ++ echo "$as_me:16164: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_gettimeofday=yes + else +@@ -16153,7 +16171,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:16156: result: $ac_cv_func_gettimeofday" >&5 ++echo "$as_me:16174: result: $ac_cv_func_gettimeofday" >&5 + echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 + if test "$ac_cv_func_gettimeofday" = yes; then + cat >>confdefs.h <<\EOF +@@ -16162,7 +16180,7 @@ + + else + +-echo "$as_me:16165: checking for gettimeofday in -lbsd" >&5 ++echo "$as_me:16183: checking for gettimeofday in -lbsd" >&5 + echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6 + if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -16170,7 +16188,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16173 "configure" ++#line 16191 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -16189,16 +16207,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:16192: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16210: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16195: \$? = $ac_status" >&5 ++ echo "$as_me:16213: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:16198: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16216: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16201: \$? = $ac_status" >&5 ++ echo "$as_me:16219: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_bsd_gettimeofday=yes + else +@@ -16209,7 +16227,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:16212: result: $ac_cv_lib_bsd_gettimeofday" >&5 ++echo "$as_me:16230: result: $ac_cv_lib_bsd_gettimeofday" >&5 + echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6 + if test "$ac_cv_lib_bsd_gettimeofday" = yes; then + +@@ -16225,13 +16243,13 @@ + esac + + ### Checks for header files. +-echo "$as_me:16228: checking for ANSI C header files" >&5 ++echo "$as_me:16246: checking for ANSI C header files" >&5 + echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 + if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16234 "configure" ++#line 16252 "configure" + #include "confdefs.h" + #include + #include +@@ -16239,13 +16257,13 @@ + #include + + _ACEOF +-if { (eval echo "$as_me:16242: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:16260: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:16248: \$? = $ac_status" >&5 ++ echo "$as_me:16266: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -16267,7 +16285,7 @@ + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16270 "configure" ++#line 16288 "configure" + #include "confdefs.h" + #include + +@@ -16285,7 +16303,7 @@ + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16288 "configure" ++#line 16306 "configure" + #include "confdefs.h" + #include + +@@ -16306,7 +16324,7 @@ + : + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16309 "configure" ++#line 16327 "configure" + #include "confdefs.h" + #include + #if ((' ' & 0x0FF) == 0x020) +@@ -16332,15 +16350,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:16335: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16353: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16338: \$? = $ac_status" >&5 ++ echo "$as_me:16356: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:16340: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16358: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16343: \$? = $ac_status" >&5 ++ echo "$as_me:16361: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -16353,7 +16371,7 @@ + fi + fi + fi +-echo "$as_me:16356: result: $ac_cv_header_stdc" >&5 ++echo "$as_me:16374: result: $ac_cv_header_stdc" >&5 + echo "${ECHO_T}$ac_cv_header_stdc" >&6 + if test $ac_cv_header_stdc = yes; then + +@@ -16369,28 +16387,28 @@ + inttypes.h stdint.h unistd.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:16372: checking for $ac_header" >&5 ++echo "$as_me:16390: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16378 "configure" ++#line 16396 "configure" + #include "confdefs.h" + $ac_includes_default + #include <$ac_header> + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16384: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16402: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16387: \$? = $ac_status" >&5 ++ echo "$as_me:16405: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16390: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16408: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16393: \$? = $ac_status" >&5 ++ echo "$as_me:16411: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_Header=yes" + else +@@ -16400,7 +16418,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:16403: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:16421: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:16431: checking for signed char" >&5 + echo $ECHO_N "checking for signed char... $ECHO_C" >&6 + if test "${ac_cv_type_signed_char+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16419 "configure" ++#line 16437 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -16431,16 +16449,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16434: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16452: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16437: \$? = $ac_status" >&5 ++ echo "$as_me:16455: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16440: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16458: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16443: \$? = $ac_status" >&5 ++ echo "$as_me:16461: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_signed_char=yes + else +@@ -16450,10 +16468,10 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:16453: result: $ac_cv_type_signed_char" >&5 ++echo "$as_me:16471: result: $ac_cv_type_signed_char" >&5 + echo "${ECHO_T}$ac_cv_type_signed_char" >&6 + +-echo "$as_me:16456: checking size of signed char" >&5 ++echo "$as_me:16474: checking size of signed char" >&5 + echo $ECHO_N "checking size of signed char... $ECHO_C" >&6 + if test "${ac_cv_sizeof_signed_char+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -16462,7 +16480,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16465 "configure" ++#line 16483 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -16474,21 +16492,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16477: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16495: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16480: \$? = $ac_status" >&5 ++ echo "$as_me:16498: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16483: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16501: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16486: \$? = $ac_status" >&5 ++ echo "$as_me:16504: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16491 "configure" ++#line 16509 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -16500,16 +16518,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16503: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16521: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16506: \$? = $ac_status" >&5 ++ echo "$as_me:16524: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16509: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16527: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16512: \$? = $ac_status" >&5 ++ echo "$as_me:16530: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid; break + else +@@ -16525,7 +16543,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16528 "configure" ++#line 16546 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -16537,16 +16555,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16540: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16558: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16543: \$? = $ac_status" >&5 ++ echo "$as_me:16561: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16546: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16564: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16549: \$? = $ac_status" >&5 ++ echo "$as_me:16567: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=$ac_mid; break + else +@@ -16562,7 +16580,7 @@ + while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16565 "configure" ++#line 16583 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -16574,16 +16592,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16577: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16595: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16580: \$? = $ac_status" >&5 ++ echo "$as_me:16598: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16583: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16601: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16586: \$? = $ac_status" >&5 ++ echo "$as_me:16604: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid + else +@@ -16596,12 +16614,12 @@ + ac_cv_sizeof_signed_char=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:16599: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:16617: error: cannot run test program while cross compiling" >&5 + echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16604 "configure" ++#line 16622 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -16617,15 +16635,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:16620: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16638: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16623: \$? = $ac_status" >&5 ++ echo "$as_me:16641: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:16625: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16643: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16628: \$? = $ac_status" >&5 ++ echo "$as_me:16646: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sizeof_signed_char=`cat conftest.val` + else +@@ -16641,19 +16659,19 @@ + ac_cv_sizeof_signed_char=0 + fi + fi +-echo "$as_me:16644: result: $ac_cv_sizeof_signed_char" >&5 ++echo "$as_me:16662: result: $ac_cv_sizeof_signed_char" >&5 + echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 + cat >>confdefs.h <&5 ++echo "$as_me:16668: checking for ANSI C header files" >&5 + echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 + if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16656 "configure" ++#line 16674 "configure" + #include "confdefs.h" + #include + #include +@@ -16661,13 +16679,13 @@ + #include + + _ACEOF +-if { (eval echo "$as_me:16664: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:16682: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:16670: \$? = $ac_status" >&5 ++ echo "$as_me:16688: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -16689,7 +16707,7 @@ + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16692 "configure" ++#line 16710 "configure" + #include "confdefs.h" + #include + +@@ -16707,7 +16725,7 @@ + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16710 "configure" ++#line 16728 "configure" + #include "confdefs.h" + #include + +@@ -16728,7 +16746,7 @@ + : + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16731 "configure" ++#line 16749 "configure" + #include "confdefs.h" + #include + #if ((' ' & 0x0FF) == 0x020) +@@ -16754,15 +16772,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:16757: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16775: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16760: \$? = $ac_status" >&5 ++ echo "$as_me:16778: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:16762: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16780: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16765: \$? = $ac_status" >&5 ++ echo "$as_me:16783: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -16775,7 +16793,7 @@ + fi + fi + fi +-echo "$as_me:16778: result: $ac_cv_header_stdc" >&5 ++echo "$as_me:16796: result: $ac_cv_header_stdc" >&5 + echo "${ECHO_T}$ac_cv_header_stdc" >&6 + if test $ac_cv_header_stdc = yes; then + +@@ -16788,13 +16806,13 @@ + ac_header_dirent=no + for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do + as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` +-echo "$as_me:16791: checking for $ac_hdr that defines DIR" >&5 ++echo "$as_me:16809: checking for $ac_hdr that defines DIR" >&5 + echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16797 "configure" ++#line 16815 "configure" + #include "confdefs.h" + #include + #include <$ac_hdr> +@@ -16809,16 +16827,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16812: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16830: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16815: \$? = $ac_status" >&5 ++ echo "$as_me:16833: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16818: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16836: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16821: \$? = $ac_status" >&5 ++ echo "$as_me:16839: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_Header=yes" + else +@@ -16828,7 +16846,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:16831: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:16849: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++ echo "$as_me:16862: checking for opendir in -ldir" >&5 + echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 + if test "${ac_cv_lib_dir_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -16849,7 +16867,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldir $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16852 "configure" ++#line 16870 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -16868,16 +16886,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:16871: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16889: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16874: \$? = $ac_status" >&5 ++ echo "$as_me:16892: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:16877: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16895: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16880: \$? = $ac_status" >&5 ++ echo "$as_me:16898: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_dir_opendir=yes + else +@@ -16888,14 +16906,14 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:16891: result: $ac_cv_lib_dir_opendir" >&5 ++echo "$as_me:16909: result: $ac_cv_lib_dir_opendir" >&5 + echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 + if test "$ac_cv_lib_dir_opendir" = yes; then + LIBS="$LIBS -ldir" + fi + + else +- echo "$as_me:16898: checking for opendir in -lx" >&5 ++ echo "$as_me:16916: checking for opendir in -lx" >&5 + echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 + if test "${ac_cv_lib_x_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -16903,7 +16921,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lx $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16906 "configure" ++#line 16924 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -16922,16 +16940,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:16925: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16943: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16928: \$? = $ac_status" >&5 ++ echo "$as_me:16946: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:16931: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16949: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16934: \$? = $ac_status" >&5 ++ echo "$as_me:16952: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_x_opendir=yes + else +@@ -16942,7 +16960,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:16945: result: $ac_cv_lib_x_opendir" >&5 ++echo "$as_me:16963: result: $ac_cv_lib_x_opendir" >&5 + echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 + if test "$ac_cv_lib_x_opendir" = yes; then + LIBS="$LIBS -lx" +@@ -16950,13 +16968,13 @@ + + fi + +-echo "$as_me:16953: checking whether time.h and sys/time.h may both be included" >&5 ++echo "$as_me:16971: checking whether time.h and sys/time.h may both be included" >&5 + echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 + if test "${ac_cv_header_time+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16959 "configure" ++#line 16977 "configure" + #include "confdefs.h" + #include + #include +@@ -16972,16 +16990,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16975: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16993: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16978: \$? = $ac_status" >&5 ++ echo "$as_me:16996: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16981: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16999: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16984: \$? = $ac_status" >&5 ++ echo "$as_me:17002: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_header_time=yes + else +@@ -16991,7 +17009,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:16994: result: $ac_cv_header_time" >&5 ++echo "$as_me:17012: result: $ac_cv_header_time" >&5 + echo "${ECHO_T}$ac_cv_header_time" >&6 + if test $ac_cv_header_time = yes; then + +@@ -17009,13 +17027,13 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_main_return="return" + +-echo "$as_me:17012: checking for an ANSI C-conforming const" >&5 ++echo "$as_me:17030: checking for an ANSI C-conforming const" >&5 + echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 + if test "${ac_cv_c_const+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17018 "configure" ++#line 17036 "configure" + #include "confdefs.h" + + int +@@ -17073,16 +17091,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:17076: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17094: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17079: \$? = $ac_status" >&5 ++ echo "$as_me:17097: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:17082: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17100: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17085: \$? = $ac_status" >&5 ++ echo "$as_me:17103: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_c_const=yes + else +@@ -17092,7 +17110,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:17095: result: $ac_cv_c_const" >&5 ++echo "$as_me:17113: result: $ac_cv_c_const" >&5 + echo "${ECHO_T}$ac_cv_c_const" >&6 + if test $ac_cv_c_const = no; then + +@@ -17104,7 +17122,7 @@ + + ### Checks for external-data + +-echo "$as_me:17107: checking if data-only library module links" >&5 ++echo "$as_me:17125: checking if data-only library module links" >&5 + echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6 + if test "${cf_cv_link_dataonly+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17112,20 +17130,20 @@ + + rm -f conftest.a + cat >conftest.$ac_ext <&5 ++ if { (eval echo "$as_me:17136: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17121: \$? = $ac_status" >&5 ++ echo "$as_me:17139: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then + mv conftest.o data.o && \ + ( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null + fi + rm -f conftest.$ac_ext data.o + cat >conftest.$ac_ext <&5 ++ if { (eval echo "$as_me:17159: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17144: \$? = $ac_status" >&5 ++ echo "$as_me:17162: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then + mv conftest.o func.o && \ + ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null +@@ -17154,7 +17172,7 @@ + cf_cv_link_dataonly=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17157 "configure" ++#line 17175 "configure" + #include "confdefs.h" + + int main(void) +@@ -17165,15 +17183,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:17168: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17186: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17171: \$? = $ac_status" >&5 ++ echo "$as_me:17189: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:17173: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17191: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17176: \$? = $ac_status" >&5 ++ echo "$as_me:17194: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_link_dataonly=yes + else +@@ -17188,7 +17206,7 @@ + + fi + +-echo "$as_me:17191: result: $cf_cv_link_dataonly" >&5 ++echo "$as_me:17209: result: $cf_cv_link_dataonly" >&5 + echo "${ECHO_T}$cf_cv_link_dataonly" >&6 + + if test "$cf_cv_link_dataonly" = no ; then +@@ -17207,23 +17225,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:17210: checking for $ac_header" >&5 ++echo "$as_me:17228: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17216 "configure" ++#line 17234 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:17220: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:17238: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:17226: \$? = $ac_status" >&5 ++ echo "$as_me:17244: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -17242,7 +17260,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:17245: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:17263: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:17273: checking for working mkstemp" >&5 + echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 + if test "${cf_cv_func_mkstemp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17263,7 +17281,7 @@ + cf_cv_func_mkstemp=maybe + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17266 "configure" ++#line 17284 "configure" + #include "confdefs.h" + + #include +@@ -17304,15 +17322,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:17307: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17325: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17310: \$? = $ac_status" >&5 ++ echo "$as_me:17328: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:17312: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17330: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17315: \$? = $ac_status" >&5 ++ echo "$as_me:17333: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_mkstemp=yes + +@@ -17327,16 +17345,16 @@ + fi + + fi +-echo "$as_me:17330: result: $cf_cv_func_mkstemp" >&5 ++echo "$as_me:17348: result: $cf_cv_func_mkstemp" >&5 + echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 + if test "x$cf_cv_func_mkstemp" = xmaybe ; then +- echo "$as_me:17333: checking for mkstemp" >&5 ++ echo "$as_me:17351: checking for mkstemp" >&5 + echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 + if test "${ac_cv_func_mkstemp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17339 "configure" ++#line 17357 "configure" + #include "confdefs.h" + #define mkstemp autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -17367,16 +17385,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:17370: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17388: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17373: \$? = $ac_status" >&5 ++ echo "$as_me:17391: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:17376: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17394: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17379: \$? = $ac_status" >&5 ++ echo "$as_me:17397: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_mkstemp=yes + else +@@ -17386,7 +17404,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:17389: result: $ac_cv_func_mkstemp" >&5 ++echo "$as_me:17407: result: $ac_cv_func_mkstemp" >&5 + echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 + + fi +@@ -17415,7 +17433,7 @@ + unset cf_TEMP_gnat + # Extract the first word of "$cf_prog_gnat", so it can be a program name with args. + set dummy $cf_prog_gnat; ac_word=$2 +-echo "$as_me:17418: checking for $ac_word" >&5 ++echo "$as_me:17436: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17432,7 +17450,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word" +- echo "$as_me:17435: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:17453: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -17444,10 +17462,10 @@ + cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat + + if test -n "$cf_TEMP_gnat"; then +- echo "$as_me:17447: result: $cf_TEMP_gnat" >&5 ++ echo "$as_me:17465: result: $cf_TEMP_gnat" >&5 + echo "${ECHO_T}$cf_TEMP_gnat" >&6 + else +- echo "$as_me:17450: result: no" >&5 ++ echo "$as_me:17468: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -17457,7 +17475,7 @@ + unset cf_cv_gnat_version + unset cf_TEMP_gnat + +-echo "$as_me:17460: checking for $cf_prog_gnat version" >&5 ++echo "$as_me:17478: checking for $cf_prog_gnat version" >&5 + echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6 + if test "${cf_cv_gnat_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17468,7 +17486,7 @@ + sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` + + fi +-echo "$as_me:17471: result: $cf_cv_gnat_version" >&5 ++echo "$as_me:17489: result: $cf_cv_gnat_version" >&5 + echo "${ECHO_T}$cf_cv_gnat_version" >&6 + test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no + eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version +@@ -17497,7 +17515,7 @@ + cd conftest.src + for cf_gprconfig in Ada C + do +- echo "$as_me:17500: checking for gprconfig name for $cf_gprconfig" >&5 ++ echo "$as_me:17518: checking for gprconfig name for $cf_gprconfig" >&5 + echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6 + if test "$cf_gprconfig" = C + then +@@ -17516,10 +17534,10 @@ + if test -n "$cf_gprconfig_value" + then + eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value" +- echo "$as_me:17519: result: $cf_gprconfig_value" >&5 ++ echo "$as_me:17537: result: $cf_gprconfig_value" >&5 + echo "${ECHO_T}$cf_gprconfig_value" >&6 + else +- echo "$as_me:17522: result: missing" >&5 ++ echo "$as_me:17540: result: missing" >&5 + echo "${ECHO_T}missing" >&6 + cf_ada_config="#" + break +@@ -17532,7 +17550,7 @@ + if test "x$cf_ada_config" != "x#" + then + +-echo "$as_me:17535: checking for gnat version" >&5 ++echo "$as_me:17553: checking for gnat version" >&5 + echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 + if test "${cf_cv_gnat_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17543,7 +17561,7 @@ + sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` + + fi +-echo "$as_me:17546: result: $cf_cv_gnat_version" >&5 ++echo "$as_me:17564: result: $cf_cv_gnat_version" >&5 + echo "${ECHO_T}$cf_cv_gnat_version" >&6 + test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no + +@@ -17552,7 +17570,7 @@ + cf_cv_prog_gnat_correct=yes + ;; + (*) +- { echo "$as_me:17555: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 ++ { echo "$as_me:17573: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 + echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} + cf_cv_prog_gnat_correct=no + ;; +@@ -17560,7 +17578,7 @@ + + # Extract the first word of "m4", so it can be a program name with args. + set dummy m4; ac_word=$2 +-echo "$as_me:17563: checking for $ac_word" >&5 ++echo "$as_me:17581: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_M4_exists+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17575,7 +17593,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_M4_exists="yes" +-echo "$as_me:17578: found $ac_dir/$ac_word" >&5 ++echo "$as_me:17596: found $ac_dir/$ac_word" >&5 + break + done + +@@ -17584,20 +17602,20 @@ + fi + M4_exists=$ac_cv_prog_M4_exists + if test -n "$M4_exists"; then +- echo "$as_me:17587: result: $M4_exists" >&5 ++ echo "$as_me:17605: result: $M4_exists" >&5 + echo "${ECHO_T}$M4_exists" >&6 + else +- echo "$as_me:17590: result: no" >&5 ++ echo "$as_me:17608: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + if test "$ac_cv_prog_M4_exists" = no; then + cf_cv_prog_gnat_correct=no +- { echo "$as_me:17596: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 ++ { echo "$as_me:17614: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 + echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;} + fi + if test "$cf_cv_prog_gnat_correct" = yes; then +- echo "$as_me:17600: checking if GNAT works" >&5 ++ echo "$as_me:17618: checking if GNAT works" >&5 + echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 + + rm -rf ./conftest* ./*~conftest* +@@ -17625,7 +17643,7 @@ + fi + rm -rf ./conftest* ./*~conftest* + +- echo "$as_me:17628: result: $cf_cv_prog_gnat_correct" >&5 ++ echo "$as_me:17646: result: $cf_cv_prog_gnat_correct" >&5 + echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 + fi + else +@@ -17635,7 +17653,7 @@ + + if test "$cf_cv_prog_gnat_correct" = yes; then + +- echo "$as_me:17638: checking optimization options for ADAFLAGS" >&5 ++ echo "$as_me:17656: checking optimization options for ADAFLAGS" >&5 + echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 + case "$CFLAGS" in + (*-g*) +@@ -17652,10 +17670,10 @@ + + ;; + esac +- echo "$as_me:17655: result: $ADAFLAGS" >&5 ++ echo "$as_me:17673: result: $ADAFLAGS" >&5 + echo "${ECHO_T}$ADAFLAGS" >&6 + +-echo "$as_me:17658: checking if GNATPREP supports -T option" >&5 ++echo "$as_me:17676: checking if GNATPREP supports -T option" >&5 + echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6 + if test "${cf_cv_gnatprep_opt_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17665,11 +17683,11 @@ + gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes + + fi +-echo "$as_me:17668: result: $cf_cv_gnatprep_opt_t" >&5 ++echo "$as_me:17686: result: $cf_cv_gnatprep_opt_t" >&5 + echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6 + test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS" + +-echo "$as_me:17672: checking if GNAT supports generics" >&5 ++echo "$as_me:17690: checking if GNAT supports generics" >&5 + echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 + case "$cf_cv_gnat_version" in + (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9]) +@@ -17679,7 +17697,7 @@ + cf_gnat_generics=no + ;; + esac +-echo "$as_me:17682: result: $cf_gnat_generics" >&5 ++echo "$as_me:17700: result: $cf_gnat_generics" >&5 + echo "${ECHO_T}$cf_gnat_generics" >&6 + + if test "$cf_gnat_generics" = yes +@@ -17691,7 +17709,7 @@ + cf_generic_objects= + fi + +-echo "$as_me:17694: checking if GNAT supports SIGINT" >&5 ++echo "$as_me:17712: checking if GNAT supports SIGINT" >&5 + echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6 + if test "${cf_cv_gnat_sigint+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17739,7 +17757,7 @@ + rm -rf ./conftest* ./*~conftest* + + fi +-echo "$as_me:17742: result: $cf_cv_gnat_sigint" >&5 ++echo "$as_me:17760: result: $cf_cv_gnat_sigint" >&5 + echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 + + if test "$cf_cv_gnat_sigint" = yes ; then +@@ -17752,7 +17770,7 @@ + cf_gnat_projects=no + + if test "$enable_gnat_projects" != no ; then +-echo "$as_me:17755: checking if GNAT supports project files" >&5 ++echo "$as_me:17773: checking if GNAT supports project files" >&5 + echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 + case "$cf_cv_gnat_version" in + (3.[0-9]*) +@@ -17815,15 +17833,15 @@ + esac + ;; + esac +-echo "$as_me:17818: result: $cf_gnat_projects" >&5 ++echo "$as_me:17836: result: $cf_gnat_projects" >&5 + echo "${ECHO_T}$cf_gnat_projects" >&6 + fi # enable_gnat_projects + + if test "$cf_gnat_projects" = yes + then +- echo "$as_me:17824: checking if GNAT supports libraries" >&5 ++ echo "$as_me:17842: checking if GNAT supports libraries" >&5 + echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 +- echo "$as_me:17826: result: $cf_gnat_libraries" >&5 ++ echo "$as_me:17844: result: $cf_gnat_libraries" >&5 + echo "${ECHO_T}$cf_gnat_libraries" >&6 + fi + +@@ -17843,7 +17861,7 @@ + then + USE_GNAT_MAKE_GPR="" + else +- { echo "$as_me:17846: WARNING: use old makefile rules since tools are missing" >&5 ++ { echo "$as_me:17864: WARNING: use old makefile rules since tools are missing" >&5 + echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;} + fi + fi +@@ -17855,7 +17873,7 @@ + USE_GNAT_LIBRARIES="#" + fi + +-echo "$as_me:17858: checking for ada-compiler" >&5 ++echo "$as_me:17876: checking for ada-compiler" >&5 + echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6 + + # Check whether --with-ada-compiler or --without-ada-compiler was given. +@@ -17866,12 +17884,12 @@ + cf_ada_compiler=gnatmake + fi; + +-echo "$as_me:17869: result: $cf_ada_compiler" >&5 ++echo "$as_me:17887: result: $cf_ada_compiler" >&5 + echo "${ECHO_T}$cf_ada_compiler" >&6 + + cf_ada_package=terminal_interface + +-echo "$as_me:17874: checking for ada-include" >&5 ++echo "$as_me:17892: checking for ada-include" >&5 + echo $ECHO_N "checking for ada-include... $ECHO_C" >&6 + + # Check whether --with-ada-include or --without-ada-include was given. +@@ -17907,7 +17925,7 @@ + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:17910: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:17928: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -17916,10 +17934,10 @@ + fi + eval ADA_INCLUDE="$withval" + +-echo "$as_me:17919: result: $ADA_INCLUDE" >&5 ++echo "$as_me:17937: result: $ADA_INCLUDE" >&5 + echo "${ECHO_T}$ADA_INCLUDE" >&6 + +-echo "$as_me:17922: checking for ada-objects" >&5 ++echo "$as_me:17940: checking for ada-objects" >&5 + echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6 + + # Check whether --with-ada-objects or --without-ada-objects was given. +@@ -17955,7 +17973,7 @@ + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:17958: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:17976: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -17964,10 +17982,10 @@ + fi + eval ADA_OBJECTS="$withval" + +-echo "$as_me:17967: result: $ADA_OBJECTS" >&5 ++echo "$as_me:17985: result: $ADA_OBJECTS" >&5 + echo "${ECHO_T}$ADA_OBJECTS" >&6 + +-echo "$as_me:17970: checking if an Ada95 shared-library should be built" >&5 ++echo "$as_me:17988: checking if an Ada95 shared-library should be built" >&5 + echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6 + + # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given. +@@ -17977,14 +17995,14 @@ + else + with_ada_sharedlib=no + fi; +-echo "$as_me:17980: result: $with_ada_sharedlib" >&5 ++echo "$as_me:17998: result: $with_ada_sharedlib" >&5 + echo "${ECHO_T}$with_ada_sharedlib" >&6 + + if test "x$with_ada_sharedlib" != xno + then + if test "x$cf_gnat_projects" != xyes + then +- { echo "$as_me:17987: WARNING: disabling shared-library since GNAT projects are not supported" >&5 ++ { echo "$as_me:18005: WARNING: disabling shared-library since GNAT projects are not supported" >&5 + echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;} + with_ada_sharedlib=no + fi +@@ -18004,7 +18022,7 @@ + + # allow the Ada binding to be renamed + +-echo "$as_me:18007: checking for ada-libname" >&5 ++echo "$as_me:18025: checking for ada-libname" >&5 + echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6 + + # Check whether --with-ada-libname or --without-ada-libname was given. +@@ -18020,16 +18038,16 @@ + ;; + esac + +-echo "$as_me:18023: result: $ADA_LIBNAME" >&5 ++echo "$as_me:18041: result: $ADA_LIBNAME" >&5 + echo "${ECHO_T}$ADA_LIBNAME" >&6 + + else +- { { echo "$as_me:18027: error: No usable Ada compiler found" >&5 ++ { { echo "$as_me:18045: error: No usable Ada compiler found" >&5 + echo "$as_me: error: No usable Ada compiler found" >&2;} + { (exit 1); exit 1; }; } + fi + else +- { { echo "$as_me:18032: error: The Ada compiler is needed for this package" >&5 ++ { { echo "$as_me:18050: error: The Ada compiler is needed for this package" >&5 + echo "$as_me: error: The Ada compiler is needed for this package" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -18069,7 +18087,7 @@ + fi + + ### Build up pieces for makefile rules +-echo "$as_me:18072: checking default library suffix" >&5 ++echo "$as_me:18090: checking default library suffix" >&5 + echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -18080,10 +18098,10 @@ + (shared) DFT_ARG_SUFFIX='' ;; + esac + test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" +-echo "$as_me:18083: result: $DFT_ARG_SUFFIX" >&5 ++echo "$as_me:18101: result: $DFT_ARG_SUFFIX" >&5 + echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 + +-echo "$as_me:18086: checking default library-dependency suffix" >&5 ++echo "$as_me:18104: checking default library-dependency suffix" >&5 + echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 + + case X$DFT_LWR_MODEL in +@@ -18166,10 +18184,10 @@ + DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}" + DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}" + fi +-echo "$as_me:18169: result: $DFT_DEP_SUFFIX" >&5 ++echo "$as_me:18187: result: $DFT_DEP_SUFFIX" >&5 + echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 + +-echo "$as_me:18172: checking default object directory" >&5 ++echo "$as_me:18190: checking default object directory" >&5 + echo $ECHO_N "checking default object directory... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -18185,7 +18203,7 @@ + DFT_OBJ_SUBDIR='obj_s' ;; + esac + esac +-echo "$as_me:18188: result: $DFT_OBJ_SUBDIR" >&5 ++echo "$as_me:18206: result: $DFT_OBJ_SUBDIR" >&5 + echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 + + ### Set up low-level terminfo dependencies for makefiles. +@@ -18327,7 +18345,7 @@ + : "${CONFIG_STATUS=./config.status}" + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ echo "$as_me:18330: creating $CONFIG_STATUS" >&5 ++{ echo "$as_me:18348: creating $CONFIG_STATUS" >&5 + echo "$as_me: creating $CONFIG_STATUS" >&6;} + cat >"$CONFIG_STATUS" <<_ACEOF + #! $SHELL +@@ -18506,7 +18524,7 @@ + echo "$ac_cs_version"; exit 0 ;; + --he | --h) + # Conflict between --help and --header +- { { echo "$as_me:18509: error: ambiguous option: $1 ++ { { echo "$as_me:18527: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&5 + echo "$as_me: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&2;} +@@ -18525,7 +18543,7 @@ + ac_need_defaults=false;; + + # This is an error. +- -*) { { echo "$as_me:18528: error: unrecognized option: $1 ++ -*) { { echo "$as_me:18546: error: unrecognized option: $1 + Try \`$0 --help' for more information." >&5 + echo "$as_me: error: unrecognized option: $1 + Try \`$0 --help' for more information." >&2;} +@@ -18599,7 +18617,7 @@ + "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; + "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; +- *) { { echo "$as_me:18602: error: invalid argument: $ac_config_target" >&5 ++ *) { { echo "$as_me:18620: error: invalid argument: $ac_config_target" >&5 + echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +@@ -18959,7 +18977,7 @@ + esac + + if test x"$ac_file" != x-; then +- { echo "$as_me:18962: creating $ac_file" >&5 ++ { echo "$as_me:18980: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi +@@ -18977,7 +18995,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:18980: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:18998: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -18990,7 +19008,7 @@ + echo "$srcdir/$f" + else + # /dev/null tree +- { { echo "$as_me:18993: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:19011: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -19006,7 +19024,7 @@ + if test -n "$ac_seen"; then + ac_used=`grep '@datarootdir@' "$ac_item"` + if test -z "$ac_used"; then +- { echo "$as_me:19009: WARNING: datarootdir was used implicitly but not set: ++ { echo "$as_me:19027: WARNING: datarootdir was used implicitly but not set: + $ac_seen" >&5 + echo "$as_me: WARNING: datarootdir was used implicitly but not set: + $ac_seen" >&2;} +@@ -19015,7 +19033,7 @@ + fi + ac_seen=`grep '${datarootdir}' "$ac_item"` + if test -n "$ac_seen"; then +- { echo "$as_me:19018: WARNING: datarootdir was used explicitly but not set: ++ { echo "$as_me:19036: WARNING: datarootdir was used explicitly but not set: + $ac_seen" >&5 + echo "$as_me: WARNING: datarootdir was used explicitly but not set: + $ac_seen" >&2;} +@@ -19052,7 +19070,7 @@ + ac_init=`${EGREP-egrep} '[ ]*'$ac_name'[ ]*=' "$ac_file"` + if test -z "$ac_init"; then + ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` +- { echo "$as_me:19055: WARNING: Variable $ac_name is used but was not set: ++ { echo "$as_me:19073: WARNING: Variable $ac_name is used but was not set: + $ac_seen" >&5 + echo "$as_me: WARNING: Variable $ac_name is used but was not set: + $ac_seen" >&2;} +@@ -19063,7 +19081,7 @@ + ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out + if test -s $tmp/out; then + ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` +- { echo "$as_me:19066: WARNING: Some variables may not be substituted: ++ { echo "$as_me:19084: WARNING: Some variables may not be substituted: + $ac_seen" >&5 + echo "$as_me: WARNING: Some variables may not be substituted: + $ac_seen" >&2;} +@@ -19112,7 +19130,7 @@ + * ) ac_file_in=$ac_file.in ;; + esac + +- test x"$ac_file" != x- && { echo "$as_me:19115: creating $ac_file" >&5 ++ test x"$ac_file" != x- && { echo "$as_me:19133: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + + # First look for the input files in the build tree, otherwise in the +@@ -19123,7 +19141,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:19126: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:19144: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -19136,7 +19154,7 @@ + echo "$srcdir/$f" + else + # /dev/null tree +- { { echo "$as_me:19139: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:19157: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -19194,7 +19212,7 @@ + rm -f $tmp/in + if test x"$ac_file" != x-; then + if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then +- { echo "$as_me:19197: $ac_file is unchanged" >&5 ++ { echo "$as_me:19215: $ac_file is unchanged" >&5 + echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +Index: INSTALL +Prereq: 1.236 +--- ncurses-6.3-20211115+/INSTALL 2021-10-26 07:55:02.000000000 +0000 ++++ ncurses-6.3-20211120/INSTALL 2021-11-20 17:54:20.000000000 +0000 +@@ -26,7 +26,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: INSTALL,v 1.236 2021/10/26 07:55:02 tom Exp $ ++-- $Id: INSTALL,v 1.237 2021/11/20 17:54:20 tom Exp $ + --------------------------------------------------------------------- + How to install Ncurses/Terminfo on your system + --------------------------------------------------------------------- +@@ -1156,6 +1156,9 @@ + Automatic selection is overridden by providing an option-value + beginning with "/". + ++ If this option is omitted, the default directory for installing ++ ".pc" files is ${libdir}/pkgconfig ++ + --with-profile + Generate profile-libraries These are named by adding "_p" to the root, + e.g., libncurses_p.a +Index: NEWS +Prereq: 1.3745 +--- ncurses-6.3-20211115+/NEWS 2021-11-16 00:26:15.000000000 +0000 ++++ ncurses-6.3-20211120/NEWS 2021-11-21 00:03:54.000000000 +0000 +@@ -26,7 +26,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: NEWS,v 1.3745 2021/11/16 00:26:15 tom Exp $ ++-- $Id: NEWS,v 1.3749 2021/11/21 00:03:54 tom Exp $ + ------------------------------------------------------------------------------- + + This is a log of changes that ncurses has gone through since Zeyd started +@@ -46,6 +46,16 @@ + Changes through 1.9.9e did not credit all contributions; + it is not possible to add this information. + ++20211120 ++ + add dim, ecma+strikeout to st-0.6 -TD ++ + deallocate the tparm cache when del_curterm is called for the last ++ allocated TERMINAL structure (report/testcase by Bram Moolenaar, ++ cf: 20200531). ++ + modify test-package to more closely conform to Debian multi-arch. ++ + if the --with-pkg-config-libdir option is not given, use ++ ${libdir}/pkgconfig as a default (prompted by discussion with Ross ++ Burton). ++ + 20211115 + + fix memory-leak in delwin for pads (report by Werner Fink, OpenSUSE + #1192668, cf: 20211106), +Index: VERSION +--- ncurses-6.3-20211115+/VERSION 2021-11-15 23:51:41.000000000 +0000 ++++ ncurses-6.3-20211120/VERSION 2021-11-20 12:06:33.000000000 +0000 +@@ -1 +1 @@ +-5:0:10 6.3 20211115 ++5:0:10 6.3 20211120 +Index: aclocal.m4 +Prereq: 1.992 +--- ncurses-6.3-20211115+/aclocal.m4 2021-11-07 15:31:47.000000000 +0000 ++++ ncurses-6.3-20211120/aclocal.m4 2021-11-20 19:56:38.000000000 +0000 +@@ -29,7 +29,7 @@ + dnl + dnl Author: Thomas E. Dickey 1995-on + dnl +-dnl $Id: aclocal.m4,v 1.992 2021/11/07 15:31:47 tom Exp $ ++dnl $Id: aclocal.m4,v 1.997 2021/11/20 19:56:38 tom Exp $ + dnl Macros used in NCURSES auto-configuration script. + dnl + dnl These macros are maintained separately from NCURSES. The copyright on +@@ -2072,7 +2072,7 @@ + AC_SUBST(BROKEN_LINKER) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_ENABLE_PC_FILES version: 15 updated: 2021/10/25 19:21:54 ++dnl CF_ENABLE_PC_FILES version: 16 updated: 2021/11/20 12:48:37 + dnl ------------------ + dnl This is the "--enable-pc-files" option, which is available if there is a + dnl pkg-config configuration on the local machine. +@@ -2101,7 +2101,8 @@ + AC_MSG_WARN(no PKG_CONFIG_LIBDIR was found) + ;; + (*) +- CF_PATH_SYNTAX(PKG_CONFIG_LIBDIR) ++ cf_pkg_config_libdir="$PKG_CONFIG_LIBDIR" ++ CF_PATH_SYNTAX(cf_pkg_config_libdir) + ;; + esac + else +@@ -9237,7 +9238,7 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_WITH_PKG_CONFIG_LIBDIR version: 17 updated: 2021/11/07 10:30:15 ++dnl CF_WITH_PKG_CONFIG_LIBDIR version: 18 updated: 2021/11/20 12:48:37 + dnl ------------------------- + dnl Allow the choice of the pkg-config library directory to be overridden. + dnl +@@ -9260,18 +9261,31 @@ + ;; + esac + ++# if $PKG_CONFIG_LIBDIR is set, try to use that + cf_search_path=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/:/ /g' -e 's,^[[ ]]*,,'` ++ ++# if the option is used, let that override. otherwise default to "libdir" + AC_ARG_WITH(pkg-config-libdir, + [ --with-pkg-config-libdir=XXX use given directory for installing pc-files], + [cf_search_path=$withval], +- [test "x$PKG_CONFIG" != xnone && cf_search_path=yes]) ++ [test "x$PKG_CONFIG" != xnone && test -z "$cf_search_path" && cf_search_path=libdir]) + + case x$cf_search_path in ++(xlibdir) ++ PKG_CONFIG_LIBDIR='${libdir}/pkgconfig' ++ AC_MSG_RESULT($PKG_CONFIG_LIBDIR) ++ cf_search_path= ++ ;; ++(x) ++ ;; + (x/*) ++ PKG_CONFIG_LIBDIR="$cf_search_path" ++ AC_MSG_RESULT($PKG_CONFIG_LIBDIR) ++ cf_search_path= + ;; +-(xyes) ++(xyes|xauto) ++ AC_MSG_RESULT(auto) + cf_search_path= +- CF_VERBOSE(auto...) + # Look for the library directory using the same prefix as the executable + AC_MSG_CHECKING(for search-list) + if test "x$PKG_CONFIG" != xnone +@@ -9300,54 +9314,57 @@ + fi + + AC_MSG_RESULT($cf_search_path) +- + ;; + (*) ++ AC_MSG_ERROR(Unexpected option value: $cf_search_path) + ;; + esac + +-AC_MSG_CHECKING(for first directory) +-cf_pkg_config_path=none +-for cf_config in $cf_search_path +-do +- if test -d "$cf_config" +- then +- cf_pkg_config_path=$cf_config +- break +- fi +-done +-AC_MSG_RESULT($cf_pkg_config_path) +- +-if test "x$cf_pkg_config_path" != xnone ; then +- # limit this to the first directory found +- PKG_CONFIG_LIBDIR="$cf_pkg_config_path" +-fi +- +-if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path" ++if test -n "$cf_search_path" + then +- AC_MSG_CHECKING(for workaround) +- if test "$prefix" = "NONE" ; then +- cf_prefix="$ac_default_prefix" +- else +- cf_prefix="$prefix" +- fi +- eval cf_libdir=$libdir +- cf_libdir=`echo "$cf_libdir" | sed -e "s,^NONE,$cf_prefix,"` +- cf_backup= ++ AC_MSG_CHECKING(for first directory) ++ cf_pkg_config_path=none + for cf_config in $cf_search_path + do +- case $cf_config in +- $cf_libdir/pkgconfig) +- PKG_CONFIG_LIBDIR=$cf_libdir/pkgconfig ++ if test -d "$cf_config" ++ then ++ cf_pkg_config_path=$cf_config + break +- ;; +- *) +- test -z "$cf_backup" && cf_backup=$cf_config +- ;; +- esac ++ fi + done +- test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup +- AC_MSG_RESULT($PKG_CONFIG_LIBDIR) ++ AC_MSG_RESULT($cf_pkg_config_path) ++ ++ if test "x$cf_pkg_config_path" != xnone ; then ++ # limit this to the first directory found ++ PKG_CONFIG_LIBDIR="$cf_pkg_config_path" ++ fi ++ ++ if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path" ++ then ++ AC_MSG_CHECKING(for workaround) ++ if test "$prefix" = "NONE" ; then ++ cf_prefix="$ac_default_prefix" ++ else ++ cf_prefix="$prefix" ++ fi ++ eval cf_libdir=$libdir ++ cf_libdir=`echo "$cf_libdir" | sed -e "s,^NONE,$cf_prefix,"` ++ cf_backup= ++ for cf_config in $cf_search_path ++ do ++ case $cf_config in ++ $cf_libdir/pkgconfig) ++ PKG_CONFIG_LIBDIR=$cf_libdir/pkgconfig ++ break ++ ;; ++ *) ++ test -z "$cf_backup" && cf_backup=$cf_config ++ ;; ++ esac ++ done ++ test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup ++ AC_MSG_RESULT($PKG_CONFIG_LIBDIR) ++ fi + fi + + AC_SUBST(PKG_CONFIG_LIBDIR) +Index: configure +--- ncurses-6.3-20211115+/configure 2021-11-07 15:32:40.000000000 +0000 ++++ ncurses-6.3-20211120/configure 2021-11-20 19:57:11.000000000 +0000 +@@ -4138,27 +4138,40 @@ + ;; + esac + ++# if $PKG_CONFIG_LIBDIR is set, try to use that + cf_search_path=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/:/ /g' -e 's,^[ ]*,,'` + ++# if the option is used, let that override. otherwise default to "libdir" ++ + # Check whether --with-pkg-config-libdir or --without-pkg-config-libdir was given. + if test "${with_pkg_config_libdir+set}" = set; then + withval="$with_pkg_config_libdir" + cf_search_path=$withval + else +- test "x$PKG_CONFIG" != xnone && cf_search_path=yes ++ test "x$PKG_CONFIG" != xnone && test -z "$cf_search_path" && cf_search_path=libdir + fi; + + case x$cf_search_path in ++(xlibdir) ++ PKG_CONFIG_LIBDIR='${libdir}/pkgconfig' ++ echo "$as_me:4157: result: $PKG_CONFIG_LIBDIR" >&5 ++echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 ++ cf_search_path= ++ ;; ++(x) ++ ;; + (x/*) ++ PKG_CONFIG_LIBDIR="$cf_search_path" ++ echo "$as_me:4165: result: $PKG_CONFIG_LIBDIR" >&5 ++echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 ++ cf_search_path= + ;; +-(xyes) ++(xyes|xauto) ++ echo "$as_me:4170: result: auto" >&5 ++echo "${ECHO_T}auto" >&6 + cf_search_path= +- test -n "$verbose" && echo " auto..." 1>&6 +- +-echo "${as_me:-configure}:4158: testing auto... ..." 1>&5 +- + # Look for the library directory using the same prefix as the executable +- echo "$as_me:4161: checking for search-list" >&5 ++ echo "$as_me:4174: checking for search-list" >&5 + echo $ECHO_N "checking for search-list... $ECHO_C" >&6 + if test "x$PKG_CONFIG" != xnone + then +@@ -4185,68 +4198,73 @@ + "` + fi + +- echo "$as_me:4188: result: $cf_search_path" >&5 ++ echo "$as_me:4201: result: $cf_search_path" >&5 + echo "${ECHO_T}$cf_search_path" >&6 +- + ;; + (*) ++ { { echo "$as_me:4205: error: Unexpected option value: $cf_search_path" >&5 ++echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;} ++ { (exit 1); exit 1; }; } + ;; + esac + +-echo "$as_me:4196: checking for first directory" >&5 +-echo $ECHO_N "checking for first directory... $ECHO_C" >&6 +-cf_pkg_config_path=none +-for cf_config in $cf_search_path +-do +- if test -d "$cf_config" +- then +- cf_pkg_config_path=$cf_config +- break +- fi +-done +-echo "$as_me:4207: result: $cf_pkg_config_path" >&5 +-echo "${ECHO_T}$cf_pkg_config_path" >&6 +- +-if test "x$cf_pkg_config_path" != xnone ; then +- # limit this to the first directory found +- PKG_CONFIG_LIBDIR="$cf_pkg_config_path" +-fi +- +-if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path" ++if test -n "$cf_search_path" + then +- echo "$as_me:4217: checking for workaround" >&5 +-echo $ECHO_N "checking for workaround... $ECHO_C" >&6 +- if test "$prefix" = "NONE" ; then +- cf_prefix="$ac_default_prefix" +- else +- cf_prefix="$prefix" +- fi +- eval cf_libdir=$libdir +- cf_libdir=`echo "$cf_libdir" | sed -e "s,^NONE,$cf_prefix,"` +- cf_backup= ++ echo "$as_me:4213: checking for first directory" >&5 ++echo $ECHO_N "checking for first directory... $ECHO_C" >&6 ++ cf_pkg_config_path=none + for cf_config in $cf_search_path + do +- case $cf_config in +- $cf_libdir/pkgconfig) +- PKG_CONFIG_LIBDIR=$cf_libdir/pkgconfig ++ if test -d "$cf_config" ++ then ++ cf_pkg_config_path=$cf_config + break +- ;; +- *) +- test -z "$cf_backup" && cf_backup=$cf_config +- ;; +- esac ++ fi + done +- test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup +- echo "$as_me:4240: result: $PKG_CONFIG_LIBDIR" >&5 ++ echo "$as_me:4224: result: $cf_pkg_config_path" >&5 ++echo "${ECHO_T}$cf_pkg_config_path" >&6 ++ ++ if test "x$cf_pkg_config_path" != xnone ; then ++ # limit this to the first directory found ++ PKG_CONFIG_LIBDIR="$cf_pkg_config_path" ++ fi ++ ++ if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path" ++ then ++ echo "$as_me:4234: checking for workaround" >&5 ++echo $ECHO_N "checking for workaround... $ECHO_C" >&6 ++ if test "$prefix" = "NONE" ; then ++ cf_prefix="$ac_default_prefix" ++ else ++ cf_prefix="$prefix" ++ fi ++ eval cf_libdir=$libdir ++ cf_libdir=`echo "$cf_libdir" | sed -e "s,^NONE,$cf_prefix,"` ++ cf_backup= ++ for cf_config in $cf_search_path ++ do ++ case $cf_config in ++ $cf_libdir/pkgconfig) ++ PKG_CONFIG_LIBDIR=$cf_libdir/pkgconfig ++ break ++ ;; ++ *) ++ test -z "$cf_backup" && cf_backup=$cf_config ++ ;; ++ esac ++ done ++ test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup ++ echo "$as_me:4257: result: $PKG_CONFIG_LIBDIR" >&5 + echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 ++ fi + fi + + if test "x$PKG_CONFIG" != xnone + then +- echo "$as_me:4246: checking if we should install .pc files for $PKG_CONFIG" >&5 ++ echo "$as_me:4264: checking if we should install .pc files for $PKG_CONFIG" >&5 + echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6 + else +- echo "$as_me:4249: checking if we should install .pc files" >&5 ++ echo "$as_me:4267: checking if we should install .pc files" >&5 + echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6 + fi + +@@ -4257,7 +4275,7 @@ + else + enable_pc_files=no + fi; +-echo "$as_me:4260: result: $enable_pc_files" >&5 ++echo "$as_me:4278: result: $enable_pc_files" >&5 + echo "${ECHO_T}$enable_pc_files" >&6 + + if test "x$enable_pc_files" != xno +@@ -4265,10 +4283,11 @@ + MAKE_PC_FILES= + case "x$PKG_CONFIG_LIBDIR" in + (xno|xnone|xyes|x) +- { echo "$as_me:4268: WARNING: no PKG_CONFIG_LIBDIR was found" >&5 ++ { echo "$as_me:4286: WARNING: no PKG_CONFIG_LIBDIR was found" >&5 + echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;} + ;; + (*) ++ cf_pkg_config_libdir="$PKG_CONFIG_LIBDIR" + + if test "x$prefix" != xNONE; then + cf_path_syntax="$prefix" +@@ -4276,7 +4295,7 @@ + cf_path_syntax="$ac_default_prefix" + fi + +-case ".$PKG_CONFIG_LIBDIR" in ++case ".$cf_pkg_config_libdir" in + (.\$\(*\)*|.\'*\'*) + ;; + (..|./*|.\\*) +@@ -4284,19 +4303,19 @@ + (.[a-zA-Z]:[\\/]*) # OS/2 EMX + ;; + (.\$\{*prefix\}*|.\$\{*dir\}*) +- eval PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR" +- case ".$PKG_CONFIG_LIBDIR" in ++ eval cf_pkg_config_libdir="$cf_pkg_config_libdir" ++ case ".$cf_pkg_config_libdir" in + (.NONE/*) +- PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e s%NONE%$cf_path_syntax%` ++ cf_pkg_config_libdir=`echo "$cf_pkg_config_libdir" | sed -e s%NONE%$cf_path_syntax%` + ;; + esac + ;; + (.no|.NONE/*) +- PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e s%NONE%$cf_path_syntax%` ++ cf_pkg_config_libdir=`echo "$cf_pkg_config_libdir" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:4298: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5 +-echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&2;} ++ { { echo "$as_me:4317: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5 ++echo "$as_me: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&2;} + { (exit 1); exit 1; }; } + ;; + esac +@@ -4309,7 +4328,7 @@ + + if test -z "$MAKE_PC_FILES" + then +- echo "$as_me:4312: checking for suffix to add to pc-files" >&5 ++ echo "$as_me:4331: checking for suffix to add to pc-files" >&5 + echo $ECHO_N "checking for suffix to add to pc-files... $ECHO_C" >&6 + + # Check whether --with-pc-suffix or --without-pc-suffix was given. +@@ -4324,13 +4343,13 @@ + esac + fi; + test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none +- echo "$as_me:4327: result: $PC_MODULE_SUFFIX" >&5 ++ echo "$as_me:4346: result: $PC_MODULE_SUFFIX" >&5 + echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6 + test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX= + + fi + +-echo "$as_me:4333: checking if we should assume mixed-case filenames" >&5 ++echo "$as_me:4352: checking if we should assume mixed-case filenames" >&5 + echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6 + + # Check whether --enable-mixed-case or --disable-mixed-case was given. +@@ -4340,11 +4359,11 @@ + else + enable_mixedcase=auto + fi; +-echo "$as_me:4343: result: $enable_mixedcase" >&5 ++echo "$as_me:4362: result: $enable_mixedcase" >&5 + echo "${ECHO_T}$enable_mixedcase" >&6 + if test "$enable_mixedcase" = "auto" ; then + +-echo "$as_me:4347: checking if filesystem supports mixed-case filenames" >&5 ++echo "$as_me:4366: checking if filesystem supports mixed-case filenames" >&5 + echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6 + if test "${cf_cv_mixedcase+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4371,7 +4390,7 @@ + fi + + fi +-echo "$as_me:4374: result: $cf_cv_mixedcase" >&5 ++echo "$as_me:4393: result: $cf_cv_mixedcase" >&5 + echo "${ECHO_T}$cf_cv_mixedcase" >&6 + test "$cf_cv_mixedcase" = yes && + cat >>confdefs.h <<\EOF +@@ -4390,7 +4409,7 @@ + fi + + # do this after mixed-case option (tags/TAGS is not as important as tic). +-echo "$as_me:4393: checking whether ${MAKE-make} sets \${MAKE}" >&5 ++echo "$as_me:4412: checking whether ${MAKE-make} sets \${MAKE}" >&5 + echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 + set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` + if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then +@@ -4410,16 +4429,16 @@ + rm -f conftest.make + fi + if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then +- echo "$as_me:4413: result: yes" >&5 ++ echo "$as_me:4432: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + SET_MAKE= + else +- echo "$as_me:4417: result: no" >&5 ++ echo "$as_me:4436: result: no" >&5 + echo "${ECHO_T}no" >&6 + SET_MAKE="MAKE=${MAKE-make}" + fi + +-echo "$as_me:4422: checking for \".PHONY\" make-support" >&5 ++echo "$as_me:4441: checking for \".PHONY\" make-support" >&5 + echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6 + if test "${cf_cv_make_PHONY+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4474,7 +4493,7 @@ + rm -rf conftest* + + fi +-echo "$as_me:4477: result: $cf_cv_make_PHONY" >&5 ++echo "$as_me:4496: result: $cf_cv_make_PHONY" >&5 + echo "${ECHO_T}$cf_cv_make_PHONY" >&6 + MAKE_NO_PHONY="#" + MAKE_PHONY="#" +@@ -4485,7 +4504,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:4488: checking for $ac_word" >&5 ++echo "$as_me:4507: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_CTAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4500,7 +4519,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_CTAGS="$ac_prog" +-echo "$as_me:4503: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4522: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4508,10 +4527,10 @@ + fi + CTAGS=$ac_cv_prog_CTAGS + if test -n "$CTAGS"; then +- echo "$as_me:4511: result: $CTAGS" >&5 ++ echo "$as_me:4530: result: $CTAGS" >&5 + echo "${ECHO_T}$CTAGS" >&6 + else +- echo "$as_me:4514: result: no" >&5 ++ echo "$as_me:4533: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4522,7 +4541,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:4525: checking for $ac_word" >&5 ++echo "$as_me:4544: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ETAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4537,7 +4556,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ETAGS="$ac_prog" +-echo "$as_me:4540: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4559: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4545,10 +4564,10 @@ + fi + ETAGS=$ac_cv_prog_ETAGS + if test -n "$ETAGS"; then +- echo "$as_me:4548: result: $ETAGS" >&5 ++ echo "$as_me:4567: result: $ETAGS" >&5 + echo "${ECHO_T}$ETAGS" >&6 + else +- echo "$as_me:4551: result: no" >&5 ++ echo "$as_me:4570: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4557,7 +4576,7 @@ + + # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args. + set dummy ${CTAGS:-ctags}; ac_word=$2 +-echo "$as_me:4560: checking for $ac_word" >&5 ++echo "$as_me:4579: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4572,7 +4591,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_MAKE_LOWER_TAGS="yes" +-echo "$as_me:4575: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4594: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4581,17 +4600,17 @@ + fi + MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS + if test -n "$MAKE_LOWER_TAGS"; then +- echo "$as_me:4584: result: $MAKE_LOWER_TAGS" >&5 ++ echo "$as_me:4603: result: $MAKE_LOWER_TAGS" >&5 + echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 + else +- echo "$as_me:4587: result: no" >&5 ++ echo "$as_me:4606: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + if test "$cf_cv_mixedcase" = yes ; then + # Extract the first word of "${ETAGS:-etags}", so it can be a program name with args. + set dummy ${ETAGS:-etags}; ac_word=$2 +-echo "$as_me:4594: checking for $ac_word" >&5 ++echo "$as_me:4613: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4606,7 +4625,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_MAKE_UPPER_TAGS="yes" +-echo "$as_me:4609: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4628: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4615,10 +4634,10 @@ + fi + MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS + if test -n "$MAKE_UPPER_TAGS"; then +- echo "$as_me:4618: result: $MAKE_UPPER_TAGS" >&5 ++ echo "$as_me:4637: result: $MAKE_UPPER_TAGS" >&5 + echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 + else +- echo "$as_me:4621: result: no" >&5 ++ echo "$as_me:4640: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4638,7 +4657,7 @@ + MAKE_LOWER_TAGS="#" + fi + +-echo "$as_me:4641: checking for makeflags variable" >&5 ++echo "$as_me:4660: checking for makeflags variable" >&5 + echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6 + if test "${cf_cv_makeflags+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4668,7 +4687,7 @@ + ;; + (*) + +-echo "${as_me:-configure}:4671: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 ++echo "${as_me:-configure}:4690: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 + + ;; + esac +@@ -4676,13 +4695,13 @@ + rm -f cf_makeflags.tmp + + fi +-echo "$as_me:4679: result: $cf_cv_makeflags" >&5 ++echo "$as_me:4698: result: $cf_cv_makeflags" >&5 + echo "${ECHO_T}$cf_cv_makeflags" >&6 + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. + set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +-echo "$as_me:4685: checking for $ac_word" >&5 ++echo "$as_me:4704: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4697,7 +4716,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" +-echo "$as_me:4700: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4719: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4705,10 +4724,10 @@ + fi + RANLIB=$ac_cv_prog_RANLIB + if test -n "$RANLIB"; then +- echo "$as_me:4708: result: $RANLIB" >&5 ++ echo "$as_me:4727: result: $RANLIB" >&5 + echo "${ECHO_T}$RANLIB" >&6 + else +- echo "$as_me:4711: result: no" >&5 ++ echo "$as_me:4730: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4717,7 +4736,7 @@ + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. + set dummy ranlib; ac_word=$2 +-echo "$as_me:4720: checking for $ac_word" >&5 ++echo "$as_me:4739: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4732,7 +4751,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_RANLIB="ranlib" +-echo "$as_me:4735: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4754: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4741,10 +4760,10 @@ + fi + ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB + if test -n "$ac_ct_RANLIB"; then +- echo "$as_me:4744: result: $ac_ct_RANLIB" >&5 ++ echo "$as_me:4763: result: $ac_ct_RANLIB" >&5 + echo "${ECHO_T}$ac_ct_RANLIB" >&6 + else +- echo "$as_me:4747: result: no" >&5 ++ echo "$as_me:4766: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4756,7 +4775,7 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. + set dummy ${ac_tool_prefix}ld; ac_word=$2 +-echo "$as_me:4759: checking for $ac_word" >&5 ++echo "$as_me:4778: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4771,7 +4790,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_LD="${ac_tool_prefix}ld" +-echo "$as_me:4774: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4793: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4779,10 +4798,10 @@ + fi + LD=$ac_cv_prog_LD + if test -n "$LD"; then +- echo "$as_me:4782: result: $LD" >&5 ++ echo "$as_me:4801: result: $LD" >&5 + echo "${ECHO_T}$LD" >&6 + else +- echo "$as_me:4785: result: no" >&5 ++ echo "$as_me:4804: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4791,7 +4810,7 @@ + ac_ct_LD=$LD + # Extract the first word of "ld", so it can be a program name with args. + set dummy ld; ac_word=$2 +-echo "$as_me:4794: checking for $ac_word" >&5 ++echo "$as_me:4813: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4806,7 +4825,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_LD="ld" +-echo "$as_me:4809: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4828: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4815,10 +4834,10 @@ + fi + ac_ct_LD=$ac_cv_prog_ac_ct_LD + if test -n "$ac_ct_LD"; then +- echo "$as_me:4818: result: $ac_ct_LD" >&5 ++ echo "$as_me:4837: result: $ac_ct_LD" >&5 + echo "${ECHO_T}$ac_ct_LD" >&6 + else +- echo "$as_me:4821: result: no" >&5 ++ echo "$as_me:4840: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4830,7 +4849,7 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. + set dummy ${ac_tool_prefix}ar; ac_word=$2 +-echo "$as_me:4833: checking for $ac_word" >&5 ++echo "$as_me:4852: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4845,7 +4864,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_AR="${ac_tool_prefix}ar" +-echo "$as_me:4848: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4867: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4853,10 +4872,10 @@ + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +- echo "$as_me:4856: result: $AR" >&5 ++ echo "$as_me:4875: result: $AR" >&5 + echo "${ECHO_T}$AR" >&6 + else +- echo "$as_me:4859: result: no" >&5 ++ echo "$as_me:4878: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4865,7 +4884,7 @@ + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. + set dummy ar; ac_word=$2 +-echo "$as_me:4868: checking for $ac_word" >&5 ++echo "$as_me:4887: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4880,7 +4899,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_AR="ar" +-echo "$as_me:4883: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4902: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4889,10 +4908,10 @@ + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +- echo "$as_me:4892: result: $ac_ct_AR" >&5 ++ echo "$as_me:4911: result: $ac_ct_AR" >&5 + echo "${ECHO_T}$ac_ct_AR" >&6 + else +- echo "$as_me:4895: result: no" >&5 ++ echo "$as_me:4914: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4904,7 +4923,7 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args. + set dummy ${ac_tool_prefix}nm; ac_word=$2 +-echo "$as_me:4907: checking for $ac_word" >&5 ++echo "$as_me:4926: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_NM+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4919,7 +4938,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_NM="${ac_tool_prefix}nm" +-echo "$as_me:4922: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4941: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4927,10 +4946,10 @@ + fi + NM=$ac_cv_prog_NM + if test -n "$NM"; then +- echo "$as_me:4930: result: $NM" >&5 ++ echo "$as_me:4949: result: $NM" >&5 + echo "${ECHO_T}$NM" >&6 + else +- echo "$as_me:4933: result: no" >&5 ++ echo "$as_me:4952: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4939,7 +4958,7 @@ + ac_ct_NM=$NM + # Extract the first word of "nm", so it can be a program name with args. + set dummy nm; ac_word=$2 +-echo "$as_me:4942: checking for $ac_word" >&5 ++echo "$as_me:4961: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_NM+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4954,7 +4973,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_NM="nm" +-echo "$as_me:4957: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4976: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4963,10 +4982,10 @@ + fi + ac_ct_NM=$ac_cv_prog_ac_ct_NM + if test -n "$ac_ct_NM"; then +- echo "$as_me:4966: result: $ac_ct_NM" >&5 ++ echo "$as_me:4985: result: $ac_ct_NM" >&5 + echo "${ECHO_T}$ac_ct_NM" >&6 + else +- echo "$as_me:4969: result: no" >&5 ++ echo "$as_me:4988: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4978,7 +4997,7 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. + set dummy ${ac_tool_prefix}ar; ac_word=$2 +-echo "$as_me:4981: checking for $ac_word" >&5 ++echo "$as_me:5000: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4993,7 +5012,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_AR="${ac_tool_prefix}ar" +-echo "$as_me:4996: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5015: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5001,10 +5020,10 @@ + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +- echo "$as_me:5004: result: $AR" >&5 ++ echo "$as_me:5023: result: $AR" >&5 + echo "${ECHO_T}$AR" >&6 + else +- echo "$as_me:5007: result: no" >&5 ++ echo "$as_me:5026: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5013,7 +5032,7 @@ + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. + set dummy ar; ac_word=$2 +-echo "$as_me:5016: checking for $ac_word" >&5 ++echo "$as_me:5035: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5028,7 +5047,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_AR="ar" +-echo "$as_me:5031: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5050: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5037,10 +5056,10 @@ + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +- echo "$as_me:5040: result: $ac_ct_AR" >&5 ++ echo "$as_me:5059: result: $ac_ct_AR" >&5 + echo "${ECHO_T}$ac_ct_AR" >&6 + else +- echo "$as_me:5043: result: no" >&5 ++ echo "$as_me:5062: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5049,7 +5068,7 @@ + AR="$ac_cv_prog_AR" + fi + +-echo "$as_me:5052: checking for options to update archives" >&5 ++echo "$as_me:5071: checking for options to update archives" >&5 + echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6 + if test "${cf_cv_ar_flags+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5086,13 +5105,13 @@ + rm -f conftest.a + + cat >"conftest.$ac_ext" <&5 ++ if { (eval echo "$as_me:5111: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5095: \$? = $ac_status" >&5 ++ echo "$as_me:5114: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then + echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5 + $AR $ARFLAGS "$cf_ar_flags" conftest.a "conftest.$ac_cv_objext" 2>&5 1>/dev/null +@@ -5103,7 +5122,7 @@ + else + test -n "$verbose" && echo " cannot compile test-program" 1>&6 + +-echo "${as_me:-configure}:5106: testing cannot compile test-program ..." 1>&5 ++echo "${as_me:-configure}:5125: testing cannot compile test-program ..." 1>&5 + + break + fi +@@ -5113,7 +5132,7 @@ + esac + + fi +-echo "$as_me:5116: result: $cf_cv_ar_flags" >&5 ++echo "$as_me:5135: result: $cf_cv_ar_flags" >&5 + echo "${ECHO_T}$cf_cv_ar_flags" >&6 + + if test -n "$ARFLAGS" ; then +@@ -5124,7 +5143,7 @@ + ARFLAGS=$cf_cv_ar_flags + fi + +-echo "$as_me:5127: checking if you have specified an install-prefix" >&5 ++echo "$as_me:5146: checking if you have specified an install-prefix" >&5 + echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6 + + # Check whether --with-install-prefix or --without-install-prefix was given. +@@ -5137,7 +5156,7 @@ + ;; + esac + fi; +-echo "$as_me:5140: result: $DESTDIR" >&5 ++echo "$as_me:5159: result: $DESTDIR" >&5 + echo "${ECHO_T}$DESTDIR" >&6 + + ############################################################################### +@@ -5172,7 +5191,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:5175: checking for $ac_word" >&5 ++echo "$as_me:5194: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_BUILD_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5187,7 +5206,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_BUILD_CC="$ac_prog" +-echo "$as_me:5190: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5209: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5195,10 +5214,10 @@ + fi + BUILD_CC=$ac_cv_prog_BUILD_CC + if test -n "$BUILD_CC"; then +- echo "$as_me:5198: result: $BUILD_CC" >&5 ++ echo "$as_me:5217: result: $BUILD_CC" >&5 + echo "${ECHO_T}$BUILD_CC" >&6 + else +- echo "$as_me:5201: result: no" >&5 ++ echo "$as_me:5220: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5207,12 +5226,12 @@ + test -n "$BUILD_CC" || BUILD_CC="none" + + fi; +- echo "$as_me:5210: checking for native build C compiler" >&5 ++ echo "$as_me:5229: checking for native build C compiler" >&5 + echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6 +- echo "$as_me:5212: result: $BUILD_CC" >&5 ++ echo "$as_me:5231: result: $BUILD_CC" >&5 + echo "${ECHO_T}$BUILD_CC" >&6 + +- echo "$as_me:5215: checking for native build C preprocessor" >&5 ++ echo "$as_me:5234: checking for native build C preprocessor" >&5 + echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6 + + # Check whether --with-build-cpp or --without-build-cpp was given. +@@ -5222,10 +5241,10 @@ + else + BUILD_CPP='${BUILD_CC} -E' + fi; +- echo "$as_me:5225: result: $BUILD_CPP" >&5 ++ echo "$as_me:5244: result: $BUILD_CPP" >&5 + echo "${ECHO_T}$BUILD_CPP" >&6 + +- echo "$as_me:5228: checking for native build C flags" >&5 ++ echo "$as_me:5247: checking for native build C flags" >&5 + echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6 + + # Check whether --with-build-cflags or --without-build-cflags was given. +@@ -5233,10 +5252,10 @@ + withval="$with_build_cflags" + BUILD_CFLAGS="$withval" + fi; +- echo "$as_me:5236: result: $BUILD_CFLAGS" >&5 ++ echo "$as_me:5255: result: $BUILD_CFLAGS" >&5 + echo "${ECHO_T}$BUILD_CFLAGS" >&6 + +- echo "$as_me:5239: checking for native build C preprocessor-flags" >&5 ++ echo "$as_me:5258: checking for native build C preprocessor-flags" >&5 + echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6 + + # Check whether --with-build-cppflags or --without-build-cppflags was given. +@@ -5244,10 +5263,10 @@ + withval="$with_build_cppflags" + BUILD_CPPFLAGS="$withval" + fi; +- echo "$as_me:5247: result: $BUILD_CPPFLAGS" >&5 ++ echo "$as_me:5266: result: $BUILD_CPPFLAGS" >&5 + echo "${ECHO_T}$BUILD_CPPFLAGS" >&6 + +- echo "$as_me:5250: checking for native build linker-flags" >&5 ++ echo "$as_me:5269: checking for native build linker-flags" >&5 + echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6 + + # Check whether --with-build-ldflags or --without-build-ldflags was given. +@@ -5255,10 +5274,10 @@ + withval="$with_build_ldflags" + BUILD_LDFLAGS="$withval" + fi; +- echo "$as_me:5258: result: $BUILD_LDFLAGS" >&5 ++ echo "$as_me:5277: result: $BUILD_LDFLAGS" >&5 + echo "${ECHO_T}$BUILD_LDFLAGS" >&6 + +- echo "$as_me:5261: checking for native build linker-libraries" >&5 ++ echo "$as_me:5280: checking for native build linker-libraries" >&5 + echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6 + + # Check whether --with-build-libs or --without-build-libs was given. +@@ -5266,7 +5285,7 @@ + withval="$with_build_libs" + BUILD_LIBS="$withval" + fi; +- echo "$as_me:5269: result: $BUILD_LIBS" >&5 ++ echo "$as_me:5288: result: $BUILD_LIBS" >&5 + echo "${ECHO_T}$BUILD_LIBS" >&6 + + # this assumes we're on Unix. +@@ -5276,7 +5295,7 @@ + : ${BUILD_CC:='${CC}'} + + if { test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}'; } ; then +- { { echo "$as_me:5279: error: Cross-build requires two compilers. ++ { { echo "$as_me:5298: error: Cross-build requires two compilers. + Use --with-build-cc to specify the native compiler." >&5 + echo "$as_me: error: Cross-build requires two compilers. + Use --with-build-cc to specify the native compiler." >&2;} +@@ -5301,7 +5320,7 @@ + ### shared, for example. + cf_list_models="" + +-echo "$as_me:5304: checking if libtool -version-number should be used" >&5 ++echo "$as_me:5323: checking if libtool -version-number should be used" >&5 + echo $ECHO_N "checking if libtool -version-number should be used... $ECHO_C" >&6 + + # Check whether --enable-libtool-version or --disable-libtool-version was given. +@@ -5318,7 +5337,7 @@ + cf_libtool_version=yes + + fi; +-echo "$as_me:5321: result: $cf_libtool_version" >&5 ++echo "$as_me:5340: result: $cf_libtool_version" >&5 + echo "${ECHO_T}$cf_libtool_version" >&6 + + if test "$cf_libtool_version" = yes ; then +@@ -5327,25 +5346,25 @@ + LIBTOOL_VERSION="-version-info" + case "x$VERSION" in + (x) +- { echo "$as_me:5330: WARNING: VERSION was not set" >&5 ++ { echo "$as_me:5349: WARNING: VERSION was not set" >&5 + echo "$as_me: WARNING: VERSION was not set" >&2;} + ;; + (x*.*.*) + ABI_VERSION="$VERSION" + test -n "$verbose" && echo " ABI_VERSION: $ABI_VERSION" 1>&6 + +-echo "${as_me:-configure}:5337: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 ++echo "${as_me:-configure}:5356: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 + + ;; + (x*:*:*) + ABI_VERSION=`echo "$VERSION" | sed -e 's/:/./g'` + test -n "$verbose" && echo " ABI_VERSION: $ABI_VERSION" 1>&6 + +-echo "${as_me:-configure}:5344: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 ++echo "${as_me:-configure}:5363: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 + + ;; + (*) +- { echo "$as_me:5348: WARNING: unexpected VERSION value: $VERSION" >&5 ++ { echo "$as_me:5367: WARNING: unexpected VERSION value: $VERSION" >&5 + echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;} + ;; + esac +@@ -5367,7 +5386,7 @@ + LIB_INSTALL= + LIB_UNINSTALL= + +-echo "$as_me:5370: checking if you want to build libraries with libtool" >&5 ++echo "$as_me:5389: checking if you want to build libraries with libtool" >&5 + echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6 + + # Check whether --with-libtool or --without-libtool was given. +@@ -5377,7 +5396,7 @@ + else + with_libtool=no + fi; +-echo "$as_me:5380: result: $with_libtool" >&5 ++echo "$as_me:5399: result: $with_libtool" >&5 + echo "${ECHO_T}$with_libtool" >&6 + if test "$with_libtool" != "no"; then + +@@ -5408,7 +5427,7 @@ + with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:5411: error: expected a pathname, not \"$with_libtool\"" >&5 ++ { { echo "$as_me:5430: error: expected a pathname, not \"$with_libtool\"" >&5 + echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -5421,7 +5440,7 @@ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-echo "$as_me:5424: checking for $ac_word" >&5 ++echo "$as_me:5443: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_LIBTOOL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5436,7 +5455,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog" +-echo "$as_me:5439: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5458: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5444,10 +5463,10 @@ + fi + LIBTOOL=$ac_cv_prog_LIBTOOL + if test -n "$LIBTOOL"; then +- echo "$as_me:5447: result: $LIBTOOL" >&5 ++ echo "$as_me:5466: result: $LIBTOOL" >&5 + echo "${ECHO_T}$LIBTOOL" >&6 + else +- echo "$as_me:5450: result: no" >&5 ++ echo "$as_me:5469: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5460,7 +5479,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:5463: checking for $ac_word" >&5 ++echo "$as_me:5482: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5475,7 +5494,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_LIBTOOL="$ac_prog" +-echo "$as_me:5478: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5497: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5483,10 +5502,10 @@ + fi + ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL + if test -n "$ac_ct_LIBTOOL"; then +- echo "$as_me:5486: result: $ac_ct_LIBTOOL" >&5 ++ echo "$as_me:5505: result: $ac_ct_LIBTOOL" >&5 + echo "${ECHO_T}$ac_ct_LIBTOOL" >&6 + else +- echo "$as_me:5489: result: no" >&5 ++ echo "$as_me:5508: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5517,7 +5536,7 @@ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-echo "$as_me:5520: checking for $ac_word" >&5 ++echo "$as_me:5539: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_LIBTOOL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5532,7 +5551,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog" +-echo "$as_me:5535: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5554: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5540,10 +5559,10 @@ + fi + LIBTOOL=$ac_cv_prog_LIBTOOL + if test -n "$LIBTOOL"; then +- echo "$as_me:5543: result: $LIBTOOL" >&5 ++ echo "$as_me:5562: result: $LIBTOOL" >&5 + echo "${ECHO_T}$LIBTOOL" >&6 + else +- echo "$as_me:5546: result: no" >&5 ++ echo "$as_me:5565: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5556,7 +5575,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:5559: checking for $ac_word" >&5 ++echo "$as_me:5578: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5571,7 +5590,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_LIBTOOL="$ac_prog" +-echo "$as_me:5574: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5593: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5579,10 +5598,10 @@ + fi + ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL + if test -n "$ac_ct_LIBTOOL"; then +- echo "$as_me:5582: result: $ac_ct_LIBTOOL" >&5 ++ echo "$as_me:5601: result: $ac_ct_LIBTOOL" >&5 + echo "${ECHO_T}$ac_ct_LIBTOOL" >&6 + else +- echo "$as_me:5585: result: no" >&5 ++ echo "$as_me:5604: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5604,7 +5623,7 @@ + fi + fi + if test -z "$LIBTOOL" ; then +- { { echo "$as_me:5607: error: Cannot find libtool" >&5 ++ { { echo "$as_me:5626: error: Cannot find libtool" >&5 + echo "$as_me: error: Cannot find libtool" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -5620,7 +5639,7 @@ + + if test -n "$LIBTOOL" && test "$LIBTOOL" != none + then +- echo "$as_me:5623: checking version of $LIBTOOL" >&5 ++ echo "$as_me:5642: checking version of $LIBTOOL" >&5 + echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6 + + if test -n "$LIBTOOL" && test "$LIBTOOL" != none +@@ -5631,7 +5650,7 @@ + fi + test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version + +- echo "$as_me:5634: result: $cf_cv_libtool_version" >&5 ++ echo "$as_me:5653: result: $cf_cv_libtool_version" >&5 + echo "${ECHO_T}$cf_cv_libtool_version" >&6 + if test -n "$cf_cv_libtool_version" + then +@@ -5640,18 +5659,18 @@ + (*...GNU-libtool...*) + ;; + (*) +- { { echo "$as_me:5643: error: This is not GNU libtool" >&5 ++ { { echo "$as_me:5662: error: This is not GNU libtool" >&5 + echo "$as_me: error: This is not GNU libtool" >&2;} + { (exit 1); exit 1; }; } + ;; + esac + else +- { { echo "$as_me:5649: error: No version found for $LIBTOOL" >&5 ++ { { echo "$as_me:5668: error: No version found for $LIBTOOL" >&5 + echo "$as_me: error: No version found for $LIBTOOL" >&2;} + { (exit 1); exit 1; }; } + fi + else +- { { echo "$as_me:5654: error: GNU libtool has not been found" >&5 ++ { { echo "$as_me:5673: error: GNU libtool has not been found" >&5 + echo "$as_me: error: GNU libtool has not been found" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -5687,7 +5706,7 @@ + + else + +-echo "$as_me:5690: checking if you want to build shared libraries" >&5 ++echo "$as_me:5709: checking if you want to build shared libraries" >&5 + echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6 + + # Check whether --with-shared or --without-shared was given. +@@ -5697,11 +5716,11 @@ + else + with_shared=no + fi; +-echo "$as_me:5700: result: $with_shared" >&5 ++echo "$as_me:5719: result: $with_shared" >&5 + echo "${ECHO_T}$with_shared" >&6 + test "x$with_shared" = "xyes" && cf_list_models="$cf_list_models shared" + +-echo "$as_me:5704: checking if you want to build static libraries" >&5 ++echo "$as_me:5723: checking if you want to build static libraries" >&5 + echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6 + + # Check whether --with-normal or --without-normal was given. +@@ -5711,11 +5730,11 @@ + else + with_normal=yes + fi; +-echo "$as_me:5714: result: $with_normal" >&5 ++echo "$as_me:5733: result: $with_normal" >&5 + echo "${ECHO_T}$with_normal" >&6 + test "x$with_normal" = "xyes" && cf_list_models="$cf_list_models normal" + +-echo "$as_me:5718: checking if you want to build debug libraries" >&5 ++echo "$as_me:5737: checking if you want to build debug libraries" >&5 + echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6 + + # Check whether --with-debug or --without-debug was given. +@@ -5725,11 +5744,11 @@ + else + with_debug=yes + fi; +-echo "$as_me:5728: result: $with_debug" >&5 ++echo "$as_me:5747: result: $with_debug" >&5 + echo "${ECHO_T}$with_debug" >&6 + test "x$with_debug" = "xyes" && cf_list_models="$cf_list_models debug" + +-echo "$as_me:5732: checking if you want to build profiling libraries" >&5 ++echo "$as_me:5751: checking if you want to build profiling libraries" >&5 + echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6 + + # Check whether --with-profile or --without-profile was given. +@@ -5739,7 +5758,7 @@ + else + with_profile=no + fi; +-echo "$as_me:5742: result: $with_profile" >&5 ++echo "$as_me:5761: result: $with_profile" >&5 + echo "${ECHO_T}$with_profile" >&6 + test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile" + +@@ -5747,7 +5766,7 @@ + + if test "X$cf_with_cxx_binding" != Xno; then + if test "x$with_shared" = "xyes"; then +-echo "$as_me:5750: checking if you want to build C++ shared libraries" >&5 ++echo "$as_me:5769: checking if you want to build C++ shared libraries" >&5 + echo $ECHO_N "checking if you want to build C++ shared libraries... $ECHO_C" >&6 + + # Check whether --with-cxx-shared or --without-cxx-shared was given. +@@ -5757,26 +5776,26 @@ + else + with_shared_cxx=no + fi; +-echo "$as_me:5760: result: $with_shared_cxx" >&5 ++echo "$as_me:5779: result: $with_shared_cxx" >&5 + echo "${ECHO_T}$with_shared_cxx" >&6 + fi + fi + + ############################################################################### + +-echo "$as_me:5767: checking for specified models" >&5 ++echo "$as_me:5786: checking for specified models" >&5 + echo $ECHO_N "checking for specified models... $ECHO_C" >&6 + test -z "$cf_list_models" && cf_list_models=normal + test "$with_libtool" != "no" && cf_list_models=libtool +-echo "$as_me:5771: result: $cf_list_models" >&5 ++echo "$as_me:5790: result: $cf_list_models" >&5 + echo "${ECHO_T}$cf_list_models" >&6 + + ### Use the first model as the default, and save its suffix for use in building + ### up test-applications. +-echo "$as_me:5776: checking for default model" >&5 ++echo "$as_me:5795: checking for default model" >&5 + echo $ECHO_N "checking for default model... $ECHO_C" >&6 + DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'` +-echo "$as_me:5779: result: $DFT_LWR_MODEL" >&5 ++echo "$as_me:5798: result: $DFT_LWR_MODEL" >&5 + echo "${ECHO_T}$DFT_LWR_MODEL" >&6 + + DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` +@@ -5790,7 +5809,7 @@ + LIB_DIR=../lib + LIB_2ND=../../lib + +-echo "$as_me:5793: checking if you want to have a library-prefix" >&5 ++echo "$as_me:5812: checking if you want to have a library-prefix" >&5 + echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6 + + # Check whether --with-lib-prefix or --without-lib-prefix was given. +@@ -5800,7 +5819,7 @@ + else + with_lib_prefix=auto + fi; +-echo "$as_me:5803: result: $with_lib_prefix" >&5 ++echo "$as_me:5822: result: $with_lib_prefix" >&5 + echo "${ECHO_T}$with_lib_prefix" >&6 + + if test "$with_lib_prefix" = auto +@@ -5831,19 +5850,19 @@ + + LIB_SUFFIX= + +- echo "$as_me:5834: checking for PATH separator" >&5 ++ echo "$as_me:5853: checking for PATH separator" >&5 + echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6 + case "$cf_cv_system_name" in + (os2*) PATH_SEPARATOR=';' ;; + (*) ${PATH_SEPARATOR:=':'} ;; + esac + +- echo "$as_me:5841: result: $PATH_SEPARATOR" >&5 ++ echo "$as_me:5860: result: $PATH_SEPARATOR" >&5 + echo "${ECHO_T}$PATH_SEPARATOR" >&6 + + ############################################################################### + +-echo "$as_me:5846: checking if you want to build a separate terminfo library" >&5 ++echo "$as_me:5865: checking if you want to build a separate terminfo library" >&5 + echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6 + + # Check whether --with-termlib or --without-termlib was given. +@@ -5853,10 +5872,10 @@ + else + with_termlib=no + fi; +-echo "$as_me:5856: result: $with_termlib" >&5 ++echo "$as_me:5875: result: $with_termlib" >&5 + echo "${ECHO_T}$with_termlib" >&6 + +-echo "$as_me:5859: checking if you want to build a separate tic library" >&5 ++echo "$as_me:5878: checking if you want to build a separate tic library" >&5 + echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6 + + # Check whether --with-ticlib or --without-ticlib was given. +@@ -5866,7 +5885,7 @@ + else + with_ticlib=no + fi; +-echo "$as_me:5869: result: $with_ticlib" >&5 ++echo "$as_me:5888: result: $with_ticlib" >&5 + echo "${ECHO_T}$with_ticlib" >&6 + + if test X"$CC_G_OPT" = X"" ; then +@@ -5879,7 +5898,7 @@ + test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT='' + fi + +-echo "$as_me:5882: checking for default loader flags" >&5 ++echo "$as_me:5901: checking for default loader flags" >&5 + echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6 + case "$DFT_LWR_MODEL" in + (libtool) LD_MODEL='' ;; +@@ -5888,13 +5907,13 @@ + (profile) LD_MODEL='-pg';; + (shared) LD_MODEL='' ;; + esac +-echo "$as_me:5891: result: $LD_MODEL" >&5 ++echo "$as_me:5910: result: $LD_MODEL" >&5 + echo "${ECHO_T}$LD_MODEL" >&6 + + case "$DFT_LWR_MODEL" in + (shared) + +-echo "$as_me:5897: checking if rpath option should be used" >&5 ++echo "$as_me:5916: checking if rpath option should be used" >&5 + echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6 + + # Check whether --enable-rpath or --disable-rpath was given. +@@ -5904,10 +5923,10 @@ + else + cf_cv_enable_rpath=no + fi; +-echo "$as_me:5907: result: $cf_cv_enable_rpath" >&5 ++echo "$as_me:5926: result: $cf_cv_enable_rpath" >&5 + echo "${ECHO_T}$cf_cv_enable_rpath" >&6 + +-echo "$as_me:5910: checking if shared libraries should be relinked during install" >&5 ++echo "$as_me:5929: checking if shared libraries should be relinked during install" >&5 + echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6 + + # Check whether --enable-relink or --disable-relink was given. +@@ -5917,7 +5936,7 @@ + else + cf_cv_do_relink=yes + fi; +-echo "$as_me:5920: result: $cf_cv_do_relink" >&5 ++echo "$as_me:5939: result: $cf_cv_do_relink" >&5 + echo "${ECHO_T}$cf_cv_do_relink" >&6 + ;; + esac +@@ -5928,7 +5947,7 @@ + LD_RPATH_OPT= + if test "x$cf_cv_enable_rpath" != xno + then +- echo "$as_me:5931: checking for an rpath option" >&5 ++ echo "$as_me:5950: checking for an rpath option" >&5 + echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 + case "$cf_cv_system_name" in + (irix*) +@@ -5959,12 +5978,12 @@ + (*) + ;; + esac +- echo "$as_me:5962: result: $LD_RPATH_OPT" >&5 ++ echo "$as_me:5981: result: $LD_RPATH_OPT" >&5 + echo "${ECHO_T}$LD_RPATH_OPT" >&6 + + case "x$LD_RPATH_OPT" in + (x-R*) +- echo "$as_me:5967: checking if we need a space after rpath option" >&5 ++ echo "$as_me:5986: checking if we need a space after rpath option" >&5 + echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6 + cf_save_LIBS="$LIBS" + +@@ -5985,7 +6004,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 5988 "configure" ++#line 6007 "configure" + #include "confdefs.h" + + int +@@ -5997,16 +6016,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6000: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6019: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6003: \$? = $ac_status" >&5 ++ echo "$as_me:6022: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6006: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6025: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6009: \$? = $ac_status" >&5 ++ echo "$as_me:6028: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_rpath_space=no + else +@@ -6016,7 +6035,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS="$cf_save_LIBS" +- echo "$as_me:6019: result: $cf_rpath_space" >&5 ++ echo "$as_me:6038: result: $cf_rpath_space" >&5 + echo "${ECHO_T}$cf_rpath_space" >&6 + test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " + ;; +@@ -6038,7 +6057,7 @@ + cf_ld_rpath_opt= + test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT" + +- echo "$as_me:6041: checking if release/abi version should be used for shared libs" >&5 ++ echo "$as_me:6060: checking if release/abi version should be used for shared libs" >&5 + echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6 + + # Check whether --with-shlib-version or --without-shlib-version was given. +@@ -6053,9 +6072,9 @@ + cf_cv_shlib_version=$withval + ;; + (*) +- echo "$as_me:6056: result: $withval" >&5 ++ echo "$as_me:6075: result: $withval" >&5 + echo "${ECHO_T}$withval" >&6 +- { { echo "$as_me:6058: error: option value must be one of: rel, abi, or auto" >&5 ++ { { echo "$as_me:6077: error: option value must be one of: rel, abi, or auto" >&5 + echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -6064,7 +6083,7 @@ + else + cf_cv_shlib_version=auto + fi; +- echo "$as_me:6067: result: $cf_cv_shlib_version" >&5 ++ echo "$as_me:6086: result: $cf_cv_shlib_version" >&5 + echo "${ECHO_T}$cf_cv_shlib_version" >&6 + + cf_cv_rm_so_locs=no +@@ -6087,14 +6106,14 @@ + + if test "$cf_try_fPIC" = yes + then +- echo "$as_me:6090: checking which $CC option to use" >&5 ++ echo "$as_me:6109: checking which $CC option to use" >&5 + echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6 + cf_save_CFLAGS="$CFLAGS" + for CC_SHARED_OPTS in -fPIC -fpic '' + do + CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6097 "configure" ++#line 6116 "configure" + #include "confdefs.h" + #include + int +@@ -6106,16 +6125,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:6109: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6128: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6112: \$? = $ac_status" >&5 ++ echo "$as_me:6131: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:6115: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6134: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6118: \$? = $ac_status" >&5 ++ echo "$as_me:6137: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -6124,7 +6143,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + done +- echo "$as_me:6127: result: $CC_SHARED_OPTS" >&5 ++ echo "$as_me:6146: result: $CC_SHARED_OPTS" >&5 + echo "${ECHO_T}$CC_SHARED_OPTS" >&6 + CFLAGS="$cf_save_CFLAGS" + fi +@@ -6195,7 +6214,7 @@ + MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@' + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi + cf_cv_shlib_version_infix=yes +- echo "$as_me:6198: checking if ld -search_paths_first works" >&5 ++ echo "$as_me:6217: checking if ld -search_paths_first works" >&5 + echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6 + if test "${cf_cv_ldflags_search_paths_first+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6204,7 +6223,7 @@ + cf_save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -Wl,-search_paths_first" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6207 "configure" ++#line 6226 "configure" + #include "confdefs.h" + + int +@@ -6216,16 +6235,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6219: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6238: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6222: \$? = $ac_status" >&5 ++ echo "$as_me:6241: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6225: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6244: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6228: \$? = $ac_status" >&5 ++ echo "$as_me:6247: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ldflags_search_paths_first=yes + else +@@ -6236,7 +6255,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LDFLAGS=$cf_save_LDFLAGS + fi +-echo "$as_me:6239: result: $cf_cv_ldflags_search_paths_first" >&5 ++echo "$as_me:6258: result: $cf_cv_ldflags_search_paths_first" >&5 + echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 + if test "$cf_cv_ldflags_search_paths_first" = yes; then + LDFLAGS="$LDFLAGS -Wl,-search_paths_first" +@@ -6586,7 +6605,7 @@ + do + CFLAGS="$cf_shared_opts $cf_save_CFLAGS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6589 "configure" ++#line 6608 "configure" + #include "confdefs.h" + #include + int +@@ -6598,16 +6617,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:6601: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6620: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6604: \$? = $ac_status" >&5 ++ echo "$as_me:6623: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:6607: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6626: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6610: \$? = $ac_status" >&5 ++ echo "$as_me:6629: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -6644,7 +6663,7 @@ + test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes + ;; + (*) +- { echo "$as_me:6647: WARNING: ignored --with-shlib-version" >&5 ++ { echo "$as_me:6666: WARNING: ignored --with-shlib-version" >&5 + echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} + ;; + esac +@@ -6654,7 +6673,7 @@ + if test -n "$cf_try_cflags" + then + cat > conftest.$ac_ext < + int main(int argc, char *argv[]) + { +@@ -6666,18 +6685,18 @@ + for cf_opt in $cf_try_cflags + do + CFLAGS="$cf_save_CFLAGS -$cf_opt" +- echo "$as_me:6669: checking if CFLAGS option -$cf_opt works" >&5 ++ echo "$as_me:6688: checking if CFLAGS option -$cf_opt works" >&5 + echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6 +- if { (eval echo "$as_me:6671: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:6690: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6674: \$? = $ac_status" >&5 ++ echo "$as_me:6693: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- echo "$as_me:6676: result: yes" >&5 ++ echo "$as_me:6695: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + cf_save_CFLAGS="$CFLAGS" + else +- echo "$as_me:6680: result: no" >&5 ++ echo "$as_me:6699: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + done +@@ -6692,17 +6711,17 @@ + + test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6 + +-echo "${as_me:-configure}:6695: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 ++echo "${as_me:-configure}:6714: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 + + test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 + +-echo "${as_me:-configure}:6699: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 ++echo "${as_me:-configure}:6718: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 + + for model in $cf_list_models ; do + case "$model" in + (libtool) + +-echo "$as_me:6705: checking for additional libtool options" >&5 ++echo "$as_me:6724: checking for additional libtool options" >&5 + echo $ECHO_N "checking for additional libtool options... $ECHO_C" >&6 + + # Check whether --with-libtool-opts or --without-libtool-opts was given. +@@ -6712,7 +6731,7 @@ + else + with_libtool_opts=no + fi; +-echo "$as_me:6715: result: $with_libtool_opts" >&5 ++echo "$as_me:6734: result: $with_libtool_opts" >&5 + echo "${ECHO_T}$with_libtool_opts" >&6 + + case .$with_libtool_opts in +@@ -6723,7 +6742,7 @@ + ;; + esac + +-echo "$as_me:6726: checking if exported-symbols file should be used" >&5 ++echo "$as_me:6745: checking if exported-symbols file should be used" >&5 + echo $ECHO_N "checking if exported-symbols file should be used... $ECHO_C" >&6 + + # Check whether --with-export-syms or --without-export-syms was given. +@@ -6738,7 +6757,7 @@ + with_export_syms='${top_srcdir}/package/${PACKAGE}.sym' + + fi +-echo "$as_me:6741: result: $with_export_syms" >&5 ++echo "$as_me:6760: result: $with_export_syms" >&5 + echo "${ECHO_T}$with_export_syms" >&6 + if test "x$with_export_syms" != xno + then +@@ -6749,15 +6768,15 @@ + ;; + (shared) + if test "$CC_SHARED_OPTS" = "unknown"; then +- { { echo "$as_me:6752: error: Shared libraries are not supported in this version" >&5 ++ { { echo "$as_me:6771: error: Shared libraries are not supported in this version" >&5 + echo "$as_me: error: Shared libraries are not supported in this version" >&2;} + { (exit 1); exit 1; }; } + fi + # workaround for inept transition to PIE vs PIC... +- echo "$as_me:6757: checking if current CFLAGS link properly" >&5 ++ echo "$as_me:6776: checking if current CFLAGS link properly" >&5 + echo $ECHO_N "checking if current CFLAGS link properly... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6760 "configure" ++#line 6779 "configure" + #include "confdefs.h" + #include + int +@@ -6769,16 +6788,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:6772: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6791: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6775: \$? = $ac_status" >&5 ++ echo "$as_me:6794: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:6778: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6797: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6781: \$? = $ac_status" >&5 ++ echo "$as_me:6800: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cflags_work=yes + else +@@ -6787,18 +6806,18 @@ + cf_cflags_work=no + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +- echo "$as_me:6790: result: $cf_cflags_work" >&5 ++ echo "$as_me:6809: result: $cf_cflags_work" >&5 + echo "${ECHO_T}$cf_cflags_work" >&6 + if test "$cf_cflags_work" = no + then + test -n "$verbose" && echo " try to work around by appending shared-options" 1>&6 + +-echo "${as_me:-configure}:6796: testing try to work around by appending shared-options ..." 1>&5 ++echo "${as_me:-configure}:6815: testing try to work around by appending shared-options ..." 1>&5 + + CFLAGS="$CFLAGS $CC_SHARED_OPTS" + fi + +-echo "$as_me:6801: checking if versioned-symbols file should be used" >&5 ++echo "$as_me:6820: checking if versioned-symbols file should be used" >&5 + echo $ECHO_N "checking if versioned-symbols file should be used... $ECHO_C" >&6 + + # Check whether --with-versioned-syms or --without-versioned-syms was given. +@@ -6816,18 +6835,18 @@ + (xno) + ;; + (x/*) +- test -f "$with_versioned_syms" || { { echo "$as_me:6819: error: expected a filename: $with_versioned_syms" >&5 ++ test -f "$with_versioned_syms" || { { echo "$as_me:6838: error: expected a filename: $with_versioned_syms" >&5 + echo "$as_me: error: expected a filename: $with_versioned_syms" >&2;} + { (exit 1); exit 1; }; } + ;; + (*) +- test -f "$with_versioned_syms" || { { echo "$as_me:6824: error: expected a filename: $with_versioned_syms" >&5 ++ test -f "$with_versioned_syms" || { { echo "$as_me:6843: error: expected a filename: $with_versioned_syms" >&5 + echo "$as_me: error: expected a filename: $with_versioned_syms" >&2;} + { (exit 1); exit 1; }; } + with_versioned_syms=`pwd`/"$with_versioned_syms" + ;; + esac +-echo "$as_me:6830: result: $with_versioned_syms" >&5 ++echo "$as_me:6849: result: $with_versioned_syms" >&5 + echo "${ECHO_T}$with_versioned_syms" >&6 + + RESULTING_SYMS= +@@ -6843,7 +6862,7 @@ + MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-Wl,%\\${VERSIONED_SYMS} -Wl,%"` + test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 + +-echo "${as_me:-configure}:6846: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 ++echo "${as_me:-configure}:6865: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 + + ;; + (*-dy\ *) +@@ -6851,11 +6870,11 @@ + MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-dy%\\${VERSIONED_SYMS} -dy%"` + test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 + +-echo "${as_me:-configure}:6854: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 ++echo "${as_me:-configure}:6873: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 + + ;; + (*) +- { echo "$as_me:6858: WARNING: this system does not support versioned-symbols" >&5 ++ { echo "$as_me:6877: WARNING: this system does not support versioned-symbols" >&5 + echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;} + ;; + esac +@@ -6867,7 +6886,7 @@ + # symbols. + if test "x$VERSIONED_SYMS" != "x" + then +- echo "$as_me:6870: checking if wildcards can be used to selectively omit symbols" >&5 ++ echo "$as_me:6889: checking if wildcards can be used to selectively omit symbols" >&5 + echo $ECHO_N "checking if wildcards can be used to selectively omit symbols... $ECHO_C" >&6 + WILDCARD_SYMS=no + +@@ -6904,7 +6923,7 @@ + } submodule_1.0; + EOF + cat >conftest.$ac_ext <&5 ++ echo "$as_me:6957: result: $WILDCARD_SYMS" >&5 + echo "${ECHO_T}$WILDCARD_SYMS" >&6 + rm -f conftest.* + fi +@@ -6948,7 +6967,7 @@ + ### Checks for special libraries, must be done up-front. + SHLIB_LIST="" + +-echo "$as_me:6951: checking if you want to link with the GPM mouse library" >&5 ++echo "$as_me:6970: checking if you want to link with the GPM mouse library" >&5 + echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6 + + # Check whether --with-gpm or --without-gpm was given. +@@ -6958,27 +6977,27 @@ + else + with_gpm=maybe + fi; +-echo "$as_me:6961: result: $with_gpm" >&5 ++echo "$as_me:6980: result: $with_gpm" >&5 + echo "${ECHO_T}$with_gpm" >&6 + + if test "$with_gpm" != no ; then +- echo "$as_me:6965: checking for gpm.h" >&5 ++ echo "$as_me:6984: checking for gpm.h" >&5 + echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6 + if test "${ac_cv_header_gpm_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 6971 "configure" ++#line 6990 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:6975: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:6994: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:6981: \$? = $ac_status" >&5 ++ echo "$as_me:7000: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -6997,7 +7016,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:7000: result: $ac_cv_header_gpm_h" >&5 ++echo "$as_me:7019: result: $ac_cv_header_gpm_h" >&5 + echo "${ECHO_T}$ac_cv_header_gpm_h" >&6 + if test "$ac_cv_header_gpm_h" = yes; then + +@@ -7008,7 +7027,7 @@ + if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then + test -n "$verbose" && echo " assuming we really have GPM library" 1>&6 + +-echo "${as_me:-configure}:7011: testing assuming we really have GPM library ..." 1>&5 ++echo "${as_me:-configure}:7030: testing assuming we really have GPM library ..." 1>&5 + + cat >>confdefs.h <<\EOF + #define HAVE_LIBGPM 1 +@@ -7016,7 +7035,7 @@ + + with_gpm=yes + else +- echo "$as_me:7019: checking for Gpm_Open in -lgpm" >&5 ++ echo "$as_me:7038: checking for Gpm_Open in -lgpm" >&5 + echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 + if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7024,7 +7043,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7027 "configure" ++#line 7046 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -7043,16 +7062,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7046: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7065: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7049: \$? = $ac_status" >&5 ++ echo "$as_me:7068: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7052: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7071: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7055: \$? = $ac_status" >&5 ++ echo "$as_me:7074: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gpm_Gpm_Open=yes + else +@@ -7063,18 +7082,18 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:7066: result: $ac_cv_lib_gpm_Gpm_Open" >&5 ++echo "$as_me:7085: result: $ac_cv_lib_gpm_Gpm_Open" >&5 + echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 + if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then + with_gpm=yes + else + + if test "$with_gpm" = maybe; then +- { echo "$as_me:7073: WARNING: Cannot link with GPM library" >&5 ++ { echo "$as_me:7092: WARNING: Cannot link with GPM library" >&5 + echo "$as_me: WARNING: Cannot link with GPM library" >&2;} + with_gpm=no + else +- { { echo "$as_me:7077: error: Cannot link with GPM library" >&5 ++ { { echo "$as_me:7096: error: Cannot link with GPM library" >&5 + echo "$as_me: error: Cannot link with GPM library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -7085,7 +7104,7 @@ + + else + +- test "$with_gpm" != maybe && { echo "$as_me:7088: WARNING: Cannot find GPM header" >&5 ++ test "$with_gpm" != maybe && { echo "$as_me:7107: WARNING: Cannot find GPM header" >&5 + echo "$as_me: WARNING: Cannot find GPM header" >&2;} + with_gpm=no + +@@ -7094,7 +7113,7 @@ + fi + + if test "$with_gpm" != no ; then +- echo "$as_me:7097: checking if you want to load GPM dynamically" >&5 ++ echo "$as_me:7116: checking if you want to load GPM dynamically" >&5 + echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6 + + # Check whether --with-dlsym or --without-dlsym was given. +@@ -7104,18 +7123,18 @@ + else + with_dlsym=yes + fi; +- echo "$as_me:7107: result: $with_dlsym" >&5 ++ echo "$as_me:7126: result: $with_dlsym" >&5 + echo "${ECHO_T}$with_dlsym" >&6 + if test "x$with_dlsym" = xyes ; then + + cf_have_dlsym=no +-echo "$as_me:7112: checking for dlsym" >&5 ++echo "$as_me:7131: checking for dlsym" >&5 + echo $ECHO_N "checking for dlsym... $ECHO_C" >&6 + if test "${ac_cv_func_dlsym+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7118 "configure" ++#line 7137 "configure" + #include "confdefs.h" + #define dlsym autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -7146,16 +7165,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7149: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7168: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7152: \$? = $ac_status" >&5 ++ echo "$as_me:7171: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7155: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7174: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7158: \$? = $ac_status" >&5 ++ echo "$as_me:7177: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_dlsym=yes + else +@@ -7165,14 +7184,14 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:7168: result: $ac_cv_func_dlsym" >&5 ++echo "$as_me:7187: result: $ac_cv_func_dlsym" >&5 + echo "${ECHO_T}$ac_cv_func_dlsym" >&6 + if test "$ac_cv_func_dlsym" = yes; then + cf_have_dlsym=yes + else + + cf_have_libdl=no +-echo "$as_me:7175: checking for dlsym in -ldl" >&5 ++echo "$as_me:7194: checking for dlsym in -ldl" >&5 + echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6 + if test "${ac_cv_lib_dl_dlsym+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7180,7 +7199,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldl $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7183 "configure" ++#line 7202 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -7199,16 +7218,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7202: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7221: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7205: \$? = $ac_status" >&5 ++ echo "$as_me:7224: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7208: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7227: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7211: \$? = $ac_status" >&5 ++ echo "$as_me:7230: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_dl_dlsym=yes + else +@@ -7219,7 +7238,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:7222: result: $ac_cv_lib_dl_dlsym" >&5 ++echo "$as_me:7241: result: $ac_cv_lib_dl_dlsym" >&5 + echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6 + if test "$ac_cv_lib_dl_dlsym" = yes; then + +@@ -7248,10 +7267,10 @@ + LIBS="$cf_add_libs" + } + +- echo "$as_me:7251: checking whether able to link to dl*() functions" >&5 ++ echo "$as_me:7270: checking whether able to link to dl*() functions" >&5 + echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7254 "configure" ++#line 7273 "configure" + #include "confdefs.h" + #include + int +@@ -7269,16 +7288,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7272: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7291: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7275: \$? = $ac_status" >&5 ++ echo "$as_me:7294: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7278: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7297: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7281: \$? = $ac_status" >&5 ++ echo "$as_me:7300: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cat >>confdefs.h <<\EOF +@@ -7289,15 +7308,15 @@ + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + +- { { echo "$as_me:7292: error: Cannot link test program for libdl" >&5 ++ { { echo "$as_me:7311: error: Cannot link test program for libdl" >&5 + echo "$as_me: error: Cannot link test program for libdl" >&2;} + { (exit 1); exit 1; }; } + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +- echo "$as_me:7297: result: ok" >&5 ++ echo "$as_me:7316: result: ok" >&5 + echo "${ECHO_T}ok" >&6 + else +- { { echo "$as_me:7300: error: Cannot find dlsym function" >&5 ++ { { echo "$as_me:7319: error: Cannot find dlsym function" >&5 + echo "$as_me: error: Cannot find dlsym function" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -7305,12 +7324,12 @@ + if test "x$with_gpm" != xyes ; then + test -n "$verbose" && echo " assuming soname for gpm is $with_gpm" 1>&6 + +-echo "${as_me:-configure}:7308: testing assuming soname for gpm is $with_gpm ..." 1>&5 ++echo "${as_me:-configure}:7327: testing assuming soname for gpm is $with_gpm ..." 1>&5 + + cf_cv_gpm_soname="$with_gpm" + else + +-echo "$as_me:7313: checking for soname of gpm library" >&5 ++echo "$as_me:7332: checking for soname of gpm library" >&5 + echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6 + if test "${cf_cv_gpm_soname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7344,15 +7363,15 @@ + done + LIBS="$cf_add_libs" + +- if { (eval echo "$as_me:7347: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:7366: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7350: \$? = $ac_status" >&5 ++ echo "$as_me:7369: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then +- if { (eval echo "$as_me:7352: \"$ac_link\"") >&5 ++ if { (eval echo "$as_me:7371: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7355: \$? = $ac_status" >&5 ++ echo "$as_me:7374: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then + cf_cv_gpm_soname="`ldd \"conftest$ac_exeext\" 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | ${FGREP-fgrep} libgpm.`" + test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown +@@ -7363,7 +7382,7 @@ + fi + + fi +-echo "$as_me:7366: result: $cf_cv_gpm_soname" >&5 ++echo "$as_me:7385: result: $cf_cv_gpm_soname" >&5 + echo "${ECHO_T}$cf_cv_gpm_soname" >&6 + + fi +@@ -7431,7 +7450,7 @@ + #define HAVE_LIBGPM 1 + EOF + +-echo "$as_me:7434: checking for Gpm_Wgetch in -lgpm" >&5 ++echo "$as_me:7453: checking for Gpm_Wgetch in -lgpm" >&5 + echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6 + if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7439,7 +7458,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7442 "configure" ++#line 7461 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -7458,16 +7477,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7461: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7480: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7464: \$? = $ac_status" >&5 ++ echo "$as_me:7483: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7467: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7486: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7470: \$? = $ac_status" >&5 ++ echo "$as_me:7489: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gpm_Gpm_Wgetch=yes + else +@@ -7478,11 +7497,11 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:7481: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5 ++echo "$as_me:7500: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5 + echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6 + if test "$ac_cv_lib_gpm_Gpm_Wgetch" = yes; then + +-echo "$as_me:7485: checking if GPM is weakly bound to curses library" >&5 ++echo "$as_me:7504: checking if GPM is weakly bound to curses library" >&5 + echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6 + if test "${cf_cv_check_gpm_wgetch+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7506,15 +7525,15 @@ + # to rely on the static library, noting that some packagers may not + # include it. + LIBS="-static -lgpm -dynamic $LIBS" +- if { (eval echo "$as_me:7509: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:7528: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7512: \$? = $ac_status" >&5 ++ echo "$as_me:7531: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then +- if { (eval echo "$as_me:7514: \"$ac_link\"") >&5 ++ if { (eval echo "$as_me:7533: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7517: \$? = $ac_status" >&5 ++ echo "$as_me:7536: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then + cf_cv_check_gpm_wgetch="`nm \"conftest$ac_exeext\" | ${EGREP-egrep} '\' | ${EGREP-egrep} '\<[vVwW]\>'`" + test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes +@@ -7526,11 +7545,11 @@ + fi + + fi +-echo "$as_me:7529: result: $cf_cv_check_gpm_wgetch" >&5 ++echo "$as_me:7548: result: $cf_cv_check_gpm_wgetch" >&5 + echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6 + + if test "$cf_cv_check_gpm_wgetch" != yes ; then +- { echo "$as_me:7533: WARNING: GPM library is already linked with curses - read the FAQ" >&5 ++ { echo "$as_me:7552: WARNING: GPM library is already linked with curses - read the FAQ" >&5 + echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;} + fi + +@@ -7538,7 +7557,7 @@ + + fi + +-echo "$as_me:7541: checking if you want to use PCRE2 for regular-expressions" >&5 ++echo "$as_me:7560: checking if you want to use PCRE2 for regular-expressions" >&5 + echo $ECHO_N "checking if you want to use PCRE2 for regular-expressions... $ECHO_C" >&6 + + # Check whether --with-pcre2 or --without-pcre2 was given. +@@ -7547,7 +7566,7 @@ + + fi; + test -z "$with_pcre2" && with_pcre2=no +-echo "$as_me:7550: result: $with_pcre2" >&5 ++echo "$as_me:7569: result: $with_pcre2" >&5 + echo "${ECHO_T}$with_pcre2" >&6 + + if test "x$with_pcre2" != xno ; then +@@ -7558,17 +7577,17 @@ + if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then + test -n "$verbose" && echo " found package $cf_with_pcre2" 1>&6 + +-echo "${as_me:-configure}:7561: testing found package $cf_with_pcre2 ..." 1>&5 ++echo "${as_me:-configure}:7580: testing found package $cf_with_pcre2 ..." 1>&5 + + cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_with_pcre2" 2>/dev/null`" + cf_pkgconfig_libs="`$PKG_CONFIG --libs "$cf_with_pcre2" 2>/dev/null`" + test -n "$verbose" && echo " package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs" 1>&6 + +-echo "${as_me:-configure}:7567: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 ++echo "${as_me:-configure}:7586: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 + + test -n "$verbose" && echo " package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs" 1>&6 + +-echo "${as_me:-configure}:7571: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5 ++echo "${as_me:-configure}:7590: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5 + + cf_fix_cppflags=no + cf_new_cflags= +@@ -7692,7 +7711,7 @@ + fi + + done +- cf_with_pcre2_ok=yes || { { echo "$as_me:7695: error: Cannot find PCRE2 library" >&5 ++ cf_with_pcre2_ok=yes || { { echo "$as_me:7714: error: Cannot find PCRE2 library" >&5 + echo "$as_me: error: Cannot find PCRE2 library" >&2;} + { (exit 1); exit 1; }; } + +@@ -7705,7 +7724,7 @@ + (*pcre2-posix*|*pcreposix*) + ;; + (*) +- echo "$as_me:7708: checking for regcomp in -lpcre2-posix" >&5 ++ echo "$as_me:7727: checking for regcomp in -lpcre2-posix" >&5 + echo $ECHO_N "checking for regcomp in -lpcre2-posix... $ECHO_C" >&6 + if test "${ac_cv_lib_pcre2_posix_regcomp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7713,7 +7732,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lpcre2-posix $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7716 "configure" ++#line 7735 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -7732,16 +7751,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7735: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7754: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7738: \$? = $ac_status" >&5 ++ echo "$as_me:7757: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7741: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7760: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7744: \$? = $ac_status" >&5 ++ echo "$as_me:7763: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_pcre2_posix_regcomp=yes + else +@@ -7752,7 +7771,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:7755: result: $ac_cv_lib_pcre2_posix_regcomp" >&5 ++echo "$as_me:7774: result: $ac_cv_lib_pcre2_posix_regcomp" >&5 + echo "${ECHO_T}$ac_cv_lib_pcre2_posix_regcomp" >&6 + if test "$ac_cv_lib_pcre2_posix_regcomp" = yes; then + +@@ -7773,7 +7792,7 @@ + LIBS="$cf_add_libs" + + else +- echo "$as_me:7776: checking for regcomp in -lpcreposix" >&5 ++ echo "$as_me:7795: checking for regcomp in -lpcreposix" >&5 + echo $ECHO_N "checking for regcomp in -lpcreposix... $ECHO_C" >&6 + if test "${ac_cv_lib_pcreposix_regcomp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7781,7 +7800,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lpcreposix $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7784 "configure" ++#line 7803 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -7800,16 +7819,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7803: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7822: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7806: \$? = $ac_status" >&5 ++ echo "$as_me:7825: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7809: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7828: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7812: \$? = $ac_status" >&5 ++ echo "$as_me:7831: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_pcreposix_regcomp=yes + else +@@ -7820,7 +7839,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:7823: result: $ac_cv_lib_pcreposix_regcomp" >&5 ++echo "$as_me:7842: result: $ac_cv_lib_pcreposix_regcomp" >&5 + echo "${ECHO_T}$ac_cv_lib_pcreposix_regcomp" >&6 + if test "$ac_cv_lib_pcreposix_regcomp" = yes; then + +@@ -7841,7 +7860,7 @@ + LIBS="$cf_add_libs" + + else +- { { echo "$as_me:7844: error: Cannot find PCRE2 POSIX library" >&5 ++ { { echo "$as_me:7863: error: Cannot find PCRE2 POSIX library" >&5 + echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -7856,23 +7875,23 @@ + for ac_header in pcre2posix.h pcreposix.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:7859: checking for $ac_header" >&5 ++echo "$as_me:7878: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7865 "configure" ++#line 7884 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:7869: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:7888: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:7875: \$? = $ac_status" >&5 ++ echo "$as_me:7894: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -7891,7 +7910,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:7894: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:7913: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:7926: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7913 "configure" ++#line 7932 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -7941,16 +7960,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:7944: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7963: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7947: \$? = $ac_status" >&5 ++ echo "$as_me:7966: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:7950: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7969: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7953: \$? = $ac_status" >&5 ++ echo "$as_me:7972: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -7960,7 +7979,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:7963: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:7982: result: `eval echo '${'"$as_ac_var"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 + if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then + cat >>confdefs.h </dev/null ; then +-echo "$as_me:7977: checking if you want to use sysmouse" >&5 ++echo "$as_me:7996: checking if you want to use sysmouse" >&5 + echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6 + + # Check whether --with-sysmouse or --without-sysmouse was given. +@@ -7986,7 +8005,7 @@ + fi; + if test "$cf_with_sysmouse" != no ; then + cat >"conftest.$ac_ext" <<_ACEOF +-#line 7989 "configure" ++#line 8008 "configure" + #include "confdefs.h" + + #include +@@ -8009,16 +8028,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:8012: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8031: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8015: \$? = $ac_status" >&5 ++ echo "$as_me:8034: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:8018: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8037: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8021: \$? = $ac_status" >&5 ++ echo "$as_me:8040: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_with_sysmouse=yes + else +@@ -8028,7 +8047,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:8031: result: $cf_with_sysmouse" >&5 ++echo "$as_me:8050: result: $cf_with_sysmouse" >&5 + echo "${ECHO_T}$cf_with_sysmouse" >&6 + test "$cf_with_sysmouse" = yes && + cat >>confdefs.h <<\EOF +@@ -8038,7 +8057,7 @@ + fi + + # pretend that ncurses==ncursesw==ncursest +-echo "$as_me:8041: checking if you want to disable library suffixes" >&5 ++echo "$as_me:8060: checking if you want to disable library suffixes" >&5 + echo $ECHO_N "checking if you want to disable library suffixes... $ECHO_C" >&6 + + # Check whether --enable-lib-suffixes or --disable-lib-suffixes was given. +@@ -8055,13 +8074,13 @@ + disable_lib_suffixes=no + + fi; +-echo "$as_me:8058: result: $disable_lib_suffixes" >&5 ++echo "$as_me:8077: result: $disable_lib_suffixes" >&5 + echo "${ECHO_T}$disable_lib_suffixes" >&6 + + ### If we're building with rpath, try to link non-standard libs that way too. + if test "$DFT_LWR_MODEL" = "shared" && test "x$cf_cv_enable_rpath" != xno; then + +-echo "$as_me:8064: checking if rpath-hack should be disabled" >&5 ++echo "$as_me:8083: checking if rpath-hack should be disabled" >&5 + echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6 + + # Check whether --enable-rpath-hack or --disable-rpath-hack was given. +@@ -8079,22 +8098,22 @@ + + fi; + if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi +-echo "$as_me:8082: result: $cf_disable_rpath_hack" >&5 ++echo "$as_me:8101: result: $cf_disable_rpath_hack" >&5 + echo "${ECHO_T}$cf_disable_rpath_hack" >&6 + + if test "$enable_rpath_hack" = yes ; then + +-echo "$as_me:8087: checking for updated LDFLAGS" >&5 ++echo "$as_me:8106: checking for updated LDFLAGS" >&5 + echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6 + if test -n "$LD_RPATH_OPT" ; then +- echo "$as_me:8090: result: maybe" >&5 ++ echo "$as_me:8109: result: maybe" >&5 + echo "${ECHO_T}maybe" >&6 + + for ac_prog in ldd + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:8097: checking for $ac_word" >&5 ++echo "$as_me:8116: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8109,7 +8128,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_cf_ldd_prog="$ac_prog" +-echo "$as_me:8112: found $ac_dir/$ac_word" >&5 ++echo "$as_me:8131: found $ac_dir/$ac_word" >&5 + break + done + +@@ -8117,10 +8136,10 @@ + fi + cf_ldd_prog=$ac_cv_prog_cf_ldd_prog + if test -n "$cf_ldd_prog"; then +- echo "$as_me:8120: result: $cf_ldd_prog" >&5 ++ echo "$as_me:8139: result: $cf_ldd_prog" >&5 + echo "${ECHO_T}$cf_ldd_prog" >&6 + else +- echo "$as_me:8123: result: no" >&5 ++ echo "$as_me:8142: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -8134,7 +8153,7 @@ + cf_rpath_oops= + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 8137 "configure" ++#line 8156 "configure" + #include "confdefs.h" + #include + int +@@ -8146,16 +8165,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:8149: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8168: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8152: \$? = $ac_status" >&5 ++ echo "$as_me:8171: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:8155: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8174: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8158: \$? = $ac_status" >&5 ++ echo "$as_me:8177: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq` + cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq` +@@ -8183,7 +8202,7 @@ + then + test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6 + +-echo "${as_me:-configure}:8186: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 ++echo "${as_me:-configure}:8205: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 + + LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" + break +@@ -8195,11 +8214,11 @@ + + test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:8198: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:8217: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:8202: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:8221: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 + + cf_rpath_dst= + for cf_rpath_src in $LDFLAGS +@@ -8236,7 +8255,7 @@ + then + test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 + +-echo "${as_me:-configure}:8239: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 ++echo "${as_me:-configure}:8258: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 + + EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" + fi +@@ -8249,11 +8268,11 @@ + + test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:8252: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:8271: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 + +-echo "${as_me:-configure}:8256: testing ...checking LIBS $LIBS ..." 1>&5 ++echo "${as_me:-configure}:8275: testing ...checking LIBS $LIBS ..." 1>&5 + + cf_rpath_dst= + for cf_rpath_src in $LIBS +@@ -8290,7 +8309,7 @@ + then + test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 + +-echo "${as_me:-configure}:8293: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 ++echo "${as_me:-configure}:8312: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 + + EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" + fi +@@ -8303,14 +8322,14 @@ + + test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 + +-echo "${as_me:-configure}:8306: testing ...checked LIBS $LIBS ..." 1>&5 ++echo "${as_me:-configure}:8325: testing ...checked LIBS $LIBS ..." 1>&5 + + test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:8310: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:8329: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 + + else +- echo "$as_me:8313: result: no" >&5 ++ echo "$as_me:8332: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -8324,7 +8343,7 @@ + EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS" + if test -n "$EXTRA_PKG_LDFLAGS" + then +- echo "$as_me:8327: checking if you want to disable extra LDFLAGS for package-scripts" >&5 ++ echo "$as_me:8346: checking if you want to disable extra LDFLAGS for package-scripts" >&5 + echo $ECHO_N "checking if you want to disable extra LDFLAGS for package-scripts... $ECHO_C" >&6 + + # Check whether --enable-pkg-ldflags or --disable-pkg-ldflags was given. +@@ -8341,7 +8360,7 @@ + disable_pkg_ldflags=no + + fi; +- echo "$as_me:8344: result: $disable_pkg_ldflags" >&5 ++ echo "$as_me:8363: result: $disable_pkg_ldflags" >&5 + echo "${ECHO_T}$disable_pkg_ldflags" >&6 + test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS= + fi +@@ -8349,7 +8368,7 @@ + ############################################################################### + + ### use option --with-extra-suffix to append suffix to headers and libraries +-echo "$as_me:8352: checking if you wish to append extra suffix to header/library paths" >&5 ++echo "$as_me:8371: checking if you wish to append extra suffix to header/library paths" >&5 + echo $ECHO_N "checking if you wish to append extra suffix to header/library paths... $ECHO_C" >&6 + EXTRA_SUFFIX= + +@@ -8368,11 +8387,11 @@ + esac + + fi; +-echo "$as_me:8371: result: $EXTRA_SUFFIX" >&5 ++echo "$as_me:8390: result: $EXTRA_SUFFIX" >&5 + echo "${ECHO_T}$EXTRA_SUFFIX" >&6 + + ### use option --disable-overwrite to leave out the link to -lcurses +-echo "$as_me:8375: checking if you wish to install ncurses overwriting curses" >&5 ++echo "$as_me:8394: checking if you wish to install ncurses overwriting curses" >&5 + echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6 + + # Check whether --enable-overwrite or --disable-overwrite was given. +@@ -8382,10 +8401,10 @@ + else + if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi + fi; +-echo "$as_me:8385: result: $with_overwrite" >&5 ++echo "$as_me:8404: result: $with_overwrite" >&5 + echo "${ECHO_T}$with_overwrite" >&6 + +-echo "$as_me:8388: checking if external terminfo-database is used" >&5 ++echo "$as_me:8407: checking if external terminfo-database is used" >&5 + echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6 + + # Check whether --enable-database or --disable-database was given. +@@ -8395,7 +8414,7 @@ + else + use_database=yes + fi; +-echo "$as_me:8398: result: $use_database" >&5 ++echo "$as_me:8417: result: $use_database" >&5 + echo "${ECHO_T}$use_database" >&6 + + case "$host_os" in +@@ -8411,7 +8430,7 @@ + if test "$use_database" != no ; then + NCURSES_USE_DATABASE=1 + +- echo "$as_me:8414: checking which terminfo source-file will be installed" >&5 ++ echo "$as_me:8433: checking which terminfo source-file will be installed" >&5 + echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6 + + # Check whether --with-database or --without-database was given. +@@ -8419,10 +8438,10 @@ + withval="$with_database" + TERMINFO_SRC=$withval + fi; +- echo "$as_me:8422: result: $TERMINFO_SRC" >&5 ++ echo "$as_me:8441: result: $TERMINFO_SRC" >&5 + echo "${ECHO_T}$TERMINFO_SRC" >&6 + +- echo "$as_me:8425: checking whether to use hashed database instead of directory/tree" >&5 ++ echo "$as_me:8444: checking whether to use hashed database instead of directory/tree" >&5 + echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6 + + # Check whether --with-hashed-db or --without-hashed-db was given. +@@ -8432,13 +8451,13 @@ + else + with_hashed_db=no + fi; +- echo "$as_me:8435: result: $with_hashed_db" >&5 ++ echo "$as_me:8454: result: $with_hashed_db" >&5 + echo "${ECHO_T}$with_hashed_db" >&6 + else + with_hashed_db=no + fi + +-echo "$as_me:8441: checking for list of fallback descriptions" >&5 ++echo "$as_me:8460: checking for list of fallback descriptions" >&5 + echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6 + + # Check whether --with-fallbacks or --without-fallbacks was given. +@@ -8448,7 +8467,7 @@ + else + with_fallback= + fi; +-echo "$as_me:8451: result: $with_fallback" >&5 ++echo "$as_me:8470: result: $with_fallback" >&5 + echo "${ECHO_T}$with_fallback" >&6 + + case ".$with_fallback" in +@@ -8456,7 +8475,7 @@ + FALLBACK_LIST= + ;; + (.yes) +- { echo "$as_me:8459: WARNING: expected a list of terminal descriptions" >&5 ++ { echo "$as_me:8478: WARNING: expected a list of terminal descriptions" >&5 + echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;} + ;; + (*) +@@ -8472,7 +8491,7 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}tic", so it can be a program name with args. + set dummy ${ac_tool_prefix}tic; ac_word=$2 +-echo "$as_me:8475: checking for $ac_word" >&5 ++echo "$as_me:8494: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_TIC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8487,7 +8506,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_TIC="${ac_tool_prefix}tic" +-echo "$as_me:8490: found $ac_dir/$ac_word" >&5 ++echo "$as_me:8509: found $ac_dir/$ac_word" >&5 + break + done + +@@ -8495,10 +8514,10 @@ + fi + TIC=$ac_cv_prog_TIC + if test -n "$TIC"; then +- echo "$as_me:8498: result: $TIC" >&5 ++ echo "$as_me:8517: result: $TIC" >&5 + echo "${ECHO_T}$TIC" >&6 + else +- echo "$as_me:8501: result: no" >&5 ++ echo "$as_me:8520: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -8507,7 +8526,7 @@ + ac_ct_TIC=$TIC + # Extract the first word of "tic", so it can be a program name with args. + set dummy tic; ac_word=$2 +-echo "$as_me:8510: checking for $ac_word" >&5 ++echo "$as_me:8529: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_TIC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8522,7 +8541,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_TIC="tic" +-echo "$as_me:8525: found $ac_dir/$ac_word" >&5 ++echo "$as_me:8544: found $ac_dir/$ac_word" >&5 + break + done + +@@ -8530,10 +8549,10 @@ + fi + ac_ct_TIC=$ac_cv_prog_ac_ct_TIC + if test -n "$ac_ct_TIC"; then +- echo "$as_me:8533: result: $ac_ct_TIC" >&5 ++ echo "$as_me:8552: result: $ac_ct_TIC" >&5 + echo "${ECHO_T}$ac_ct_TIC" >&6 + else +- echo "$as_me:8536: result: no" >&5 ++ echo "$as_me:8555: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -8545,7 +8564,7 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}infocmp", so it can be a program name with args. + set dummy ${ac_tool_prefix}infocmp; ac_word=$2 +-echo "$as_me:8548: checking for $ac_word" >&5 ++echo "$as_me:8567: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_INFOCMP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8560,7 +8579,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_INFOCMP="${ac_tool_prefix}infocmp" +-echo "$as_me:8563: found $ac_dir/$ac_word" >&5 ++echo "$as_me:8582: found $ac_dir/$ac_word" >&5 + break + done + +@@ -8568,10 +8587,10 @@ + fi + INFOCMP=$ac_cv_prog_INFOCMP + if test -n "$INFOCMP"; then +- echo "$as_me:8571: result: $INFOCMP" >&5 ++ echo "$as_me:8590: result: $INFOCMP" >&5 + echo "${ECHO_T}$INFOCMP" >&6 + else +- echo "$as_me:8574: result: no" >&5 ++ echo "$as_me:8593: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -8580,7 +8599,7 @@ + ac_ct_INFOCMP=$INFOCMP + # Extract the first word of "infocmp", so it can be a program name with args. + set dummy infocmp; ac_word=$2 +-echo "$as_me:8583: checking for $ac_word" >&5 ++echo "$as_me:8602: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_INFOCMP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8595,7 +8614,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_INFOCMP="infocmp" +-echo "$as_me:8598: found $ac_dir/$ac_word" >&5 ++echo "$as_me:8617: found $ac_dir/$ac_word" >&5 + break + done + +@@ -8603,10 +8622,10 @@ + fi + ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP + if test -n "$ac_ct_INFOCMP"; then +- echo "$as_me:8606: result: $ac_ct_INFOCMP" >&5 ++ echo "$as_me:8625: result: $ac_ct_INFOCMP" >&5 + echo "${ECHO_T}$ac_ct_INFOCMP" >&6 + else +- echo "$as_me:8609: result: no" >&5 ++ echo "$as_me:8628: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -8621,10 +8640,10 @@ + # Check whether --with-tic-path or --without-tic-path was given. + if test "${with_tic_path+set}" = set; then + withval="$with_tic_path" +- echo "$as_me:8624: checking for tic program for fallbacks" >&5 ++ echo "$as_me:8643: checking for tic program for fallbacks" >&5 + echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6 + TIC=$withval +- echo "$as_me:8627: result: $TIC" >&5 ++ echo "$as_me:8646: result: $TIC" >&5 + echo "${ECHO_T}$TIC" >&6 + + if test "x$prefix" != xNONE; then +@@ -8652,7 +8671,7 @@ + TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:8655: error: expected a pathname, not \"$TIC\"" >&5 ++ { { echo "$as_me:8674: error: expected a pathname, not \"$TIC\"" >&5 + echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -8665,7 +8684,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:8668: checking for $ac_word" >&5 ++echo "$as_me:8687: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_TIC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8682,7 +8701,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_TIC="$ac_dir/$ac_word" +- echo "$as_me:8685: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:8704: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -8693,10 +8712,10 @@ + TIC=$ac_cv_path_TIC + + if test -n "$TIC"; then +- echo "$as_me:8696: result: $TIC" >&5 ++ echo "$as_me:8715: result: $TIC" >&5 + echo "${ECHO_T}$TIC" >&6 + else +- echo "$as_me:8699: result: no" >&5 ++ echo "$as_me:8718: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -8755,7 +8774,7 @@ + + if test -n "$cf_path_prog" ; then + +-echo "${as_me:-configure}:8758: testing defining path for ${cf_path_prog} ..." 1>&5 ++echo "${as_me:-configure}:8777: testing defining path for ${cf_path_prog} ..." 1>&5 + + cat >>confdefs.h <&5 ++ { echo "$as_me:8792: WARNING: no tic program found for fallbacks" >&5 + echo "$as_me: WARNING: no tic program found for fallbacks" >&2;} + fi + +@@ -8779,10 +8798,10 @@ + # Check whether --with-infocmp-path or --without-infocmp-path was given. + if test "${with_infocmp_path+set}" = set; then + withval="$with_infocmp_path" +- echo "$as_me:8782: checking for infocmp program for fallbacks" >&5 ++ echo "$as_me:8801: checking for infocmp program for fallbacks" >&5 + echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6 + INFOCMP=$withval +- echo "$as_me:8785: result: $INFOCMP" >&5 ++ echo "$as_me:8804: result: $INFOCMP" >&5 + echo "${ECHO_T}$INFOCMP" >&6 + + if test "x$prefix" != xNONE; then +@@ -8810,7 +8829,7 @@ + INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:8813: error: expected a pathname, not \"$INFOCMP\"" >&5 ++ { { echo "$as_me:8832: error: expected a pathname, not \"$INFOCMP\"" >&5 + echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -8823,7 +8842,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:8826: checking for $ac_word" >&5 ++echo "$as_me:8845: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_INFOCMP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8840,7 +8859,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_INFOCMP="$ac_dir/$ac_word" +- echo "$as_me:8843: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:8862: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -8851,10 +8870,10 @@ + INFOCMP=$ac_cv_path_INFOCMP + + if test -n "$INFOCMP"; then +- echo "$as_me:8854: result: $INFOCMP" >&5 ++ echo "$as_me:8873: result: $INFOCMP" >&5 + echo "${ECHO_T}$INFOCMP" >&6 + else +- echo "$as_me:8857: result: no" >&5 ++ echo "$as_me:8876: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -8913,7 +8932,7 @@ + + if test -n "$cf_path_prog" ; then + +-echo "${as_me:-configure}:8916: testing defining path for ${cf_path_prog} ..." 1>&5 ++echo "${as_me:-configure}:8935: testing defining path for ${cf_path_prog} ..." 1>&5 + + cat >>confdefs.h <&5 ++ { echo "$as_me:8950: WARNING: no infocmp program found for fallbacks" >&5 + echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;} + fi + +@@ -8938,7 +8957,7 @@ + test -z "$INFOCMP" && FALLBACK_LIST= + if test -z "$FALLBACK_LIST" + then +- { echo "$as_me:8941: WARNING: ignoring fallback option because tic/infocmp are not available" >&5 ++ { echo "$as_me:8960: WARNING: ignoring fallback option because tic/infocmp are not available" >&5 + echo "$as_me: WARNING: ignoring fallback option because tic/infocmp are not available" >&2;} + fi + fi +@@ -8946,7 +8965,7 @@ + USE_FALLBACKS= + test -z "$FALLBACK_LIST" && USE_FALLBACKS="#" + +-echo "$as_me:8949: checking if you want modern xterm or antique" >&5 ++echo "$as_me:8968: checking if you want modern xterm or antique" >&5 + echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6 + + # Check whether --with-xterm-new or --without-xterm-new was given. +@@ -8960,11 +8979,11 @@ + (no) with_xterm_new=xterm-old;; + (*) with_xterm_new=xterm-new;; + esac +-echo "$as_me:8963: result: $with_xterm_new" >&5 ++echo "$as_me:8982: result: $with_xterm_new" >&5 + echo "${ECHO_T}$with_xterm_new" >&6 + WHICH_XTERM=$with_xterm_new + +-echo "$as_me:8967: checking if xterm backspace sends BS or DEL" >&5 ++echo "$as_me:8986: checking if xterm backspace sends BS or DEL" >&5 + echo $ECHO_N "checking if xterm backspace sends BS or DEL... $ECHO_C" >&6 + + # Check whether --with-xterm-kbs or --without-xterm-kbs was given. +@@ -8985,7 +9004,7 @@ + with_xterm_kbs=$withval + ;; + esac +-echo "$as_me:8988: result: $with_xterm_kbs" >&5 ++echo "$as_me:9007: result: $with_xterm_kbs" >&5 + echo "${ECHO_T}$with_xterm_kbs" >&6 + XTERM_KBS=$with_xterm_kbs + +@@ -8995,7 +9014,7 @@ + MAKE_TERMINFO="#" + else + +-echo "$as_me:8998: checking for list of terminfo directories" >&5 ++echo "$as_me:9017: checking for list of terminfo directories" >&5 + echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6 + + # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given. +@@ -9035,7 +9054,7 @@ + cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:9038: error: expected a pathname, not \"$cf_src_path\"" >&5 ++ { { echo "$as_me:9057: error: expected a pathname, not \"$cf_src_path\"" >&5 + echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -9058,7 +9077,7 @@ + ;; + esac + +-echo "$as_me:9061: result: $TERMINFO_DIRS" >&5 ++echo "$as_me:9080: result: $TERMINFO_DIRS" >&5 + echo "${ECHO_T}$TERMINFO_DIRS" >&6 + test -n "$TERMINFO_DIRS" && + cat >>confdefs.h <&5 ++ { echo "$as_me:9089: WARNING: ignoring non-directory/file TERMINFO value" >&5 + echo "$as_me: WARNING: ignoring non-directory/file TERMINFO value" >&2;} + unset TERMINFO + ;; + esac + +-echo "$as_me:9076: checking for default terminfo directory" >&5 ++echo "$as_me:9095: checking for default terminfo directory" >&5 + echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6 + + # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given. +@@ -9109,7 +9128,7 @@ + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:9112: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:9131: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -9118,7 +9137,7 @@ + fi + eval TERMINFO="$withval" + +-echo "$as_me:9121: result: $TERMINFO" >&5 ++echo "$as_me:9140: result: $TERMINFO" >&5 + echo "${ECHO_T}$TERMINFO" >&6 + + cat >>confdefs.h <&5 ++echo "$as_me:9151: checking if big-core option selected" >&5 + echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6 + + # Check whether --enable-big-core or --disable-big-core was given. +@@ -9141,7 +9160,7 @@ + with_big_core=no + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9144 "configure" ++#line 9163 "configure" + #include "confdefs.h" + + #include +@@ -9155,15 +9174,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:9158: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9177: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9161: \$? = $ac_status" >&5 ++ echo "$as_me:9180: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:9163: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9182: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9166: \$? = $ac_status" >&5 ++ echo "$as_me:9185: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + with_big_core=yes + else +@@ -9175,7 +9194,7 @@ + rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" + fi + fi; +-echo "$as_me:9178: result: $with_big_core" >&5 ++echo "$as_me:9197: result: $with_big_core" >&5 + echo "${ECHO_T}$with_big_core" >&6 + test "x$with_big_core" = "xyes" && + cat >>confdefs.h <<\EOF +@@ -9185,7 +9204,7 @@ + ### ISO C only guarantees 512-char strings, we have tables which load faster + ### when constructed using "big" strings. More than the C compiler, the awk + ### program is a limit on most vendor UNIX systems. Check that we can build. +-echo "$as_me:9188: checking if big-strings option selected" >&5 ++echo "$as_me:9207: checking if big-strings option selected" >&5 + echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6 + + # Check whether --enable-big-strings or --disable-big-strings was given. +@@ -9209,14 +9228,14 @@ + esac + + fi; +-echo "$as_me:9212: result: $with_big_strings" >&5 ++echo "$as_me:9231: result: $with_big_strings" >&5 + echo "${ECHO_T}$with_big_strings" >&6 + + USE_BIG_STRINGS=0 + test "x$with_big_strings" = "xyes" && USE_BIG_STRINGS=1 + + ### use option --enable-termcap to compile in the termcap fallback support +-echo "$as_me:9219: checking if you want termcap-fallback support" >&5 ++echo "$as_me:9238: checking if you want termcap-fallback support" >&5 + echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6 + + # Check whether --enable-termcap or --disable-termcap was given. +@@ -9226,14 +9245,14 @@ + else + with_termcap=no + fi; +-echo "$as_me:9229: result: $with_termcap" >&5 ++echo "$as_me:9248: result: $with_termcap" >&5 + echo "${ECHO_T}$with_termcap" >&6 + + NCURSES_USE_TERMCAP=0 + if test "x$with_termcap" != "xyes" ; then + if test "$use_database" = no ; then + if test -z "$with_fallback" ; then +- { { echo "$as_me:9236: error: You have disabled the database w/o specifying fallbacks" >&5 ++ { { echo "$as_me:9255: error: You have disabled the database w/o specifying fallbacks" >&5 + echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -9246,13 +9265,13 @@ + else + + if test "$with_ticlib" != no ; then +- { { echo "$as_me:9249: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5 ++ { { echo "$as_me:9268: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5 + echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;} + { (exit 1); exit 1; }; } + fi + + NCURSES_USE_TERMCAP=1 +- echo "$as_me:9255: checking for list of termcap files" >&5 ++ echo "$as_me:9274: checking for list of termcap files" >&5 + echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6 + + # Check whether --with-termpath or --without-termpath was given. +@@ -9292,7 +9311,7 @@ + cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:9295: error: expected a pathname, not \"$cf_src_path\"" >&5 ++ { { echo "$as_me:9314: error: expected a pathname, not \"$cf_src_path\"" >&5 + echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -9315,7 +9334,7 @@ + ;; + esac + +- echo "$as_me:9318: result: $TERMPATH" >&5 ++ echo "$as_me:9337: result: $TERMPATH" >&5 + echo "${ECHO_T}$TERMPATH" >&6 + test -n "$TERMPATH" && + cat >>confdefs.h <&5 ++ echo "$as_me:9345: checking if fast termcap-loader is needed" >&5 + echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6 + + # Check whether --enable-getcap or --disable-getcap was given. +@@ -9333,14 +9352,14 @@ + else + with_getcap=no + fi; +- echo "$as_me:9336: result: $with_getcap" >&5 ++ echo "$as_me:9355: result: $with_getcap" >&5 + echo "${ECHO_T}$with_getcap" >&6 + test "x$with_getcap" = "xyes" && + cat >>confdefs.h <<\EOF + #define USE_GETCAP 1 + EOF + +- echo "$as_me:9343: checking if translated termcaps will be cached in ~/.terminfo" >&5 ++ echo "$as_me:9362: checking if translated termcaps will be cached in ~/.terminfo" >&5 + echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6 + + # Check whether --enable-getcap-cache or --disable-getcap-cache was given. +@@ -9350,7 +9369,7 @@ + else + with_getcap_cache=no + fi; +- echo "$as_me:9353: result: $with_getcap_cache" >&5 ++ echo "$as_me:9372: result: $with_getcap_cache" >&5 + echo "${ECHO_T}$with_getcap_cache" >&6 + test "x$with_getcap_cache" = "xyes" && + cat >>confdefs.h <<\EOF +@@ -9360,7 +9379,7 @@ + fi + + ### Use option --disable-home-terminfo to completely remove ~/.terminfo +-echo "$as_me:9363: checking if ~/.terminfo is wanted" >&5 ++echo "$as_me:9382: checking if ~/.terminfo is wanted" >&5 + echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6 + + # Check whether --enable-home-terminfo or --disable-home-terminfo was given. +@@ -9370,14 +9389,14 @@ + else + with_home_terminfo=yes + fi; +-echo "$as_me:9373: result: $with_home_terminfo" >&5 ++echo "$as_me:9392: result: $with_home_terminfo" >&5 + echo "${ECHO_T}$with_home_terminfo" >&6 + test "x$with_home_terminfo" = "xyes" && + cat >>confdefs.h <<\EOF + #define USE_HOME_TERMINFO 1 + EOF + +-echo "$as_me:9380: checking if you want to permit root to use ncurses environment variables" >&5 ++echo "$as_me:9399: checking if you want to permit root to use ncurses environment variables" >&5 + echo $ECHO_N "checking if you want to permit root to use ncurses environment variables... $ECHO_C" >&6 + + # Check whether --enable-root-environ or --disable-root-environ was given. +@@ -9387,14 +9406,14 @@ + else + with_root_environ=yes + fi; +-echo "$as_me:9390: result: $with_root_environ" >&5 ++echo "$as_me:9409: result: $with_root_environ" >&5 + echo "${ECHO_T}$with_root_environ" >&6 + test "x$with_root_environ" = xyes && + cat >>confdefs.h <<\EOF + #define USE_ROOT_ENVIRON 1 + EOF + +-echo "$as_me:9397: checking if you want to permit setuid programs to access all files" >&5 ++echo "$as_me:9416: checking if you want to permit setuid programs to access all files" >&5 + echo $ECHO_N "checking if you want to permit setuid programs to access all files... $ECHO_C" >&6 + + # Check whether --enable-root-environ or --disable-root-environ was given. +@@ -9404,7 +9423,7 @@ + else + with_root_access=yes + fi; +-echo "$as_me:9407: result: $with_root_access" >&5 ++echo "$as_me:9426: result: $with_root_access" >&5 + echo "${ECHO_T}$with_root_access" >&6 + test "x$with_root_access" = xyes && + cat >>confdefs.h <<\EOF +@@ -9419,23 +9438,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:9422: checking for $ac_header" >&5 ++echo "$as_me:9441: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9428 "configure" ++#line 9447 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:9432: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:9451: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:9438: \$? = $ac_status" >&5 ++ echo "$as_me:9457: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -9454,7 +9473,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:9457: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:9476: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:9491: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9478 "configure" ++#line 9497 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -9506,16 +9525,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:9509: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9528: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9512: \$? = $ac_status" >&5 ++ echo "$as_me:9531: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:9515: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9534: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9518: \$? = $ac_status" >&5 ++ echo "$as_me:9537: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -9525,7 +9544,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:9528: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:9547: result: `eval echo '${'"$as_ac_var"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 + if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:9564: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9551 "configure" ++#line 9570 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -9579,16 +9598,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:9582: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9601: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9585: \$? = $ac_status" >&5 ++ echo "$as_me:9604: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:9588: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9607: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9591: \$? = $ac_status" >&5 ++ echo "$as_me:9610: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -9598,7 +9617,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:9601: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:9620: result: `eval echo '${'"$as_ac_var"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 + if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then + cat >>confdefs.h <&5 ++ echo "$as_me:9631: checking if link/symlink functions work" >&5 + echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6 + if test "${cf_cv_link_funcs+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -9622,7 +9641,7 @@ + eval 'ac_cv_func_'$cf_func'=error' + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9625 "configure" ++#line 9644 "configure" + #include "confdefs.h" + + #include +@@ -9660,15 +9679,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:9663: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9682: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9666: \$? = $ac_status" >&5 ++ echo "$as_me:9685: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:9668: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9687: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9671: \$? = $ac_status" >&5 ++ echo "$as_me:9690: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_link_funcs="$cf_cv_link_funcs $cf_func" +@@ -9686,7 +9705,7 @@ + test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no + + fi +-echo "$as_me:9689: result: $cf_cv_link_funcs" >&5 ++echo "$as_me:9708: result: $cf_cv_link_funcs" >&5 + echo "${ECHO_T}$cf_cv_link_funcs" >&6 + test "$ac_cv_func_link" = yes && + cat >>confdefs.h <<\EOF +@@ -9706,7 +9725,7 @@ + # soft links (symbolic links) are useful for some systems where hard links do + # not work, or to make it simpler to copy terminfo trees around. + if test "x$ac_cv_func_symlink" = xyes ; then +- echo "$as_me:9709: checking if tic should use symbolic links" >&5 ++ echo "$as_me:9728: checking if tic should use symbolic links" >&5 + echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6 + + # Check whether --enable-symlinks or --disable-symlinks was given. +@@ -9716,21 +9735,21 @@ + else + with_symlinks=no + fi; +- echo "$as_me:9719: result: $with_symlinks" >&5 ++ echo "$as_me:9738: result: $with_symlinks" >&5 + echo "${ECHO_T}$with_symlinks" >&6 + fi + + # If we have hard links and did not choose to use soft links instead, there is + # no reason to make this choice optional - use the hard links. + if test "$with_symlinks" = no ; then +- echo "$as_me:9726: checking if tic should use hard links" >&5 ++ echo "$as_me:9745: checking if tic should use hard links" >&5 + echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6 + if test "x$ac_cv_func_link" = xyes ; then + with_links=yes + else + with_links=no + fi +- echo "$as_me:9733: result: $with_links" >&5 ++ echo "$as_me:9752: result: $with_links" >&5 + echo "${ECHO_T}$with_links" >&6 + fi + +@@ -9746,7 +9765,7 @@ + + ### use option --enable-broken-linker to force on use of broken-linker support + +-echo "$as_me:9749: checking if you want broken-linker support code" >&5 ++echo "$as_me:9768: checking if you want broken-linker support code" >&5 + echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6 + + # Check whether --enable-broken_linker or --disable-broken_linker was given. +@@ -9756,7 +9775,7 @@ + else + with_broken_linker=no + fi; +-echo "$as_me:9759: result: $with_broken_linker" >&5 ++echo "$as_me:9778: result: $with_broken_linker" >&5 + echo "${ECHO_T}$with_broken_linker" >&6 + + : "${BROKEN_LINKER:=0}" +@@ -9770,7 +9789,7 @@ + fi + + ### use option --enable-bsdpad to have tputs process BSD-style prefix padding +-echo "$as_me:9773: checking if tputs should process BSD-style prefix padding" >&5 ++echo "$as_me:9792: checking if tputs should process BSD-style prefix padding" >&5 + echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6 + + # Check whether --enable-bsdpad or --disable-bsdpad was given. +@@ -9780,7 +9799,7 @@ + else + with_bsdpad=no + fi; +-echo "$as_me:9783: result: $with_bsdpad" >&5 ++echo "$as_me:9802: result: $with_bsdpad" >&5 + echo "${ECHO_T}$with_bsdpad" >&6 + test "x$with_bsdpad" = xyes && + cat >>confdefs.h <<\EOF +@@ -9799,14 +9818,14 @@ + # Check to define _XOPEN_SOURCE "automatically" + CPPFLAGS_before_XOPEN="$CPPFLAGS" + +-echo "$as_me:9802: checking if the POSIX test-macros are already defined" >&5 ++echo "$as_me:9821: checking if the POSIX test-macros are already defined" >&5 + echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6 + if test "${cf_cv_posix_visible+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9809 "configure" ++#line 9828 "configure" + #include "confdefs.h" + #include + int +@@ -9825,16 +9844,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:9828: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9847: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9831: \$? = $ac_status" >&5 ++ echo "$as_me:9850: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:9834: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9853: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9837: \$? = $ac_status" >&5 ++ echo "$as_me:9856: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_posix_visible=no + else +@@ -9845,7 +9864,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:9848: result: $cf_cv_posix_visible" >&5 ++echo "$as_me:9867: result: $cf_cv_posix_visible" >&5 + echo "${ECHO_T}$cf_cv_posix_visible" >&6 + + if test "$cf_cv_posix_visible" = no; then +@@ -9890,14 +9909,14 @@ + + cf_gnu_xopen_source=$cf_XOPEN_SOURCE + +-echo "$as_me:9893: checking if this is the GNU C library" >&5 ++echo "$as_me:9912: checking if this is the GNU C library" >&5 + echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6 + if test "${cf_cv_gnu_library+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9900 "configure" ++#line 9919 "configure" + #include "confdefs.h" + #include + int +@@ -9916,16 +9935,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:9919: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9938: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9922: \$? = $ac_status" >&5 ++ echo "$as_me:9941: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:9925: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9944: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9928: \$? = $ac_status" >&5 ++ echo "$as_me:9947: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_library=yes + else +@@ -9936,7 +9955,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:9939: result: $cf_cv_gnu_library" >&5 ++echo "$as_me:9958: result: $cf_cv_gnu_library" >&5 + echo "${ECHO_T}$cf_cv_gnu_library" >&6 + + if test x$cf_cv_gnu_library = xyes; then +@@ -9944,7 +9963,7 @@ + # With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE + # was changed to help a little. newlib incorporated the change about 4 + # years later. +- echo "$as_me:9947: checking if _DEFAULT_SOURCE can be used as a basis" >&5 ++ echo "$as_me:9966: checking if _DEFAULT_SOURCE can be used as a basis" >&5 + echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6 + if test "${cf_cv_gnu_library_219+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -9956,7 +9975,7 @@ + CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 9959 "configure" ++#line 9978 "configure" + #include "confdefs.h" + #include + int +@@ -9975,16 +9994,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:9978: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9997: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9981: \$? = $ac_status" >&5 ++ echo "$as_me:10000: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:9984: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10003: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9987: \$? = $ac_status" >&5 ++ echo "$as_me:10006: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_library_219=yes + else +@@ -9996,12 +10015,12 @@ + CPPFLAGS="$cf_save" + + fi +-echo "$as_me:9999: result: $cf_cv_gnu_library_219" >&5 ++echo "$as_me:10018: result: $cf_cv_gnu_library_219" >&5 + echo "${ECHO_T}$cf_cv_gnu_library_219" >&6 + + if test "x$cf_cv_gnu_library_219" = xyes; then + cf_save="$CPPFLAGS" +- echo "$as_me:10004: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 ++ echo "$as_me:10023: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 + echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_gnu_dftsrc_219+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10106,7 +10125,7 @@ + fi + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10109 "configure" ++#line 10128 "configure" + #include "confdefs.h" + + #include +@@ -10126,16 +10145,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10129: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10148: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10132: \$? = $ac_status" >&5 ++ echo "$as_me:10151: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10135: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10154: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10138: \$? = $ac_status" >&5 ++ echo "$as_me:10157: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_dftsrc_219=yes + else +@@ -10146,7 +10165,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:10149: result: $cf_cv_gnu_dftsrc_219" >&5 ++echo "$as_me:10168: result: $cf_cv_gnu_dftsrc_219" >&5 + echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6 + test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save" + else +@@ -10155,14 +10174,14 @@ + + if test "x$cf_cv_gnu_dftsrc_219" != xyes; then + +- echo "$as_me:10158: checking if we must define _GNU_SOURCE" >&5 ++ echo "$as_me:10177: checking if we must define _GNU_SOURCE" >&5 + echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_gnu_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10165 "configure" ++#line 10184 "configure" + #include "confdefs.h" + #include + int +@@ -10177,16 +10196,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10180: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10199: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10183: \$? = $ac_status" >&5 ++ echo "$as_me:10202: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10186: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10205: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10189: \$? = $ac_status" >&5 ++ echo "$as_me:10208: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_source=no + else +@@ -10293,7 +10312,7 @@ + fi + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10296 "configure" ++#line 10315 "configure" + #include "confdefs.h" + #include + int +@@ -10308,16 +10327,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10311: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10330: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10314: \$? = $ac_status" >&5 ++ echo "$as_me:10333: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10317: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10336: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10320: \$? = $ac_status" >&5 ++ echo "$as_me:10339: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gnu_source=no + else +@@ -10332,12 +10351,12 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:10335: result: $cf_cv_gnu_source" >&5 ++echo "$as_me:10354: result: $cf_cv_gnu_source" >&5 + echo "${ECHO_T}$cf_cv_gnu_source" >&6 + + if test "$cf_cv_gnu_source" = yes + then +- echo "$as_me:10340: checking if we should also define _DEFAULT_SOURCE" >&5 ++ echo "$as_me:10359: checking if we should also define _DEFAULT_SOURCE" >&5 + echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_default_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10347,7 +10366,7 @@ + CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10350 "configure" ++#line 10369 "configure" + #include "confdefs.h" + #include + int +@@ -10362,16 +10381,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10365: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10384: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10368: \$? = $ac_status" >&5 ++ echo "$as_me:10387: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10371: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10390: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10374: \$? = $ac_status" >&5 ++ echo "$as_me:10393: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_default_source=no + else +@@ -10382,7 +10401,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:10385: result: $cf_cv_default_source" >&5 ++echo "$as_me:10404: result: $cf_cv_default_source" >&5 + echo "${ECHO_T}$cf_cv_default_source" >&6 + if test "$cf_cv_default_source" = yes + then +@@ -10419,16 +10438,16 @@ + sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` + +-echo "$as_me:10422: checking if we should define _POSIX_C_SOURCE" >&5 ++echo "$as_me:10441: checking if we should define _POSIX_C_SOURCE" >&5 + echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_posix_c_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + +-echo "${as_me:-configure}:10428: testing if the symbol is already defined go no further ..." 1>&5 ++echo "${as_me:-configure}:10447: testing if the symbol is already defined go no further ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10431 "configure" ++#line 10450 "configure" + #include "confdefs.h" + #include + int +@@ -10443,16 +10462,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10446: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10465: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10449: \$? = $ac_status" >&5 ++ echo "$as_me:10468: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10452: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10471: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10455: \$? = $ac_status" >&5 ++ echo "$as_me:10474: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_posix_c_source=no + else +@@ -10473,7 +10492,7 @@ + esac + if test "$cf_want_posix_source" = yes ; then + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10476 "configure" ++#line 10495 "configure" + #include "confdefs.h" + #include + int +@@ -10488,16 +10507,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10491: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10510: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10494: \$? = $ac_status" >&5 ++ echo "$as_me:10513: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10497: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10516: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10500: \$? = $ac_status" >&5 ++ echo "$as_me:10519: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -10508,7 +10527,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi + +-echo "${as_me:-configure}:10511: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 ++echo "${as_me:-configure}:10530: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 + + CFLAGS="$cf_trim_CFLAGS" + CPPFLAGS="$cf_trim_CPPFLAGS" +@@ -10516,10 +10535,10 @@ + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" + +-echo "${as_me:-configure}:10519: testing if the second compile does not leave our definition intact error ..." 1>&5 ++echo "${as_me:-configure}:10538: testing if the second compile does not leave our definition intact error ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10522 "configure" ++#line 10541 "configure" + #include "confdefs.h" + #include + int +@@ -10534,16 +10553,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10537: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10556: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10540: \$? = $ac_status" >&5 ++ echo "$as_me:10559: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10543: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10562: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10546: \$? = $ac_status" >&5 ++ echo "$as_me:10565: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -10559,7 +10578,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:10562: result: $cf_cv_posix_c_source" >&5 ++echo "$as_me:10581: result: $cf_cv_posix_c_source" >&5 + echo "${ECHO_T}$cf_cv_posix_c_source" >&6 + + if test "$cf_cv_posix_c_source" != no ; then +@@ -10676,7 +10695,7 @@ + # OpenBSD 6.x has broken locale support, both compile-time and runtime. + # see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html + # Abusing the conformance level is a workaround. +- { echo "$as_me:10679: WARNING: this system does not provide usable locale support" >&5 ++ { echo "$as_me:10698: WARNING: this system does not provide usable locale support" >&5 + echo "$as_me: WARNING: this system does not provide usable locale support" >&2;} + cf_xopen_source="-D_BSD_SOURCE" + cf_XOPEN_SOURCE=700 +@@ -10708,14 +10727,14 @@ + ;; + (*) + +-echo "$as_me:10711: checking if we should define _XOPEN_SOURCE" >&5 ++echo "$as_me:10730: checking if we should define _XOPEN_SOURCE" >&5 + echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_xopen_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10718 "configure" ++#line 10737 "configure" + #include "confdefs.h" + + #include +@@ -10734,16 +10753,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10737: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10756: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10740: \$? = $ac_status" >&5 ++ echo "$as_me:10759: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10743: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10762: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10746: \$? = $ac_status" >&5 ++ echo "$as_me:10765: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_xopen_source=no + else +@@ -10755,7 +10774,7 @@ + CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10758 "configure" ++#line 10777 "configure" + #include "confdefs.h" + + #include +@@ -10774,16 +10793,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10777: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10796: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10780: \$? = $ac_status" >&5 ++ echo "$as_me:10799: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10783: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10802: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10786: \$? = $ac_status" >&5 ++ echo "$as_me:10805: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_xopen_source=no + else +@@ -10798,7 +10817,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:10801: result: $cf_cv_xopen_source" >&5 ++echo "$as_me:10820: result: $cf_cv_xopen_source" >&5 + echo "${ECHO_T}$cf_cv_xopen_source" >&6 + + if test "$cf_cv_xopen_source" != no ; then +@@ -10956,16 +10975,16 @@ + sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` + +-echo "$as_me:10959: checking if we should define _POSIX_C_SOURCE" >&5 ++echo "$as_me:10978: checking if we should define _POSIX_C_SOURCE" >&5 + echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_posix_c_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + +-echo "${as_me:-configure}:10965: testing if the symbol is already defined go no further ..." 1>&5 ++echo "${as_me:-configure}:10984: testing if the symbol is already defined go no further ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 10968 "configure" ++#line 10987 "configure" + #include "confdefs.h" + #include + int +@@ -10980,16 +10999,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:10983: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11002: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10986: \$? = $ac_status" >&5 ++ echo "$as_me:11005: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:10989: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11008: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10992: \$? = $ac_status" >&5 ++ echo "$as_me:11011: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_posix_c_source=no + else +@@ -11010,7 +11029,7 @@ + esac + if test "$cf_want_posix_source" = yes ; then + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11013 "configure" ++#line 11032 "configure" + #include "confdefs.h" + #include + int +@@ -11025,16 +11044,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11028: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11047: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11031: \$? = $ac_status" >&5 ++ echo "$as_me:11050: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11034: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11053: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11037: \$? = $ac_status" >&5 ++ echo "$as_me:11056: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -11045,7 +11064,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi + +-echo "${as_me:-configure}:11048: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 ++echo "${as_me:-configure}:11067: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 + + CFLAGS="$cf_trim_CFLAGS" + CPPFLAGS="$cf_trim_CPPFLAGS" +@@ -11053,10 +11072,10 @@ + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" + +-echo "${as_me:-configure}:11056: testing if the second compile does not leave our definition intact error ..." 1>&5 ++echo "${as_me:-configure}:11075: testing if the second compile does not leave our definition intact error ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11059 "configure" ++#line 11078 "configure" + #include "confdefs.h" + #include + int +@@ -11071,16 +11090,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11074: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11093: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11077: \$? = $ac_status" >&5 ++ echo "$as_me:11096: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11080: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11099: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11083: \$? = $ac_status" >&5 ++ echo "$as_me:11102: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -11096,7 +11115,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:11099: result: $cf_cv_posix_c_source" >&5 ++echo "$as_me:11118: result: $cf_cv_posix_c_source" >&5 + echo "${ECHO_T}$cf_cv_posix_c_source" >&6 + + if test "$cf_cv_posix_c_source" != no ; then +@@ -11222,7 +11241,7 @@ + test "$CFLAGS" != "$cf_old_cflag" || break + test -n "$verbose" && echo " removing old option $cf_add_cflags from CFLAGS" 1>&6 + +-echo "${as_me:-configure}:11225: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:11244: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5 + + CFLAGS="$cf_old_cflag" + done +@@ -11234,7 +11253,7 @@ + test "$CPPFLAGS" != "$cf_old_cflag" || break + test -n "$verbose" && echo " removing old option $cf_add_cflags from CPPFLAGS" 1>&6 + +-echo "${as_me:-configure}:11237: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5 ++echo "${as_me:-configure}:11256: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5 + + CPPFLAGS="$cf_old_cflag" + done +@@ -11322,7 +11341,7 @@ + if test -n "$cf_new_cflags" ; then + test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 + +-echo "${as_me:-configure}:11325: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 ++echo "${as_me:-configure}:11344: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" +@@ -11332,7 +11351,7 @@ + if test -n "$cf_new_cppflags" ; then + test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 + +-echo "${as_me:-configure}:11335: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 ++echo "${as_me:-configure}:11354: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" +@@ -11342,7 +11361,7 @@ + if test -n "$cf_new_extra_cppflags" ; then + test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 + +-echo "${as_me:-configure}:11345: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 ++echo "${as_me:-configure}:11364: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 + + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" +@@ -11354,10 +11373,10 @@ + fi + + if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then +- echo "$as_me:11357: checking if _XOPEN_SOURCE really is set" >&5 ++ echo "$as_me:11376: checking if _XOPEN_SOURCE really is set" >&5 + echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11360 "configure" ++#line 11379 "configure" + #include "confdefs.h" + #include + int +@@ -11372,16 +11391,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11375: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11394: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11378: \$? = $ac_status" >&5 ++ echo "$as_me:11397: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11381: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11400: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11384: \$? = $ac_status" >&5 ++ echo "$as_me:11403: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_XOPEN_SOURCE_set=yes + else +@@ -11390,12 +11409,12 @@ + cf_XOPEN_SOURCE_set=no + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +- echo "$as_me:11393: result: $cf_XOPEN_SOURCE_set" >&5 ++ echo "$as_me:11412: result: $cf_XOPEN_SOURCE_set" >&5 + echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6 + if test "$cf_XOPEN_SOURCE_set" = yes + then + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11398 "configure" ++#line 11417 "configure" + #include "confdefs.h" + #include + int +@@ -11410,16 +11429,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11413: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11432: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11416: \$? = $ac_status" >&5 ++ echo "$as_me:11435: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11419: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11438: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11422: \$? = $ac_status" >&5 ++ echo "$as_me:11441: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_XOPEN_SOURCE_set_ok=yes + else +@@ -11430,19 +11449,19 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + if test "$cf_XOPEN_SOURCE_set_ok" = no + then +- { echo "$as_me:11433: WARNING: _XOPEN_SOURCE is lower than requested" >&5 ++ { echo "$as_me:11452: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} + fi + else + +-echo "$as_me:11438: checking if we should define _XOPEN_SOURCE" >&5 ++echo "$as_me:11457: checking if we should define _XOPEN_SOURCE" >&5 + echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_xopen_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11445 "configure" ++#line 11464 "configure" + #include "confdefs.h" + + #include +@@ -11461,16 +11480,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11464: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11483: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11467: \$? = $ac_status" >&5 ++ echo "$as_me:11486: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11470: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11489: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11473: \$? = $ac_status" >&5 ++ echo "$as_me:11492: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_xopen_source=no + else +@@ -11482,7 +11501,7 @@ + CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11485 "configure" ++#line 11504 "configure" + #include "confdefs.h" + + #include +@@ -11501,16 +11520,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11504: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11523: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11507: \$? = $ac_status" >&5 ++ echo "$as_me:11526: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11510: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11529: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11513: \$? = $ac_status" >&5 ++ echo "$as_me:11532: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_xopen_source=no + else +@@ -11525,7 +11544,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:11528: result: $cf_cv_xopen_source" >&5 ++echo "$as_me:11547: result: $cf_cv_xopen_source" >&5 + echo "${ECHO_T}$cf_cv_xopen_source" >&6 + + if test "$cf_cv_xopen_source" != no ; then +@@ -11676,14 +11695,14 @@ + + # Work around breakage on OS X + +-echo "$as_me:11679: checking if SIGWINCH is defined" >&5 ++echo "$as_me:11698: checking if SIGWINCH is defined" >&5 + echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6 + if test "${cf_cv_define_sigwinch+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11686 "configure" ++#line 11705 "configure" + #include "confdefs.h" + + #include +@@ -11698,23 +11717,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11701: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11720: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11704: \$? = $ac_status" >&5 ++ echo "$as_me:11723: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11707: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11726: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11710: \$? = $ac_status" >&5 ++ echo "$as_me:11729: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_define_sigwinch=yes + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11717 "configure" ++#line 11736 "configure" + #include "confdefs.h" + + #undef _XOPEN_SOURCE +@@ -11732,16 +11751,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11735: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11754: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11738: \$? = $ac_status" >&5 ++ echo "$as_me:11757: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11741: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11760: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11744: \$? = $ac_status" >&5 ++ echo "$as_me:11763: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_define_sigwinch=maybe + else +@@ -11755,11 +11774,11 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:11758: result: $cf_cv_define_sigwinch" >&5 ++echo "$as_me:11777: result: $cf_cv_define_sigwinch" >&5 + echo "${ECHO_T}$cf_cv_define_sigwinch" >&6 + + if test "$cf_cv_define_sigwinch" = maybe ; then +-echo "$as_me:11762: checking for actual SIGWINCH definition" >&5 ++echo "$as_me:11781: checking for actual SIGWINCH definition" >&5 + echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6 + if test "${cf_cv_fixup_sigwinch+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -11770,7 +11789,7 @@ + while test "$cf_sigwinch" != 1 + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11773 "configure" ++#line 11792 "configure" + #include "confdefs.h" + + #undef _XOPEN_SOURCE +@@ -11792,16 +11811,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11795: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11814: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11798: \$? = $ac_status" >&5 ++ echo "$as_me:11817: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11801: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11820: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11804: \$? = $ac_status" >&5 ++ echo "$as_me:11823: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_fixup_sigwinch=$cf_sigwinch + break +@@ -11815,7 +11834,7 @@ + done + + fi +-echo "$as_me:11818: result: $cf_cv_fixup_sigwinch" >&5 ++echo "$as_me:11837: result: $cf_cv_fixup_sigwinch" >&5 + echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 + + if test "$cf_cv_fixup_sigwinch" != unknown ; then +@@ -11825,13 +11844,13 @@ + + # Checks for CODESET support. + +-echo "$as_me:11828: checking for nl_langinfo and CODESET" >&5 ++echo "$as_me:11847: checking for nl_langinfo and CODESET" >&5 + echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6 + if test "${am_cv_langinfo_codeset+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11834 "configure" ++#line 11853 "configure" + #include "confdefs.h" + #include + int +@@ -11843,16 +11862,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:11846: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11865: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11849: \$? = $ac_status" >&5 ++ echo "$as_me:11868: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:11852: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11871: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11855: \$? = $ac_status" >&5 ++ echo "$as_me:11874: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + am_cv_langinfo_codeset=yes + else +@@ -11863,7 +11882,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + fi +-echo "$as_me:11866: result: $am_cv_langinfo_codeset" >&5 ++echo "$as_me:11885: result: $am_cv_langinfo_codeset" >&5 + echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 + if test "$am_cv_langinfo_codeset" = yes; then + +@@ -11877,7 +11896,7 @@ + NCURSES_OK_WCHAR_T= + NCURSES_OK_WINT_T= + +-echo "$as_me:11880: checking if you want wide-character code" >&5 ++echo "$as_me:11899: checking if you want wide-character code" >&5 + echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6 + + # Check whether --enable-widec or --disable-widec was given. +@@ -11887,7 +11906,7 @@ + else + with_widec=no + fi; +-echo "$as_me:11890: result: $with_widec" >&5 ++echo "$as_me:11909: result: $with_widec" >&5 + echo "${ECHO_T}$with_widec" >&6 + + NCURSES_WCWIDTH_GRAPHICS=1 +@@ -11911,23 +11930,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:11914: checking for $ac_header" >&5 ++echo "$as_me:11933: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11920 "configure" ++#line 11939 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:11924: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:11943: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:11930: \$? = $ac_status" >&5 ++ echo "$as_me:11949: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -11946,7 +11965,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:11949: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:11968: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:11978: checking if wchar.h can be used as is" >&5 + echo $ECHO_N "checking if wchar.h can be used as is... $ECHO_C" >&6 + if test "${cf_cv_wchar_h_okay+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 11966 "configure" ++#line 11985 "configure" + #include "confdefs.h" + + #include +@@ -11985,16 +12004,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:11988: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12007: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11991: \$? = $ac_status" >&5 ++ echo "$as_me:12010: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:11994: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12013: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11997: \$? = $ac_status" >&5 ++ echo "$as_me:12016: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_wchar_h_okay=yes + else +@@ -12004,16 +12023,16 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:12007: result: $cf_cv_wchar_h_okay" >&5 ++echo "$as_me:12026: result: $cf_cv_wchar_h_okay" >&5 + echo "${ECHO_T}$cf_cv_wchar_h_okay" >&6 + + if test "$cf_cv_wchar_h_okay" = no + then + +-echo "$as_me:12013: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 ++echo "$as_me:12032: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 + echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12016 "configure" ++#line 12035 "configure" + #include "confdefs.h" + #include + +@@ -12029,16 +12048,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12032: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12051: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12035: \$? = $ac_status" >&5 ++ echo "$as_me:12054: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12038: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12057: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12041: \$? = $ac_status" >&5 ++ echo "$as_me:12060: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_result=no + else +@@ -12047,16 +12066,16 @@ + cf_result=yes + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +-echo "$as_me:12050: result: $cf_result" >&5 ++echo "$as_me:12069: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + + if test "$cf_result" = yes ; then + CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" + elif test "x" != "x" ; then +- echo "$as_me:12056: checking checking for compatible value versus " >&5 ++ echo "$as_me:12075: checking checking for compatible value versus " >&5 + echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12059 "configure" ++#line 12078 "configure" + #include "confdefs.h" + #include + +@@ -12072,16 +12091,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12075: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12094: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12078: \$? = $ac_status" >&5 ++ echo "$as_me:12097: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12081: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12100: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12084: \$? = $ac_status" >&5 ++ echo "$as_me:12103: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_result=yes + else +@@ -12090,7 +12109,7 @@ + cf_result=no + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +- echo "$as_me:12093: result: $cf_result" >&5 ++ echo "$as_me:12112: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test "$cf_result" = no ; then + # perhaps we can override it - try... +@@ -12100,7 +12119,7 @@ + + fi + +-echo "$as_me:12103: checking if wcwidth agrees graphics are single-width" >&5 ++echo "$as_me:12122: checking if wcwidth agrees graphics are single-width" >&5 + echo $ECHO_N "checking if wcwidth agrees graphics are single-width... $ECHO_C" >&6 + if test "${cf_cv_wcwidth_graphics+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -12171,7 +12190,7 @@ + cf_cv_wcwidth_graphics=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12174 "configure" ++#line 12193 "configure" + #include "confdefs.h" + + #include +@@ -12215,15 +12234,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:12218: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12237: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12221: \$? = $ac_status" >&5 ++ echo "$as_me:12240: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:12223: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12242: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12226: \$? = $ac_status" >&5 ++ echo "$as_me:12245: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_wcwidth_graphics=yes + else +@@ -12236,7 +12255,7 @@ + fi + + fi +-echo "$as_me:12239: result: $cf_cv_wcwidth_graphics" >&5 ++echo "$as_me:12258: result: $cf_cv_wcwidth_graphics" >&5 + echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6 + + test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0 +@@ -12247,13 +12266,13 @@ + for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:12250: checking for $ac_func" >&5 ++echo "$as_me:12269: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12256 "configure" ++#line 12275 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -12284,16 +12303,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:12287: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12306: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12290: \$? = $ac_status" >&5 ++ echo "$as_me:12309: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:12293: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12312: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12296: \$? = $ac_status" >&5 ++ echo "$as_me:12315: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -12303,7 +12322,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:12306: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:12325: result: `eval echo '${'"$as_ac_var"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 + if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:12340: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12327 "configure" ++#line 12346 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:12331: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:12350: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:12337: \$? = $ac_status" >&5 ++ echo "$as_me:12356: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -12353,7 +12372,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:12356: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:12375: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:12385: checking for multibyte character support" >&5 + echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6 + if test "${cf_cv_utf8_lib+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -12371,7 +12390,7 @@ + + cf_save_LIBS="$LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12374 "configure" ++#line 12393 "configure" + #include "confdefs.h" + + #include +@@ -12389,16 +12408,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:12392: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12411: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12395: \$? = $ac_status" >&5 ++ echo "$as_me:12414: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:12398: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12417: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12401: \$? = $ac_status" >&5 ++ echo "$as_me:12420: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_utf8_lib=yes + else +@@ -12410,12 +12429,12 @@ + cf_cv_header_path_utf8= + cf_cv_library_path_utf8= + +-echo "${as_me:-configure}:12413: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:12432: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12418 "configure" ++#line 12437 "configure" + #include "confdefs.h" + + #include +@@ -12428,16 +12447,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:12431: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12450: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12434: \$? = $ac_status" >&5 ++ echo "$as_me:12453: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:12437: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12456: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12440: \$? = $ac_status" >&5 ++ echo "$as_me:12459: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_find_linkage_utf8=yes +@@ -12451,7 +12470,7 @@ + LIBS="-lutf8 $cf_save_LIBS" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12454 "configure" ++#line 12473 "configure" + #include "confdefs.h" + + #include +@@ -12464,16 +12483,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:12467: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12486: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12470: \$? = $ac_status" >&5 ++ echo "$as_me:12489: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:12473: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12492: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12476: \$? = $ac_status" >&5 ++ echo "$as_me:12495: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_find_linkage_utf8=yes +@@ -12490,9 +12509,9 @@ + + test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 + +-echo "${as_me:-configure}:12493: testing find linkage for utf8 library ..." 1>&5 ++echo "${as_me:-configure}:12512: testing find linkage for utf8 library ..." 1>&5 + +-echo "${as_me:-configure}:12495: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:12514: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_CPPFLAGS="$CPPFLAGS" + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -12583,7 +12602,7 @@ + if test -d "$cf_cv_header_path_utf8" ; then + test -n "$verbose" && echo " ... testing $cf_cv_header_path_utf8" 1>&6 + +-echo "${as_me:-configure}:12586: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:12605: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 + + CPPFLAGS="$cf_save_CPPFLAGS" + +@@ -12591,7 +12610,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12594 "configure" ++#line 12613 "configure" + #include "confdefs.h" + + #include +@@ -12604,21 +12623,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12607: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12626: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12610: \$? = $ac_status" >&5 ++ echo "$as_me:12629: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12613: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12632: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12616: \$? = $ac_status" >&5 ++ echo "$as_me:12635: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + test -n "$verbose" && echo " ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6 + +-echo "${as_me:-configure}:12621: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:12640: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 + + cf_cv_find_linkage_utf8=maybe + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -12636,7 +12655,7 @@ + + if test "$cf_cv_find_linkage_utf8" = maybe ; then + +-echo "${as_me:-configure}:12639: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:12658: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + cf_save_LDFLAGS="$LDFLAGS" +@@ -12711,13 +12730,13 @@ + if test -d "$cf_cv_library_path_utf8" ; then + test -n "$verbose" && echo " ... testing $cf_cv_library_path_utf8" 1>&6 + +-echo "${as_me:-configure}:12714: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:12733: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 + + CPPFLAGS="$cf_test_CPPFLAGS" + LIBS="-lutf8 $cf_save_LIBS" + LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12720 "configure" ++#line 12739 "configure" + #include "confdefs.h" + + #include +@@ -12730,21 +12749,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:12733: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12752: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12736: \$? = $ac_status" >&5 ++ echo "$as_me:12755: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:12739: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12758: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12742: \$? = $ac_status" >&5 ++ echo "$as_me:12761: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + test -n "$verbose" && echo " ... found utf8 library in $cf_cv_library_path_utf8" 1>&6 + +-echo "${as_me:-configure}:12747: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:12766: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 + + cf_cv_find_linkage_utf8=yes + cf_cv_library_file_utf8="-lutf8" +@@ -12786,7 +12805,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:12789: result: $cf_cv_utf8_lib" >&5 ++echo "$as_me:12808: result: $cf_cv_utf8_lib" >&5 + echo "${ECHO_T}$cf_cv_utf8_lib" >&6 + + # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between +@@ -12824,7 +12843,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12827 "configure" ++#line 12846 "configure" + #include "confdefs.h" + #include + int +@@ -12836,16 +12855,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12839: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12858: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12842: \$? = $ac_status" >&5 ++ echo "$as_me:12861: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12845: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12864: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12848: \$? = $ac_status" >&5 ++ echo "$as_me:12867: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -12862,7 +12881,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:12865: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:12884: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -12898,7 +12917,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me:-configure}:12901: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:12920: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -12930,14 +12949,14 @@ + fi + + # This is needed on Tru64 5.0 to declare mbstate_t +-echo "$as_me:12933: checking if we must include wchar.h to declare mbstate_t" >&5 ++echo "$as_me:12952: checking if we must include wchar.h to declare mbstate_t" >&5 + echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6 + if test "${cf_cv_mbstate_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12940 "configure" ++#line 12959 "configure" + #include "confdefs.h" + + #include +@@ -12955,23 +12974,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12958: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12977: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12961: \$? = $ac_status" >&5 ++ echo "$as_me:12980: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12964: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12983: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12967: \$? = $ac_status" >&5 ++ echo "$as_me:12986: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_mbstate_t=no + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 12974 "configure" ++#line 12993 "configure" + #include "confdefs.h" + + #include +@@ -12990,16 +13009,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:12993: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13012: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12996: \$? = $ac_status" >&5 ++ echo "$as_me:13015: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:12999: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13018: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13002: \$? = $ac_status" >&5 ++ echo "$as_me:13021: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_mbstate_t=yes + else +@@ -13011,7 +13030,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:13014: result: $cf_cv_mbstate_t" >&5 ++echo "$as_me:13033: result: $cf_cv_mbstate_t" >&5 + echo "${ECHO_T}$cf_cv_mbstate_t" >&6 + + if test "$cf_cv_mbstate_t" = yes ; then +@@ -13029,14 +13048,14 @@ + fi + + # This is needed on Tru64 5.0 to declare wchar_t +-echo "$as_me:13032: checking if we must include wchar.h to declare wchar_t" >&5 ++echo "$as_me:13051: checking if we must include wchar.h to declare wchar_t" >&5 + echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6 + if test "${cf_cv_wchar_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13039 "configure" ++#line 13058 "configure" + #include "confdefs.h" + + #include +@@ -13054,23 +13073,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13057: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13076: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13060: \$? = $ac_status" >&5 ++ echo "$as_me:13079: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13063: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13082: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13066: \$? = $ac_status" >&5 ++ echo "$as_me:13085: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_wchar_t=no + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13073 "configure" ++#line 13092 "configure" + #include "confdefs.h" + + #include +@@ -13089,16 +13108,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13092: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13111: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13095: \$? = $ac_status" >&5 ++ echo "$as_me:13114: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13098: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13117: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13101: \$? = $ac_status" >&5 ++ echo "$as_me:13120: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_wchar_t=yes + else +@@ -13110,7 +13129,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:13113: result: $cf_cv_wchar_t" >&5 ++echo "$as_me:13132: result: $cf_cv_wchar_t" >&5 + echo "${ECHO_T}$cf_cv_wchar_t" >&6 + + if test "$cf_cv_wchar_t" = yes ; then +@@ -13133,14 +13152,14 @@ + fi + + # This is needed on Tru64 5.0 to declare wint_t +-echo "$as_me:13136: checking if we must include wchar.h to declare wint_t" >&5 ++echo "$as_me:13155: checking if we must include wchar.h to declare wint_t" >&5 + echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6 + if test "${cf_cv_wint_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13143 "configure" ++#line 13162 "configure" + #include "confdefs.h" + + #include +@@ -13158,23 +13177,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13161: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13180: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13164: \$? = $ac_status" >&5 ++ echo "$as_me:13183: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13167: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13186: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13170: \$? = $ac_status" >&5 ++ echo "$as_me:13189: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_wint_t=no + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13177 "configure" ++#line 13196 "configure" + #include "confdefs.h" + + #include +@@ -13193,16 +13212,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13196: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13215: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13199: \$? = $ac_status" >&5 ++ echo "$as_me:13218: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13202: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13221: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13205: \$? = $ac_status" >&5 ++ echo "$as_me:13224: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_wint_t=yes + else +@@ -13214,7 +13233,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:13217: result: $cf_cv_wint_t" >&5 ++echo "$as_me:13236: result: $cf_cv_wint_t" >&5 + echo "${ECHO_T}$cf_cv_wint_t" >&6 + + if test "$cf_cv_wint_t" = yes ; then +@@ -13246,7 +13265,7 @@ + fi + + ### use option --disable-lp64 to allow long chtype +-echo "$as_me:13249: checking whether to enable _LP64 definition in curses.h" >&5 ++echo "$as_me:13268: checking whether to enable _LP64 definition in curses.h" >&5 + echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6 + + # Check whether --enable-lp64 or --disable-lp64 was given. +@@ -13256,7 +13275,7 @@ + else + with_lp64=$cf_dft_with_lp64 + fi; +-echo "$as_me:13259: result: $with_lp64" >&5 ++echo "$as_me:13278: result: $with_lp64" >&5 + echo "${ECHO_T}$with_lp64" >&6 + + if test "x$with_lp64" = xyes ; then +@@ -13272,7 +13291,7 @@ + fi; + if test "$enable_largefile" != no; then + +- echo "$as_me:13275: checking for special C compiler options needed for large files" >&5 ++ echo "$as_me:13294: checking for special C compiler options needed for large files" >&5 + echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 + if test "${ac_cv_sys_largefile_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -13284,7 +13303,7 @@ + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13287 "configure" ++#line 13306 "configure" + #include "confdefs.h" + #include + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -13304,16 +13323,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13307: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13326: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13310: \$? = $ac_status" >&5 ++ echo "$as_me:13329: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13313: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13332: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13316: \$? = $ac_status" >&5 ++ echo "$as_me:13335: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -13323,16 +13342,16 @@ + rm -f "conftest.$ac_objext" + CC="$CC -n32" + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13326: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13345: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13329: \$? = $ac_status" >&5 ++ echo "$as_me:13348: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13332: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13351: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13335: \$? = $ac_status" >&5 ++ echo "$as_me:13354: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sys_largefile_CC=' -n32'; break + else +@@ -13346,13 +13365,13 @@ + rm -f "conftest.$ac_ext" + fi + fi +-echo "$as_me:13349: result: $ac_cv_sys_largefile_CC" >&5 ++echo "$as_me:13368: result: $ac_cv_sys_largefile_CC" >&5 + echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 + if test "$ac_cv_sys_largefile_CC" != no; then + CC=$CC$ac_cv_sys_largefile_CC + fi + +- echo "$as_me:13355: checking for _FILE_OFFSET_BITS value needed for large files" >&5 ++ echo "$as_me:13374: checking for _FILE_OFFSET_BITS value needed for large files" >&5 + echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 + if test "${ac_cv_sys_file_offset_bits+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -13360,7 +13379,7 @@ + while :; do + ac_cv_sys_file_offset_bits=no + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13363 "configure" ++#line 13382 "configure" + #include "confdefs.h" + #include + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -13380,16 +13399,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13383: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13402: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13386: \$? = $ac_status" >&5 ++ echo "$as_me:13405: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13389: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13408: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13392: \$? = $ac_status" >&5 ++ echo "$as_me:13411: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -13398,7 +13417,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13401 "configure" ++#line 13420 "configure" + #include "confdefs.h" + #define _FILE_OFFSET_BITS 64 + #include +@@ -13419,16 +13438,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13422: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13441: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13425: \$? = $ac_status" >&5 ++ echo "$as_me:13444: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13428: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13447: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13431: \$? = $ac_status" >&5 ++ echo "$as_me:13450: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sys_file_offset_bits=64; break + else +@@ -13439,7 +13458,7 @@ + break + done + fi +-echo "$as_me:13442: result: $ac_cv_sys_file_offset_bits" >&5 ++echo "$as_me:13461: result: $ac_cv_sys_file_offset_bits" >&5 + echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 + if test "$ac_cv_sys_file_offset_bits" != no; then + +@@ -13449,7 +13468,7 @@ + + fi + rm -rf conftest* +- echo "$as_me:13452: checking for _LARGE_FILES value needed for large files" >&5 ++ echo "$as_me:13471: checking for _LARGE_FILES value needed for large files" >&5 + echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 + if test "${ac_cv_sys_large_files+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -13457,7 +13476,7 @@ + while :; do + ac_cv_sys_large_files=no + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13460 "configure" ++#line 13479 "configure" + #include "confdefs.h" + #include + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -13477,16 +13496,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13480: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13499: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13483: \$? = $ac_status" >&5 ++ echo "$as_me:13502: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13486: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13505: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13489: \$? = $ac_status" >&5 ++ echo "$as_me:13508: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -13495,7 +13514,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13498 "configure" ++#line 13517 "configure" + #include "confdefs.h" + #define _LARGE_FILES 1 + #include +@@ -13516,16 +13535,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13519: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13538: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13522: \$? = $ac_status" >&5 ++ echo "$as_me:13541: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13525: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13544: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13528: \$? = $ac_status" >&5 ++ echo "$as_me:13547: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sys_large_files=1; break + else +@@ -13536,7 +13555,7 @@ + break + done + fi +-echo "$as_me:13539: result: $ac_cv_sys_large_files" >&5 ++echo "$as_me:13558: result: $ac_cv_sys_large_files" >&5 + echo "${ECHO_T}$ac_cv_sys_large_files" >&6 + if test "$ac_cv_sys_large_files" != no; then + +@@ -13549,7 +13568,7 @@ + fi + + if test "$enable_largefile" != no ; then +- echo "$as_me:13552: checking for _LARGEFILE_SOURCE value needed for large files" >&5 ++ echo "$as_me:13571: checking for _LARGEFILE_SOURCE value needed for large files" >&5 + echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6 + if test "${ac_cv_sys_largefile_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -13557,7 +13576,7 @@ + while :; do + ac_cv_sys_largefile_source=no + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13560 "configure" ++#line 13579 "configure" + #include "confdefs.h" + #include + int +@@ -13569,16 +13588,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13572: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13591: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13575: \$? = $ac_status" >&5 ++ echo "$as_me:13594: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13578: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13597: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13581: \$? = $ac_status" >&5 ++ echo "$as_me:13600: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break + else +@@ -13587,7 +13606,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13590 "configure" ++#line 13609 "configure" + #include "confdefs.h" + #define _LARGEFILE_SOURCE 1 + #include +@@ -13600,16 +13619,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13603: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13622: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13606: \$? = $ac_status" >&5 ++ echo "$as_me:13625: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13609: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13628: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13612: \$? = $ac_status" >&5 ++ echo "$as_me:13631: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sys_largefile_source=1; break + else +@@ -13620,7 +13639,7 @@ + break + done + fi +-echo "$as_me:13623: result: $ac_cv_sys_largefile_source" >&5 ++echo "$as_me:13642: result: $ac_cv_sys_largefile_source" >&5 + echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6 + if test "$ac_cv_sys_largefile_source" != no; then + +@@ -13634,13 +13653,13 @@ + # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug + # in glibc 2.1.3, but that breaks too many other things. + # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. +-echo "$as_me:13637: checking for fseeko" >&5 ++echo "$as_me:13656: checking for fseeko" >&5 + echo $ECHO_N "checking for fseeko... $ECHO_C" >&6 + if test "${ac_cv_func_fseeko+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13643 "configure" ++#line 13662 "configure" + #include "confdefs.h" + #include + int +@@ -13652,16 +13671,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:13655: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:13674: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:13658: \$? = $ac_status" >&5 ++ echo "$as_me:13677: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:13661: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13680: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13664: \$? = $ac_status" >&5 ++ echo "$as_me:13683: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_fseeko=yes + else +@@ -13671,7 +13690,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:13674: result: $ac_cv_func_fseeko" >&5 ++echo "$as_me:13693: result: $ac_cv_func_fseeko" >&5 + echo "${ECHO_T}$ac_cv_func_fseeko" >&6 + if test $ac_cv_func_fseeko = yes; then + +@@ -13710,14 +13729,14 @@ + + fi + +- echo "$as_me:13713: checking whether to use struct dirent64" >&5 ++ echo "$as_me:13732: checking whether to use struct dirent64" >&5 + echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6 + if test "${cf_cv_struct_dirent64+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 13720 "configure" ++#line 13739 "configure" + #include "confdefs.h" + + #pragma GCC diagnostic error "-Wincompatible-pointer-types" +@@ -13740,16 +13759,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:13743: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13762: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13746: \$? = $ac_status" >&5 ++ echo "$as_me:13765: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:13749: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13768: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13752: \$? = $ac_status" >&5 ++ echo "$as_me:13771: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_struct_dirent64=yes + else +@@ -13760,7 +13779,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:13763: result: $cf_cv_struct_dirent64" >&5 ++echo "$as_me:13782: result: $cf_cv_struct_dirent64" >&5 + echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 + test "$cf_cv_struct_dirent64" = yes && + cat >>confdefs.h <<\EOF +@@ -13770,7 +13789,7 @@ + fi + + ### use option --disable-tparm-varargs to make tparm() conform to X/Open +-echo "$as_me:13773: checking if you want tparm not to use X/Open fixed-parameter list" >&5 ++echo "$as_me:13792: checking if you want tparm not to use X/Open fixed-parameter list" >&5 + echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6 + + # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given. +@@ -13780,14 +13799,14 @@ + else + with_tparm_varargs=yes + fi; +-echo "$as_me:13783: result: $with_tparm_varargs" >&5 ++echo "$as_me:13802: result: $with_tparm_varargs" >&5 + echo "${ECHO_T}$with_tparm_varargs" >&6 + NCURSES_TPARM_VARARGS=0 + test "x$with_tparm_varargs" = xyes && NCURSES_TPARM_VARARGS=1 + + ### use option --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw + if test "$with_ticlib" != no ; then +-echo "$as_me:13790: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5 ++echo "$as_me:13809: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5 + echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6 + + # Check whether --enable-tic-depends or --disable-tic-depends was given. +@@ -13797,14 +13816,14 @@ + else + with_tic_depends=yes + fi; +-echo "$as_me:13800: result: $with_tic_depends" >&5 ++echo "$as_me:13819: result: $with_tic_depends" >&5 + echo "${ECHO_T}$with_tic_depends" >&6 + else + with_tic_depends=no + fi + + ### use option --enable-wattr-macros to enable wattr* macros in curses.h +-echo "$as_me:13807: checking if you want to enable wattr* macros" >&5 ++echo "$as_me:13826: checking if you want to enable wattr* macros" >&5 + echo $ECHO_N "checking if you want to enable wattr* macros... $ECHO_C" >&6 + + # Check whether --enable-wattr-macros or --disable-wattr-macros was given. +@@ -13816,15 +13835,15 @@ + fi; + if [ "x$with_wattr_macros" != xyes ]; then + NCURSES_WATTR_MACROS=0 +- echo "$as_me:13819: result: no" >&5 ++ echo "$as_me:13838: result: no" >&5 + echo "${ECHO_T}no" >&6 + else + NCURSES_WATTR_MACROS=1 +- echo "$as_me:13823: result: yes" >&5 ++ echo "$as_me:13842: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + fi + +-echo "$as_me:13827: checking for X11 rgb file" >&5 ++echo "$as_me:13846: checking for X11 rgb file" >&5 + echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6 + + # Check whether --with-x11-rgb or --without-x11-rgb was given. +@@ -13888,7 +13907,7 @@ + cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:13891: error: expected a pathname, not \"$cf_path\"" >&5 ++ { { echo "$as_me:13910: error: expected a pathname, not \"$cf_path\"" >&5 + echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -13896,7 +13915,7 @@ + + fi + +-echo "$as_me:13899: result: $RGB_PATH" >&5 ++echo "$as_me:13918: result: $RGB_PATH" >&5 + echo "${ECHO_T}$RGB_PATH" >&6 + + cat >>confdefs.h <&5 ++echo "$as_me:13932: checking for type of bool" >&5 + echo $ECHO_N "checking for type of bool... $ECHO_C" >&6 + + # Check whether --with-bool or --without-bool was given. +@@ -13920,10 +13939,10 @@ + else + NCURSES_BOOL=auto + fi; +-echo "$as_me:13923: result: $NCURSES_BOOL" >&5 ++echo "$as_me:13942: result: $NCURSES_BOOL" >&5 + echo "${ECHO_T}$NCURSES_BOOL" >&6 + +-echo "$as_me:13926: checking for alternate terminal capabilities file" >&5 ++echo "$as_me:13945: checking for alternate terminal capabilities file" >&5 + echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6 + + # Check whether --with-caps or --without-caps was given. +@@ -13934,11 +13953,11 @@ + TERMINFO_CAPS=Caps + fi; + test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps +-echo "$as_me:13937: result: $TERMINFO_CAPS" >&5 ++echo "$as_me:13956: result: $TERMINFO_CAPS" >&5 + echo "${ECHO_T}$TERMINFO_CAPS" >&6 + + ### use option --with-chtype to override chtype's type +-echo "$as_me:13941: checking for type of chtype" >&5 ++echo "$as_me:13960: checking for type of chtype" >&5 + echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 + + # Check whether --with-chtype or --without-chtype was given. +@@ -13948,11 +13967,11 @@ + else + NCURSES_CHTYPE=$cf_dft_chtype + fi; +-echo "$as_me:13951: result: $NCURSES_CHTYPE" >&5 ++echo "$as_me:13970: result: $NCURSES_CHTYPE" >&5 + echo "${ECHO_T}$NCURSES_CHTYPE" >&6 + + ### use option --with-ospeed to override ospeed's type +-echo "$as_me:13955: checking for type of ospeed" >&5 ++echo "$as_me:13974: checking for type of ospeed" >&5 + echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6 + + # Check whether --with-ospeed or --without-ospeed was given. +@@ -13962,11 +13981,11 @@ + else + NCURSES_OSPEED=short + fi; +-echo "$as_me:13965: result: $NCURSES_OSPEED" >&5 ++echo "$as_me:13984: result: $NCURSES_OSPEED" >&5 + echo "${ECHO_T}$NCURSES_OSPEED" >&6 + + ### use option --with-mmask-t to override mmask_t's type +-echo "$as_me:13969: checking for type of mmask_t" >&5 ++echo "$as_me:13988: checking for type of mmask_t" >&5 + echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6 + + # Check whether --with-mmask-t or --without-mmask-t was given. +@@ -13976,11 +13995,11 @@ + else + NCURSES_MMASK_T=$cf_dft_mmask_t + fi; +-echo "$as_me:13979: result: $NCURSES_MMASK_T" >&5 ++echo "$as_me:13998: result: $NCURSES_MMASK_T" >&5 + echo "${ECHO_T}$NCURSES_MMASK_T" >&6 + + ### use option --with-ccharw-max to override CCHARW_MAX size +-echo "$as_me:13983: checking for size CCHARW_MAX" >&5 ++echo "$as_me:14002: checking for size CCHARW_MAX" >&5 + echo $ECHO_N "checking for size CCHARW_MAX... $ECHO_C" >&6 + + # Check whether --with-ccharw-max or --without-ccharw-max was given. +@@ -13990,16 +14009,16 @@ + else + NCURSES_CCHARW_MAX=5 + fi; +-echo "$as_me:13993: result: $NCURSES_CCHARW_MAX" >&5 ++echo "$as_me:14012: result: $NCURSES_CCHARW_MAX" >&5 + echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6 + +-echo "$as_me:13996: checking for ANSI C header files" >&5 ++echo "$as_me:14015: checking for ANSI C header files" >&5 + echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 + if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14002 "configure" ++#line 14021 "configure" + #include "confdefs.h" + #include + #include +@@ -14007,13 +14026,13 @@ + #include + + _ACEOF +-if { (eval echo "$as_me:14010: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:14029: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:14016: \$? = $ac_status" >&5 ++ echo "$as_me:14035: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -14035,7 +14054,7 @@ + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14038 "configure" ++#line 14057 "configure" + #include "confdefs.h" + #include + +@@ -14053,7 +14072,7 @@ + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14056 "configure" ++#line 14075 "configure" + #include "confdefs.h" + #include + +@@ -14074,7 +14093,7 @@ + : + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14077 "configure" ++#line 14096 "configure" + #include "confdefs.h" + #include + #if ((' ' & 0x0FF) == 0x020) +@@ -14100,15 +14119,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:14103: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14122: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14106: \$? = $ac_status" >&5 ++ echo "$as_me:14125: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:14108: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14127: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14111: \$? = $ac_status" >&5 ++ echo "$as_me:14130: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -14121,7 +14140,7 @@ + fi + fi + fi +-echo "$as_me:14124: result: $ac_cv_header_stdc" >&5 ++echo "$as_me:14143: result: $ac_cv_header_stdc" >&5 + echo "${ECHO_T}$ac_cv_header_stdc" >&6 + if test $ac_cv_header_stdc = yes; then + +@@ -14137,28 +14156,28 @@ + inttypes.h stdint.h unistd.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:14140: checking for $ac_header" >&5 ++echo "$as_me:14159: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14146 "configure" ++#line 14165 "configure" + #include "confdefs.h" + $ac_includes_default + #include <$ac_header> + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14152: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14171: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14155: \$? = $ac_status" >&5 ++ echo "$as_me:14174: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14158: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14177: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14161: \$? = $ac_status" >&5 ++ echo "$as_me:14180: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_Header=yes" + else +@@ -14168,7 +14187,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:14171: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:14190: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:14200: checking for signed char" >&5 + echo $ECHO_N "checking for signed char... $ECHO_C" >&6 + if test "${ac_cv_type_signed_char+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14187 "configure" ++#line 14206 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -14199,16 +14218,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14202: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14221: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14205: \$? = $ac_status" >&5 ++ echo "$as_me:14224: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14208: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14227: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14211: \$? = $ac_status" >&5 ++ echo "$as_me:14230: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_signed_char=yes + else +@@ -14218,10 +14237,10 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:14221: result: $ac_cv_type_signed_char" >&5 ++echo "$as_me:14240: result: $ac_cv_type_signed_char" >&5 + echo "${ECHO_T}$ac_cv_type_signed_char" >&6 + +-echo "$as_me:14224: checking size of signed char" >&5 ++echo "$as_me:14243: checking size of signed char" >&5 + echo $ECHO_N "checking size of signed char... $ECHO_C" >&6 + if test "${ac_cv_sizeof_signed_char+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -14230,7 +14249,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14233 "configure" ++#line 14252 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -14242,21 +14261,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14245: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14264: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14248: \$? = $ac_status" >&5 ++ echo "$as_me:14267: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14251: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14270: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14254: \$? = $ac_status" >&5 ++ echo "$as_me:14273: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14259 "configure" ++#line 14278 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -14268,16 +14287,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14271: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14290: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14274: \$? = $ac_status" >&5 ++ echo "$as_me:14293: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14277: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14296: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14280: \$? = $ac_status" >&5 ++ echo "$as_me:14299: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid; break + else +@@ -14293,7 +14312,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14296 "configure" ++#line 14315 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -14305,16 +14324,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14308: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14327: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14311: \$? = $ac_status" >&5 ++ echo "$as_me:14330: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14314: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14333: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14317: \$? = $ac_status" >&5 ++ echo "$as_me:14336: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=$ac_mid; break + else +@@ -14330,7 +14349,7 @@ + while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14333 "configure" ++#line 14352 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -14342,16 +14361,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:14345: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14364: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14348: \$? = $ac_status" >&5 ++ echo "$as_me:14367: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:14351: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14370: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14354: \$? = $ac_status" >&5 ++ echo "$as_me:14373: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid + else +@@ -14364,12 +14383,12 @@ + ac_cv_sizeof_signed_char=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:14367: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:14386: error: cannot run test program while cross compiling" >&5 + echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 14372 "configure" ++#line 14391 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -14385,15 +14404,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:14388: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14407: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14391: \$? = $ac_status" >&5 ++ echo "$as_me:14410: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:14393: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14412: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14396: \$? = $ac_status" >&5 ++ echo "$as_me:14415: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sizeof_signed_char=`cat conftest.val` + else +@@ -14409,7 +14428,7 @@ + ac_cv_sizeof_signed_char=0 + fi + fi +-echo "$as_me:14412: result: $ac_cv_sizeof_signed_char" >&5 ++echo "$as_me:14431: result: $ac_cv_sizeof_signed_char" >&5 + echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 + cat >>confdefs.h <&5 ++echo "$as_me:14442: checking if you want to use signed Boolean array in term.h" >&5 + echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6 + + # Check whether --enable-signed-char or --disable-signed-char was given. +@@ -14430,12 +14449,12 @@ + else + with_signed_char=no + fi; +-echo "$as_me:14433: result: $with_signed_char" >&5 ++echo "$as_me:14452: result: $with_signed_char" >&5 + echo "${ECHO_T}$with_signed_char" >&6 + test "x$with_signed_char" != xyes && NCURSES_SBOOL="char" + + ### use option --with-tparm-arg to override tparm's argument type +-echo "$as_me:14438: checking for type of tparm args" >&5 ++echo "$as_me:14457: checking for type of tparm args" >&5 + echo $ECHO_N "checking for type of tparm args... $ECHO_C" >&6 + + # Check whether --with-tparm-arg or --without-tparm-arg was given. +@@ -14445,11 +14464,11 @@ + else + NCURSES_TPARM_ARG=$cf_dft_tparm_arg + fi; +-echo "$as_me:14448: result: $NCURSES_TPARM_ARG" >&5 ++echo "$as_me:14467: result: $NCURSES_TPARM_ARG" >&5 + echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6 + + ### Enable compiling-in rcs id's +-echo "$as_me:14452: checking if RCS identifiers should be compiled-in" >&5 ++echo "$as_me:14471: checking if RCS identifiers should be compiled-in" >&5 + echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6 + + # Check whether --with-rcs-ids or --without-rcs-ids was given. +@@ -14459,7 +14478,7 @@ + else + with_rcs_ids=no + fi; +-echo "$as_me:14462: result: $with_rcs_ids" >&5 ++echo "$as_me:14481: result: $with_rcs_ids" >&5 + echo "${ECHO_T}$with_rcs_ids" >&6 + test "x$with_rcs_ids" = xyes && + cat >>confdefs.h <<\EOF +@@ -14468,7 +14487,7 @@ + + ############################################################################### + +-echo "$as_me:14471: checking format of man-pages" >&5 ++echo "$as_me:14490: checking format of man-pages" >&5 + echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6 + + # Check whether --with-manpage-format or --without-manpage-format was given. +@@ -14557,14 +14576,14 @@ + ;; + esac + +-echo "$as_me:14560: result: $MANPAGE_FORMAT" >&5 ++echo "$as_me:14579: result: $MANPAGE_FORMAT" >&5 + echo "${ECHO_T}$MANPAGE_FORMAT" >&6 + if test -n "$cf_unknown" ; then +- { echo "$as_me:14563: WARNING: Unexpected manpage-format $cf_unknown" >&5 ++ { echo "$as_me:14582: WARNING: Unexpected manpage-format $cf_unknown" >&5 + echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;} + fi + +-echo "$as_me:14567: checking for manpage renaming" >&5 ++echo "$as_me:14586: checking for manpage renaming" >&5 + echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6 + + # Check whether --with-manpage-renames or --without-manpage-renames was given. +@@ -14592,7 +14611,7 @@ + if test -f "$srcdir/man/$MANPAGE_RENAMES" ; then + MANPAGE_RENAMES=`cd "$srcdir/man" && pwd`/$MANPAGE_RENAMES + elif test ! -f "$MANPAGE_RENAMES" ; then +- { { echo "$as_me:14595: error: not a filename: $MANPAGE_RENAMES" >&5 ++ { { echo "$as_me:14614: error: not a filename: $MANPAGE_RENAMES" >&5 + echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -14606,10 +14625,10 @@ + fi + fi + +-echo "$as_me:14609: result: $MANPAGE_RENAMES" >&5 ++echo "$as_me:14628: result: $MANPAGE_RENAMES" >&5 + echo "${ECHO_T}$MANPAGE_RENAMES" >&6 + +-echo "$as_me:14612: checking if manpage aliases will be installed" >&5 ++echo "$as_me:14631: checking if manpage aliases will be installed" >&5 + echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6 + + # Check whether --with-manpage-aliases or --without-manpage-aliases was given. +@@ -14620,7 +14639,7 @@ + MANPAGE_ALIASES=yes + fi; + +-echo "$as_me:14623: result: $MANPAGE_ALIASES" >&5 ++echo "$as_me:14642: result: $MANPAGE_ALIASES" >&5 + echo "${ECHO_T}$MANPAGE_ALIASES" >&6 + + case "x$LN_S" in +@@ -14634,7 +14653,7 @@ + + MANPAGE_SYMLINKS=no + if test "$MANPAGE_ALIASES" = yes ; then +-echo "$as_me:14637: checking if manpage symlinks should be used" >&5 ++echo "$as_me:14656: checking if manpage symlinks should be used" >&5 + echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6 + + # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given. +@@ -14647,17 +14666,17 @@ + + if test "$$cf_use_symlinks" = no; then + if test "$MANPAGE_SYMLINKS" = yes ; then +- { echo "$as_me:14650: WARNING: cannot make symlinks" >&5 ++ { echo "$as_me:14669: WARNING: cannot make symlinks" >&5 + echo "$as_me: WARNING: cannot make symlinks" >&2;} + MANPAGE_SYMLINKS=no + fi + fi + +-echo "$as_me:14656: result: $MANPAGE_SYMLINKS" >&5 ++echo "$as_me:14675: result: $MANPAGE_SYMLINKS" >&5 + echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6 + fi + +-echo "$as_me:14660: checking for manpage tbl" >&5 ++echo "$as_me:14679: checking for manpage tbl" >&5 + echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6 + + # Check whether --with-manpage-tbl or --without-manpage-tbl was given. +@@ -14668,7 +14687,7 @@ + MANPAGE_TBL=no + fi; + +-echo "$as_me:14671: result: $MANPAGE_TBL" >&5 ++echo "$as_me:14690: result: $MANPAGE_TBL" >&5 + echo "${ECHO_T}$MANPAGE_TBL" >&6 + + if test "$prefix" = "NONE" ; then +@@ -15001,7 +15020,7 @@ + ############################################################################### + + ### Note that some functions (such as const) are normally disabled anyway. +-echo "$as_me:15004: checking if you want to build with function extensions" >&5 ++echo "$as_me:15023: checking if you want to build with function extensions" >&5 + echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6 + + # Check whether --enable-ext-funcs or --disable-ext-funcs was given. +@@ -15011,7 +15030,7 @@ + else + with_ext_funcs=yes + fi; +-echo "$as_me:15014: result: $with_ext_funcs" >&5 ++echo "$as_me:15033: result: $with_ext_funcs" >&5 + echo "${ECHO_T}$with_ext_funcs" >&6 + if test "x$with_ext_funcs" = xyes ; then + NCURSES_EXT_FUNCS=1 +@@ -15071,7 +15090,7 @@ + GENERATED_EXT_FUNCS= + fi + +-echo "$as_me:15074: checking if you want to build with SCREEN extensions" >&5 ++echo "$as_me:15093: checking if you want to build with SCREEN extensions" >&5 + echo $ECHO_N "checking if you want to build with SCREEN extensions... $ECHO_C" >&6 + + # Check whether --enable-sp-funcs or --disable-sp-funcs was given. +@@ -15081,7 +15100,7 @@ + else + with_sp_funcs=$cf_dft_ext_spfuncs + fi; +-echo "$as_me:15084: result: $with_sp_funcs" >&5 ++echo "$as_me:15103: result: $with_sp_funcs" >&5 + echo "${ECHO_T}$with_sp_funcs" >&6 + if test "x$with_sp_funcs" = xyes ; then + NCURSES_SP_FUNCS=1 +@@ -15100,7 +15119,7 @@ + GENERATED_SP_FUNCS= + fi + +-echo "$as_me:15103: checking if you want to build with terminal-driver" >&5 ++echo "$as_me:15122: checking if you want to build with terminal-driver" >&5 + echo $ECHO_N "checking if you want to build with terminal-driver... $ECHO_C" >&6 + + # Check whether --enable-term-driver or --disable-term-driver was given. +@@ -15110,7 +15129,7 @@ + else + with_term_driver=no + fi; +-echo "$as_me:15113: result: $with_term_driver" >&5 ++echo "$as_me:15132: result: $with_term_driver" >&5 + echo "${ECHO_T}$with_term_driver" >&6 + if test "x$with_term_driver" = xyes ; then + +@@ -15119,19 +15138,19 @@ + EOF + + if test "x$with_termlib" != xno ; then +- { { echo "$as_me:15122: error: The term-driver option conflicts with the termlib option" >&5 ++ { { echo "$as_me:15141: error: The term-driver option conflicts with the termlib option" >&5 + echo "$as_me: error: The term-driver option conflicts with the termlib option" >&2;} + { (exit 1); exit 1; }; } + fi + if test "x$with_sp_funcs" != xyes ; then +- { { echo "$as_me:15127: error: The term-driver option relies upon sp-funcs" >&5 ++ { { echo "$as_me:15146: error: The term-driver option relies upon sp-funcs" >&5 + echo "$as_me: error: The term-driver option relies upon sp-funcs" >&2;} + { (exit 1); exit 1; }; } + fi + fi + + ### use option --enable-const to turn on use of const beyond that in XSI. +-echo "$as_me:15134: checking for extended use of const keyword" >&5 ++echo "$as_me:15153: checking for extended use of const keyword" >&5 + echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6 + + # Check whether --enable-const or --disable-const was given. +@@ -15141,7 +15160,7 @@ + else + with_ext_const=$cf_dft_ext_const + fi; +-echo "$as_me:15144: result: $with_ext_const" >&5 ++echo "$as_me:15163: result: $with_ext_const" >&5 + echo "${ECHO_T}$with_ext_const" >&6 + NCURSES_CONST='/*nothing*/' + if test "x$with_ext_const" = xyes ; then +@@ -15149,7 +15168,7 @@ + fi + + ### use option --enable-ext-colors to turn on use of colors beyond 16. +-echo "$as_me:15152: checking if you want to use extended colors" >&5 ++echo "$as_me:15171: checking if you want to use extended colors" >&5 + echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6 + + # Check whether --enable-ext-colors or --disable-ext-colors was given. +@@ -15159,12 +15178,12 @@ + else + with_ext_colors=$cf_dft_ext_colors + fi; +-echo "$as_me:15162: result: $with_ext_colors" >&5 ++echo "$as_me:15181: result: $with_ext_colors" >&5 + echo "${ECHO_T}$with_ext_colors" >&6 + NCURSES_EXT_COLORS=0 + if test "x$with_ext_colors" = xyes ; then + if test "x$with_widec" != xyes ; then +- { echo "$as_me:15167: WARNING: This option applies only to wide-character library" >&5 ++ { echo "$as_me:15186: WARNING: This option applies only to wide-character library" >&5 + echo "$as_me: WARNING: This option applies only to wide-character library" >&2;} + else + # cannot be ABI 5 since it changes sizeof(cchar_t) +@@ -15174,7 +15193,7 @@ + (5.*) + cf_cv_rel_version=6.0 + cf_cv_abi_version=6 +- { echo "$as_me:15177: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 ++ { echo "$as_me:15196: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 + echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;} + ;; + esac +@@ -15202,7 +15221,7 @@ + fi + + ### use option --enable-ext-mouse to modify coding to support 5-button mice +-echo "$as_me:15205: checking if you want to use extended mouse encoding" >&5 ++echo "$as_me:15224: checking if you want to use extended mouse encoding" >&5 + echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6 + + # Check whether --enable-ext-mouse or --disable-ext-mouse was given. +@@ -15212,7 +15231,7 @@ + else + with_ext_mouse=$cf_dft_ext_mouse + fi; +-echo "$as_me:15215: result: $with_ext_mouse" >&5 ++echo "$as_me:15234: result: $with_ext_mouse" >&5 + echo "${ECHO_T}$with_ext_mouse" >&6 + NCURSES_MOUSE_VERSION=1 + if test "x$with_ext_mouse" = xyes ; then +@@ -15223,7 +15242,7 @@ + (5.*) + cf_cv_rel_version=6.0 + cf_cv_abi_version=6 +- { echo "$as_me:15226: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 ++ { echo "$as_me:15245: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 + echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;} + ;; + esac +@@ -15232,7 +15251,7 @@ + fi + + ### use option --enable-ext-putwin to turn on extended screendumps +-echo "$as_me:15235: checking if you want to use extended putwin/screendump" >&5 ++echo "$as_me:15254: checking if you want to use extended putwin/screendump" >&5 + echo $ECHO_N "checking if you want to use extended putwin/screendump... $ECHO_C" >&6 + + # Check whether --enable-ext-putwin or --disable-ext-putwin was given. +@@ -15242,7 +15261,7 @@ + else + with_ext_putwin=$cf_dft_ext_putwin + fi; +-echo "$as_me:15245: result: $with_ext_putwin" >&5 ++echo "$as_me:15264: result: $with_ext_putwin" >&5 + echo "${ECHO_T}$with_ext_putwin" >&6 + if test "x$with_ext_putwin" = xyes ; then + +@@ -15252,7 +15271,7 @@ + + fi + +-echo "$as_me:15255: checking if you want \$NCURSES_NO_PADDING code" >&5 ++echo "$as_me:15274: checking if you want \$NCURSES_NO_PADDING code" >&5 + echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6 + + # Check whether --enable-no-padding or --disable-no-padding was given. +@@ -15262,7 +15281,7 @@ + else + with_no_padding=$with_ext_funcs + fi; +-echo "$as_me:15265: result: $with_no_padding" >&5 ++echo "$as_me:15284: result: $with_no_padding" >&5 + echo "${ECHO_T}$with_no_padding" >&6 + test "x$with_no_padding" = xyes && + cat >>confdefs.h <<\EOF +@@ -15270,7 +15289,7 @@ + EOF + + ### use option --enable-sigwinch to turn on use of SIGWINCH logic +-echo "$as_me:15273: checking if you want SIGWINCH handler" >&5 ++echo "$as_me:15292: checking if you want SIGWINCH handler" >&5 + echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6 + + # Check whether --enable-sigwinch or --disable-sigwinch was given. +@@ -15280,7 +15299,7 @@ + else + with_sigwinch=$with_ext_funcs + fi; +-echo "$as_me:15283: result: $with_sigwinch" >&5 ++echo "$as_me:15302: result: $with_sigwinch" >&5 + echo "${ECHO_T}$with_sigwinch" >&6 + test "x$with_sigwinch" = xyes && + cat >>confdefs.h <<\EOF +@@ -15288,7 +15307,7 @@ + EOF + + ### use option --enable-tcap-names to allow user to define new capabilities +-echo "$as_me:15291: checking if you want user-definable terminal capabilities like termcap" >&5 ++echo "$as_me:15310: checking if you want user-definable terminal capabilities like termcap" >&5 + echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6 + + # Check whether --enable-tcap-names or --disable-tcap-names was given. +@@ -15298,14 +15317,14 @@ + else + with_tcap_names=$with_ext_funcs + fi; +-echo "$as_me:15301: result: $with_tcap_names" >&5 ++echo "$as_me:15320: result: $with_tcap_names" >&5 + echo "${ECHO_T}$with_tcap_names" >&6 + NCURSES_XNAMES=0 + test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1 + + ############################################################################## + +-echo "$as_me:15308: checking if you want to link with the pthread library" >&5 ++echo "$as_me:15327: checking if you want to link with the pthread library" >&5 + echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6 + + # Check whether --with-pthread or --without-pthread was given. +@@ -15315,27 +15334,27 @@ + else + with_pthread=no + fi; +-echo "$as_me:15318: result: $with_pthread" >&5 ++echo "$as_me:15337: result: $with_pthread" >&5 + echo "${ECHO_T}$with_pthread" >&6 + + if test "$with_pthread" != no ; then +- echo "$as_me:15322: checking for pthread.h" >&5 ++ echo "$as_me:15341: checking for pthread.h" >&5 + echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 + if test "${ac_cv_header_pthread_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 15328 "configure" ++#line 15347 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:15332: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:15351: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:15338: \$? = $ac_status" >&5 ++ echo "$as_me:15357: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -15354,7 +15373,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:15357: result: $ac_cv_header_pthread_h" >&5 ++echo "$as_me:15376: result: $ac_cv_header_pthread_h" >&5 + echo "${ECHO_T}$ac_cv_header_pthread_h" >&6 + if test "$ac_cv_header_pthread_h" = yes; then + +@@ -15364,7 +15383,7 @@ + + for cf_lib_pthread in pthread c_r + do +- echo "$as_me:15367: checking if we can link with the $cf_lib_pthread library" >&5 ++ echo "$as_me:15386: checking if we can link with the $cf_lib_pthread library" >&5 + echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6 + cf_save_LIBS="$LIBS" + +@@ -15385,7 +15404,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 15388 "configure" ++#line 15407 "configure" + #include "confdefs.h" + + #include +@@ -15402,16 +15421,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:15405: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15424: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15408: \$? = $ac_status" >&5 ++ echo "$as_me:15427: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:15411: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15430: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15414: \$? = $ac_status" >&5 ++ echo "$as_me:15433: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + with_pthread=yes + else +@@ -15421,7 +15440,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS="$cf_save_LIBS" +- echo "$as_me:15424: result: $with_pthread" >&5 ++ echo "$as_me:15443: result: $with_pthread" >&5 + echo "${ECHO_T}$with_pthread" >&6 + test "$with_pthread" = yes && break + done +@@ -15449,7 +15468,7 @@ + EOF + + else +- { { echo "$as_me:15452: error: Cannot link with pthread library" >&5 ++ { { echo "$as_me:15471: error: Cannot link with pthread library" >&5 + echo "$as_me: error: Cannot link with pthread library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -15459,13 +15478,13 @@ + fi + + if test "x$with_pthread" != xno; then +- echo "$as_me:15462: checking for pthread_kill" >&5 ++ echo "$as_me:15481: checking for pthread_kill" >&5 + echo $ECHO_N "checking for pthread_kill... $ECHO_C" >&6 + if test "${ac_cv_func_pthread_kill+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 15468 "configure" ++#line 15487 "configure" + #include "confdefs.h" + #define pthread_kill autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -15496,16 +15515,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:15499: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15518: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15502: \$? = $ac_status" >&5 ++ echo "$as_me:15521: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:15505: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15524: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15508: \$? = $ac_status" >&5 ++ echo "$as_me:15527: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_pthread_kill=yes + else +@@ -15515,11 +15534,11 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:15518: result: $ac_cv_func_pthread_kill" >&5 ++echo "$as_me:15537: result: $ac_cv_func_pthread_kill" >&5 + echo "${ECHO_T}$ac_cv_func_pthread_kill" >&6 + if test "$ac_cv_func_pthread_kill" = yes; then + +- echo "$as_me:15522: checking if you want to allow EINTR in wgetch with pthreads" >&5 ++ echo "$as_me:15541: checking if you want to allow EINTR in wgetch with pthreads" >&5 + echo $ECHO_N "checking if you want to allow EINTR in wgetch with pthreads... $ECHO_C" >&6 + + # Check whether --enable-pthreads-eintr or --disable-pthreads-eintr was given. +@@ -15529,7 +15548,7 @@ + else + use_pthreads_eintr=no + fi; +- echo "$as_me:15532: result: $use_pthreads_eintr" >&5 ++ echo "$as_me:15551: result: $use_pthreads_eintr" >&5 + echo "${ECHO_T}$use_pthreads_eintr" >&6 + if test "x$use_pthreads_eintr" = xyes ; then + +@@ -15540,7 +15559,7 @@ + fi + fi + +- echo "$as_me:15543: checking if you want to use weak-symbols for pthreads" >&5 ++ echo "$as_me:15562: checking if you want to use weak-symbols for pthreads" >&5 + echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6 + + # Check whether --enable-weak-symbols or --disable-weak-symbols was given. +@@ -15550,18 +15569,18 @@ + else + use_weak_symbols=no + fi; +- echo "$as_me:15553: result: $use_weak_symbols" >&5 ++ echo "$as_me:15572: result: $use_weak_symbols" >&5 + echo "${ECHO_T}$use_weak_symbols" >&6 + if test "x$use_weak_symbols" = xyes ; then + +-echo "$as_me:15557: checking if $CC supports weak symbols" >&5 ++echo "$as_me:15576: checking if $CC supports weak symbols" >&5 + echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6 + if test "${cf_cv_weak_symbols+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 15564 "configure" ++#line 15583 "configure" + #include "confdefs.h" + + #include +@@ -15587,16 +15606,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:15590: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15609: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15593: \$? = $ac_status" >&5 ++ echo "$as_me:15612: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:15596: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15615: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15599: \$? = $ac_status" >&5 ++ echo "$as_me:15618: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_weak_symbols=yes + else +@@ -15607,7 +15626,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:15610: result: $cf_cv_weak_symbols" >&5 ++echo "$as_me:15629: result: $cf_cv_weak_symbols" >&5 + echo "${ECHO_T}$cf_cv_weak_symbols" >&6 + + else +@@ -15657,7 +15676,7 @@ + # opaque outside of that, so there is no --enable-opaque option. We can use + # this option without --with-pthreads, but this will be always set for + # pthreads. +-echo "$as_me:15660: checking if you want reentrant code" >&5 ++echo "$as_me:15679: checking if you want reentrant code" >&5 + echo $ECHO_N "checking if you want reentrant code... $ECHO_C" >&6 + + # Check whether --enable-reentrant or --disable-reentrant was given. +@@ -15667,7 +15686,7 @@ + else + with_reentrant=no + fi; +-echo "$as_me:15670: result: $with_reentrant" >&5 ++echo "$as_me:15689: result: $with_reentrant" >&5 + echo "${ECHO_T}$with_reentrant" >&6 + if test "x$with_reentrant" = xyes ; then + cf_cv_enable_reentrant=1 +@@ -15755,7 +15774,7 @@ + (5.*) + cf_cv_rel_version=6.0 + cf_cv_abi_version=6 +- { echo "$as_me:15758: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 ++ { echo "$as_me:15777: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 + echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;} + ;; + esac +@@ -15767,7 +15786,7 @@ + NCURSES_SIZE_T=short + fi + +-echo "$as_me:15770: checking if you want opaque curses-library structures" >&5 ++echo "$as_me:15789: checking if you want opaque curses-library structures" >&5 + echo $ECHO_N "checking if you want opaque curses-library structures... $ECHO_C" >&6 + + # Check whether --enable-opaque-curses or --disable-opaque-curses was given. +@@ -15789,16 +15808,16 @@ + test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=no + + fi; +-echo "$as_me:15792: result: $enable_opaque_curses" >&5 ++echo "$as_me:15811: result: $enable_opaque_curses" >&5 + echo "${ECHO_T}$enable_opaque_curses" >&6 + + test "$cf_cv_enable_reentrant" = 1 && \ + test "$enable_opaque_curses" = no && \ +-{ { echo "$as_me:15797: error: reentrant configuration requires opaque library" >&5 ++{ { echo "$as_me:15816: error: reentrant configuration requires opaque library" >&5 + echo "$as_me: error: reentrant configuration requires opaque library" >&2;} + { (exit 1); exit 1; }; } + +-echo "$as_me:15801: checking if you want opaque form-library structures" >&5 ++echo "$as_me:15820: checking if you want opaque form-library structures" >&5 + echo $ECHO_N "checking if you want opaque form-library structures... $ECHO_C" >&6 + + # Check whether --enable-opaque-form or --disable-opaque-form was given. +@@ -15808,10 +15827,10 @@ + else + enable_opaque_form=no + fi; +-echo "$as_me:15811: result: $enable_opaque_form" >&5 ++echo "$as_me:15830: result: $enable_opaque_form" >&5 + echo "${ECHO_T}$enable_opaque_form" >&6 + +-echo "$as_me:15814: checking if you want opaque menu-library structures" >&5 ++echo "$as_me:15833: checking if you want opaque menu-library structures" >&5 + echo $ECHO_N "checking if you want opaque menu-library structures... $ECHO_C" >&6 + + # Check whether --enable-opaque-menu or --disable-opaque-menu was given. +@@ -15821,10 +15840,10 @@ + else + enable_opaque_menu=no + fi; +-echo "$as_me:15824: result: $enable_opaque_menu" >&5 ++echo "$as_me:15843: result: $enable_opaque_menu" >&5 + echo "${ECHO_T}$enable_opaque_menu" >&6 + +-echo "$as_me:15827: checking if you want opaque panel-library structures" >&5 ++echo "$as_me:15846: checking if you want opaque panel-library structures" >&5 + echo $ECHO_N "checking if you want opaque panel-library structures... $ECHO_C" >&6 + + # Check whether --enable-opaque-panel or --disable-opaque-panel was given. +@@ -15834,7 +15853,7 @@ + else + enable_opaque_panel=no + fi; +-echo "$as_me:15837: result: $enable_opaque_panel" >&5 ++echo "$as_me:15856: result: $enable_opaque_panel" >&5 + echo "${ECHO_T}$enable_opaque_panel" >&6 + + NCURSES_OPAQUE=0; test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1 +@@ -15844,7 +15863,7 @@ + + ### Allow using a different wrap-prefix + if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then +- echo "$as_me:15847: checking for prefix used to wrap public variables" >&5 ++ echo "$as_me:15866: checking for prefix used to wrap public variables" >&5 + echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6 + + # Check whether --with-wrap-prefix or --without-wrap-prefix was given. +@@ -15854,7 +15873,7 @@ + else + NCURSES_WRAP_PREFIX=_nc_ + fi; +- echo "$as_me:15857: result: $NCURSES_WRAP_PREFIX" >&5 ++ echo "$as_me:15876: result: $NCURSES_WRAP_PREFIX" >&5 + echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 + else + NCURSES_WRAP_PREFIX=_nc_ +@@ -15867,7 +15886,7 @@ + ############################################################################### + # These options are relatively safe to experiment with. + +-echo "$as_me:15870: checking if you want all development code" >&5 ++echo "$as_me:15889: checking if you want all development code" >&5 + echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6 + + # Check whether --with-develop or --without-develop was given. +@@ -15877,11 +15896,11 @@ + else + with_develop=no + fi; +-echo "$as_me:15880: result: $with_develop" >&5 ++echo "$as_me:15899: result: $with_develop" >&5 + echo "${ECHO_T}$with_develop" >&6 + + ### use option --enable-hard-tabs to turn on use of hard-tabs optimize +-echo "$as_me:15884: checking if you want hard-tabs code" >&5 ++echo "$as_me:15903: checking if you want hard-tabs code" >&5 + echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6 + + # Check whether --enable-hard-tabs or --disable-hard-tabs was given. +@@ -15891,7 +15910,7 @@ + else + enable_hard_tabs=$with_develop + fi; +-echo "$as_me:15894: result: $enable_hard_tabs" >&5 ++echo "$as_me:15913: result: $enable_hard_tabs" >&5 + echo "${ECHO_T}$enable_hard_tabs" >&6 + test "x$enable_hard_tabs" = xyes && + cat >>confdefs.h <<\EOF +@@ -15899,7 +15918,7 @@ + EOF + + ### use option --enable-xmc-glitch to turn on use of magic-cookie optimize +-echo "$as_me:15902: checking if you want limited support for xmc" >&5 ++echo "$as_me:15921: checking if you want limited support for xmc" >&5 + echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6 + + # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given. +@@ -15909,7 +15928,7 @@ + else + enable_xmc_glitch=$with_develop + fi; +-echo "$as_me:15912: result: $enable_xmc_glitch" >&5 ++echo "$as_me:15931: result: $enable_xmc_glitch" >&5 + echo "${ECHO_T}$enable_xmc_glitch" >&6 + test "x$enable_xmc_glitch" = xyes && + cat >>confdefs.h <<\EOF +@@ -15919,7 +15938,7 @@ + ############################################################################### + # These are just experimental, probably should not be in a package: + +-echo "$as_me:15922: checking if you do not want to assume colors are white-on-black" >&5 ++echo "$as_me:15941: checking if you do not want to assume colors are white-on-black" >&5 + echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6 + + # Check whether --enable-assumed-color or --disable-assumed-color was given. +@@ -15929,7 +15948,7 @@ + else + with_assumed_color=yes + fi; +-echo "$as_me:15932: result: $with_assumed_color" >&5 ++echo "$as_me:15951: result: $with_assumed_color" >&5 + echo "${ECHO_T}$with_assumed_color" >&6 + test "x$with_assumed_color" = xyes && + cat >>confdefs.h <<\EOF +@@ -15937,7 +15956,7 @@ + EOF + + ### use option --enable-hashmap to turn on use of hashmap scrolling logic +-echo "$as_me:15940: checking if you want hashmap scrolling-optimization code" >&5 ++echo "$as_me:15959: checking if you want hashmap scrolling-optimization code" >&5 + echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6 + + # Check whether --enable-hashmap or --disable-hashmap was given. +@@ -15947,7 +15966,7 @@ + else + with_hashmap=yes + fi; +-echo "$as_me:15950: result: $with_hashmap" >&5 ++echo "$as_me:15969: result: $with_hashmap" >&5 + echo "${ECHO_T}$with_hashmap" >&6 + test "x$with_hashmap" = xyes && + cat >>confdefs.h <<\EOF +@@ -15955,7 +15974,7 @@ + EOF + + ### use option --enable-colorfgbg to turn on use of $COLORFGBG environment +-echo "$as_me:15958: checking if you want colorfgbg code" >&5 ++echo "$as_me:15977: checking if you want colorfgbg code" >&5 + echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6 + + # Check whether --enable-colorfgbg or --disable-colorfgbg was given. +@@ -15965,7 +15984,7 @@ + else + with_colorfgbg=no + fi; +-echo "$as_me:15968: result: $with_colorfgbg" >&5 ++echo "$as_me:15987: result: $with_colorfgbg" >&5 + echo "${ECHO_T}$with_colorfgbg" >&6 + test "x$with_colorfgbg" = xyes && + cat >>confdefs.h <<\EOF +@@ -15973,7 +15992,7 @@ + EOF + + ### use option --enable-fvisibility to turn on use of gcc-specific feature +-echo "$as_me:15976: checking if you want to use gcc -fvisibility option" >&5 ++echo "$as_me:15995: checking if you want to use gcc -fvisibility option" >&5 + echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6 + + # Check whether --enable-fvisibility or --disable-fvisibility was given. +@@ -15983,14 +16002,14 @@ + else + cf_with_fvisibility=no + fi; +-echo "$as_me:15986: result: $cf_with_fvisibility" >&5 ++echo "$as_me:16005: result: $cf_with_fvisibility" >&5 + echo "${ECHO_T}$cf_with_fvisibility" >&6 + + NCURSES_IMPEXP= + NCURSES_CXX_IMPEXP= + if test "x$cf_with_fvisibility" = xyes; then + +-echo "$as_me:15993: checking if $CC -fvisibility=hidden option works" >&5 ++echo "$as_me:16012: checking if $CC -fvisibility=hidden option works" >&5 + echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6 + if test "${cf_cv_fvisibility_hidden+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -15999,7 +16018,7 @@ + cf_save_cflags="$CFLAGS" + CFLAGS="$CFLAGS -fvisibility=hidden" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16002 "configure" ++#line 16021 "configure" + #include "confdefs.h" + + __attribute__ ((visibility("default"))) int somefunc() {return 42;} +@@ -16015,16 +16034,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:16018: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16037: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16021: \$? = $ac_status" >&5 ++ echo "$as_me:16040: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:16024: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16043: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16027: \$? = $ac_status" >&5 ++ echo "$as_me:16046: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_fvisibility_hidden=yes + else +@@ -16036,7 +16055,7 @@ + CFLAGS=$cf_save_cflags + + fi +-echo "$as_me:16039: result: $cf_cv_fvisibility_hidden" >&5 ++echo "$as_me:16058: result: $cf_cv_fvisibility_hidden" >&5 + echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6 + + if test "x$cf_cv_fvisibility_hidden" = xyes +@@ -16151,7 +16170,7 @@ + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + ac_main_return="return" + +-echo "$as_me:16154: checking if $CXX -fvisibility=hidden option works" >&5 ++echo "$as_me:16173: checking if $CXX -fvisibility=hidden option works" >&5 + echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6 + if test "${cf_cv_fvisibility_hidden2+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -16160,7 +16179,7 @@ + cf_save_cflags="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -fvisibility=hidden" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16163 "configure" ++#line 16182 "configure" + #include "confdefs.h" + + __attribute__ ((visibility("default"))) int somefunc() {return 42;} +@@ -16176,16 +16195,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:16179: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16198: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16182: \$? = $ac_status" >&5 ++ echo "$as_me:16201: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:16185: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16204: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16188: \$? = $ac_status" >&5 ++ echo "$as_me:16207: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_fvisibility_hidden2=yes + else +@@ -16197,7 +16216,7 @@ + CXXFLAGS=$cf_save_cflags + + fi +-echo "$as_me:16200: result: $cf_cv_fvisibility_hidden2" >&5 ++echo "$as_me:16219: result: $cf_cv_fvisibility_hidden2" >&5 + echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6 + + if test "x$cf_cv_fvisibility_hidden2" = xyes +@@ -16320,7 +16339,7 @@ + fi + + ### use option --enable-interop to turn on use of bindings used for interop +-echo "$as_me:16323: checking if you want interop bindings" >&5 ++echo "$as_me:16342: checking if you want interop bindings" >&5 + echo $ECHO_N "checking if you want interop bindings... $ECHO_C" >&6 + + # Check whether --enable-interop or --disable-interop was given. +@@ -16330,13 +16349,13 @@ + else + with_exp_interop=$cf_dft_interop + fi; +-echo "$as_me:16333: result: $with_exp_interop" >&5 ++echo "$as_me:16352: result: $with_exp_interop" >&5 + echo "${ECHO_T}$with_exp_interop" >&6 + + NCURSES_INTEROP_FUNCS=0 + test "x$with_exp_interop" = xyes && NCURSES_INTEROP_FUNCS=1 + +-echo "$as_me:16339: checking if you want experimental safe-sprintf code" >&5 ++echo "$as_me:16358: checking if you want experimental safe-sprintf code" >&5 + echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6 + + # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given. +@@ -16346,13 +16365,13 @@ + else + with_safe_sprintf=no + fi; +-echo "$as_me:16349: result: $with_safe_sprintf" >&5 ++echo "$as_me:16368: result: $with_safe_sprintf" >&5 + echo "${ECHO_T}$with_safe_sprintf" >&6 + + ### use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic + # when hashmap is used scroll hints are useless + if test "$with_hashmap" = no ; then +-echo "$as_me:16355: checking if you want to experiment without scrolling-hints code" >&5 ++echo "$as_me:16374: checking if you want to experiment without scrolling-hints code" >&5 + echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6 + + # Check whether --enable-scroll-hints or --disable-scroll-hints was given. +@@ -16362,7 +16381,7 @@ + else + with_scroll_hints=yes + fi; +-echo "$as_me:16365: result: $with_scroll_hints" >&5 ++echo "$as_me:16384: result: $with_scroll_hints" >&5 + echo "${ECHO_T}$with_scroll_hints" >&6 + test "x$with_scroll_hints" = xyes && + cat >>confdefs.h <<\EOF +@@ -16371,7 +16390,7 @@ + + fi + +-echo "$as_me:16374: checking if you want wgetch-events code" >&5 ++echo "$as_me:16393: checking if you want wgetch-events code" >&5 + echo $ECHO_N "checking if you want wgetch-events code... $ECHO_C" >&6 + + # Check whether --enable-wgetch-events or --disable-wgetch-events was given. +@@ -16381,7 +16400,7 @@ + else + with_wgetch_events=no + fi; +-echo "$as_me:16384: result: $with_wgetch_events" >&5 ++echo "$as_me:16403: result: $with_wgetch_events" >&5 + echo "${ECHO_T}$with_wgetch_events" >&6 + if test "x$with_wgetch_events" = xyes ; then + +@@ -16396,7 +16415,7 @@ + + case "$cf_cv_system_name" in + (*mingw32*|*mingw64*|*-msvc*) +- echo "$as_me:16399: checking if you want experimental-Windows driver" >&5 ++ echo "$as_me:16418: checking if you want experimental-Windows driver" >&5 + echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6 + + # Check whether --enable-exp-win32 or --disable-exp-win32 was given. +@@ -16406,7 +16425,7 @@ + else + with_exp_win32=no + fi; +- echo "$as_me:16409: result: $with_exp_win32" >&5 ++ echo "$as_me:16428: result: $with_exp_win32" >&5 + echo "${ECHO_T}$with_exp_win32" >&6 + if test "x$with_exp_win32" = xyes + then +@@ -16432,7 +16451,7 @@ + + ### use option --disable-echo to suppress full display compiling commands + +-echo "$as_me:16435: checking if you want to see long compiling messages" >&5 ++echo "$as_me:16454: checking if you want to see long compiling messages" >&5 + echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6 + + # Check whether --enable-echo or --disable-echo was given. +@@ -16466,7 +16485,7 @@ + ECHO_CC='' + + fi; +-echo "$as_me:16469: result: $enableval" >&5 ++echo "$as_me:16488: result: $enableval" >&5 + echo "${ECHO_T}$enableval" >&6 + + if test "x$enable_echo" = xyes; then +@@ -16479,7 +16498,7 @@ + + # --disable-stripping is used for debugging + +-echo "$as_me:16482: checking if you want to install stripped executables" >&5 ++echo "$as_me:16501: checking if you want to install stripped executables" >&5 + echo $ECHO_N "checking if you want to install stripped executables... $ECHO_C" >&6 + + # Check whether --enable-stripping or --disable-stripping was given. +@@ -16496,7 +16515,7 @@ + enable_stripping=yes + + fi; +-echo "$as_me:16499: result: $enable_stripping" >&5 ++echo "$as_me:16518: result: $enable_stripping" >&5 + echo "${ECHO_T}$enable_stripping" >&6 + + if test "$enable_stripping" = yes +@@ -16507,7 +16526,7 @@ + fi + + : "${INSTALL:=install}" +-echo "$as_me:16510: checking if install accepts -p option" >&5 ++echo "$as_me:16529: checking if install accepts -p option" >&5 + echo $ECHO_N "checking if install accepts -p option... $ECHO_C" >&6 + if test "${cf_cv_install_p+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -16538,10 +16557,10 @@ + rm -rf ./conftest* + + fi +-echo "$as_me:16541: result: $cf_cv_install_p" >&5 ++echo "$as_me:16560: result: $cf_cv_install_p" >&5 + echo "${ECHO_T}$cf_cv_install_p" >&6 + +-echo "$as_me:16544: checking if install needs to be told about ownership" >&5 ++echo "$as_me:16563: checking if install needs to be told about ownership" >&5 + echo $ECHO_N "checking if install needs to be told about ownership... $ECHO_C" >&6 + case `$ac_config_guess` in + (*minix) +@@ -16552,7 +16571,7 @@ + ;; + esac + +-echo "$as_me:16555: result: $with_install_o" >&5 ++echo "$as_me:16574: result: $with_install_o" >&5 + echo "${ECHO_T}$with_install_o" >&6 + if test "x$with_install_o" = xyes + then +@@ -16577,7 +16596,7 @@ + + ### use option --enable-warnings to turn on all gcc warnings + +-echo "$as_me:16580: checking if you want to use C11 _Noreturn feature" >&5 ++echo "$as_me:16599: checking if you want to use C11 _Noreturn feature" >&5 + echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6 + + # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given. +@@ -16594,17 +16613,17 @@ + enable_stdnoreturn=no + + fi; +-echo "$as_me:16597: result: $enable_stdnoreturn" >&5 ++echo "$as_me:16616: result: $enable_stdnoreturn" >&5 + echo "${ECHO_T}$enable_stdnoreturn" >&6 + + if test $enable_stdnoreturn = yes; then +-echo "$as_me:16601: checking for C11 _Noreturn feature" >&5 ++echo "$as_me:16620: checking for C11 _Noreturn feature" >&5 + echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6 + if test "${cf_cv_c11_noreturn+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16607 "configure" ++#line 16626 "configure" + #include "confdefs.h" + + #include +@@ -16621,16 +16640,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16624: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16643: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16627: \$? = $ac_status" >&5 ++ echo "$as_me:16646: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16630: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16649: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16633: \$? = $ac_status" >&5 ++ echo "$as_me:16652: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_c11_noreturn=yes + else +@@ -16641,7 +16660,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:16644: result: $cf_cv_c11_noreturn" >&5 ++echo "$as_me:16663: result: $cf_cv_c11_noreturn" >&5 + echo "${ECHO_T}$cf_cv_c11_noreturn" >&6 + else + cf_cv_c11_noreturn=no, +@@ -16671,7 +16690,7 @@ + (*-Werror=*) + test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 + +-echo "${as_me:-configure}:16674: testing repairing CFLAGS: $CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:16693: testing repairing CFLAGS: $CFLAGS ..." 1>&5 + + cf_temp_flags= + for cf_temp_scan in $CFLAGS +@@ -16694,11 +16713,11 @@ + CFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 + +-echo "${as_me:-configure}:16697: testing ... fixed $CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:16716: testing ... fixed $CFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +-echo "${as_me:-configure}:16701: testing ... extra $EXTRA_CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:16720: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + ;; + esac +@@ -16710,7 +16729,7 @@ + (*-Werror=*) + test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 + +-echo "${as_me:-configure}:16713: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 ++echo "${as_me:-configure}:16732: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 + + cf_temp_flags= + for cf_temp_scan in $CPPFLAGS +@@ -16733,11 +16752,11 @@ + CPPFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 + +-echo "${as_me:-configure}:16736: testing ... fixed $CPPFLAGS ..." 1>&5 ++echo "${as_me:-configure}:16755: testing ... fixed $CPPFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +-echo "${as_me:-configure}:16740: testing ... extra $EXTRA_CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:16759: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + ;; + esac +@@ -16749,7 +16768,7 @@ + (*-Werror=*) + test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:16752: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:16771: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 + + cf_temp_flags= + for cf_temp_scan in $LDFLAGS +@@ -16772,17 +16791,17 @@ + LDFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:16775: testing ... fixed $LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:16794: testing ... fixed $LDFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +-echo "${as_me:-configure}:16779: testing ... extra $EXTRA_CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:16798: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + ;; + esac + fi + +-echo "$as_me:16785: checking if you want to turn on gcc warnings" >&5 ++echo "$as_me:16804: checking if you want to turn on gcc warnings" >&5 + echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6 + + # Check whether --enable-warnings or --disable-warnings was given. +@@ -16799,7 +16818,7 @@ + enable_warnings=no + + fi; +-echo "$as_me:16802: result: $enable_warnings" >&5 ++echo "$as_me:16821: result: $enable_warnings" >&5 + echo "${ECHO_T}$enable_warnings" >&6 + if test "$enable_warnings" = "yes" + then +@@ -16823,7 +16842,7 @@ + done + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16826 "configure" ++#line 16845 "configure" + #include "confdefs.h" + + #include +@@ -16838,26 +16857,26 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16841: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16860: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16844: \$? = $ac_status" >&5 ++ echo "$as_me:16863: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16847: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16866: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16850: \$? = $ac_status" >&5 ++ echo "$as_me:16869: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + +-echo "$as_me:16853: checking for X11/Xt const-feature" >&5 ++echo "$as_me:16872: checking for X11/Xt const-feature" >&5 + echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6 + if test "${cf_cv_const_x_string+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 16860 "configure" ++#line 16879 "configure" + #include "confdefs.h" + + #define _CONST_X_STRING /* X11R7.8 (perhaps) */ +@@ -16874,16 +16893,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:16877: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16896: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16880: \$? = $ac_status" >&5 ++ echo "$as_me:16899: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:16883: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16902: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16886: \$? = $ac_status" >&5 ++ echo "$as_me:16905: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_const_x_string=no +@@ -16898,7 +16917,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:16901: result: $cf_cv_const_x_string" >&5 ++echo "$as_me:16920: result: $cf_cv_const_x_string" >&5 + echo "${ECHO_T}$cf_cv_const_x_string" >&6 + + LIBS="$cf_save_LIBS_CF_CONST_X_STRING" +@@ -16927,7 +16946,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi + cat > "conftest.$ac_ext" <&5 ++ { echo "$as_me:16965: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" +@@ -16959,12 +16978,12 @@ + wd981 + do + CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" +- if { (eval echo "$as_me:16962: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:16981: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16965: \$? = $ac_status" >&5 ++ echo "$as_me:16984: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- test -n "$verbose" && echo "$as_me:16967: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:16986: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" + fi +@@ -16972,7 +16991,7 @@ + CFLAGS="$cf_save_CFLAGS" + elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" + then +- { echo "$as_me:16975: checking for $CC warning options..." >&5 ++ { echo "$as_me:16994: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + cf_warn_CONST="" +@@ -16995,12 +17014,12 @@ + Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum + do + CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" +- if { (eval echo "$as_me:16998: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:17017: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17001: \$? = $ac_status" >&5 ++ echo "$as_me:17020: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- test -n "$verbose" && echo "$as_me:17003: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:17022: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + case "$cf_opt" in + (Winline) +@@ -17008,7 +17027,7 @@ + ([34].*) + test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 + +-echo "${as_me:-configure}:17011: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 ++echo "${as_me:-configure}:17030: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 + + continue;; + esac +@@ -17018,7 +17037,7 @@ + ([12].*) + test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 + +-echo "${as_me:-configure}:17021: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 ++echo "${as_me:-configure}:17040: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 + + continue;; + esac +@@ -17051,10 +17070,10 @@ + EOF + if test "$GCC" = yes + then +- { echo "$as_me:17054: checking for $CC __attribute__ directives..." >&5 ++ { echo "$as_me:17073: checking for $CC __attribute__ directives..." >&5 + echo "$as_me: checking for $CC __attribute__ directives..." >&6;} + cat > "conftest.$ac_ext" <&5 ++ if { (eval echo "$as_me:17125: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17109: \$? = $ac_status" >&5 ++ echo "$as_me:17128: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- test -n "$verbose" && echo "$as_me:17111: result: ... $cf_attribute" >&5 ++ test -n "$verbose" && echo "$as_me:17130: result: ... $cf_attribute" >&5 + echo "${ECHO_T}... $cf_attribute" >&6 + cat conftest.h >>confdefs.h + case "$cf_attribute" in +@@ -17180,12 +17199,12 @@ + if test "$GCC" = yes ; then + case "$host_os" in + (linux*|gnu*) +- echo "$as_me:17183: checking if this is really Intel C++ compiler" >&5 ++ echo "$as_me:17202: checking if this is really Intel C++ compiler" >&5 + echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6 + cf_save_CFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -no-gcc" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17188 "configure" ++#line 17207 "configure" + #include "confdefs.h" + + int +@@ -17202,16 +17221,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:17205: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17224: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17208: \$? = $ac_status" >&5 ++ echo "$as_me:17227: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:17211: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17230: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17214: \$? = $ac_status" >&5 ++ echo "$as_me:17233: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + INTEL_CPLUSPLUS=yes + cf_save_CFLAGS="$cf_save_CFLAGS -we147" +@@ -17222,7 +17241,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + CXXFLAGS="$cf_save_CFLAGS" +- echo "$as_me:17225: result: $INTEL_CPLUSPLUS" >&5 ++ echo "$as_me:17244: result: $INTEL_CPLUSPLUS" >&5 + echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6 + ;; + esac +@@ -17231,11 +17250,11 @@ + CLANG_CPLUSPLUS=no + + if test "$GCC" = yes ; then +- echo "$as_me:17234: checking if this is really Clang C++ compiler" >&5 ++ echo "$as_me:17253: checking if this is really Clang C++ compiler" >&5 + echo $ECHO_N "checking if this is really Clang C++ compiler... $ECHO_C" >&6 + cf_save_CFLAGS="$CXXFLAGS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17238 "configure" ++#line 17257 "configure" + #include "confdefs.h" + + int +@@ -17252,16 +17271,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:17255: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17274: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17258: \$? = $ac_status" >&5 ++ echo "$as_me:17277: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:17261: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17280: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17264: \$? = $ac_status" >&5 ++ echo "$as_me:17283: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + CLANG_CPLUSPLUS=yes + +@@ -17271,7 +17290,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + CXXFLAGS="$cf_save_CFLAGS" +- echo "$as_me:17274: result: $CLANG_CPLUSPLUS" >&5 ++ echo "$as_me:17293: result: $CLANG_CPLUSPLUS" >&5 + echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6 + fi + +@@ -17280,30 +17299,30 @@ + if test "x$CLANG_CPLUSPLUS" = "xyes" ; then + case "$CC" in + (c[1-9][0-9]|*/c[1-9][0-9]) +- { echo "$as_me:17283: WARNING: replacing broken compiler alias $CC" >&5 ++ { echo "$as_me:17302: WARNING: replacing broken compiler alias $CC" >&5 + echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;} + CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`" + CC=clang + ;; + esac + +- echo "$as_me:17290: checking version of $CC" >&5 ++ echo "$as_me:17309: checking version of $CC" >&5 + echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 + CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" + test -z "$CLANG_VERSION" && CLANG_VERSION=unknown +- echo "$as_me:17294: result: $CLANG_VERSION" >&5 ++ echo "$as_me:17313: result: $CLANG_VERSION" >&5 + echo "${ECHO_T}$CLANG_VERSION" >&6 + + for cf_clang_opt in \ + -Qunused-arguments \ + -Wno-error=implicit-function-declaration + do +- echo "$as_me:17301: checking if option $cf_clang_opt works" >&5 ++ echo "$as_me:17320: checking if option $cf_clang_opt works" >&5 + echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6 + cf_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $cf_clang_opt" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17306 "configure" ++#line 17325 "configure" + #include "confdefs.h" + + #include +@@ -17317,16 +17336,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:17320: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17339: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17323: \$? = $ac_status" >&5 ++ echo "$as_me:17342: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:17326: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17345: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17329: \$? = $ac_status" >&5 ++ echo "$as_me:17348: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_clang_optok=yes +@@ -17337,13 +17356,13 @@ + cf_clang_optok=no + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +- echo "$as_me:17340: result: $cf_clang_optok" >&5 ++ echo "$as_me:17359: result: $cf_clang_optok" >&5 + echo "${ECHO_T}$cf_clang_optok" >&6 + CFLAGS="$cf_save_CFLAGS" + if test "$cf_clang_optok" = yes; then + test -n "$verbose" && echo " adding option $cf_clang_opt" 1>&6 + +-echo "${as_me:-configure}:17346: testing adding option $cf_clang_opt ..." 1>&5 ++echo "${as_me:-configure}:17365: testing adding option $cf_clang_opt ..." 1>&5 + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_clang_opt" +@@ -17360,7 +17379,7 @@ + ac_main_return="return" + + cat > conftest.$ac_ext <&5 ++ { echo "$as_me:17400: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CXXFLAGS="$CXXFLAGS" + EXTRA_CXXFLAGS="-Wall" +@@ -17395,12 +17414,12 @@ + wd981 + do + CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt" +- if { (eval echo "$as_me:17398: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:17417: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17401: \$? = $ac_status" >&5 ++ echo "$as_me:17420: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- test -n "$verbose" && echo "$as_me:17403: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:17422: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" + fi +@@ -17409,7 +17428,7 @@ + + elif test "$GXX" = yes + then +- { echo "$as_me:17412: checking for $CXX warning options..." >&5 ++ { echo "$as_me:17431: checking for $CXX warning options..." >&5 + echo "$as_me: checking for $CXX warning options..." >&6;} + cf_save_CXXFLAGS="$CXXFLAGS" + EXTRA_CXXFLAGS="-W -Wall" +@@ -17439,16 +17458,16 @@ + Wundef $cf_gxx_extra_warnings Wno-unused + do + CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt" +- if { (eval echo "$as_me:17442: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:17461: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17445: \$? = $ac_status" >&5 ++ echo "$as_me:17464: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- test -n "$verbose" && echo "$as_me:17447: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:17466: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" + else +- test -n "$verbose" && echo "$as_me:17451: result: ... no -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:17470: result: ... no -$cf_opt" >&5 + echo "${ECHO_T}... no -$cf_opt" >&6 + fi + done +@@ -17466,7 +17485,7 @@ + fi + fi + +-echo "$as_me:17469: checking if you want to work around bogus compiler/loader warnings" >&5 ++echo "$as_me:17488: checking if you want to work around bogus compiler/loader warnings" >&5 + echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6 + + # Check whether --enable-string-hacks or --disable-string-hacks was given. +@@ -17476,7 +17495,7 @@ + else + enable_string_hacks=no + fi; +-echo "$as_me:17479: result: $enable_string_hacks" >&5 ++echo "$as_me:17498: result: $enable_string_hacks" >&5 + echo "${ECHO_T}$enable_string_hacks" >&6 + + if test "x$enable_string_hacks" = "xyes"; then +@@ -17485,15 +17504,15 @@ + #define USE_STRING_HACKS 1 + EOF + +- { echo "$as_me:17488: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 ++ { echo "$as_me:17507: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 + echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;} +- echo "$as_me:17490: checking for strlcat" >&5 ++ echo "$as_me:17509: checking for strlcat" >&5 + echo $ECHO_N "checking for strlcat... $ECHO_C" >&6 + if test "${ac_cv_func_strlcat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17496 "configure" ++#line 17515 "configure" + #include "confdefs.h" + #define strlcat autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -17524,16 +17543,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:17527: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17546: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17530: \$? = $ac_status" >&5 ++ echo "$as_me:17549: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:17533: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17552: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17536: \$? = $ac_status" >&5 ++ echo "$as_me:17555: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_strlcat=yes + else +@@ -17543,7 +17562,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:17546: result: $ac_cv_func_strlcat" >&5 ++echo "$as_me:17565: result: $ac_cv_func_strlcat" >&5 + echo "${ECHO_T}$ac_cv_func_strlcat" >&6 + if test "$ac_cv_func_strlcat" = yes; then + +@@ -17553,7 +17572,7 @@ + + else + +- echo "$as_me:17556: checking for strlcat in -lbsd" >&5 ++ echo "$as_me:17575: checking for strlcat in -lbsd" >&5 + echo $ECHO_N "checking for strlcat in -lbsd... $ECHO_C" >&6 + if test "${ac_cv_lib_bsd_strlcat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17561,7 +17580,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17564 "configure" ++#line 17583 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -17580,16 +17599,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:17583: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17602: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17586: \$? = $ac_status" >&5 ++ echo "$as_me:17605: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:17589: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17608: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17592: \$? = $ac_status" >&5 ++ echo "$as_me:17611: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_bsd_strlcat=yes + else +@@ -17600,7 +17619,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:17603: result: $ac_cv_lib_bsd_strlcat" >&5 ++echo "$as_me:17622: result: $ac_cv_lib_bsd_strlcat" >&5 + echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6 + if test "$ac_cv_lib_bsd_strlcat" = yes; then + +@@ -17623,23 +17642,23 @@ + for ac_header in bsd/string.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:17626: checking for $ac_header" >&5 ++echo "$as_me:17645: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17632 "configure" ++#line 17651 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:17636: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:17655: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:17642: \$? = $ac_status" >&5 ++ echo "$as_me:17661: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -17658,7 +17677,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:17661: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:17680: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:17701: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17688 "configure" ++#line 17707 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -17716,16 +17735,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:17719: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17738: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17722: \$? = $ac_status" >&5 ++ echo "$as_me:17741: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:17725: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17744: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17728: \$? = $ac_status" >&5 ++ echo "$as_me:17747: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -17735,7 +17754,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:17738: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:17757: result: `eval echo '${'"$as_ac_var"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 + if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:17770: checking if you want to enable runtime assertions" >&5 + echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6 + + # Check whether --enable-assertions or --disable-assertions was given. +@@ -17758,7 +17777,7 @@ + else + with_assertions=no + fi; +-echo "$as_me:17761: result: $with_assertions" >&5 ++echo "$as_me:17780: result: $with_assertions" >&5 + echo "${ECHO_T}$with_assertions" >&6 + if test -n "$GCC" + then +@@ -17774,7 +17793,7 @@ + + ### use option --disable-leaks to suppress "permanent" leaks, for testing + +-echo "$as_me:17777: checking if you want to use dmalloc for testing" >&5 ++echo "$as_me:17796: checking if you want to use dmalloc for testing" >&5 + echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6 + + # Check whether --with-dmalloc or --without-dmalloc was given. +@@ -17796,7 +17815,7 @@ + else + with_dmalloc= + fi; +-echo "$as_me:17799: result: ${with_dmalloc:-no}" >&5 ++echo "$as_me:17818: result: ${with_dmalloc:-no}" >&5 + echo "${ECHO_T}${with_dmalloc:-no}" >&6 + + case ".$with_cflags" in +@@ -17910,23 +17929,23 @@ + esac + + if test "$with_dmalloc" = yes ; then +- echo "$as_me:17913: checking for dmalloc.h" >&5 ++ echo "$as_me:17932: checking for dmalloc.h" >&5 + echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6 + if test "${ac_cv_header_dmalloc_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17919 "configure" ++#line 17938 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:17923: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:17942: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:17929: \$? = $ac_status" >&5 ++ echo "$as_me:17948: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -17945,11 +17964,11 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:17948: result: $ac_cv_header_dmalloc_h" >&5 ++echo "$as_me:17967: result: $ac_cv_header_dmalloc_h" >&5 + echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6 + if test "$ac_cv_header_dmalloc_h" = yes; then + +-echo "$as_me:17952: checking for dmalloc_debug in -ldmalloc" >&5 ++echo "$as_me:17971: checking for dmalloc_debug in -ldmalloc" >&5 + echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6 + if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17957,7 +17976,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldmalloc $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 17960 "configure" ++#line 17979 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -17976,16 +17995,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:17979: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17998: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17982: \$? = $ac_status" >&5 ++ echo "$as_me:18001: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:17985: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18004: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17988: \$? = $ac_status" >&5 ++ echo "$as_me:18007: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_dmalloc_dmalloc_debug=yes + else +@@ -17996,7 +18015,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:17999: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 ++echo "$as_me:18018: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 + echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6 + if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:18033: checking if you want to use dbmalloc for testing" >&5 + echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6 + + # Check whether --with-dbmalloc or --without-dbmalloc was given. +@@ -18033,7 +18052,7 @@ + else + with_dbmalloc= + fi; +-echo "$as_me:18036: result: ${with_dbmalloc:-no}" >&5 ++echo "$as_me:18055: result: ${with_dbmalloc:-no}" >&5 + echo "${ECHO_T}${with_dbmalloc:-no}" >&6 + + case ".$with_cflags" in +@@ -18147,23 +18166,23 @@ + esac + + if test "$with_dbmalloc" = yes ; then +- echo "$as_me:18150: checking for dbmalloc.h" >&5 ++ echo "$as_me:18169: checking for dbmalloc.h" >&5 + echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6 + if test "${ac_cv_header_dbmalloc_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18156 "configure" ++#line 18175 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:18160: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:18179: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:18166: \$? = $ac_status" >&5 ++ echo "$as_me:18185: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -18182,11 +18201,11 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:18185: result: $ac_cv_header_dbmalloc_h" >&5 ++echo "$as_me:18204: result: $ac_cv_header_dbmalloc_h" >&5 + echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6 + if test "$ac_cv_header_dbmalloc_h" = yes; then + +-echo "$as_me:18189: checking for debug_malloc in -ldbmalloc" >&5 ++echo "$as_me:18208: checking for debug_malloc in -ldbmalloc" >&5 + echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6 + if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -18194,7 +18213,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldbmalloc $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18197 "configure" ++#line 18216 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -18213,16 +18232,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:18216: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18235: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18219: \$? = $ac_status" >&5 ++ echo "$as_me:18238: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:18222: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18241: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18225: \$? = $ac_status" >&5 ++ echo "$as_me:18244: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_dbmalloc_debug_malloc=yes + else +@@ -18233,7 +18252,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:18236: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 ++echo "$as_me:18255: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 + echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6 + if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:18270: checking if you want to use valgrind for testing" >&5 + echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6 + + # Check whether --with-valgrind or --without-valgrind was given. +@@ -18270,7 +18289,7 @@ + else + with_valgrind= + fi; +-echo "$as_me:18273: result: ${with_valgrind:-no}" >&5 ++echo "$as_me:18292: result: ${with_valgrind:-no}" >&5 + echo "${ECHO_T}${with_valgrind:-no}" >&6 + + case ".$with_cflags" in +@@ -18383,7 +18402,7 @@ + ;; + esac + +-echo "$as_me:18386: checking if you want to perform memory-leak testing" >&5 ++echo "$as_me:18405: checking if you want to perform memory-leak testing" >&5 + echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6 + + # Check whether --enable-leaks or --disable-leaks was given. +@@ -18394,7 +18413,7 @@ + enable_leaks=yes + fi; + if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi +-echo "$as_me:18397: result: $with_no_leaks" >&5 ++echo "$as_me:18416: result: $with_no_leaks" >&5 + echo "${ECHO_T}$with_no_leaks" >&6 + + if test "$enable_leaks" = no ; then +@@ -18446,7 +18465,7 @@ + ;; + esac + +-echo "$as_me:18449: checking whether to add trace feature to all models" >&5 ++echo "$as_me:18468: checking whether to add trace feature to all models" >&5 + echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6 + + # Check whether --with-trace or --without-trace was given. +@@ -18456,7 +18475,7 @@ + else + cf_with_trace=$cf_all_traces + fi; +-echo "$as_me:18459: result: $cf_with_trace" >&5 ++echo "$as_me:18478: result: $cf_with_trace" >&5 + echo "${ECHO_T}$cf_with_trace" >&6 + + if test "x$cf_with_trace" = xyes ; then +@@ -18570,7 +18589,7 @@ + ADA_TRACE=FALSE + fi + +-echo "$as_me:18573: checking if we want to use GNAT projects" >&5 ++echo "$as_me:18592: checking if we want to use GNAT projects" >&5 + echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6 + + # Check whether --enable-gnat-projects or --disable-gnat-projects was given. +@@ -18587,7 +18606,7 @@ + enable_gnat_projects=yes + + fi; +-echo "$as_me:18590: result: $enable_gnat_projects" >&5 ++echo "$as_me:18609: result: $enable_gnat_projects" >&5 + echo "${ECHO_T}$enable_gnat_projects" >&6 + + ### Checks for libraries. +@@ -18600,14 +18619,14 @@ + CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN" + fi + +-echo "$as_me:18603: checking if ssp library is needed" >&5 ++echo "$as_me:18622: checking if ssp library is needed" >&5 + echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6 + if test "${cf_cv_need_libssp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18610 "configure" ++#line 18629 "configure" + #include "confdefs.h" + + #include +@@ -18624,16 +18643,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:18627: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18646: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18630: \$? = $ac_status" >&5 ++ echo "$as_me:18649: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:18633: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18652: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18636: \$? = $ac_status" >&5 ++ echo "$as_me:18655: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_need_libssp=no + else +@@ -18643,7 +18662,7 @@ + cf_save_LIBS="$LIBS" + LIBS="$LIBS -lssp" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18646 "configure" ++#line 18665 "configure" + #include "confdefs.h" + + #include +@@ -18660,16 +18679,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:18663: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18682: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18666: \$? = $ac_status" >&5 ++ echo "$as_me:18685: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:18669: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18688: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18672: \$? = $ac_status" >&5 ++ echo "$as_me:18691: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_need_libssp=yes + else +@@ -18683,7 +18702,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:18686: result: $cf_cv_need_libssp" >&5 ++echo "$as_me:18705: result: $cf_cv_need_libssp" >&5 + echo "${ECHO_T}$cf_cv_need_libssp" >&6 + + if test "x$cf_cv_need_libssp" = xyes +@@ -18709,13 +18728,13 @@ + + ;; + (*) +-echo "$as_me:18712: checking for gettimeofday" >&5 ++echo "$as_me:18731: checking for gettimeofday" >&5 + echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6 + if test "${ac_cv_func_gettimeofday+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18718 "configure" ++#line 18737 "configure" + #include "confdefs.h" + #define gettimeofday autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -18746,16 +18765,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:18749: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18768: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18752: \$? = $ac_status" >&5 ++ echo "$as_me:18771: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:18755: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18774: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18758: \$? = $ac_status" >&5 ++ echo "$as_me:18777: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_gettimeofday=yes + else +@@ -18765,7 +18784,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:18768: result: $ac_cv_func_gettimeofday" >&5 ++echo "$as_me:18787: result: $ac_cv_func_gettimeofday" >&5 + echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 + if test "$ac_cv_func_gettimeofday" = yes; then + +@@ -18775,7 +18794,7 @@ + + else + +-echo "$as_me:18778: checking for gettimeofday in -lbsd" >&5 ++echo "$as_me:18797: checking for gettimeofday in -lbsd" >&5 + echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6 + if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -18783,7 +18802,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18786 "configure" ++#line 18805 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -18802,16 +18821,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:18805: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18824: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18808: \$? = $ac_status" >&5 ++ echo "$as_me:18827: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:18811: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18830: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18814: \$? = $ac_status" >&5 ++ echo "$as_me:18833: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_bsd_gettimeofday=yes + else +@@ -18822,7 +18841,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:18825: result: $ac_cv_lib_bsd_gettimeofday" >&5 ++echo "$as_me:18844: result: $ac_cv_lib_bsd_gettimeofday" >&5 + echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6 + if test "$ac_cv_lib_bsd_gettimeofday" = yes; then + +@@ -18852,14 +18871,14 @@ + ;; + esac + +-echo "$as_me:18855: checking if -lm needed for math functions" >&5 ++echo "$as_me:18874: checking if -lm needed for math functions" >&5 + echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6 + if test "${cf_cv_need_libm+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18862 "configure" ++#line 18881 "configure" + #include "confdefs.h" + + #include +@@ -18875,16 +18894,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:18878: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18897: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18881: \$? = $ac_status" >&5 ++ echo "$as_me:18900: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:18884: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18903: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18887: \$? = $ac_status" >&5 ++ echo "$as_me:18906: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_need_libm=no + else +@@ -18894,7 +18913,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:18897: result: $cf_cv_need_libm" >&5 ++echo "$as_me:18916: result: $cf_cv_need_libm" >&5 + echo "${ECHO_T}$cf_cv_need_libm" >&6 + if test "$cf_cv_need_libm" = yes + then +@@ -18902,13 +18921,13 @@ + fi + + ### Checks for header files. +-echo "$as_me:18905: checking for ANSI C header files" >&5 ++echo "$as_me:18924: checking for ANSI C header files" >&5 + echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 + if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18911 "configure" ++#line 18930 "configure" + #include "confdefs.h" + #include + #include +@@ -18916,13 +18935,13 @@ + #include + + _ACEOF +-if { (eval echo "$as_me:18919: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:18938: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:18925: \$? = $ac_status" >&5 ++ echo "$as_me:18944: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -18944,7 +18963,7 @@ + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18947 "configure" ++#line 18966 "configure" + #include "confdefs.h" + #include + +@@ -18962,7 +18981,7 @@ + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18965 "configure" ++#line 18984 "configure" + #include "confdefs.h" + #include + +@@ -18983,7 +19002,7 @@ + : + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 18986 "configure" ++#line 19005 "configure" + #include "confdefs.h" + #include + #if ((' ' & 0x0FF) == 0x020) +@@ -19009,15 +19028,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:19012: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19031: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19015: \$? = $ac_status" >&5 ++ echo "$as_me:19034: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:19017: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19036: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19020: \$? = $ac_status" >&5 ++ echo "$as_me:19039: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -19030,7 +19049,7 @@ + fi + fi + fi +-echo "$as_me:19033: result: $ac_cv_header_stdc" >&5 ++echo "$as_me:19052: result: $ac_cv_header_stdc" >&5 + echo "${ECHO_T}$ac_cv_header_stdc" >&6 + if test $ac_cv_header_stdc = yes; then + +@@ -19043,13 +19062,13 @@ + ac_header_dirent=no + for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do + as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` +-echo "$as_me:19046: checking for $ac_hdr that defines DIR" >&5 ++echo "$as_me:19065: checking for $ac_hdr that defines DIR" >&5 + echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19052 "configure" ++#line 19071 "configure" + #include "confdefs.h" + #include + #include <$ac_hdr> +@@ -19064,16 +19083,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:19067: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19086: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19070: \$? = $ac_status" >&5 ++ echo "$as_me:19089: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:19073: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19092: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19076: \$? = $ac_status" >&5 ++ echo "$as_me:19095: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_Header=yes" + else +@@ -19083,7 +19102,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:19086: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:19105: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++ echo "$as_me:19118: checking for opendir in -ldir" >&5 + echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 + if test "${ac_cv_lib_dir_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19104,7 +19123,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldir $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19107 "configure" ++#line 19126 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19123,16 +19142,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19126: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19145: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19129: \$? = $ac_status" >&5 ++ echo "$as_me:19148: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19132: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19151: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19135: \$? = $ac_status" >&5 ++ echo "$as_me:19154: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_dir_opendir=yes + else +@@ -19143,14 +19162,14 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19146: result: $ac_cv_lib_dir_opendir" >&5 ++echo "$as_me:19165: result: $ac_cv_lib_dir_opendir" >&5 + echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 + if test "$ac_cv_lib_dir_opendir" = yes; then + LIBS="$LIBS -ldir" + fi + + else +- echo "$as_me:19153: checking for opendir in -lx" >&5 ++ echo "$as_me:19172: checking for opendir in -lx" >&5 + echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 + if test "${ac_cv_lib_x_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19158,7 +19177,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lx $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19161 "configure" ++#line 19180 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19177,16 +19196,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19180: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19199: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19183: \$? = $ac_status" >&5 ++ echo "$as_me:19202: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19186: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19205: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19189: \$? = $ac_status" >&5 ++ echo "$as_me:19208: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_x_opendir=yes + else +@@ -19197,7 +19216,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19200: result: $ac_cv_lib_x_opendir" >&5 ++echo "$as_me:19219: result: $ac_cv_lib_x_opendir" >&5 + echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 + if test "$ac_cv_lib_x_opendir" = yes; then + LIBS="$LIBS -lx" +@@ -19205,13 +19224,13 @@ + + fi + +-echo "$as_me:19208: checking whether time.h and sys/time.h may both be included" >&5 ++echo "$as_me:19227: checking whether time.h and sys/time.h may both be included" >&5 + echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 + if test "${ac_cv_header_time+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19214 "configure" ++#line 19233 "configure" + #include "confdefs.h" + #include + #include +@@ -19227,16 +19246,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:19230: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19249: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19233: \$? = $ac_status" >&5 ++ echo "$as_me:19252: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:19236: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19255: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19239: \$? = $ac_status" >&5 ++ echo "$as_me:19258: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_header_time=yes + else +@@ -19246,7 +19265,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:19249: result: $ac_cv_header_time" >&5 ++echo "$as_me:19268: result: $ac_cv_header_time" >&5 + echo "${ECHO_T}$ac_cv_header_time" >&6 + if test $ac_cv_header_time = yes; then + +@@ -19261,7 +19280,7 @@ + case "$host_os" in + (mingw*) + # -lsystre -ltre -lintl -liconv +- echo "$as_me:19264: checking for regcomp in -lsystre" >&5 ++ echo "$as_me:19283: checking for regcomp in -lsystre" >&5 + echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6 + if test "${ac_cv_lib_systre_regcomp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19269,7 +19288,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lsystre $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19272 "configure" ++#line 19291 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19288,16 +19307,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19291: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19310: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19294: \$? = $ac_status" >&5 ++ echo "$as_me:19313: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19297: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19316: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19300: \$? = $ac_status" >&5 ++ echo "$as_me:19319: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_systre_regcomp=yes + else +@@ -19308,11 +19327,11 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19311: result: $ac_cv_lib_systre_regcomp" >&5 ++echo "$as_me:19330: result: $ac_cv_lib_systre_regcomp" >&5 + echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6 + if test "$ac_cv_lib_systre_regcomp" = yes; then + +- echo "$as_me:19315: checking for libiconv_open in -liconv" >&5 ++ echo "$as_me:19334: checking for libiconv_open in -liconv" >&5 + echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6 + if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19320,7 +19339,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-liconv $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19323 "configure" ++#line 19342 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19339,16 +19358,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19342: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19361: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19345: \$? = $ac_status" >&5 ++ echo "$as_me:19364: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19348: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19367: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19351: \$? = $ac_status" >&5 ++ echo "$as_me:19370: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_iconv_libiconv_open=yes + else +@@ -19359,7 +19378,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19362: result: $ac_cv_lib_iconv_libiconv_open" >&5 ++echo "$as_me:19381: result: $ac_cv_lib_iconv_libiconv_open" >&5 + echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6 + if test "$ac_cv_lib_iconv_libiconv_open" = yes; then + +@@ -19381,7 +19400,7 @@ + + fi + +- echo "$as_me:19384: checking for libintl_gettext in -lintl" >&5 ++ echo "$as_me:19403: checking for libintl_gettext in -lintl" >&5 + echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6 + if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19389,7 +19408,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19392 "configure" ++#line 19411 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19408,16 +19427,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19411: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19430: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19414: \$? = $ac_status" >&5 ++ echo "$as_me:19433: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19417: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19436: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19420: \$? = $ac_status" >&5 ++ echo "$as_me:19439: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_intl_libintl_gettext=yes + else +@@ -19428,7 +19447,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19431: result: $ac_cv_lib_intl_libintl_gettext" >&5 ++echo "$as_me:19450: result: $ac_cv_lib_intl_libintl_gettext" >&5 + echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6 + if test "$ac_cv_lib_intl_libintl_gettext" = yes; then + +@@ -19450,7 +19469,7 @@ + + fi + +- echo "$as_me:19453: checking for tre_regcomp in -ltre" >&5 ++ echo "$as_me:19472: checking for tre_regcomp in -ltre" >&5 + echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6 + if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19458,7 +19477,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ltre $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19461 "configure" ++#line 19480 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19477,16 +19496,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19480: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19499: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19483: \$? = $ac_status" >&5 ++ echo "$as_me:19502: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19486: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19505: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19489: \$? = $ac_status" >&5 ++ echo "$as_me:19508: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_tre_tre_regcomp=yes + else +@@ -19497,7 +19516,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19500: result: $ac_cv_lib_tre_tre_regcomp" >&5 ++echo "$as_me:19519: result: $ac_cv_lib_tre_tre_regcomp" >&5 + echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6 + if test "$ac_cv_lib_tre_tre_regcomp" = yes; then + +@@ -19539,7 +19558,7 @@ + + else + +- echo "$as_me:19542: checking for regcomp in -lgnurx" >&5 ++ echo "$as_me:19561: checking for regcomp in -lgnurx" >&5 + echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6 + if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19547,7 +19566,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgnurx $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19550 "configure" ++#line 19569 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19566,16 +19585,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19569: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19588: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19572: \$? = $ac_status" >&5 ++ echo "$as_me:19591: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19575: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19594: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19578: \$? = $ac_status" >&5 ++ echo "$as_me:19597: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gnurx_regcomp=yes + else +@@ -19586,7 +19605,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19589: result: $ac_cv_lib_gnurx_regcomp" >&5 ++echo "$as_me:19608: result: $ac_cv_lib_gnurx_regcomp" >&5 + echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6 + if test "$ac_cv_lib_gnurx_regcomp" = yes; then + +@@ -19614,13 +19633,13 @@ + ;; + (*) + cf_regex_libs="regex re" +- echo "$as_me:19617: checking for regcomp" >&5 ++ echo "$as_me:19636: checking for regcomp" >&5 + echo $ECHO_N "checking for regcomp... $ECHO_C" >&6 + if test "${ac_cv_func_regcomp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19623 "configure" ++#line 19642 "configure" + #include "confdefs.h" + #define regcomp autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -19651,16 +19670,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19654: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19673: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19657: \$? = $ac_status" >&5 ++ echo "$as_me:19676: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19660: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19679: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19663: \$? = $ac_status" >&5 ++ echo "$as_me:19682: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_regcomp=yes + else +@@ -19670,7 +19689,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:19673: result: $ac_cv_func_regcomp" >&5 ++echo "$as_me:19692: result: $ac_cv_func_regcomp" >&5 + echo "${ECHO_T}$ac_cv_func_regcomp" >&6 + if test "$ac_cv_func_regcomp" = yes; then + cf_regex_func=regcomp +@@ -19679,7 +19698,7 @@ + for cf_regex_lib in $cf_regex_libs + do + as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh` +-echo "$as_me:19682: checking for regcomp in -l$cf_regex_lib" >&5 ++echo "$as_me:19701: checking for regcomp in -l$cf_regex_lib" >&5 + echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Lib+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19687,7 +19706,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-l$cf_regex_lib $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19690 "configure" ++#line 19709 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19706,16 +19725,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19709: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19728: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19712: \$? = $ac_status" >&5 ++ echo "$as_me:19731: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19715: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19734: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19718: \$? = $ac_status" >&5 ++ echo "$as_me:19737: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_Lib=yes" + else +@@ -19726,7 +19745,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19729: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 ++echo "$as_me:19748: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then + +@@ -19758,13 +19777,13 @@ + esac + + if test "$cf_regex_func" = no ; then +- echo "$as_me:19761: checking for compile" >&5 ++ echo "$as_me:19780: checking for compile" >&5 + echo $ECHO_N "checking for compile... $ECHO_C" >&6 + if test "${ac_cv_func_compile+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19767 "configure" ++#line 19786 "configure" + #include "confdefs.h" + #define compile autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -19795,16 +19814,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19798: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19817: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19801: \$? = $ac_status" >&5 ++ echo "$as_me:19820: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19804: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19823: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19807: \$? = $ac_status" >&5 ++ echo "$as_me:19826: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_compile=yes + else +@@ -19814,13 +19833,13 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:19817: result: $ac_cv_func_compile" >&5 ++echo "$as_me:19836: result: $ac_cv_func_compile" >&5 + echo "${ECHO_T}$ac_cv_func_compile" >&6 + if test "$ac_cv_func_compile" = yes; then + cf_regex_func=compile + else + +- echo "$as_me:19823: checking for compile in -lgen" >&5 ++ echo "$as_me:19842: checking for compile in -lgen" >&5 + echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6 + if test "${ac_cv_lib_gen_compile+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19828,7 +19847,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgen $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19831 "configure" ++#line 19850 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19847,16 +19866,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19850: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19869: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19853: \$? = $ac_status" >&5 ++ echo "$as_me:19872: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19856: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19875: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19859: \$? = $ac_status" >&5 ++ echo "$as_me:19878: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gen_compile=yes + else +@@ -19867,7 +19886,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19870: result: $ac_cv_lib_gen_compile" >&5 ++echo "$as_me:19889: result: $ac_cv_lib_gen_compile" >&5 + echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6 + if test "$ac_cv_lib_gen_compile" = yes; then + +@@ -19895,11 +19914,11 @@ + fi + + if test "$cf_regex_func" = no ; then +- { echo "$as_me:19898: WARNING: cannot find regular expression library" >&5 ++ { echo "$as_me:19917: WARNING: cannot find regular expression library" >&5 + echo "$as_me: WARNING: cannot find regular expression library" >&2;} + fi + +-echo "$as_me:19902: checking for regular-expression headers" >&5 ++echo "$as_me:19921: checking for regular-expression headers" >&5 + echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6 + if test "${cf_cv_regex_hdrs+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19911,7 +19930,7 @@ + for cf_regex_hdr in regexp.h regexpr.h + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19914 "configure" ++#line 19933 "configure" + #include "confdefs.h" + #include <$cf_regex_hdr> + int +@@ -19928,16 +19947,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19931: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19950: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19934: \$? = $ac_status" >&5 ++ echo "$as_me:19953: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19937: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19956: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19940: \$? = $ac_status" >&5 ++ echo "$as_me:19959: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_regex_hdrs=$cf_regex_hdr +@@ -19954,7 +19973,7 @@ + for cf_regex_hdr in regex.h + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19957 "configure" ++#line 19976 "configure" + #include "confdefs.h" + #include + #include <$cf_regex_hdr> +@@ -19974,16 +19993,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19977: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19996: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19980: \$? = $ac_status" >&5 ++ echo "$as_me:19999: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19983: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20002: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19986: \$? = $ac_status" >&5 ++ echo "$as_me:20005: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_regex_hdrs=$cf_regex_hdr +@@ -19999,11 +20018,11 @@ + esac + + fi +-echo "$as_me:20002: result: $cf_cv_regex_hdrs" >&5 ++echo "$as_me:20021: result: $cf_cv_regex_hdrs" >&5 + echo "${ECHO_T}$cf_cv_regex_hdrs" >&6 + + case "$cf_cv_regex_hdrs" in +- (no) { echo "$as_me:20006: WARNING: no regular expression header found" >&5 ++ (no) { echo "$as_me:20025: WARNING: no regular expression header found" >&5 + echo "$as_me: WARNING: no regular expression header found" >&2;} ;; + (regex.h) + cat >>confdefs.h <<\EOF +@@ -20041,23 +20060,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:20044: checking for $ac_header" >&5 ++echo "$as_me:20063: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20050 "configure" ++#line 20069 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:20054: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:20073: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:20060: \$? = $ac_status" >&5 ++ echo "$as_me:20079: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -20076,7 +20095,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:20079: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:20098: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:20111: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20098 "configure" ++#line 20117 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:20102: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:20121: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:20108: \$? = $ac_status" >&5 ++ echo "$as_me:20127: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -20124,7 +20143,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:20127: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:20146: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:20156: checking for header declaring getopt variables" >&5 + echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6 + if test "${cf_cv_getopt_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -20144,7 +20163,7 @@ + for cf_header in stdio.h stdlib.h unistd.h getopt.h + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20147 "configure" ++#line 20166 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -20157,16 +20176,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20160: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20179: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20163: \$? = $ac_status" >&5 ++ echo "$as_me:20182: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20166: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20185: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20169: \$? = $ac_status" >&5 ++ echo "$as_me:20188: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_getopt_header=$cf_header + break +@@ -20178,7 +20197,7 @@ + done + + fi +-echo "$as_me:20181: result: $cf_cv_getopt_header" >&5 ++echo "$as_me:20200: result: $cf_cv_getopt_header" >&5 + echo "${ECHO_T}$cf_cv_getopt_header" >&6 + if test "$cf_cv_getopt_header" != none ; then + +@@ -20195,14 +20214,14 @@ + + fi + +-echo "$as_me:20198: checking if external environ is declared" >&5 ++echo "$as_me:20217: checking if external environ is declared" >&5 + echo $ECHO_N "checking if external environ is declared... $ECHO_C" >&6 + if test "${cf_cv_dcl_environ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20205 "configure" ++#line 20224 "configure" + #include "confdefs.h" + + #ifdef HAVE_STDLIB_H +@@ -20218,16 +20237,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20221: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20240: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20224: \$? = $ac_status" >&5 ++ echo "$as_me:20243: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20227: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20246: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20230: \$? = $ac_status" >&5 ++ echo "$as_me:20249: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_dcl_environ=yes + else +@@ -20238,7 +20257,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:20241: result: $cf_cv_dcl_environ" >&5 ++echo "$as_me:20260: result: $cf_cv_dcl_environ" >&5 + echo "${ECHO_T}$cf_cv_dcl_environ" >&6 + + if test "$cf_cv_dcl_environ" = no ; then +@@ -20253,14 +20272,14 @@ + + # It's possible (for near-UNIX clones) that the data doesn't exist + +-echo "$as_me:20256: checking if external environ exists" >&5 ++echo "$as_me:20275: checking if external environ exists" >&5 + echo $ECHO_N "checking if external environ exists... $ECHO_C" >&6 + if test "${cf_cv_have_environ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20263 "configure" ++#line 20282 "configure" + #include "confdefs.h" + + #undef environ +@@ -20275,16 +20294,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:20278: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20297: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20281: \$? = $ac_status" >&5 ++ echo "$as_me:20300: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:20284: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20303: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20287: \$? = $ac_status" >&5 ++ echo "$as_me:20306: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have_environ=yes + else +@@ -20295,7 +20314,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + fi +-echo "$as_me:20298: result: $cf_cv_have_environ" >&5 ++echo "$as_me:20317: result: $cf_cv_have_environ" >&5 + echo "${ECHO_T}$cf_cv_have_environ" >&6 + + if test "$cf_cv_have_environ" = yes ; then +@@ -20308,13 +20327,13 @@ + + fi + +-echo "$as_me:20311: checking for getenv" >&5 ++echo "$as_me:20330: checking for getenv" >&5 + echo $ECHO_N "checking for getenv... $ECHO_C" >&6 + if test "${ac_cv_func_getenv+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20317 "configure" ++#line 20336 "configure" + #include "confdefs.h" + #define getenv autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -20345,16 +20364,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:20348: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20367: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20351: \$? = $ac_status" >&5 ++ echo "$as_me:20370: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:20354: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20373: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20357: \$? = $ac_status" >&5 ++ echo "$as_me:20376: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_getenv=yes + else +@@ -20364,19 +20383,19 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:20367: result: $ac_cv_func_getenv" >&5 ++echo "$as_me:20386: result: $ac_cv_func_getenv" >&5 + echo "${ECHO_T}$ac_cv_func_getenv" >&6 + + for ac_func in putenv setenv strdup + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:20373: checking for $ac_func" >&5 ++echo "$as_me:20392: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20379 "configure" ++#line 20398 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -20407,16 +20426,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:20410: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20429: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20413: \$? = $ac_status" >&5 ++ echo "$as_me:20432: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:20416: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20435: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20419: \$? = $ac_status" >&5 ++ echo "$as_me:20438: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -20426,7 +20445,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:20429: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:20448: result: `eval echo '${'"$as_ac_var"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 + if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:20458: checking if getenv returns consistent values" >&5 + echo $ECHO_N "checking if getenv returns consistent values... $ECHO_C" >&6 + if test "${cf_cv_consistent_getenv+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -20446,7 +20465,7 @@ + cf_cv_consistent_getenv=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20449 "configure" ++#line 20468 "configure" + #include "confdefs.h" + + #include +@@ -20555,15 +20574,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:20558: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20577: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20561: \$? = $ac_status" >&5 ++ echo "$as_me:20580: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:20563: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20582: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20566: \$? = $ac_status" >&5 ++ echo "$as_me:20585: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_consistent_getenv=yes + else +@@ -20576,7 +20595,7 @@ + fi + + fi +-echo "$as_me:20579: result: $cf_cv_consistent_getenv" >&5 ++echo "$as_me:20598: result: $cf_cv_consistent_getenv" >&5 + echo "${ECHO_T}$cf_cv_consistent_getenv" >&6 + + if test "x$cf_cv_consistent_getenv" = xno +@@ -20591,18 +20610,18 @@ + if test "x$cf_cv_consistent_getenv" = xno && \ + test "x$cf_with_trace" = xyes + then +- { echo "$as_me:20594: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5 ++ { echo "$as_me:20613: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5 + echo "$as_me: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&2;} + fi + +-echo "$as_me:20598: checking if sys/time.h works with sys/select.h" >&5 ++echo "$as_me:20617: checking if sys/time.h works with sys/select.h" >&5 + echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6 + if test "${cf_cv_sys_time_select+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20605 "configure" ++#line 20624 "configure" + #include "confdefs.h" + + #include +@@ -20622,16 +20641,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20625: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20644: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20628: \$? = $ac_status" >&5 ++ echo "$as_me:20647: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20631: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20650: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20634: \$? = $ac_status" >&5 ++ echo "$as_me:20653: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_sys_time_select=yes + else +@@ -20643,7 +20662,7 @@ + + fi + +-echo "$as_me:20646: result: $cf_cv_sys_time_select" >&5 ++echo "$as_me:20665: result: $cf_cv_sys_time_select" >&5 + echo "${ECHO_T}$cf_cv_sys_time_select" >&6 + test "$cf_cv_sys_time_select" = yes && + cat >>confdefs.h <<\EOF +@@ -20658,13 +20677,13 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_main_return="return" + +-echo "$as_me:20661: checking for an ANSI C-conforming const" >&5 ++echo "$as_me:20680: checking for an ANSI C-conforming const" >&5 + echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 + if test "${ac_cv_c_const+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20667 "configure" ++#line 20686 "configure" + #include "confdefs.h" + + int +@@ -20722,16 +20741,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20725: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20744: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20728: \$? = $ac_status" >&5 ++ echo "$as_me:20747: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20731: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20750: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20734: \$? = $ac_status" >&5 ++ echo "$as_me:20753: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_c_const=yes + else +@@ -20741,7 +20760,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:20744: result: $ac_cv_c_const" >&5 ++echo "$as_me:20763: result: $ac_cv_c_const" >&5 + echo "${ECHO_T}$ac_cv_c_const" >&6 + if test $ac_cv_c_const = no; then + +@@ -20751,7 +20770,7 @@ + + fi + +-echo "$as_me:20754: checking for inline" >&5 ++echo "$as_me:20773: checking for inline" >&5 + echo $ECHO_N "checking for inline... $ECHO_C" >&6 + if test "${ac_cv_c_inline+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -20759,7 +20778,7 @@ + ac_cv_c_inline=no + for ac_kw in inline __inline__ __inline; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20762 "configure" ++#line 20781 "configure" + #include "confdefs.h" + #ifndef __cplusplus + static $ac_kw int static_foo () {return 0; } +@@ -20768,16 +20787,16 @@ + + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20771: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20790: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20774: \$? = $ac_status" >&5 ++ echo "$as_me:20793: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20777: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20796: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20780: \$? = $ac_status" >&5 ++ echo "$as_me:20799: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_c_inline=$ac_kw; break + else +@@ -20788,7 +20807,7 @@ + done + + fi +-echo "$as_me:20791: result: $ac_cv_c_inline" >&5 ++echo "$as_me:20810: result: $ac_cv_c_inline" >&5 + echo "${ECHO_T}$ac_cv_c_inline" >&6 + case $ac_cv_c_inline in + inline | yes) ;; +@@ -20814,7 +20833,7 @@ + : + elif test "$GCC" = yes + then +- echo "$as_me:20817: checking if $CC supports options to tune inlining" >&5 ++ echo "$as_me:20836: checking if $CC supports options to tune inlining" >&5 + echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6 + if test "${cf_cv_gcc_inline+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -20823,7 +20842,7 @@ + cf_save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS --param max-inline-insns-single=1200" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20826 "configure" ++#line 20845 "configure" + #include "confdefs.h" + inline int foo(void) { return 1; } + int +@@ -20835,16 +20854,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20838: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20857: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20841: \$? = $ac_status" >&5 ++ echo "$as_me:20860: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20844: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20863: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20847: \$? = $ac_status" >&5 ++ echo "$as_me:20866: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gcc_inline=yes + else +@@ -20856,7 +20875,7 @@ + CFLAGS=$cf_save_CFLAGS + + fi +-echo "$as_me:20859: result: $cf_cv_gcc_inline" >&5 ++echo "$as_me:20878: result: $cf_cv_gcc_inline" >&5 + echo "${ECHO_T}$cf_cv_gcc_inline" >&6 + if test "$cf_cv_gcc_inline" = yes ; then + +@@ -20962,7 +20981,7 @@ + fi + fi + +-echo "$as_me:20965: checking for signal global datatype" >&5 ++echo "$as_me:20984: checking for signal global datatype" >&5 + echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6 + if test "${cf_cv_sig_atomic_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -20974,7 +20993,7 @@ + "int" + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20977 "configure" ++#line 20996 "configure" + #include "confdefs.h" + + #include +@@ -20998,16 +21017,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:21001: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21020: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21004: \$? = $ac_status" >&5 ++ echo "$as_me:21023: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:21007: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21026: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21010: \$? = $ac_status" >&5 ++ echo "$as_me:21029: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_sig_atomic_t=$cf_type + else +@@ -21021,7 +21040,7 @@ + + fi + +-echo "$as_me:21024: result: $cf_cv_sig_atomic_t" >&5 ++echo "$as_me:21043: result: $cf_cv_sig_atomic_t" >&5 + echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6 + test "$cf_cv_sig_atomic_t" != no && + cat >>confdefs.h <&5 ++echo "$as_me:21052: checking for type of chtype" >&5 + echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 + if test "${cf_cv_typeof_chtype+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -21040,7 +21059,7 @@ + cf_cv_typeof_chtype=long + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21043 "configure" ++#line 21062 "configure" + #include "confdefs.h" + + #define WANT_BITS 31 +@@ -21075,15 +21094,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:21078: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21097: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21081: \$? = $ac_status" >&5 ++ echo "$as_me:21100: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:21083: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21102: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21086: \$? = $ac_status" >&5 ++ echo "$as_me:21105: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_typeof_chtype=`cat cf_test.out` + else +@@ -21098,7 +21117,7 @@ + + fi + +-echo "$as_me:21101: result: $cf_cv_typeof_chtype" >&5 ++echo "$as_me:21120: result: $cf_cv_typeof_chtype" >&5 + echo "${ECHO_T}$cf_cv_typeof_chtype" >&6 + + cat >>confdefs.h <&5 ++echo "$as_me:21132: checking if unsigned literals are legal" >&5 + echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6 + if test "${cf_cv_unsigned_literals+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21120 "configure" ++#line 21139 "configure" + #include "confdefs.h" + + int +@@ -21129,16 +21148,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:21132: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21151: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21135: \$? = $ac_status" >&5 ++ echo "$as_me:21154: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:21138: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21157: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21141: \$? = $ac_status" >&5 ++ echo "$as_me:21160: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_unsigned_literals=yes + else +@@ -21150,7 +21169,7 @@ + + fi + +-echo "$as_me:21153: result: $cf_cv_unsigned_literals" >&5 ++echo "$as_me:21172: result: $cf_cv_unsigned_literals" >&5 + echo "${ECHO_T}$cf_cv_unsigned_literals" >&6 + + cf_cv_1UL="1" +@@ -21166,14 +21185,14 @@ + + ### Checks for external-data + +-echo "$as_me:21169: checking if external errno is declared" >&5 ++echo "$as_me:21188: checking if external errno is declared" >&5 + echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6 + if test "${cf_cv_dcl_errno+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21176 "configure" ++#line 21195 "configure" + #include "confdefs.h" + + #ifdef HAVE_STDLIB_H +@@ -21191,16 +21210,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:21194: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21213: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21197: \$? = $ac_status" >&5 ++ echo "$as_me:21216: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:21200: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21219: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21203: \$? = $ac_status" >&5 ++ echo "$as_me:21222: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_dcl_errno=yes + else +@@ -21211,7 +21230,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:21214: result: $cf_cv_dcl_errno" >&5 ++echo "$as_me:21233: result: $cf_cv_dcl_errno" >&5 + echo "${ECHO_T}$cf_cv_dcl_errno" >&6 + + if test "$cf_cv_dcl_errno" = no ; then +@@ -21226,14 +21245,14 @@ + + # It's possible (for near-UNIX clones) that the data doesn't exist + +-echo "$as_me:21229: checking if external errno exists" >&5 ++echo "$as_me:21248: checking if external errno exists" >&5 + echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6 + if test "${cf_cv_have_errno+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21236 "configure" ++#line 21255 "configure" + #include "confdefs.h" + + #undef errno +@@ -21248,16 +21267,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21251: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21270: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21254: \$? = $ac_status" >&5 ++ echo "$as_me:21273: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21257: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21276: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21260: \$? = $ac_status" >&5 ++ echo "$as_me:21279: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have_errno=yes + else +@@ -21268,7 +21287,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + fi +-echo "$as_me:21271: result: $cf_cv_have_errno" >&5 ++echo "$as_me:21290: result: $cf_cv_have_errno" >&5 + echo "${ECHO_T}$cf_cv_have_errno" >&6 + + if test "$cf_cv_have_errno" = yes ; then +@@ -21281,7 +21300,7 @@ + + fi + +-echo "$as_me:21284: checking if data-only library module links" >&5 ++echo "$as_me:21303: checking if data-only library module links" >&5 + echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6 + if test "${cf_cv_link_dataonly+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -21289,20 +21308,20 @@ + + rm -f conftest.a + cat >conftest.$ac_ext <&5 ++ if { (eval echo "$as_me:21314: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21298: \$? = $ac_status" >&5 ++ echo "$as_me:21317: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then + mv conftest.o data.o && \ + ( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null + fi + rm -f conftest.$ac_ext data.o + cat >conftest.$ac_ext <&5 ++ if { (eval echo "$as_me:21337: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21321: \$? = $ac_status" >&5 ++ echo "$as_me:21340: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then + mv conftest.o func.o && \ + ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null +@@ -21331,7 +21350,7 @@ + cf_cv_link_dataonly=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21334 "configure" ++#line 21353 "configure" + #include "confdefs.h" + + int main(void) +@@ -21342,15 +21361,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:21345: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21364: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21348: \$? = $ac_status" >&5 ++ echo "$as_me:21367: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:21350: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21369: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21353: \$? = $ac_status" >&5 ++ echo "$as_me:21372: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_link_dataonly=yes + else +@@ -21365,7 +21384,7 @@ + + fi + +-echo "$as_me:21368: result: $cf_cv_link_dataonly" >&5 ++echo "$as_me:21387: result: $cf_cv_link_dataonly" >&5 + echo "${ECHO_T}$cf_cv_link_dataonly" >&6 + + if test "$cf_cv_link_dataonly" = no ; then +@@ -21409,13 +21428,13 @@ + + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:21412: checking for $ac_func" >&5 ++echo "$as_me:21431: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21418 "configure" ++#line 21437 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -21446,16 +21465,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21449: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21468: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21452: \$? = $ac_status" >&5 ++ echo "$as_me:21471: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21455: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21474: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21458: \$? = $ac_status" >&5 ++ echo "$as_me:21477: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -21465,7 +21484,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:21468: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:21487: result: `eval echo '${'"$as_ac_var"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 + if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then + cat >>confdefs.h <&5 ++ { { echo "$as_me:21499: error: getopt is required for building programs" >&5 + echo "$as_me: error: getopt is required for building programs" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -21486,7 +21505,7 @@ + then + if test "x$ac_cv_func_vsnprintf" = xyes + then +- { echo "$as_me:21489: WARNING: will use vsnprintf instead of safe-sprintf option" >&5 ++ { echo "$as_me:21508: WARNING: will use vsnprintf instead of safe-sprintf option" >&5 + echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;} + else + +@@ -21499,14 +21518,14 @@ + + if test "x$with_getcap" = "xyes" ; then + +-echo "$as_me:21502: checking for terminal-capability database functions" >&5 ++echo "$as_me:21521: checking for terminal-capability database functions" >&5 + echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6 + if test "${cf_cv_cgetent+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21509 "configure" ++#line 21528 "configure" + #include "confdefs.h" + + #include +@@ -21526,16 +21545,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21529: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21548: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21532: \$? = $ac_status" >&5 ++ echo "$as_me:21551: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21535: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21554: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21538: \$? = $ac_status" >&5 ++ echo "$as_me:21557: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_cgetent=yes + else +@@ -21546,7 +21565,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + fi +-echo "$as_me:21549: result: $cf_cv_cgetent" >&5 ++echo "$as_me:21568: result: $cf_cv_cgetent" >&5 + echo "${ECHO_T}$cf_cv_cgetent" >&6 + + if test "$cf_cv_cgetent" = yes +@@ -21556,14 +21575,14 @@ + #define HAVE_BSD_CGETENT 1 + EOF + +-echo "$as_me:21559: checking if cgetent uses const parameter" >&5 ++echo "$as_me:21578: checking if cgetent uses const parameter" >&5 + echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6 + if test "${cf_cv_cgetent_const+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21566 "configure" ++#line 21585 "configure" + #include "confdefs.h" + + #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers" +@@ -21586,16 +21605,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21589: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21608: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21592: \$? = $ac_status" >&5 ++ echo "$as_me:21611: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21595: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21614: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21598: \$? = $ac_status" >&5 ++ echo "$as_me:21617: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_cgetent_const=yes + else +@@ -21606,7 +21625,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + fi +-echo "$as_me:21609: result: $cf_cv_cgetent_const" >&5 ++echo "$as_me:21628: result: $cf_cv_cgetent_const" >&5 + echo "${ECHO_T}$cf_cv_cgetent_const" >&6 + if test "$cf_cv_cgetent_const" = yes + then +@@ -21620,14 +21639,14 @@ + + fi + +-echo "$as_me:21623: checking for isascii" >&5 ++echo "$as_me:21642: checking for isascii" >&5 + echo $ECHO_N "checking for isascii... $ECHO_C" >&6 + if test "${cf_cv_have_isascii+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21630 "configure" ++#line 21649 "configure" + #include "confdefs.h" + #include + int +@@ -21639,16 +21658,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21642: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21661: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21645: \$? = $ac_status" >&5 ++ echo "$as_me:21664: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21648: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21667: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21651: \$? = $ac_status" >&5 ++ echo "$as_me:21670: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have_isascii=yes + else +@@ -21659,7 +21678,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + fi +-echo "$as_me:21662: result: $cf_cv_have_isascii" >&5 ++echo "$as_me:21681: result: $cf_cv_have_isascii" >&5 + echo "${ECHO_T}$cf_cv_have_isascii" >&6 + test "$cf_cv_have_isascii" = yes && + cat >>confdefs.h <<\EOF +@@ -21667,10 +21686,10 @@ + EOF + + if test "$ac_cv_func_sigaction" = yes; then +-echo "$as_me:21670: checking whether sigaction needs _POSIX_SOURCE" >&5 ++echo "$as_me:21689: checking whether sigaction needs _POSIX_SOURCE" >&5 + echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21673 "configure" ++#line 21692 "configure" + #include "confdefs.h" + + #include +@@ -21684,16 +21703,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:21687: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21706: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21690: \$? = $ac_status" >&5 ++ echo "$as_me:21709: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:21693: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21712: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21696: \$? = $ac_status" >&5 ++ echo "$as_me:21715: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + sigact_bad=no + else +@@ -21701,7 +21720,7 @@ + cat "conftest.$ac_ext" >&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21704 "configure" ++#line 21723 "configure" + #include "confdefs.h" + + #define _POSIX_SOURCE +@@ -21716,16 +21735,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:21719: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21738: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21722: \$? = $ac_status" >&5 ++ echo "$as_me:21741: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:21725: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21744: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21728: \$? = $ac_status" >&5 ++ echo "$as_me:21747: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + sigact_bad=yes + +@@ -21741,11 +21760,11 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +-echo "$as_me:21744: result: $sigact_bad" >&5 ++echo "$as_me:21763: result: $sigact_bad" >&5 + echo "${ECHO_T}$sigact_bad" >&6 + fi + +-echo "$as_me:21748: checking if nanosleep really works" >&5 ++echo "$as_me:21767: checking if nanosleep really works" >&5 + echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6 + if test "${cf_cv_func_nanosleep+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -21755,7 +21774,7 @@ + cf_cv_func_nanosleep=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21758 "configure" ++#line 21777 "configure" + #include "confdefs.h" + + #include +@@ -21780,15 +21799,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:21783: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21802: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21786: \$? = $ac_status" >&5 ++ echo "$as_me:21805: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:21788: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21807: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21791: \$? = $ac_status" >&5 ++ echo "$as_me:21810: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_nanosleep=yes + else +@@ -21800,7 +21819,7 @@ + rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" + fi + fi +-echo "$as_me:21803: result: $cf_cv_func_nanosleep" >&5 ++echo "$as_me:21822: result: $cf_cv_func_nanosleep" >&5 + echo "${ECHO_T}$cf_cv_func_nanosleep" >&6 + + test "$cf_cv_func_nanosleep" = "yes" && +@@ -21817,23 +21836,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:21820: checking for $ac_header" >&5 ++echo "$as_me:21839: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21826 "configure" ++#line 21845 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:21830: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:21849: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:21836: \$? = $ac_status" >&5 ++ echo "$as_me:21855: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -21852,7 +21871,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:21855: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:21874: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++ echo "$as_me:21891: checking whether termios.h needs _POSIX_SOURCE" >&5 + echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21875 "configure" ++#line 21894 "configure" + #include "confdefs.h" + #include + int +@@ -21884,16 +21903,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:21887: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21906: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21890: \$? = $ac_status" >&5 ++ echo "$as_me:21909: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:21893: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21912: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21896: \$? = $ac_status" >&5 ++ echo "$as_me:21915: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + termios_bad=no + else +@@ -21901,7 +21920,7 @@ + cat "conftest.$ac_ext" >&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21904 "configure" ++#line 21923 "configure" + #include "confdefs.h" + + #define _POSIX_SOURCE +@@ -21915,16 +21934,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:21918: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21937: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21921: \$? = $ac_status" >&5 ++ echo "$as_me:21940: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:21924: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21943: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21927: \$? = $ac_status" >&5 ++ echo "$as_me:21946: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + termios_bad=unknown + else +@@ -21940,19 +21959,19 @@ + + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +- echo "$as_me:21943: result: $termios_bad" >&5 ++ echo "$as_me:21962: result: $termios_bad" >&5 + echo "${ECHO_T}$termios_bad" >&6 + fi + fi + +-echo "$as_me:21948: checking for tcgetattr" >&5 ++echo "$as_me:21967: checking for tcgetattr" >&5 + echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6 + if test "${cf_cv_have_tcgetattr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21955 "configure" ++#line 21974 "configure" + #include "confdefs.h" + + #include +@@ -21980,16 +21999,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21983: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22002: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21986: \$? = $ac_status" >&5 ++ echo "$as_me:22005: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21989: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22008: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21992: \$? = $ac_status" >&5 ++ echo "$as_me:22011: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have_tcgetattr=yes + else +@@ -21999,21 +22018,21 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:22002: result: $cf_cv_have_tcgetattr" >&5 ++echo "$as_me:22021: result: $cf_cv_have_tcgetattr" >&5 + echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6 + test "$cf_cv_have_tcgetattr" = yes && + cat >>confdefs.h <<\EOF + #define HAVE_TCGETATTR 1 + EOF + +-echo "$as_me:22009: checking for vsscanf function or workaround" >&5 ++echo "$as_me:22028: checking for vsscanf function or workaround" >&5 + echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6 + if test "${cf_cv_func_vsscanf+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22016 "configure" ++#line 22035 "configure" + #include "confdefs.h" + + #include +@@ -22029,16 +22048,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22032: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22051: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22035: \$? = $ac_status" >&5 ++ echo "$as_me:22054: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22038: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22057: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22041: \$? = $ac_status" >&5 ++ echo "$as_me:22060: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_vsscanf=vsscanf + else +@@ -22046,7 +22065,7 @@ + cat "conftest.$ac_ext" >&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22049 "configure" ++#line 22068 "configure" + #include "confdefs.h" + + #include +@@ -22068,16 +22087,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22071: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22090: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22074: \$? = $ac_status" >&5 ++ echo "$as_me:22093: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22077: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22096: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22080: \$? = $ac_status" >&5 ++ echo "$as_me:22099: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_vsscanf=vfscanf + else +@@ -22085,7 +22104,7 @@ + cat "conftest.$ac_ext" >&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22088 "configure" ++#line 22107 "configure" + #include "confdefs.h" + + #include +@@ -22107,16 +22126,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22110: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22129: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22113: \$? = $ac_status" >&5 ++ echo "$as_me:22132: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22116: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22135: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22119: \$? = $ac_status" >&5 ++ echo "$as_me:22138: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_vsscanf=_doscan + else +@@ -22131,7 +22150,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:22134: result: $cf_cv_func_vsscanf" >&5 ++echo "$as_me:22153: result: $cf_cv_func_vsscanf" >&5 + echo "${ECHO_T}$cf_cv_func_vsscanf" >&6 + + case "$cf_cv_func_vsscanf" in +@@ -22157,23 +22176,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:22160: checking for $ac_header" >&5 ++echo "$as_me:22179: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22166 "configure" ++#line 22185 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:22170: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:22189: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:22176: \$? = $ac_status" >&5 ++ echo "$as_me:22195: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -22192,7 +22211,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:22195: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:22214: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:22224: checking for working mkstemp" >&5 + echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 + if test "${cf_cv_func_mkstemp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -22213,7 +22232,7 @@ + cf_cv_func_mkstemp=maybe + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22216 "configure" ++#line 22235 "configure" + #include "confdefs.h" + + #include +@@ -22254,15 +22273,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:22257: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22276: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22260: \$? = $ac_status" >&5 ++ echo "$as_me:22279: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:22262: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22281: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22265: \$? = $ac_status" >&5 ++ echo "$as_me:22284: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_mkstemp=yes + +@@ -22277,16 +22296,16 @@ + fi + + fi +-echo "$as_me:22280: result: $cf_cv_func_mkstemp" >&5 ++echo "$as_me:22299: result: $cf_cv_func_mkstemp" >&5 + echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 + if test "x$cf_cv_func_mkstemp" = xmaybe ; then +- echo "$as_me:22283: checking for mkstemp" >&5 ++ echo "$as_me:22302: checking for mkstemp" >&5 + echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 + if test "${ac_cv_func_mkstemp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22289 "configure" ++#line 22308 "configure" + #include "confdefs.h" + #define mkstemp autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -22317,16 +22336,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22320: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22339: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22323: \$? = $ac_status" >&5 ++ echo "$as_me:22342: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22326: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22345: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22329: \$? = $ac_status" >&5 ++ echo "$as_me:22348: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_mkstemp=yes + else +@@ -22336,7 +22355,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:22339: result: $ac_cv_func_mkstemp" >&5 ++echo "$as_me:22358: result: $ac_cv_func_mkstemp" >&5 + echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 + + fi +@@ -22357,21 +22376,21 @@ + fi + + if test "x$cross_compiling" = xyes ; then +- { echo "$as_me:22360: WARNING: cross compiling: assume setvbuf params not reversed" >&5 ++ { echo "$as_me:22379: WARNING: cross compiling: assume setvbuf params not reversed" >&5 + echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;} + else +- echo "$as_me:22363: checking whether setvbuf arguments are reversed" >&5 ++ echo "$as_me:22382: checking whether setvbuf arguments are reversed" >&5 + echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6 + if test "${ac_cv_func_setvbuf_reversed+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:22369: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:22388: error: cannot run test program while cross compiling" >&5 + echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22374 "configure" ++#line 22393 "configure" + #include "confdefs.h" + #include + /* If setvbuf has the reversed format, exit 0. */ +@@ -22388,15 +22407,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:22391: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22410: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22394: \$? = $ac_status" >&5 ++ echo "$as_me:22413: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:22396: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22415: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22399: \$? = $ac_status" >&5 ++ echo "$as_me:22418: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_setvbuf_reversed=yes + else +@@ -22409,7 +22428,7 @@ + fi + rm -f core ./core.* ./*.core + fi +-echo "$as_me:22412: result: $ac_cv_func_setvbuf_reversed" >&5 ++echo "$as_me:22431: result: $ac_cv_func_setvbuf_reversed" >&5 + echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6 + if test $ac_cv_func_setvbuf_reversed = yes; then + +@@ -22420,13 +22439,13 @@ + fi + + fi +-echo "$as_me:22423: checking for intptr_t" >&5 ++echo "$as_me:22442: checking for intptr_t" >&5 + echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6 + if test "${ac_cv_type_intptr_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22429 "configure" ++#line 22448 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -22441,16 +22460,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:22444: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:22463: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:22447: \$? = $ac_status" >&5 ++ echo "$as_me:22466: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:22450: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22469: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22453: \$? = $ac_status" >&5 ++ echo "$as_me:22472: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_intptr_t=yes + else +@@ -22460,7 +22479,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:22463: result: $ac_cv_type_intptr_t" >&5 ++echo "$as_me:22482: result: $ac_cv_type_intptr_t" >&5 + echo "${ECHO_T}$ac_cv_type_intptr_t" >&6 + if test "$ac_cv_type_intptr_t" = yes; then + : +@@ -22472,13 +22491,13 @@ + + fi + +-echo "$as_me:22475: checking for ssize_t" >&5 ++echo "$as_me:22494: checking for ssize_t" >&5 + echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6 + if test "${ac_cv_type_ssize_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22481 "configure" ++#line 22500 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -22493,16 +22512,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:22496: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:22515: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:22499: \$? = $ac_status" >&5 ++ echo "$as_me:22518: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:22502: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22521: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22505: \$? = $ac_status" >&5 ++ echo "$as_me:22524: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_ssize_t=yes + else +@@ -22512,7 +22531,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:22515: result: $ac_cv_type_ssize_t" >&5 ++echo "$as_me:22534: result: $ac_cv_type_ssize_t" >&5 + echo "${ECHO_T}$ac_cv_type_ssize_t" >&6 + if test "$ac_cv_type_ssize_t" = yes; then + : +@@ -22524,14 +22543,14 @@ + + fi + +-echo "$as_me:22527: checking for type sigaction_t" >&5 ++echo "$as_me:22546: checking for type sigaction_t" >&5 + echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6 + if test "${cf_cv_type_sigaction+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22534 "configure" ++#line 22553 "configure" + #include "confdefs.h" + + #include +@@ -22544,16 +22563,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:22547: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:22566: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:22550: \$? = $ac_status" >&5 ++ echo "$as_me:22569: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:22553: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22572: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22556: \$? = $ac_status" >&5 ++ echo "$as_me:22575: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_type_sigaction=yes + else +@@ -22564,14 +22583,14 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi + +-echo "$as_me:22567: result: $cf_cv_type_sigaction" >&5 ++echo "$as_me:22586: result: $cf_cv_type_sigaction" >&5 + echo "${ECHO_T}$cf_cv_type_sigaction" >&6 + test "$cf_cv_type_sigaction" = yes && + cat >>confdefs.h <<\EOF + #define HAVE_TYPE_SIGACTION 1 + EOF + +-echo "$as_me:22574: checking declaration of size-change" >&5 ++echo "$as_me:22593: checking declaration of size-change" >&5 + echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6 + if test "${cf_cv_sizechange+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -22592,7 +22611,7 @@ + + fi + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22595 "configure" ++#line 22614 "configure" + #include "confdefs.h" + #include + #ifdef HAVE_TERMIOS_H +@@ -22642,16 +22661,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:22645: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:22664: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:22648: \$? = $ac_status" >&5 ++ echo "$as_me:22667: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:22651: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22670: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22654: \$? = $ac_status" >&5 ++ echo "$as_me:22673: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_sizechange=yes + else +@@ -22670,7 +22689,7 @@ + done + + fi +-echo "$as_me:22673: result: $cf_cv_sizechange" >&5 ++echo "$as_me:22692: result: $cf_cv_sizechange" >&5 + echo "${ECHO_T}$cf_cv_sizechange" >&6 + if test "$cf_cv_sizechange" != no ; then + +@@ -22688,13 +22707,13 @@ + esac + fi + +-echo "$as_me:22691: checking for memmove" >&5 ++echo "$as_me:22710: checking for memmove" >&5 + echo $ECHO_N "checking for memmove... $ECHO_C" >&6 + if test "${ac_cv_func_memmove+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22697 "configure" ++#line 22716 "configure" + #include "confdefs.h" + #define memmove autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -22725,16 +22744,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22728: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22747: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22731: \$? = $ac_status" >&5 ++ echo "$as_me:22750: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22734: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22753: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22737: \$? = $ac_status" >&5 ++ echo "$as_me:22756: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_memmove=yes + else +@@ -22744,19 +22763,19 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:22747: result: $ac_cv_func_memmove" >&5 ++echo "$as_me:22766: result: $ac_cv_func_memmove" >&5 + echo "${ECHO_T}$ac_cv_func_memmove" >&6 + if test "$ac_cv_func_memmove" = yes; then + : + else + +-echo "$as_me:22753: checking for bcopy" >&5 ++echo "$as_me:22772: checking for bcopy" >&5 + echo $ECHO_N "checking for bcopy... $ECHO_C" >&6 + if test "${ac_cv_func_bcopy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22759 "configure" ++#line 22778 "configure" + #include "confdefs.h" + #define bcopy autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -22787,16 +22806,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22790: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22809: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22793: \$? = $ac_status" >&5 ++ echo "$as_me:22812: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22796: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22815: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22799: \$? = $ac_status" >&5 ++ echo "$as_me:22818: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_bcopy=yes + else +@@ -22806,11 +22825,11 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:22809: result: $ac_cv_func_bcopy" >&5 ++echo "$as_me:22828: result: $ac_cv_func_bcopy" >&5 + echo "${ECHO_T}$ac_cv_func_bcopy" >&6 + if test "$ac_cv_func_bcopy" = yes; then + +- echo "$as_me:22813: checking if bcopy does overlapping moves" >&5 ++ echo "$as_me:22832: checking if bcopy does overlapping moves" >&5 + echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6 + if test "${cf_cv_good_bcopy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -22820,7 +22839,7 @@ + cf_cv_good_bcopy=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22823 "configure" ++#line 22842 "configure" + #include "confdefs.h" + + int main(void) { +@@ -22834,15 +22853,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:22837: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22856: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22840: \$? = $ac_status" >&5 ++ echo "$as_me:22859: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:22842: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22861: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22845: \$? = $ac_status" >&5 ++ echo "$as_me:22864: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_good_bcopy=yes + else +@@ -22855,7 +22874,7 @@ + fi + + fi +-echo "$as_me:22858: result: $cf_cv_good_bcopy" >&5 ++echo "$as_me:22877: result: $cf_cv_good_bcopy" >&5 + echo "${ECHO_T}$cf_cv_good_bcopy" >&6 + + else +@@ -22882,13 +22901,13 @@ + for ac_func in posix_openpt + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:22885: checking for $ac_func" >&5 ++echo "$as_me:22904: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22891 "configure" ++#line 22910 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -22919,16 +22938,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22922: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22941: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22925: \$? = $ac_status" >&5 ++ echo "$as_me:22944: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22928: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22947: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22931: \$? = $ac_status" >&5 ++ echo "$as_me:22950: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -22938,7 +22957,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:22941: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:22960: result: `eval echo '${'"$as_ac_var"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 + if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:22970: checking if poll really works" >&5 + echo $ECHO_N "checking if poll really works... $ECHO_C" >&6 + if test "${cf_cv_working_poll+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -22958,7 +22977,7 @@ + cf_cv_working_poll=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22961 "configure" ++#line 22980 "configure" + #include "confdefs.h" + + #include +@@ -23010,15 +23029,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:23013: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23032: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23016: \$? = $ac_status" >&5 ++ echo "$as_me:23035: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:23018: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23037: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23021: \$? = $ac_status" >&5 ++ echo "$as_me:23040: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_working_poll=yes + else +@@ -23030,21 +23049,21 @@ + rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" + fi + fi +-echo "$as_me:23033: result: $cf_cv_working_poll" >&5 ++echo "$as_me:23052: result: $cf_cv_working_poll" >&5 + echo "${ECHO_T}$cf_cv_working_poll" >&6 + test "$cf_cv_working_poll" = "yes" && + cat >>confdefs.h <<\EOF + #define HAVE_WORKING_POLL 1 + EOF + +-echo "$as_me:23040: checking for va_copy" >&5 ++echo "$as_me:23059: checking for va_copy" >&5 + echo $ECHO_N "checking for va_copy... $ECHO_C" >&6 + if test "${cf_cv_have_va_copy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23047 "configure" ++#line 23066 "configure" + #include "confdefs.h" + + #include +@@ -23061,16 +23080,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23064: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23083: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23067: \$? = $ac_status" >&5 ++ echo "$as_me:23086: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23070: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23089: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23073: \$? = $ac_status" >&5 ++ echo "$as_me:23092: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have_va_copy=yes + else +@@ -23080,7 +23099,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:23083: result: $cf_cv_have_va_copy" >&5 ++echo "$as_me:23102: result: $cf_cv_have_va_copy" >&5 + echo "${ECHO_T}$cf_cv_have_va_copy" >&6 + + if test "$cf_cv_have_va_copy" = yes; +@@ -23092,14 +23111,14 @@ + + else # !cf_cv_have_va_copy + +-echo "$as_me:23095: checking for __va_copy" >&5 ++echo "$as_me:23114: checking for __va_copy" >&5 + echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6 + if test "${cf_cv_have___va_copy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23102 "configure" ++#line 23121 "configure" + #include "confdefs.h" + + #include +@@ -23116,16 +23135,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23119: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23138: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23122: \$? = $ac_status" >&5 ++ echo "$as_me:23141: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23125: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23144: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23128: \$? = $ac_status" >&5 ++ echo "$as_me:23147: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have___va_copy=yes + else +@@ -23135,7 +23154,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:23138: result: $cf_cv_have___va_copy" >&5 ++echo "$as_me:23157: result: $cf_cv_have___va_copy" >&5 + echo "${ECHO_T}$cf_cv_have___va_copy" >&6 + + if test "$cf_cv_have___va_copy" = yes +@@ -23147,14 +23166,14 @@ + + else # !cf_cv_have___va_copy + +-echo "$as_me:23150: checking for __builtin_va_copy" >&5 ++echo "$as_me:23169: checking for __builtin_va_copy" >&5 + echo $ECHO_N "checking for __builtin_va_copy... $ECHO_C" >&6 + if test "${cf_cv_have___builtin_va_copy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23157 "configure" ++#line 23176 "configure" + #include "confdefs.h" + + #include +@@ -23171,16 +23190,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23174: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23193: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23177: \$? = $ac_status" >&5 ++ echo "$as_me:23196: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23180: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23199: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23183: \$? = $ac_status" >&5 ++ echo "$as_me:23202: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have___builtin_va_copy=yes + else +@@ -23190,7 +23209,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:23193: result: $cf_cv_have___builtin_va_copy" >&5 ++echo "$as_me:23212: result: $cf_cv_have___builtin_va_copy" >&5 + echo "${ECHO_T}$cf_cv_have___builtin_va_copy" >&6 + + test "$cf_cv_have___builtin_va_copy" = yes && +@@ -23208,14 +23227,14 @@ + ;; + + (*) +- echo "$as_me:23211: checking if we can simply copy va_list" >&5 ++ echo "$as_me:23230: checking if we can simply copy va_list" >&5 + echo $ECHO_N "checking if we can simply copy va_list... $ECHO_C" >&6 + if test "${cf_cv_pointer_va_list+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23218 "configure" ++#line 23237 "configure" + #include "confdefs.h" + + #include +@@ -23232,16 +23251,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23235: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23254: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23238: \$? = $ac_status" >&5 ++ echo "$as_me:23257: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23241: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23260: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23244: \$? = $ac_status" >&5 ++ echo "$as_me:23263: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_pointer_va_list=yes + else +@@ -23251,19 +23270,19 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:23254: result: $cf_cv_pointer_va_list" >&5 ++echo "$as_me:23273: result: $cf_cv_pointer_va_list" >&5 + echo "${ECHO_T}$cf_cv_pointer_va_list" >&6 + + if test "$cf_cv_pointer_va_list" = no + then +- echo "$as_me:23259: checking if we can copy va_list indirectly" >&5 ++ echo "$as_me:23278: checking if we can copy va_list indirectly" >&5 + echo $ECHO_N "checking if we can copy va_list indirectly... $ECHO_C" >&6 + if test "${cf_cv_array_va_list+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23266 "configure" ++#line 23285 "configure" + #include "confdefs.h" + + #include +@@ -23280,16 +23299,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23283: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23302: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23286: \$? = $ac_status" >&5 ++ echo "$as_me:23305: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23289: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23308: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23292: \$? = $ac_status" >&5 ++ echo "$as_me:23311: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_array_va_list=yes + else +@@ -23299,7 +23318,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:23302: result: $cf_cv_array_va_list" >&5 ++echo "$as_me:23321: result: $cf_cv_array_va_list" >&5 + echo "${ECHO_T}$cf_cv_array_va_list" >&6 + test "$cf_cv_array_va_list" = yes && + cat >>confdefs.h <<\EOF +@@ -23310,13 +23329,13 @@ + ;; + esac + +-echo "$as_me:23313: checking for pid_t" >&5 ++echo "$as_me:23332: checking for pid_t" >&5 + echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 + if test "${ac_cv_type_pid_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23319 "configure" ++#line 23338 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -23331,16 +23350,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:23334: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:23353: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:23337: \$? = $ac_status" >&5 ++ echo "$as_me:23356: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:23340: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23359: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23343: \$? = $ac_status" >&5 ++ echo "$as_me:23362: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_pid_t=yes + else +@@ -23350,7 +23369,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:23353: result: $ac_cv_type_pid_t" >&5 ++echo "$as_me:23372: result: $ac_cv_type_pid_t" >&5 + echo "${ECHO_T}$ac_cv_type_pid_t" >&6 + if test "$ac_cv_type_pid_t" = yes; then + : +@@ -23365,23 +23384,23 @@ + for ac_header in unistd.h vfork.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:23368: checking for $ac_header" >&5 ++echo "$as_me:23387: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23374 "configure" ++#line 23393 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:23378: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:23397: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:23384: \$? = $ac_status" >&5 ++ echo "$as_me:23403: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -23400,7 +23419,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:23403: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:23422: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:23435: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23422 "configure" ++#line 23441 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -23450,16 +23469,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23453: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23472: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23456: \$? = $ac_status" >&5 ++ echo "$as_me:23475: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23459: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23478: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23462: \$? = $ac_status" >&5 ++ echo "$as_me:23481: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -23469,7 +23488,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:23472: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:23491: result: `eval echo '${'"$as_ac_var"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 + if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then + cat >>confdefs.h <&5 ++ echo "$as_me:23503: checking for working fork" >&5 + echo $ECHO_N "checking for working fork... $ECHO_C" >&6 + if test "${ac_cv_func_fork_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -23504,15 +23523,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:23507: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23526: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23510: \$? = $ac_status" >&5 ++ echo "$as_me:23529: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:23512: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23531: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23515: \$? = $ac_status" >&5 ++ echo "$as_me:23534: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_fork_works=yes + else +@@ -23524,7 +23543,7 @@ + rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" + fi + fi +-echo "$as_me:23527: result: $ac_cv_func_fork_works" >&5 ++echo "$as_me:23546: result: $ac_cv_func_fork_works" >&5 + echo "${ECHO_T}$ac_cv_func_fork_works" >&6 + + fi +@@ -23538,12 +23557,12 @@ + ac_cv_func_fork_works=yes + ;; + esac +- { echo "$as_me:23541: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 ++ { echo "$as_me:23560: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 + echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;} + fi + ac_cv_func_vfork_works=$ac_cv_func_vfork + if test "x$ac_cv_func_vfork" = xyes; then +- echo "$as_me:23546: checking for working vfork" >&5 ++ echo "$as_me:23565: checking for working vfork" >&5 + echo $ECHO_N "checking for working vfork... $ECHO_C" >&6 + if test "${ac_cv_func_vfork_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -23552,7 +23571,7 @@ + ac_cv_func_vfork_works=cross + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23555 "configure" ++#line 23574 "configure" + #include "confdefs.h" + /* Thanks to Paul Eggert for this test. */ + #include +@@ -23649,15 +23668,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:23652: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23671: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23655: \$? = $ac_status" >&5 ++ echo "$as_me:23674: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:23657: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23676: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23660: \$? = $ac_status" >&5 ++ echo "$as_me:23679: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_vfork_works=yes + else +@@ -23669,13 +23688,13 @@ + rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" + fi + fi +-echo "$as_me:23672: result: $ac_cv_func_vfork_works" >&5 ++echo "$as_me:23691: result: $ac_cv_func_vfork_works" >&5 + echo "${ECHO_T}$ac_cv_func_vfork_works" >&6 + + fi; + if test "x$ac_cv_func_fork_works" = xcross; then + ac_cv_func_vfork_works=ac_cv_func_vfork +- { echo "$as_me:23678: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 ++ { echo "$as_me:23697: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 + echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;} + fi + +@@ -23700,7 +23719,7 @@ + + fi + +-echo "$as_me:23703: checking if fopen accepts explicit binary mode" >&5 ++echo "$as_me:23722: checking if fopen accepts explicit binary mode" >&5 + echo $ECHO_N "checking if fopen accepts explicit binary mode... $ECHO_C" >&6 + if test "${cf_cv_fopen_bin_r+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -23710,7 +23729,7 @@ + cf_cv_fopen_bin_r=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23713 "configure" ++#line 23732 "configure" + #include "confdefs.h" + + #include +@@ -23743,15 +23762,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:23746: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23765: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23749: \$? = $ac_status" >&5 ++ echo "$as_me:23768: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:23751: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23770: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23754: \$? = $ac_status" >&5 ++ echo "$as_me:23773: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_fopen_bin_r=yes + else +@@ -23764,7 +23783,7 @@ + fi + + fi +-echo "$as_me:23767: result: $cf_cv_fopen_bin_r" >&5 ++echo "$as_me:23786: result: $cf_cv_fopen_bin_r" >&5 + echo "${ECHO_T}$cf_cv_fopen_bin_r" >&6 + test "x$cf_cv_fopen_bin_r" != xno && + cat >>confdefs.h <<\EOF +@@ -23773,7 +23792,7 @@ + + # special check for test/ditto.c + +-echo "$as_me:23776: checking for openpty in -lutil" >&5 ++echo "$as_me:23795: checking for openpty in -lutil" >&5 + echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6 + if test "${ac_cv_lib_util_openpty+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -23781,7 +23800,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lutil $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23784 "configure" ++#line 23803 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -23800,16 +23819,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23803: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23822: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23806: \$? = $ac_status" >&5 ++ echo "$as_me:23825: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23809: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23828: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23812: \$? = $ac_status" >&5 ++ echo "$as_me:23831: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_util_openpty=yes + else +@@ -23820,7 +23839,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:23823: result: $ac_cv_lib_util_openpty" >&5 ++echo "$as_me:23842: result: $ac_cv_lib_util_openpty" >&5 + echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6 + if test "$ac_cv_lib_util_openpty" = yes; then + cf_cv_lib_util=yes +@@ -23828,7 +23847,7 @@ + cf_cv_lib_util=no + fi + +-echo "$as_me:23831: checking for openpty header" >&5 ++echo "$as_me:23850: checking for openpty header" >&5 + echo $ECHO_N "checking for openpty header... $ECHO_C" >&6 + if test "${cf_cv_func_openpty+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -23855,7 +23874,7 @@ + for cf_header in pty.h libutil.h util.h + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23858 "configure" ++#line 23877 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -23872,16 +23891,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23875: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23894: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23878: \$? = $ac_status" >&5 ++ echo "$as_me:23897: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23881: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23900: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23884: \$? = $ac_status" >&5 ++ echo "$as_me:23903: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_func_openpty=$cf_header +@@ -23899,7 +23918,7 @@ + LIBS="$cf_save_LIBS" + + fi +-echo "$as_me:23902: result: $cf_cv_func_openpty" >&5 ++echo "$as_me:23921: result: $cf_cv_func_openpty" >&5 + echo "${ECHO_T}$cf_cv_func_openpty" >&6 + + if test "$cf_cv_func_openpty" != no ; then +@@ -23972,7 +23991,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23975 "configure" ++#line 23994 "configure" + #include "confdefs.h" + #include + int +@@ -23984,16 +24003,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:23987: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24006: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:23990: \$? = $ac_status" >&5 ++ echo "$as_me:24009: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:23993: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24012: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23996: \$? = $ac_status" >&5 ++ echo "$as_me:24015: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -24010,7 +24029,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:24013: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:24032: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -24046,7 +24065,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me:-configure}:24049: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:24068: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -24057,7 +24076,7 @@ + else + case "$with_hashed_db" in + (./*|../*|/*) +- { echo "$as_me:24060: WARNING: no such directory $with_hashed_db" >&5 ++ { echo "$as_me:24079: WARNING: no such directory $with_hashed_db" >&5 + echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;} + ;; + (*) +@@ -24129,7 +24148,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24132 "configure" ++#line 24151 "configure" + #include "confdefs.h" + #include + int +@@ -24141,16 +24160,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:24144: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24163: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24147: \$? = $ac_status" >&5 ++ echo "$as_me:24166: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:24150: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24169: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24153: \$? = $ac_status" >&5 ++ echo "$as_me:24172: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -24167,7 +24186,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:24170: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:24189: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -24247,7 +24266,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me:-configure}:24250: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:24269: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -24264,23 +24283,23 @@ + fi + esac + +-echo "$as_me:24267: checking for db.h" >&5 ++echo "$as_me:24286: checking for db.h" >&5 + echo $ECHO_N "checking for db.h... $ECHO_C" >&6 + if test "${ac_cv_header_db_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24273 "configure" ++#line 24292 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:24277: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:24296: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:24283: \$? = $ac_status" >&5 ++ echo "$as_me:24302: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -24299,11 +24318,11 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:24302: result: $ac_cv_header_db_h" >&5 ++echo "$as_me:24321: result: $ac_cv_header_db_h" >&5 + echo "${ECHO_T}$ac_cv_header_db_h" >&6 + if test "$ac_cv_header_db_h" = yes; then + +-echo "$as_me:24306: checking for version of db" >&5 ++echo "$as_me:24325: checking for version of db" >&5 + echo $ECHO_N "checking for version of db... $ECHO_C" >&6 + if test "${cf_cv_hashed_db_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -24314,10 +24333,10 @@ + for cf_db_version in 1 2 3 4 5 6 + do + +-echo "${as_me:-configure}:24317: testing checking for db version $cf_db_version ..." 1>&5 ++echo "${as_me:-configure}:24336: testing checking for db version $cf_db_version ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24320 "configure" ++#line 24339 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -24347,16 +24366,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:24350: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24369: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24353: \$? = $ac_status" >&5 ++ echo "$as_me:24372: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:24356: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24375: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24359: \$? = $ac_status" >&5 ++ echo "$as_me:24378: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_hashed_db_version=$cf_db_version +@@ -24370,16 +24389,16 @@ + done + + fi +-echo "$as_me:24373: result: $cf_cv_hashed_db_version" >&5 ++echo "$as_me:24392: result: $cf_cv_hashed_db_version" >&5 + echo "${ECHO_T}$cf_cv_hashed_db_version" >&6 + + if test "$cf_cv_hashed_db_version" = unknown ; then +- { { echo "$as_me:24377: error: Cannot determine version of db" >&5 ++ { { echo "$as_me:24396: error: Cannot determine version of db" >&5 + echo "$as_me: error: Cannot determine version of db" >&2;} + { (exit 1); exit 1; }; } + else + +-echo "$as_me:24382: checking for db libraries" >&5 ++echo "$as_me:24401: checking for db libraries" >&5 + echo $ECHO_N "checking for db libraries... $ECHO_C" >&6 + if test "${cf_cv_hashed_db_libs+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -24409,10 +24428,10 @@ + + fi + +-echo "${as_me:-configure}:24412: testing checking for library $cf_db_libs ..." 1>&5 ++echo "${as_me:-configure}:24431: testing checking for library $cf_db_libs ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24415 "configure" ++#line 24434 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -24467,16 +24486,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:24470: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24489: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:24473: \$? = $ac_status" >&5 ++ echo "$as_me:24492: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:24476: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24495: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24479: \$? = $ac_status" >&5 ++ echo "$as_me:24498: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + if test -n "$cf_db_libs" ; then +@@ -24496,11 +24515,11 @@ + done + + fi +-echo "$as_me:24499: result: $cf_cv_hashed_db_libs" >&5 ++echo "$as_me:24518: result: $cf_cv_hashed_db_libs" >&5 + echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6 + + if test "$cf_cv_hashed_db_libs" = unknown ; then +- { { echo "$as_me:24503: error: Cannot determine library for db" >&5 ++ { { echo "$as_me:24522: error: Cannot determine library for db" >&5 + echo "$as_me: error: Cannot determine library for db" >&2;} + { (exit 1); exit 1; }; } + elif test "$cf_cv_hashed_db_libs" != default ; then +@@ -24526,7 +24545,7 @@ + + else + +- { { echo "$as_me:24529: error: Cannot find db.h" >&5 ++ { { echo "$as_me:24548: error: Cannot find db.h" >&5 + echo "$as_me: error: Cannot find db.h" >&2;} + { (exit 1); exit 1; }; } + +@@ -24541,7 +24560,7 @@ + + # Just in case, check if the C compiler has a bool type. + +-echo "$as_me:24544: checking if we should include stdbool.h" >&5 ++echo "$as_me:24563: checking if we should include stdbool.h" >&5 + echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 + + if test "${cf_cv_header_stdbool_h+set}" = set; then +@@ -24549,7 +24568,7 @@ + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24552 "configure" ++#line 24571 "configure" + #include "confdefs.h" + + int +@@ -24561,23 +24580,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:24564: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24583: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24567: \$? = $ac_status" >&5 ++ echo "$as_me:24586: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:24570: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24589: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24573: \$? = $ac_status" >&5 ++ echo "$as_me:24592: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_header_stdbool_h=0 + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24580 "configure" ++#line 24599 "configure" + #include "confdefs.h" + + #ifndef __BEOS__ +@@ -24593,16 +24612,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:24596: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24615: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24599: \$? = $ac_status" >&5 ++ echo "$as_me:24618: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:24602: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24621: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24605: \$? = $ac_status" >&5 ++ echo "$as_me:24624: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_header_stdbool_h=1 + else +@@ -24616,13 +24635,13 @@ + fi + + if test "$cf_cv_header_stdbool_h" = 1 +-then echo "$as_me:24619: result: yes" >&5 ++then echo "$as_me:24638: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +-else echo "$as_me:24621: result: no" >&5 ++else echo "$as_me:24640: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:24625: checking for builtin bool type" >&5 ++echo "$as_me:24644: checking for builtin bool type" >&5 + echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 + + if test "${cf_cv_cc_bool_type+set}" = set; then +@@ -24630,7 +24649,7 @@ + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24633 "configure" ++#line 24652 "configure" + #include "confdefs.h" + + #include +@@ -24645,16 +24664,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:24648: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24667: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24651: \$? = $ac_status" >&5 ++ echo "$as_me:24670: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:24654: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24673: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24657: \$? = $ac_status" >&5 ++ echo "$as_me:24676: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_cc_bool_type=1 + else +@@ -24667,9 +24686,9 @@ + fi + + if test "$cf_cv_cc_bool_type" = 1 +-then echo "$as_me:24670: result: yes" >&5 ++then echo "$as_me:24689: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +-else echo "$as_me:24672: result: no" >&5 ++else echo "$as_me:24691: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -24686,10 +24705,10 @@ + + cf_save="$LIBS" + LIBS="$LIBS $CXXLIBS" +- echo "$as_me:24689: checking if we already have C++ library" >&5 ++ echo "$as_me:24708: checking if we already have C++ library" >&5 + echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24692 "configure" ++#line 24711 "configure" + #include "confdefs.h" + + #include +@@ -24703,16 +24722,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:24706: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24725: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:24709: \$? = $ac_status" >&5 ++ echo "$as_me:24728: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:24712: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24731: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24715: \$? = $ac_status" >&5 ++ echo "$as_me:24734: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_have_libstdcpp=yes + else +@@ -24721,7 +24740,7 @@ + cf_have_libstdcpp=no + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +- echo "$as_me:24724: result: $cf_have_libstdcpp" >&5 ++ echo "$as_me:24743: result: $cf_have_libstdcpp" >&5 + echo "${ECHO_T}$cf_have_libstdcpp" >&6 + LIBS="$cf_save" + +@@ -24740,7 +24759,7 @@ + ;; + esac + +- echo "$as_me:24743: checking for library $cf_stdcpp_libname" >&5 ++ echo "$as_me:24762: checking for library $cf_stdcpp_libname" >&5 + echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6 + if test "${cf_cv_libstdcpp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -24766,7 +24785,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24769 "configure" ++#line 24788 "configure" + #include "confdefs.h" + + #include +@@ -24780,16 +24799,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:24783: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24802: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:24786: \$? = $ac_status" >&5 ++ echo "$as_me:24805: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:24789: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24808: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24792: \$? = $ac_status" >&5 ++ echo "$as_me:24811: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_libstdcpp=yes + else +@@ -24801,7 +24820,7 @@ + LIBS="$cf_save" + + fi +-echo "$as_me:24804: result: $cf_cv_libstdcpp" >&5 ++echo "$as_me:24823: result: $cf_cv_libstdcpp" >&5 + echo "${ECHO_T}$cf_cv_libstdcpp" >&6 + test "$cf_cv_libstdcpp" = yes && { + cf_add_libs="$CXXLIBS" +@@ -24823,7 +24842,7 @@ + fi + fi + +- echo "$as_me:24826: checking whether $CXX understands -c and -o together" >&5 ++ echo "$as_me:24845: checking whether $CXX understands -c and -o together" >&5 + echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6 + if test "${cf_cv_prog_CXX_c_o+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -24838,15 +24857,15 @@ + # We do the test twice because some compilers refuse to overwrite an + # existing .o file with -o, though they will create one. + ac_try='$CXX $CXXFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5' +-if { (eval echo "$as_me:24841: \"$ac_try\"") >&5 ++if { (eval echo "$as_me:24860: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24844: \$? = $ac_status" >&5 ++ echo "$as_me:24863: \$? = $ac_status" >&5 + (exit "$ac_status"); } && +- test -f conftest2.$ac_objext && { (eval echo "$as_me:24846: \"$ac_try\"") >&5 ++ test -f conftest2.$ac_objext && { (eval echo "$as_me:24865: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24849: \$? = $ac_status" >&5 ++ echo "$as_me:24868: \$? = $ac_status" >&5 + (exit "$ac_status"); }; + then + eval cf_cv_prog_CXX_c_o=yes +@@ -24857,10 +24876,10 @@ + + fi + if test "$cf_cv_prog_CXX_c_o" = yes; then +- echo "$as_me:24860: result: yes" >&5 ++ echo "$as_me:24879: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:24863: result: no" >&5 ++ echo "$as_me:24882: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -24880,7 +24899,7 @@ + ;; + esac + if test "$GXX" = yes; then +- echo "$as_me:24883: checking for lib$cf_gpp_libname" >&5 ++ echo "$as_me:24902: checking for lib$cf_gpp_libname" >&5 + echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6 + cf_save="$LIBS" + +@@ -24901,7 +24920,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24904 "configure" ++#line 24923 "configure" + #include "confdefs.h" + + #include <$cf_gpp_libname/builtin.h> +@@ -24915,16 +24934,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:24918: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24937: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:24921: \$? = $ac_status" >&5 ++ echo "$as_me:24940: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:24924: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24943: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24927: \$? = $ac_status" >&5 ++ echo "$as_me:24946: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cxx_library=yes + +@@ -24961,7 +24980,7 @@ + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24964 "configure" ++#line 24983 "configure" + #include "confdefs.h" + + #include +@@ -24975,16 +24994,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:24978: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24997: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:24981: \$? = $ac_status" >&5 ++ echo "$as_me:25000: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:24984: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25003: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24987: \$? = $ac_status" >&5 ++ echo "$as_me:25006: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cxx_library=yes + +@@ -25017,7 +25036,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS="$cf_save" +- echo "$as_me:25020: result: $cf_cxx_library" >&5 ++ echo "$as_me:25039: result: $cf_cxx_library" >&5 + echo "${ECHO_T}$cf_cxx_library" >&6 + fi + +@@ -25033,7 +25052,7 @@ + ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + ac_main_return="return" +-echo "$as_me:25036: checking how to run the C++ preprocessor" >&5 ++echo "$as_me:25055: checking how to run the C++ preprocessor" >&5 + echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 + if test -z "$CXXCPP"; then + if test "${ac_cv_prog_CXXCPP+set}" = set; then +@@ -25050,18 +25069,18 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25053 "configure" ++#line 25072 "configure" + #include "confdefs.h" + #include + Syntax error + _ACEOF +-if { (eval echo "$as_me:25058: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:25077: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:25064: \$? = $ac_status" >&5 ++ echo "$as_me:25083: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -25084,17 +25103,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25087 "configure" ++#line 25106 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:25091: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:25110: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:25097: \$? = $ac_status" >&5 ++ echo "$as_me:25116: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -25131,7 +25150,7 @@ + else + ac_cv_prog_CXXCPP=$CXXCPP + fi +-echo "$as_me:25134: result: $CXXCPP" >&5 ++echo "$as_me:25153: result: $CXXCPP" >&5 + echo "${ECHO_T}$CXXCPP" >&6 + ac_preproc_ok=false + for ac_cxx_preproc_warn_flag in '' yes +@@ -25141,18 +25160,18 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25144 "configure" ++#line 25163 "configure" + #include "confdefs.h" + #include + Syntax error + _ACEOF +-if { (eval echo "$as_me:25149: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:25168: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:25155: \$? = $ac_status" >&5 ++ echo "$as_me:25174: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -25175,17 +25194,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25178 "configure" ++#line 25197 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:25182: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:25201: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:25188: \$? = $ac_status" >&5 ++ echo "$as_me:25207: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -25213,7 +25232,7 @@ + if $ac_preproc_ok; then + : + else +- { { echo "$as_me:25216: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 ++ { { echo "$as_me:25235: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 + echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -25228,23 +25247,23 @@ + for ac_header in typeinfo + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:25231: checking for $ac_header" >&5 ++echo "$as_me:25250: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25237 "configure" ++#line 25256 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:25241: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:25260: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:25247: \$? = $ac_status" >&5 ++ echo "$as_me:25266: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -25263,7 +25282,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:25266: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:25285: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:25298: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25285 "configure" ++#line 25304 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:25289: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:25308: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:25295: \$? = $ac_status" >&5 ++ echo "$as_me:25314: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -25311,7 +25330,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:25314: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:25333: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++ echo "$as_me:25344: checking if iostream uses std-namespace" >&5 + echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25328 "configure" ++#line 25347 "configure" + #include "confdefs.h" + + #include +@@ -25342,16 +25361,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25345: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25364: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25348: \$? = $ac_status" >&5 ++ echo "$as_me:25367: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25351: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25370: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25354: \$? = $ac_status" >&5 ++ echo "$as_me:25373: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_iostream_namespace=yes + else +@@ -25360,7 +25379,7 @@ + cf_iostream_namespace=no + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +- echo "$as_me:25363: result: $cf_iostream_namespace" >&5 ++ echo "$as_me:25382: result: $cf_iostream_namespace" >&5 + echo "${ECHO_T}$cf_iostream_namespace" >&6 + if test "$cf_iostream_namespace" = yes ; then + +@@ -25371,7 +25390,7 @@ + fi + fi + +-echo "$as_me:25374: checking if we should include stdbool.h" >&5 ++echo "$as_me:25393: checking if we should include stdbool.h" >&5 + echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 + + if test "${cf_cv_header_stdbool_h+set}" = set; then +@@ -25379,7 +25398,7 @@ + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25382 "configure" ++#line 25401 "configure" + #include "confdefs.h" + + int +@@ -25391,23 +25410,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25394: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25413: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25397: \$? = $ac_status" >&5 ++ echo "$as_me:25416: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25400: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25419: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25403: \$? = $ac_status" >&5 ++ echo "$as_me:25422: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_header_stdbool_h=0 + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25410 "configure" ++#line 25429 "configure" + #include "confdefs.h" + + #ifndef __BEOS__ +@@ -25423,16 +25442,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25426: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25445: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25429: \$? = $ac_status" >&5 ++ echo "$as_me:25448: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25432: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25451: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25435: \$? = $ac_status" >&5 ++ echo "$as_me:25454: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_header_stdbool_h=1 + else +@@ -25446,13 +25465,13 @@ + fi + + if test "$cf_cv_header_stdbool_h" = 1 +-then echo "$as_me:25449: result: yes" >&5 ++then echo "$as_me:25468: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +-else echo "$as_me:25451: result: no" >&5 ++else echo "$as_me:25470: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:25455: checking for builtin bool type" >&5 ++echo "$as_me:25474: checking for builtin bool type" >&5 + echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 + + if test "${cf_cv_builtin_bool+set}" = set; then +@@ -25460,7 +25479,7 @@ + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25463 "configure" ++#line 25482 "configure" + #include "confdefs.h" + + #include +@@ -25475,16 +25494,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25478: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25497: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25481: \$? = $ac_status" >&5 ++ echo "$as_me:25500: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25484: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25503: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25487: \$? = $ac_status" >&5 ++ echo "$as_me:25506: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_builtin_bool=1 + else +@@ -25497,19 +25516,19 @@ + fi + + if test "$cf_cv_builtin_bool" = 1 +-then echo "$as_me:25500: result: yes" >&5 ++then echo "$as_me:25519: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +-else echo "$as_me:25502: result: no" >&5 ++else echo "$as_me:25521: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:25506: checking for bool" >&5 ++echo "$as_me:25525: checking for bool" >&5 + echo $ECHO_N "checking for bool... $ECHO_C" >&6 + if test "${ac_cv_type_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25512 "configure" ++#line 25531 "configure" + #include "confdefs.h" + + #include +@@ -25545,16 +25564,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25548: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25567: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25551: \$? = $ac_status" >&5 ++ echo "$as_me:25570: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25554: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25573: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25557: \$? = $ac_status" >&5 ++ echo "$as_me:25576: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_bool=yes + else +@@ -25564,10 +25583,10 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:25567: result: $ac_cv_type_bool" >&5 ++echo "$as_me:25586: result: $ac_cv_type_bool" >&5 + echo "${ECHO_T}$ac_cv_type_bool" >&6 + +-echo "$as_me:25570: checking size of bool" >&5 ++echo "$as_me:25589: checking size of bool" >&5 + echo $ECHO_N "checking size of bool... $ECHO_C" >&6 + if test "${ac_cv_sizeof_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -25576,7 +25595,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25579 "configure" ++#line 25598 "configure" + #include "confdefs.h" + + #include +@@ -25609,21 +25628,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25612: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25631: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25615: \$? = $ac_status" >&5 ++ echo "$as_me:25634: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25618: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25637: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25621: \$? = $ac_status" >&5 ++ echo "$as_me:25640: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25626 "configure" ++#line 25645 "configure" + #include "confdefs.h" + + #include +@@ -25656,16 +25675,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25659: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25678: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25662: \$? = $ac_status" >&5 ++ echo "$as_me:25681: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25665: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25684: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25668: \$? = $ac_status" >&5 ++ echo "$as_me:25687: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid; break + else +@@ -25681,7 +25700,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25684 "configure" ++#line 25703 "configure" + #include "confdefs.h" + + #include +@@ -25714,16 +25733,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25717: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25736: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25720: \$? = $ac_status" >&5 ++ echo "$as_me:25739: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25723: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25742: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25726: \$? = $ac_status" >&5 ++ echo "$as_me:25745: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=$ac_mid; break + else +@@ -25739,7 +25758,7 @@ + while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25742 "configure" ++#line 25761 "configure" + #include "confdefs.h" + + #include +@@ -25772,16 +25791,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25775: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25794: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25778: \$? = $ac_status" >&5 ++ echo "$as_me:25797: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25781: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25800: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25784: \$? = $ac_status" >&5 ++ echo "$as_me:25803: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid + else +@@ -25794,12 +25813,12 @@ + ac_cv_sizeof_bool=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:25797: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:25816: error: cannot run test program while cross compiling" >&5 + echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25802 "configure" ++#line 25821 "configure" + #include "confdefs.h" + + #include +@@ -25836,15 +25855,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:25839: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:25858: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:25842: \$? = $ac_status" >&5 ++ echo "$as_me:25861: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:25844: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25863: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25847: \$? = $ac_status" >&5 ++ echo "$as_me:25866: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sizeof_bool=`cat conftest.val` + else +@@ -25860,13 +25879,13 @@ + ac_cv_sizeof_bool=0 + fi + fi +-echo "$as_me:25863: result: $ac_cv_sizeof_bool" >&5 ++echo "$as_me:25882: result: $ac_cv_sizeof_bool" >&5 + echo "${ECHO_T}$ac_cv_sizeof_bool" >&6 + cat >>confdefs.h <&5 ++echo "$as_me:25888: checking for type of bool" >&5 + echo $ECHO_N "checking for type of bool... $ECHO_C" >&6 + if test "${cf_cv_type_of_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -25885,7 +25904,7 @@ + + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25888 "configure" ++#line 25907 "configure" + #include "confdefs.h" + + #include +@@ -25927,15 +25946,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:25930: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:25949: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:25933: \$? = $ac_status" >&5 ++ echo "$as_me:25952: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:25935: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25954: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25938: \$? = $ac_status" >&5 ++ echo "$as_me:25957: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_type_of_bool=`cat cf_test.out` + if test -z "$cf_cv_type_of_bool"; then +@@ -25952,19 +25971,19 @@ + rm -f cf_test.out + + fi +-echo "$as_me:25955: result: $cf_cv_type_of_bool" >&5 ++echo "$as_me:25974: result: $cf_cv_type_of_bool" >&5 + echo "${ECHO_T}$cf_cv_type_of_bool" >&6 + + if test "$cf_cv_type_of_bool" = unknown ; then + case .$NCURSES_BOOL in + (.auto|.) NCURSES_BOOL=unsigned;; + esac +- { echo "$as_me:25962: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 ++ { echo "$as_me:25981: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} + cf_cv_type_of_bool=$NCURSES_BOOL + fi + +-echo "$as_me:25967: checking for special defines needed for etip.h" >&5 ++echo "$as_me:25986: checking for special defines needed for etip.h" >&5 + echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6 + cf_save_CXXFLAGS="$CXXFLAGS" + cf_result="none" +@@ -25982,7 +26001,7 @@ + test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}" + test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25985 "configure" ++#line 26004 "configure" + #include "confdefs.h" + + #include +@@ -25996,16 +26015,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25999: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26018: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26002: \$? = $ac_status" >&5 ++ echo "$as_me:26021: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26005: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26024: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26008: \$? = $ac_status" >&5 ++ echo "$as_me:26027: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + test -n "$cf_math" && cat >>confdefs.h <&5 ++echo "$as_me:26048: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + CXXFLAGS="$cf_save_CXXFLAGS" + + if test -n "$CXX"; then +-echo "$as_me:26034: checking if $CXX accepts parameter initialization" >&5 ++echo "$as_me:26053: checking if $CXX accepts parameter initialization" >&5 + echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6 + if test "${cf_cv_cpp_param_init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26048,7 +26067,7 @@ + cf_cv_cpp_param_init=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26051 "configure" ++#line 26070 "configure" + #include "confdefs.h" + + class TEST { +@@ -26067,15 +26086,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:26070: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:26089: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:26073: \$? = $ac_status" >&5 ++ echo "$as_me:26092: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:26075: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26094: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26078: \$? = $ac_status" >&5 ++ echo "$as_me:26097: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_cpp_param_init=yes + else +@@ -26094,7 +26113,7 @@ + ac_main_return="return" + + fi +-echo "$as_me:26097: result: $cf_cv_cpp_param_init" >&5 ++echo "$as_me:26116: result: $cf_cv_cpp_param_init" >&5 + echo "${ECHO_T}$cf_cv_cpp_param_init" >&6 + fi + test "$cf_cv_cpp_param_init" = yes && +@@ -26104,7 +26123,7 @@ + + if test -n "$CXX"; then + +-echo "$as_me:26107: checking if $CXX accepts static_cast" >&5 ++echo "$as_me:26126: checking if $CXX accepts static_cast" >&5 + echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6 + if test "${cf_cv_cpp_static_cast+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26118,7 +26137,7 @@ + ac_main_return="return" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26121 "configure" ++#line 26140 "configure" + #include "confdefs.h" + + class NCursesPanel +@@ -26162,16 +26181,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26165: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26184: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26168: \$? = $ac_status" >&5 ++ echo "$as_me:26187: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26171: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26190: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26174: \$? = $ac_status" >&5 ++ echo "$as_me:26193: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_cpp_static_cast=yes + else +@@ -26189,7 +26208,7 @@ + ac_main_return="return" + + fi +-echo "$as_me:26192: result: $cf_cv_cpp_static_cast" >&5 ++echo "$as_me:26211: result: $cf_cv_cpp_static_cast" >&5 + echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6 + + fi +@@ -26238,13 +26257,13 @@ + else + if test "$cf_cv_header_stdbool_h" = 1 ; then + +-echo "$as_me:26241: checking for bool" >&5 ++echo "$as_me:26260: checking for bool" >&5 + echo $ECHO_N "checking for bool... $ECHO_C" >&6 + if test "${ac_cv_type_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26247 "configure" ++#line 26266 "configure" + #include "confdefs.h" + + #include +@@ -26280,16 +26299,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26283: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26302: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26286: \$? = $ac_status" >&5 ++ echo "$as_me:26305: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26289: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26308: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26292: \$? = $ac_status" >&5 ++ echo "$as_me:26311: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_bool=yes + else +@@ -26299,10 +26318,10 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:26302: result: $ac_cv_type_bool" >&5 ++echo "$as_me:26321: result: $ac_cv_type_bool" >&5 + echo "${ECHO_T}$ac_cv_type_bool" >&6 + +-echo "$as_me:26305: checking size of bool" >&5 ++echo "$as_me:26324: checking size of bool" >&5 + echo $ECHO_N "checking size of bool... $ECHO_C" >&6 + if test "${ac_cv_sizeof_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26311,7 +26330,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26314 "configure" ++#line 26333 "configure" + #include "confdefs.h" + + #include +@@ -26344,21 +26363,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26347: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26366: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26350: \$? = $ac_status" >&5 ++ echo "$as_me:26369: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26353: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26372: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26356: \$? = $ac_status" >&5 ++ echo "$as_me:26375: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26361 "configure" ++#line 26380 "configure" + #include "confdefs.h" + + #include +@@ -26391,16 +26410,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26394: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26413: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26397: \$? = $ac_status" >&5 ++ echo "$as_me:26416: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26400: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26419: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26403: \$? = $ac_status" >&5 ++ echo "$as_me:26422: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid; break + else +@@ -26416,7 +26435,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26419 "configure" ++#line 26438 "configure" + #include "confdefs.h" + + #include +@@ -26449,16 +26468,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26452: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26471: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26455: \$? = $ac_status" >&5 ++ echo "$as_me:26474: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26458: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26477: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26461: \$? = $ac_status" >&5 ++ echo "$as_me:26480: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=$ac_mid; break + else +@@ -26474,7 +26493,7 @@ + while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26477 "configure" ++#line 26496 "configure" + #include "confdefs.h" + + #include +@@ -26507,16 +26526,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26510: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26529: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26513: \$? = $ac_status" >&5 ++ echo "$as_me:26532: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26516: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26535: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26519: \$? = $ac_status" >&5 ++ echo "$as_me:26538: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid + else +@@ -26529,12 +26548,12 @@ + ac_cv_sizeof_bool=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:26532: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:26551: error: cannot run test program while cross compiling" >&5 + echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26537 "configure" ++#line 26556 "configure" + #include "confdefs.h" + + #include +@@ -26571,15 +26590,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:26574: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:26593: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:26577: \$? = $ac_status" >&5 ++ echo "$as_me:26596: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:26579: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26598: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26582: \$? = $ac_status" >&5 ++ echo "$as_me:26601: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sizeof_bool=`cat conftest.val` + else +@@ -26595,13 +26614,13 @@ + ac_cv_sizeof_bool=0 + fi + fi +-echo "$as_me:26598: result: $ac_cv_sizeof_bool" >&5 ++echo "$as_me:26617: result: $ac_cv_sizeof_bool" >&5 + echo "${ECHO_T}$ac_cv_sizeof_bool" >&6 + cat >>confdefs.h <&5 ++echo "$as_me:26623: checking for type of bool" >&5 + echo $ECHO_N "checking for type of bool... $ECHO_C" >&6 + if test "${cf_cv_type_of_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26620,7 +26639,7 @@ + + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26623 "configure" ++#line 26642 "configure" + #include "confdefs.h" + + #include +@@ -26662,15 +26681,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:26665: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:26684: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:26668: \$? = $ac_status" >&5 ++ echo "$as_me:26687: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:26670: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26689: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26673: \$? = $ac_status" >&5 ++ echo "$as_me:26692: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_type_of_bool=`cat cf_test.out` + if test -z "$cf_cv_type_of_bool"; then +@@ -26687,26 +26706,26 @@ + rm -f cf_test.out + + fi +-echo "$as_me:26690: result: $cf_cv_type_of_bool" >&5 ++echo "$as_me:26709: result: $cf_cv_type_of_bool" >&5 + echo "${ECHO_T}$cf_cv_type_of_bool" >&6 + + if test "$cf_cv_type_of_bool" = unknown ; then + case .$NCURSES_BOOL in + (.auto|.) NCURSES_BOOL=unsigned;; + esac +- { echo "$as_me:26697: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 ++ { echo "$as_me:26716: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} + cf_cv_type_of_bool=$NCURSES_BOOL + fi + + else +- echo "$as_me:26703: checking for fallback type of bool" >&5 ++ echo "$as_me:26722: checking for fallback type of bool" >&5 + echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6 + case "$host_cpu" in + (i?86) cf_cv_type_of_bool=char ;; + (*) cf_cv_type_of_bool=int ;; + esac +- echo "$as_me:26709: result: $cf_cv_type_of_bool" >&5 ++ echo "$as_me:26728: result: $cf_cv_type_of_bool" >&5 + echo "${ECHO_T}$cf_cv_type_of_bool" >&6 + fi + fi +@@ -26735,7 +26754,7 @@ + + if test "$cf_with_ada" != "no" ; then + if test "$with_libtool" != "no"; then +- { echo "$as_me:26738: WARNING: libtool does not support Ada - disabling feature" >&5 ++ { echo "$as_me:26757: WARNING: libtool does not support Ada - disabling feature" >&5 + echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;} + cf_with_ada=no + fi +@@ -26752,7 +26771,7 @@ + unset cf_TEMP_gnat + # Extract the first word of "$cf_prog_gnat", so it can be a program name with args. + set dummy $cf_prog_gnat; ac_word=$2 +-echo "$as_me:26755: checking for $ac_word" >&5 ++echo "$as_me:26774: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26769,7 +26788,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word" +- echo "$as_me:26772: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:26791: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -26781,10 +26800,10 @@ + cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat + + if test -n "$cf_TEMP_gnat"; then +- echo "$as_me:26784: result: $cf_TEMP_gnat" >&5 ++ echo "$as_me:26803: result: $cf_TEMP_gnat" >&5 + echo "${ECHO_T}$cf_TEMP_gnat" >&6 + else +- echo "$as_me:26787: result: no" >&5 ++ echo "$as_me:26806: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -26794,7 +26813,7 @@ + unset cf_cv_gnat_version + unset cf_TEMP_gnat + +-echo "$as_me:26797: checking for $cf_prog_gnat version" >&5 ++echo "$as_me:26816: checking for $cf_prog_gnat version" >&5 + echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6 + if test "${cf_cv_gnat_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26805,7 +26824,7 @@ + sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` + + fi +-echo "$as_me:26808: result: $cf_cv_gnat_version" >&5 ++echo "$as_me:26827: result: $cf_cv_gnat_version" >&5 + echo "${ECHO_T}$cf_cv_gnat_version" >&6 + test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no + eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version +@@ -26834,7 +26853,7 @@ + cd conftest.src + for cf_gprconfig in Ada C + do +- echo "$as_me:26837: checking for gprconfig name for $cf_gprconfig" >&5 ++ echo "$as_me:26856: checking for gprconfig name for $cf_gprconfig" >&5 + echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6 + if test "$cf_gprconfig" = C + then +@@ -26853,10 +26872,10 @@ + if test -n "$cf_gprconfig_value" + then + eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value" +- echo "$as_me:26856: result: $cf_gprconfig_value" >&5 ++ echo "$as_me:26875: result: $cf_gprconfig_value" >&5 + echo "${ECHO_T}$cf_gprconfig_value" >&6 + else +- echo "$as_me:26859: result: missing" >&5 ++ echo "$as_me:26878: result: missing" >&5 + echo "${ECHO_T}missing" >&6 + cf_ada_config="#" + break +@@ -26869,7 +26888,7 @@ + if test "x$cf_ada_config" != "x#" + then + +-echo "$as_me:26872: checking for gnat version" >&5 ++echo "$as_me:26891: checking for gnat version" >&5 + echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 + if test "${cf_cv_gnat_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26880,7 +26899,7 @@ + sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` + + fi +-echo "$as_me:26883: result: $cf_cv_gnat_version" >&5 ++echo "$as_me:26902: result: $cf_cv_gnat_version" >&5 + echo "${ECHO_T}$cf_cv_gnat_version" >&6 + test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no + +@@ -26889,7 +26908,7 @@ + cf_cv_prog_gnat_correct=yes + ;; + (*) +- { echo "$as_me:26892: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 ++ { echo "$as_me:26911: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 + echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} + cf_cv_prog_gnat_correct=no + ;; +@@ -26897,7 +26916,7 @@ + + # Extract the first word of "m4", so it can be a program name with args. + set dummy m4; ac_word=$2 +-echo "$as_me:26900: checking for $ac_word" >&5 ++echo "$as_me:26919: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_M4_exists+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26912,7 +26931,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_M4_exists="yes" +-echo "$as_me:26915: found $ac_dir/$ac_word" >&5 ++echo "$as_me:26934: found $ac_dir/$ac_word" >&5 + break + done + +@@ -26921,20 +26940,20 @@ + fi + M4_exists=$ac_cv_prog_M4_exists + if test -n "$M4_exists"; then +- echo "$as_me:26924: result: $M4_exists" >&5 ++ echo "$as_me:26943: result: $M4_exists" >&5 + echo "${ECHO_T}$M4_exists" >&6 + else +- echo "$as_me:26927: result: no" >&5 ++ echo "$as_me:26946: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + if test "$ac_cv_prog_M4_exists" = no; then + cf_cv_prog_gnat_correct=no +- { echo "$as_me:26933: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 ++ { echo "$as_me:26952: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 + echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;} + fi + if test "$cf_cv_prog_gnat_correct" = yes; then +- echo "$as_me:26937: checking if GNAT works" >&5 ++ echo "$as_me:26956: checking if GNAT works" >&5 + echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 + + rm -rf ./conftest* ./*~conftest* +@@ -26962,7 +26981,7 @@ + fi + rm -rf ./conftest* ./*~conftest* + +- echo "$as_me:26965: result: $cf_cv_prog_gnat_correct" >&5 ++ echo "$as_me:26984: result: $cf_cv_prog_gnat_correct" >&5 + echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 + fi + else +@@ -26974,7 +26993,7 @@ + + ADAFLAGS="$ADAFLAGS -gnatpn" + +- echo "$as_me:26977: checking optimization options for ADAFLAGS" >&5 ++ echo "$as_me:26996: checking optimization options for ADAFLAGS" >&5 + echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 + case "$CFLAGS" in + (*-g*) +@@ -26991,10 +27010,10 @@ + + ;; + esac +- echo "$as_me:26994: result: $ADAFLAGS" >&5 ++ echo "$as_me:27013: result: $ADAFLAGS" >&5 + echo "${ECHO_T}$ADAFLAGS" >&6 + +-echo "$as_me:26997: checking if GNATPREP supports -T option" >&5 ++echo "$as_me:27016: checking if GNATPREP supports -T option" >&5 + echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6 + if test "${cf_cv_gnatprep_opt_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -27004,11 +27023,11 @@ + gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes + + fi +-echo "$as_me:27007: result: $cf_cv_gnatprep_opt_t" >&5 ++echo "$as_me:27026: result: $cf_cv_gnatprep_opt_t" >&5 + echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6 + test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS" + +-echo "$as_me:27011: checking if GNAT supports generics" >&5 ++echo "$as_me:27030: checking if GNAT supports generics" >&5 + echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 + case "$cf_cv_gnat_version" in + (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9]) +@@ -27018,7 +27037,7 @@ + cf_gnat_generics=no + ;; + esac +-echo "$as_me:27021: result: $cf_gnat_generics" >&5 ++echo "$as_me:27040: result: $cf_gnat_generics" >&5 + echo "${ECHO_T}$cf_gnat_generics" >&6 + + if test "$cf_gnat_generics" = yes +@@ -27030,7 +27049,7 @@ + cf_generic_objects= + fi + +-echo "$as_me:27033: checking if GNAT supports SIGINT" >&5 ++echo "$as_me:27052: checking if GNAT supports SIGINT" >&5 + echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6 + if test "${cf_cv_gnat_sigint+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -27078,7 +27097,7 @@ + rm -rf ./conftest* ./*~conftest* + + fi +-echo "$as_me:27081: result: $cf_cv_gnat_sigint" >&5 ++echo "$as_me:27100: result: $cf_cv_gnat_sigint" >&5 + echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 + + if test "$cf_cv_gnat_sigint" = yes ; then +@@ -27091,7 +27110,7 @@ + cf_gnat_projects=no + + if test "$enable_gnat_projects" != no ; then +-echo "$as_me:27094: checking if GNAT supports project files" >&5 ++echo "$as_me:27113: checking if GNAT supports project files" >&5 + echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 + case "$cf_cv_gnat_version" in + (3.[0-9]*) +@@ -27154,15 +27173,15 @@ + esac + ;; + esac +-echo "$as_me:27157: result: $cf_gnat_projects" >&5 ++echo "$as_me:27176: result: $cf_gnat_projects" >&5 + echo "${ECHO_T}$cf_gnat_projects" >&6 + fi # enable_gnat_projects + + if test "$cf_gnat_projects" = yes + then +- echo "$as_me:27163: checking if GNAT supports libraries" >&5 ++ echo "$as_me:27182: checking if GNAT supports libraries" >&5 + echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 +- echo "$as_me:27165: result: $cf_gnat_libraries" >&5 ++ echo "$as_me:27184: result: $cf_gnat_libraries" >&5 + echo "${ECHO_T}$cf_gnat_libraries" >&6 + fi + +@@ -27182,7 +27201,7 @@ + then + USE_GNAT_MAKE_GPR="" + else +- { echo "$as_me:27185: WARNING: use old makefile rules since tools are missing" >&5 ++ { echo "$as_me:27204: WARNING: use old makefile rules since tools are missing" >&5 + echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;} + fi + fi +@@ -27194,7 +27213,7 @@ + USE_GNAT_LIBRARIES="#" + fi + +-echo "$as_me:27197: checking for ada-compiler" >&5 ++echo "$as_me:27216: checking for ada-compiler" >&5 + echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6 + + # Check whether --with-ada-compiler or --without-ada-compiler was given. +@@ -27205,12 +27224,12 @@ + cf_ada_compiler=gnatmake + fi; + +-echo "$as_me:27208: result: $cf_ada_compiler" >&5 ++echo "$as_me:27227: result: $cf_ada_compiler" >&5 + echo "${ECHO_T}$cf_ada_compiler" >&6 + + cf_ada_package=terminal_interface + +-echo "$as_me:27213: checking for ada-include" >&5 ++echo "$as_me:27232: checking for ada-include" >&5 + echo $ECHO_N "checking for ada-include... $ECHO_C" >&6 + + # Check whether --with-ada-include or --without-ada-include was given. +@@ -27246,7 +27265,7 @@ + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:27249: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:27268: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -27255,10 +27274,10 @@ + fi + eval ADA_INCLUDE="$withval" + +-echo "$as_me:27258: result: $ADA_INCLUDE" >&5 ++echo "$as_me:27277: result: $ADA_INCLUDE" >&5 + echo "${ECHO_T}$ADA_INCLUDE" >&6 + +-echo "$as_me:27261: checking for ada-objects" >&5 ++echo "$as_me:27280: checking for ada-objects" >&5 + echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6 + + # Check whether --with-ada-objects or --without-ada-objects was given. +@@ -27294,7 +27313,7 @@ + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:27297: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:27316: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -27303,10 +27322,10 @@ + fi + eval ADA_OBJECTS="$withval" + +-echo "$as_me:27306: result: $ADA_OBJECTS" >&5 ++echo "$as_me:27325: result: $ADA_OBJECTS" >&5 + echo "${ECHO_T}$ADA_OBJECTS" >&6 + +-echo "$as_me:27309: checking if an Ada95 shared-library should be built" >&5 ++echo "$as_me:27328: checking if an Ada95 shared-library should be built" >&5 + echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6 + + # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given. +@@ -27316,14 +27335,14 @@ + else + with_ada_sharedlib=no + fi; +-echo "$as_me:27319: result: $with_ada_sharedlib" >&5 ++echo "$as_me:27338: result: $with_ada_sharedlib" >&5 + echo "${ECHO_T}$with_ada_sharedlib" >&6 + + if test "x$with_ada_sharedlib" != xno + then + if test "x$cf_gnat_projects" != xyes + then +- { echo "$as_me:27326: WARNING: disabling shared-library since GNAT projects are not supported" >&5 ++ { echo "$as_me:27345: WARNING: disabling shared-library since GNAT projects are not supported" >&5 + echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;} + with_ada_sharedlib=no + fi +@@ -27343,7 +27362,7 @@ + + # allow the Ada binding to be renamed + +-echo "$as_me:27346: checking for ada-libname" >&5 ++echo "$as_me:27365: checking for ada-libname" >&5 + echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6 + + # Check whether --with-ada-libname or --without-ada-libname was given. +@@ -27359,7 +27378,7 @@ + ;; + esac + +-echo "$as_me:27362: result: $ADA_LIBNAME" >&5 ++echo "$as_me:27381: result: $ADA_LIBNAME" >&5 + echo "${ECHO_T}$ADA_LIBNAME" >&6 + + fi +@@ -27370,13 +27389,13 @@ + + # do this "late" to avoid conflict with header-checks + if test "x$with_widec" = xyes ; then +- echo "$as_me:27373: checking for wchar_t" >&5 ++ echo "$as_me:27392: checking for wchar_t" >&5 + echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6 + if test "${ac_cv_type_wchar_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27379 "configure" ++#line 27398 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -27391,16 +27410,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:27394: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27413: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27397: \$? = $ac_status" >&5 ++ echo "$as_me:27416: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:27400: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27419: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27403: \$? = $ac_status" >&5 ++ echo "$as_me:27422: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_wchar_t=yes + else +@@ -27410,10 +27429,10 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:27413: result: $ac_cv_type_wchar_t" >&5 ++echo "$as_me:27432: result: $ac_cv_type_wchar_t" >&5 + echo "${ECHO_T}$ac_cv_type_wchar_t" >&6 + +-echo "$as_me:27416: checking size of wchar_t" >&5 ++echo "$as_me:27435: checking size of wchar_t" >&5 + echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6 + if test "${ac_cv_sizeof_wchar_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -27422,7 +27441,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27425 "configure" ++#line 27444 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -27434,21 +27453,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:27437: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27456: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27440: \$? = $ac_status" >&5 ++ echo "$as_me:27459: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:27443: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27462: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27446: \$? = $ac_status" >&5 ++ echo "$as_me:27465: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27451 "configure" ++#line 27470 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -27460,16 +27479,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:27463: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27482: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27466: \$? = $ac_status" >&5 ++ echo "$as_me:27485: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:27469: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27488: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27472: \$? = $ac_status" >&5 ++ echo "$as_me:27491: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid; break + else +@@ -27485,7 +27504,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27488 "configure" ++#line 27507 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -27497,16 +27516,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:27500: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27519: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27503: \$? = $ac_status" >&5 ++ echo "$as_me:27522: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:27506: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27525: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27509: \$? = $ac_status" >&5 ++ echo "$as_me:27528: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=$ac_mid; break + else +@@ -27522,7 +27541,7 @@ + while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27525 "configure" ++#line 27544 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -27534,16 +27553,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:27537: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27556: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27540: \$? = $ac_status" >&5 ++ echo "$as_me:27559: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:27543: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27562: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27546: \$? = $ac_status" >&5 ++ echo "$as_me:27565: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid + else +@@ -27556,12 +27575,12 @@ + ac_cv_sizeof_wchar_t=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:27559: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:27578: error: cannot run test program while cross compiling" >&5 + echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27564 "configure" ++#line 27583 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -27577,15 +27596,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:27580: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:27599: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:27583: \$? = $ac_status" >&5 ++ echo "$as_me:27602: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:27585: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27604: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27588: \$? = $ac_status" >&5 ++ echo "$as_me:27607: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sizeof_wchar_t=`cat conftest.val` + else +@@ -27601,7 +27620,7 @@ + ac_cv_sizeof_wchar_t=0 + fi + fi +-echo "$as_me:27604: result: $ac_cv_sizeof_wchar_t" >&5 ++echo "$as_me:27623: result: $ac_cv_sizeof_wchar_t" >&5 + echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6 + cat >>confdefs.h <&6 + +-echo "${as_me:-configure}:27617: testing test failed (assume 2) ..." 1>&5 ++echo "${as_me:-configure}:27636: testing test failed (assume 2) ..." 1>&5 + + sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp + mv confdefs.tmp confdefs.h +@@ -27632,7 +27651,7 @@ + ### chooses to split module lists into libraries. + ### + ### (see CF_LIB_RULES). +-echo "$as_me:27635: checking for library subsets" >&5 ++echo "$as_me:27654: checking for library subsets" >&5 + echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 + LIB_SUBSETS= + +@@ -27686,7 +27705,7 @@ + test "x$with_widec" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar" + test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs" + +-echo "$as_me:27689: result: $LIB_SUBSETS" >&5 ++echo "$as_me:27708: result: $LIB_SUBSETS" >&5 + echo "${ECHO_T}$LIB_SUBSETS" >&6 + + ### Construct the list of include-directories to be generated +@@ -27717,7 +27736,7 @@ + fi + + ### Build up pieces for makefile rules +-echo "$as_me:27720: checking default library suffix" >&5 ++echo "$as_me:27739: checking default library suffix" >&5 + echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -27728,10 +27747,10 @@ + (shared) DFT_ARG_SUFFIX='' ;; + esac + test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" +-echo "$as_me:27731: result: $DFT_ARG_SUFFIX" >&5 ++echo "$as_me:27750: result: $DFT_ARG_SUFFIX" >&5 + echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 + +-echo "$as_me:27734: checking default library-dependency suffix" >&5 ++echo "$as_me:27753: checking default library-dependency suffix" >&5 + echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 + + case X$DFT_LWR_MODEL in +@@ -27814,10 +27833,10 @@ + DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}" + DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}" + fi +-echo "$as_me:27817: result: $DFT_DEP_SUFFIX" >&5 ++echo "$as_me:27836: result: $DFT_DEP_SUFFIX" >&5 + echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 + +-echo "$as_me:27820: checking default object directory" >&5 ++echo "$as_me:27839: checking default object directory" >&5 + echo $ECHO_N "checking default object directory... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -27833,11 +27852,11 @@ + DFT_OBJ_SUBDIR='obj_s' ;; + esac + esac +-echo "$as_me:27836: result: $DFT_OBJ_SUBDIR" >&5 ++echo "$as_me:27855: result: $DFT_OBJ_SUBDIR" >&5 + echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 + + if test "x$cf_with_cxx" = xyes ; then +-echo "$as_me:27840: checking c++ library-dependency suffix" >&5 ++echo "$as_me:27859: checking c++ library-dependency suffix" >&5 + echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6 + if test "$with_libtool" != "no"; then + # libtool thinks it can make c++ shared libraries (perhaps only g++) +@@ -27930,7 +27949,7 @@ + fi + + fi +-echo "$as_me:27933: result: $CXX_LIB_SUFFIX" >&5 ++echo "$as_me:27952: result: $CXX_LIB_SUFFIX" >&5 + echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 + + fi +@@ -28106,19 +28125,19 @@ + + if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED" + then +- echo "$as_me:28109: checking if linker supports switching between static/dynamic" >&5 ++ echo "$as_me:28128: checking if linker supports switching between static/dynamic" >&5 + echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6 + + rm -f libconftest.a + cat >conftest.$ac_ext < + int cf_ldflags_static(FILE *fp) { return fflush(fp); } + EOF +- if { (eval echo "$as_me:28118: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:28137: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:28121: \$? = $ac_status" >&5 ++ echo "$as_me:28140: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then + ( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null + ( eval $RANLIB libconftest.a ) 2>&5 >/dev/null +@@ -28129,10 +28148,10 @@ + + LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 28132 "configure" ++#line 28151 "configure" + #include "confdefs.h" + +-#line 28135 "configure" ++#line 28154 "configure" + #include + int cf_ldflags_static(FILE *fp); + +@@ -28147,16 +28166,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:28150: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:28169: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:28153: \$? = $ac_status" >&5 ++ echo "$as_me:28172: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:28156: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:28175: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:28159: \$? = $ac_status" >&5 ++ echo "$as_me:28178: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + # some linkers simply ignore the -dynamic +@@ -28179,7 +28198,7 @@ + rm -f libconftest.* + LIBS="$cf_save_LIBS" + +- echo "$as_me:28182: result: $cf_ldflags_static" >&5 ++ echo "$as_me:28201: result: $cf_ldflags_static" >&5 + echo "${ECHO_T}$cf_ldflags_static" >&6 + + if test "$cf_ldflags_static" != yes +@@ -28195,7 +28214,7 @@ + ;; + esac + +-echo "$as_me:28198: checking where we will install curses.h" >&5 ++echo "$as_me:28217: checking where we will install curses.h" >&5 + echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 + + includesubdir= +@@ -28205,7 +28224,7 @@ + then + includesubdir="/ncurses${USE_LIB_SUFFIX}" + fi +-echo "$as_me:28208: result: ${includedir}${includesubdir}" >&5 ++echo "$as_me:28227: result: ${includedir}${includesubdir}" >&5 + echo "${ECHO_T}${includedir}${includesubdir}" >&6 + + ### Resolve a conflict between normal and wide-curses by forcing applications +@@ -28213,7 +28232,7 @@ + if test "$with_overwrite" != no ; then + if test "$NCURSES_LIBUTF8" = 1 ; then + NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)' +- { echo "$as_me:28216: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 ++ { echo "$as_me:28235: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 + echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;} + fi + fi +@@ -28241,7 +28260,7 @@ + + # pkgsrc uses these + +-echo "$as_me:28244: checking for desired basename for form library" >&5 ++echo "$as_me:28263: checking for desired basename for form library" >&5 + echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6 + + # Check whether --with-form-libname or --without-form-libname was given. +@@ -28261,10 +28280,10 @@ + ;; + esac + +-echo "$as_me:28264: result: $FORM_NAME" >&5 ++echo "$as_me:28283: result: $FORM_NAME" >&5 + echo "${ECHO_T}$FORM_NAME" >&6 + +-echo "$as_me:28267: checking for desired basename for menu library" >&5 ++echo "$as_me:28286: checking for desired basename for menu library" >&5 + echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6 + + # Check whether --with-menu-libname or --without-menu-libname was given. +@@ -28284,10 +28303,10 @@ + ;; + esac + +-echo "$as_me:28287: result: $MENU_NAME" >&5 ++echo "$as_me:28306: result: $MENU_NAME" >&5 + echo "${ECHO_T}$MENU_NAME" >&6 + +-echo "$as_me:28290: checking for desired basename for panel library" >&5 ++echo "$as_me:28309: checking for desired basename for panel library" >&5 + echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6 + + # Check whether --with-panel-libname or --without-panel-libname was given. +@@ -28307,10 +28326,10 @@ + ;; + esac + +-echo "$as_me:28310: result: $PANEL_NAME" >&5 ++echo "$as_me:28329: result: $PANEL_NAME" >&5 + echo "${ECHO_T}$PANEL_NAME" >&6 + +-echo "$as_me:28313: checking for desired basename for cxx library" >&5 ++echo "$as_me:28332: checking for desired basename for cxx library" >&5 + echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6 + + # Check whether --with-cxx-libname or --without-cxx-libname was given. +@@ -28330,13 +28349,13 @@ + ;; + esac + +-echo "$as_me:28333: result: $CXX_NAME" >&5 ++echo "$as_me:28352: result: $CXX_NAME" >&5 + echo "${ECHO_T}$CXX_NAME" >&6 + + ### Construct the list of subdirectories for which we'll customize makefiles + ### with the appropriate compile-rules. + +-echo "$as_me:28339: checking for src modules" >&5 ++echo "$as_me:28358: checking for src modules" >&5 + echo $ECHO_N "checking for src modules... $ECHO_C" >&6 + + # dependencies and linker-arguments for test-programs +@@ -28405,7 +28424,7 @@ + fi + fi + done +-echo "$as_me:28408: result: $cf_cv_src_modules" >&5 ++echo "$as_me:28427: result: $cf_cv_src_modules" >&5 + echo "${ECHO_T}$cf_cv_src_modules" >&6 + + TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" +@@ -28566,7 +28585,7 @@ + (*-D_XOPEN_SOURCE_EXTENDED*) + test -n "$verbose" && echo " moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6 + +-echo "${as_me:-configure}:28569: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 ++echo "${as_me:-configure}:28588: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 + + CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED" + CPPFLAGS=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'` +@@ -28577,7 +28596,7 @@ + + # Help to automatically enable the extended curses features when using either + # the *-config or the ".pc" files by adding defines. +-echo "$as_me:28580: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5 ++echo "$as_me:28599: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5 + echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6 + PKG_CFLAGS= + for cf_loop1 in $CPPFLAGS_after_XOPEN +@@ -28593,7 +28612,7 @@ + done + test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1" + done +-echo "$as_me:28596: result: $PKG_CFLAGS" >&5 ++echo "$as_me:28615: result: $PKG_CFLAGS" >&5 + echo "${ECHO_T}$PKG_CFLAGS" >&6 + + # AC_CHECK_SIZEOF demands a literal parameter, no variables. So we do this. +@@ -28654,7 +28673,7 @@ + cf_filter_syms=$cf_dft_filter_syms + test -n "$verbose" && echo " will map symbols to ABI=$cf_cv_abi_version" 1>&6 + +-echo "${as_me:-configure}:28657: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 ++echo "${as_me:-configure}:28676: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 + + fi + +@@ -28681,7 +28700,7 @@ + + # This is used for the *-config script and *.pc data files. + +-echo "$as_me:28684: checking for linker search path" >&5 ++echo "$as_me:28703: checking for linker search path" >&5 + echo $ECHO_N "checking for linker search path... $ECHO_C" >&6 + if test "${cf_cv_ld_searchpath+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -28729,7 +28748,7 @@ + cf_pathlist="$cf_pathlist /lib /usr/lib" + ;; + (*) +- { echo "$as_me:28732: WARNING: problem with Solaris architecture" >&5 ++ { echo "$as_me:28751: WARNING: problem with Solaris architecture" >&5 + echo "$as_me: WARNING: problem with Solaris architecture" >&2;} + ;; + esac +@@ -28770,7 +28789,7 @@ + test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib + + fi +-echo "$as_me:28773: result: $cf_cv_ld_searchpath" >&5 ++echo "$as_me:28792: result: $cf_cv_ld_searchpath" >&5 + echo "${ECHO_T}$cf_cv_ld_searchpath" >&6 + + LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'` +@@ -28860,7 +28879,7 @@ + : "${CONFIG_STATUS=./config.status}" + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ echo "$as_me:28863: creating $CONFIG_STATUS" >&5 ++{ echo "$as_me:28882: creating $CONFIG_STATUS" >&5 + echo "$as_me: creating $CONFIG_STATUS" >&6;} + cat >"$CONFIG_STATUS" <<_ACEOF + #! $SHELL +@@ -29039,7 +29058,7 @@ + echo "$ac_cs_version"; exit 0 ;; + --he | --h) + # Conflict between --help and --header +- { { echo "$as_me:29042: error: ambiguous option: $1 ++ { { echo "$as_me:29061: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&5 + echo "$as_me: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&2;} +@@ -29058,7 +29077,7 @@ + ac_need_defaults=false;; + + # This is an error. +- -*) { { echo "$as_me:29061: error: unrecognized option: $1 ++ -*) { { echo "$as_me:29080: error: unrecognized option: $1 + Try \`$0 --help' for more information." >&5 + echo "$as_me: error: unrecognized option: $1 + Try \`$0 --help' for more information." >&2;} +@@ -29184,7 +29203,7 @@ + "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; + "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; +- *) { { echo "$as_me:29187: error: invalid argument: $ac_config_target" >&5 ++ *) { { echo "$as_me:29206: error: invalid argument: $ac_config_target" >&5 + echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +@@ -29696,7 +29715,7 @@ + esac + + if test x"$ac_file" != x-; then +- { echo "$as_me:29699: creating $ac_file" >&5 ++ { echo "$as_me:29718: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi +@@ -29714,7 +29733,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:29717: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:29736: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -29727,7 +29746,7 @@ + echo "$srcdir/$f" + else + # /dev/null tree +- { { echo "$as_me:29730: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:29749: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -29743,7 +29762,7 @@ + if test -n "$ac_seen"; then + ac_used=`grep '@datarootdir@' "$ac_item"` + if test -z "$ac_used"; then +- { echo "$as_me:29746: WARNING: datarootdir was used implicitly but not set: ++ { echo "$as_me:29765: WARNING: datarootdir was used implicitly but not set: + $ac_seen" >&5 + echo "$as_me: WARNING: datarootdir was used implicitly but not set: + $ac_seen" >&2;} +@@ -29752,7 +29771,7 @@ + fi + ac_seen=`grep '${datarootdir}' "$ac_item"` + if test -n "$ac_seen"; then +- { echo "$as_me:29755: WARNING: datarootdir was used explicitly but not set: ++ { echo "$as_me:29774: WARNING: datarootdir was used explicitly but not set: + $ac_seen" >&5 + echo "$as_me: WARNING: datarootdir was used explicitly but not set: + $ac_seen" >&2;} +@@ -29789,7 +29808,7 @@ + ac_init=`${EGREP-egrep} '[ ]*'$ac_name'[ ]*=' "$ac_file"` + if test -z "$ac_init"; then + ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` +- { echo "$as_me:29792: WARNING: Variable $ac_name is used but was not set: ++ { echo "$as_me:29811: WARNING: Variable $ac_name is used but was not set: + $ac_seen" >&5 + echo "$as_me: WARNING: Variable $ac_name is used but was not set: + $ac_seen" >&2;} +@@ -29800,7 +29819,7 @@ + ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out + if test -s $tmp/out; then + ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` +- { echo "$as_me:29803: WARNING: Some variables may not be substituted: ++ { echo "$as_me:29822: WARNING: Some variables may not be substituted: + $ac_seen" >&5 + echo "$as_me: WARNING: Some variables may not be substituted: + $ac_seen" >&2;} +@@ -29849,7 +29868,7 @@ + * ) ac_file_in=$ac_file.in ;; + esac + +- test x"$ac_file" != x- && { echo "$as_me:29852: creating $ac_file" >&5 ++ test x"$ac_file" != x- && { echo "$as_me:29871: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + + # First look for the input files in the build tree, otherwise in the +@@ -29860,7 +29879,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:29863: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:29882: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -29873,7 +29892,7 @@ + echo "$srcdir/$f" + else + # /dev/null tree +- { { echo "$as_me:29876: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:29895: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -29931,7 +29950,7 @@ + rm -f $tmp/in + if test x"$ac_file" != x-; then + if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then +- { echo "$as_me:29934: $ac_file is unchanged" >&5 ++ { echo "$as_me:29953: $ac_file is unchanged" >&5 + echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +@@ -30318,7 +30337,7 @@ + (cygdll|msysdll|mingw|msvcdll) + test "x$with_shared_cxx" = xno && test -n "$verbose" && echo " overriding CXX_MODEL to SHARED" 1>&6 + +-echo "${as_me:-configure}:30321: testing overriding CXX_MODEL to SHARED ..." 1>&5 ++echo "${as_me:-configure}:30340: testing overriding CXX_MODEL to SHARED ..." 1>&5 + + with_shared_cxx=yes + ;; +Index: dist.mk +Prereq: 1.1450 +--- ncurses-6.3-20211115+/dist.mk 2021-11-15 23:51:41.000000000 +0000 ++++ ncurses-6.3-20211120/dist.mk 2021-11-20 12:06:33.000000000 +0000 +@@ -26,7 +26,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: dist.mk,v 1.1450 2021/11/15 23:51:41 tom Exp $ ++# $Id: dist.mk,v 1.1451 2021/11/20 12:06:33 tom Exp $ + # Makefile for creating ncurses distributions. + # + # This only needs to be used directly as a makefile by developers, but +@@ -38,7 +38,7 @@ + # These define the major/minor/patch versions of ncurses. + NCURSES_MAJOR = 6 + NCURSES_MINOR = 3 +-NCURSES_PATCH = 20211115 ++NCURSES_PATCH = 20211120 + + # We don't append the patch to the version, since this only applies to releases + VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) +Index: include/nc_alloc.h +Prereq: 1.28 +--- ncurses-6.3-20211115+/include/nc_alloc.h 2021-03-20 16:07:29.000000000 +0000 ++++ ncurses-6.3-20211120/include/nc_alloc.h 2021-11-20 23:33:38.000000000 +0000 +@@ -30,7 +30,7 @@ + /**************************************************************************** + * Author: Thomas E. Dickey 1996-on * + ****************************************************************************/ +-/* $Id: nc_alloc.h,v 1.28 2021/03/20 16:07:29 tom Exp $ */ ++/* $Id: nc_alloc.h,v 1.30 2021/11/20 23:33:38 tom Exp $ */ + + #ifndef NC_ALLOC_included + #define NC_ALLOC_included 1 +@@ -77,7 +77,6 @@ + + #ifdef NCURSES_INTERNALS + extern GCC_NORETURN NCURSES_EXPORT(void) _nc_free_tic(int); +-extern NCURSES_EXPORT(void) _nc_free_tparm(void); + extern void _nc_leaks_dump_entry(void); + extern NCURSES_EXPORT(void) _nc_leaks_tic(void); + +Index: misc/terminfo.src +--- ncurses-6.3-20211115+/misc/terminfo.src 2021-11-14 00:01:04.000000000 +0000 ++++ ncurses-6.3-20211120/misc/terminfo.src 2021-11-20 23:59:38.000000000 +0000 +@@ -6,8 +6,8 @@ + # Report bugs and new terminal descriptions to + # bug-ncurses@gnu.org + # +-# $Revision: 1.947 $ +-# $Date: 2021/11/14 00:01:04 $ ++# $Revision: 1.949 $ ++# $Date: 2021/11/20 23:59:38 $ + # + # The original header is preserved below for reference. It is noted that there + # is a "newer" version which differs in some cosmetic details (but actually +@@ -7126,9 +7126,9 @@ + cr=\r, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, + cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, + cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, +- dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, +- ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0, +- flash=\E[?5h$<100/>\E[?5l, fsl=^G, home=\E[H, ++ dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, dl=\E[%p1%dM, ++ dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, ++ enacs=\E)0, flash=\E[?5h$<100/>\E[?5l, fsl=^G, home=\E[H, + hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, + il=\E[%p1%dL, il1=\E[L, ind=\n, invis=\E[8m, + is2=\E[4l\E>\E[?1034l, kDC=\E[3;2~, kEND=\E[1;2F, +@@ -7165,13 +7165,13 @@ + setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6} + %=%t3%e%p1%d%;m, + sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%| +- %t;7%;%?%p4%t;5%;%?%p7%t;8%;m, ++ %t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m, + sgr0=\E[0m, smacs=\E(0, smir=\E[4h, smkx=\E[?1h\E=, + smso=\E[7m, smul=\E[4m, tbc=\E[3g, u6=\E[%i%d;%dR, + u7=\E[6n, u8=\E[?1;2c, u9=\E[c, vpa=\E[%i%p1%dd, Se=\E[2 q, + Ss=\E[%p1%d q, use=vt220+pcedit, use=ecma+index, + use=xterm+alt1049, use=vt220+cvis, use=xterm+sl, +- use=ecma+italics, ++ use=ecma+italics, use=ecma+strikeout, + # + # st-0.1.1 + # +@@ -27297,4 +27297,7 @@ + # + add xterm+sl-alt, use that in foot+base (report by Jonas Grosse + # Sundrup) -TD + # ++# 2021-11-20 ++# + add dim, ecma+strikeout to st-0.6 -TD ++# + ######## SHANTIH! SHANTIH! SHANTIH! +Index: ncurses/term.priv.h +Prereq: 1.6 +--- ncurses-6.3-20211115+/ncurses/term.priv.h 2021-09-26 20:43:08.000000000 +0000 ++++ ncurses-6.3-20211120/ncurses/term.priv.h 2021-11-20 23:33:33.000000000 +0000 +@@ -27,7 +27,7 @@ + ****************************************************************************/ + + /* +- * $Id: term.priv.h,v 1.6 2021/09/26 20:43:08 tom Exp $ ++ * $Id: term.priv.h,v 1.7 2021/11/20 23:33:33 tom Exp $ + * + * term.priv.h + * +@@ -185,6 +185,7 @@ + TGETENT_CACHE tgetent_cache[TGETENT_MAX]; + int tgetent_index; + long tgetent_sequence; ++ int terminal_count; + + char * dbd_blob; /* string-heap for dbd_list[] */ + char ** dbd_list; /* distinct places to look for data */ +@@ -323,6 +324,8 @@ + + extern NCURSES_EXPORT_VAR(NCURSES_PRESCREEN) _nc_prescreen; + ++extern NCURSES_EXPORT(void) _nc_free_tparm(TERMINAL*); ++ + #ifdef __cplusplus + } + #endif +Index: ncurses/tinfo/entries.c +Prereq: 1.30 +--- ncurses-6.3-20211115+/ncurses/tinfo/entries.c 2020-02-02 23:34:34.000000000 +0000 ++++ ncurses-6.3-20211120/ncurses/tinfo/entries.c 2021-11-20 23:40:57.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2019,2020 Thomas E. Dickey * ++ * Copyright 2019-2020,2021 Thomas E. Dickey * + * Copyright 2006-2012,2017 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -38,7 +38,7 @@ + + #include + +-MODULE_ID("$Id: entries.c,v 1.30 2020/02/02 23:34:34 tom Exp $") ++MODULE_ID("$Id: entries.c,v 1.32 2021/11/20 23:40:57 tom Exp $") + + /**************************************************************************** + * +@@ -122,7 +122,7 @@ + T((T_CALLED("_nc_free_tinfo()"))); + #if NO_LEAKS + _nc_globals.leak_checking = TRUE; +- _nc_free_tparm(); ++ _nc_free_tparm(cur_term); + _nc_tgetent_leaks(); + + if (TerminalOf(CURRENT_SCREEN) != 0) { +Index: ncurses/tinfo/lib_cur_term.c +Prereq: 1.44 +--- ncurses-6.3-20211115+/ncurses/tinfo/lib_cur_term.c 2021-11-06 19:04:21.000000000 +0000 ++++ ncurses-6.3-20211120/ncurses/tinfo/lib_cur_term.c 2021-11-20 23:19:41.000000000 +0000 +@@ -41,7 +41,7 @@ + #include /* ospeed */ + #include /* VALID_STRING */ + +-MODULE_ID("$Id: lib_cur_term.c,v 1.44 2021/11/06 19:04:21 tom Exp $") ++MODULE_ID("$Id: lib_cur_term.c,v 1.45 2021/11/20 23:19:41 tom Exp $") + + #undef CUR + #define CUR TerminalType(termp). +@@ -167,6 +167,10 @@ + /* discard memory used in tgetent's cache for this terminal */ + _nc_tgetent_leak(termp); + #endif ++ if (--_nc_globals.terminal_count == 0) { ++ _nc_free_tparm(termp); ++ } ++ + free(termp->tparm_state.fmt_buff); + free(termp->tparm_state.out_buff); + free(termp); +Index: ncurses/tinfo/lib_data.c +Prereq: 1.85 +--- ncurses-6.3-20211115+/ncurses/tinfo/lib_data.c 2021-09-04 10:54:35.000000000 +0000 ++++ ncurses-6.3-20211120/ncurses/tinfo/lib_data.c 2021-11-20 23:14:34.000000000 +0000 +@@ -43,7 +43,7 @@ + + #include + +-MODULE_ID("$Id: lib_data.c,v 1.85 2021/09/04 10:54:35 tom Exp $") ++MODULE_ID("$Id: lib_data.c,v 1.86 2021/11/20 23:14:34 tom Exp $") + + /* + * OS/2's native linker complains if we don't initialize public data when +@@ -148,6 +148,7 @@ + TGETENT_0s, /* tgetent_cache */ + 0, /* tgetent_index */ + 0, /* tgetent_sequence */ ++ 0, /* terminal_count */ + + 0, /* dbd_blob */ + 0, /* dbd_list */ +Index: ncurses/tinfo/lib_setup.c +Prereq: 1.214 +--- ncurses-6.3-20211115+/ncurses/tinfo/lib_setup.c 2021-09-01 23:38:12.000000000 +0000 ++++ ncurses-6.3-20211120/ncurses/tinfo/lib_setup.c 2021-11-20 23:11:31.000000000 +0000 +@@ -49,7 +49,7 @@ + #include + #endif + +-MODULE_ID("$Id: lib_setup.c,v 1.214 2021/09/01 23:38:12 tom Exp $") ++MODULE_ID("$Id: lib_setup.c,v 1.215 2021/11/20 23:11:31 tom Exp $") + + /**************************************************************************** + * +@@ -743,6 +743,7 @@ + "Not enough memory to create terminal structure.\n", + myname, free(myname)); + } ++ ++_nc_globals.terminal_count; + #if HAVE_SYSCONF + { + long limit; +Index: ncurses/tinfo/lib_tparm.c +Prereq: 1.135 +--- ncurses-6.3-20211115+/ncurses/tinfo/lib_tparm.c 2021-11-15 23:31:31.000000000 +0000 ++++ ncurses-6.3-20211120/ncurses/tinfo/lib_tparm.c 2021-11-20 23:29:15.000000000 +0000 +@@ -53,7 +53,7 @@ + #include + #include + +-MODULE_ID("$Id: lib_tparm.c,v 1.135 2021/11/15 23:31:31 tom Exp $") ++MODULE_ID("$Id: lib_tparm.c,v 1.137 2021/11/20 23:29:15 tom Exp $") + + /* + * char * +@@ -142,10 +142,8 @@ + #if HAVE_TSEARCH + #define MyCache _nc_globals.cached_tparm + #define MyCount _nc_globals.count_tparm +-#if NO_LEAKS + static int which_tparm; + static TPARM_DATA **delete_tparm; +-#endif + #endif /* HAVE_TSEARCH */ + + static char dummy[] = ""; /* avoid const-cast */ +@@ -160,10 +158,9 @@ + } + #endif + +-#if NO_LEAKS + #if HAVE_TSEARCH + static void +-visit_nodes(const void *nodep, const VISIT which, const int depth) ++visit_nodes(const void *nodep, VISIT which, int depth) + { + (void) depth; + if (which == preorder || which == leaf) { +@@ -174,9 +171,9 @@ + #endif + + NCURSES_EXPORT(void) +-_nc_free_tparm(void) ++_nc_free_tparm(TERMINAL *termp) + { +- TPARM_STATE *tps = get_tparm_state(cur_term); /* FIXME */ ++ TPARM_STATE *tps = get_tparm_state(termp); + #if HAVE_TSEARCH + if (MyCount != 0) { + delete_tparm = typeCalloc(TPARM_DATA *, MyCount); +@@ -204,7 +201,6 @@ + FreeAndNull(TPS(fmt_buff)); + TPS(fmt_size) = 0; + } +-#endif + + static int + tparm_error(TPARM_STATE *tps, const char *message) +Index: package/debian-mingw/changelog +--- ncurses-6.3-20211115+/package/debian-mingw/changelog 2021-11-15 23:51:41.000000000 +0000 ++++ ncurses-6.3-20211120/package/debian-mingw/changelog 2021-11-20 12:06:33.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20211115) unstable; urgency=low ++ncurses6 (6.3+20211120) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Mon, 15 Nov 2021 18:51:41 -0500 ++ -- Thomas E. Dickey Sat, 20 Nov 2021 07:06:33 -0500 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian-mingw64/changelog +--- ncurses-6.3-20211115+/package/debian-mingw64/changelog 2021-11-15 23:51:41.000000000 +0000 ++++ ncurses-6.3-20211120/package/debian-mingw64/changelog 2021-11-20 12:06:33.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20211115) unstable; urgency=low ++ncurses6 (6.3+20211120) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Mon, 15 Nov 2021 18:51:41 -0500 ++ -- Thomas E. Dickey Sat, 20 Nov 2021 07:06:33 -0500 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian/changelog +--- ncurses-6.3-20211115+/package/debian/changelog 2021-11-15 23:51:41.000000000 +0000 ++++ ncurses-6.3-20211120/package/debian/changelog 2021-11-20 12:06:33.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20211115) unstable; urgency=low ++ncurses6 (6.3+20211120) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Mon, 15 Nov 2021 18:51:41 -0500 ++ -- Thomas E. Dickey Sat, 20 Nov 2021 07:06:33 -0500 + + ncurses6 (5.9-20120608) unstable; urgency=low + +Index: package/debian/control +--- ncurses-6.3-20211115+/package/debian/control 2018-01-01 11:55:00.000000000 +0000 ++++ ncurses-6.3-20211120/package/debian/control 2021-11-20 15:52:13.000000000 +0000 +@@ -3,7 +3,7 @@ + Priority: optional + Maintainer: Thomas E. Dickey + Homepage: https://invisible-island.net/ncurses/ +-Build-Depends: debhelper (>= 7) ++Build-Depends: debhelper (>= 8.1.3) + Standards-Version: 3.8.2 + + Package: ncurses6 +Index: package/debian/rules +Prereq: 1.41 +--- ncurses-6.3-20211115+/package/debian/rules 2021-10-11 18:18:08.000000000 +0000 ++++ ncurses-6.3-20211120/package/debian/rules 2021-11-20 15:51:09.000000000 +0000 +@@ -1,5 +1,5 @@ + #!/usr/bin/make -f +-# $Id: rules,v 1.41 2021/10/11 18:18:08 tom Exp $ ++# $Id: rules,v 1.42 2021/11/20 15:51:09 tom Exp $ + + # Uncomment this to turn on verbose mode. + #export DH_VERBOSE=1 +@@ -12,12 +12,15 @@ + # from having to guess our platform (since we know it already) + DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) + DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) ++DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + + CC_NORMAL = -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wconversion + CC_STRICT = $(CC_NORMAL) -W -Wbad-function-cast -Wcast-align -Wcast-qual -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wwrite-strings -ansi -pedantic + + MY_ABI=6 + MY_DIR=/usr ++BINDIR=$(MY_DIR)/bin ++LIBDIR=$(MY_DIR)/lib/$(DEB_HOST_MULTIARCH) + MYDATA=/usr/local/ncurses/share/terminfo + NORMAL_DIR=$(CURDIR)/debian/ncurses$(MY_ABI) + THREAD_DIR=$(CURDIR)/debian/ncursest$(MY_ABI) +@@ -28,7 +31,7 @@ + LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) + + ifneq ($(MY_DIR),/usr) +- RPATH_ENV = RPATH_LIST=../lib:$(MY_DIR)/lib ++ RPATH_ENV = RPATH_LIST=../lib:$(LIBDIR) + RPATH_OPT = --enable-rpath + else + RPATH_ENV = +@@ -54,6 +57,7 @@ + --host=$(DEB_HOST_GNU_TYPE) \ + --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=$(MY_DIR) \ ++ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ + --disable-echo \ + --disable-getcap \ + --disable-leaks \ +@@ -182,9 +186,9 @@ + dh_prep $(verbose) -pncurses6 + + $(MAKE) -C t/ncurses6 install.libs install.progs DESTDIR=$(NCURSES6_DIR) +- $(MAKE) -C t/ncurses6/test ncurses LOCAL_LIBDIR=$(MY_DIR)/lib ++ $(MAKE) -C t/ncurses6/test ncurses LOCAL_LIBDIR=$(LIBDIR) + +- mv t/ncurses6/test/ncurses $(NCURSES6_DIR)$(MY_DIR)/bin/ncurses$(MY_ABI) ++ mv t/ncurses6/test/ncurses $(NCURSES6_DIR)$(BINDIR)/ncurses$(MY_ABI) + + touch $@ + +@@ -195,9 +199,9 @@ + dh_prep $(verbose) -pncursest6 + + $(MAKE) -C t/ncursest6 install.libs install.progs DESTDIR=$(NCURSEST6_DIR) +- $(MAKE) -C t/ncursest6/test ncurses LOCAL_LIBDIR=$(MY_DIR)/lib ++ $(MAKE) -C t/ncursest6/test ncurses LOCAL_LIBDIR=$(LIBDIR) + +- mv t/ncursest6/test/ncurses $(NCURSEST6_DIR)$(MY_DIR)/bin/ncursest$(MY_ABI) ++ mv t/ncursest6/test/ncurses $(NCURSEST6_DIR)$(BINDIR)/ncursest$(MY_ABI) + + touch $@ + +Index: package/mingw-ncurses.nsi +Prereq: 1.492 +--- ncurses-6.3-20211115+/package/mingw-ncurses.nsi 2021-11-15 23:51:41.000000000 +0000 ++++ ncurses-6.3-20211120/package/mingw-ncurses.nsi 2021-11-20 12:06:33.000000000 +0000 +@@ -1,4 +1,4 @@ +-; $Id: mingw-ncurses.nsi,v 1.492 2021/11/15 23:51:41 tom Exp $ ++; $Id: mingw-ncurses.nsi,v 1.493 2021/11/20 12:06:33 tom Exp $ + + ; TODO add examples + ; TODO bump ABI to 6 +@@ -10,7 +10,7 @@ + !define VERSION_MAJOR "6" + !define VERSION_MINOR "3" + !define VERSION_YYYY "2021" +-!define VERSION_MMDD "1115" ++!define VERSION_MMDD "1120" + !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} + + !define MY_ABI "5" +Index: package/mingw-ncurses.spec +--- ncurses-6.3-20211115+/package/mingw-ncurses.spec 2021-11-15 23:51:41.000000000 +0000 ++++ ncurses-6.3-20211120/package/mingw-ncurses.spec 2021-11-20 12:06:33.000000000 +0000 +@@ -3,7 +3,7 @@ + Summary: shared libraries for terminal handling + Name: mingw32-ncurses6 + Version: 6.3 +-Release: 20211115 ++Release: 20211120 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncurses.spec +--- ncurses-6.3-20211115+/package/ncurses.spec 2021-11-15 23:51:41.000000000 +0000 ++++ ncurses-6.3-20211120/package/ncurses.spec 2021-11-20 12:06:33.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: shared libraries for terminal handling + Name: ncurses6 + Version: 6.3 +-Release: 20211115 ++Release: 20211120 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncursest.spec +--- ncurses-6.3-20211115+/package/ncursest.spec 2021-11-15 23:51:41.000000000 +0000 ++++ ncurses-6.3-20211120/package/ncursest.spec 2021-11-20 12:06:33.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: Curses library with POSIX thread support. + Name: ncursest6 + Version: 6.3 +-Release: 20211115 ++Release: 20211120 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz diff --git a/system/ncurses/ncurses-6.3-20211127.patch b/system/ncurses/ncurses-6.3-20211127.patch new file mode 100644 index 000000000..34e702abc --- /dev/null +++ b/system/ncurses/ncurses-6.3-20211127.patch @@ -0,0 +1,3202 @@ +# ncurses 6.3 - patch 20211127 - Thomas E. Dickey +# +# ------------------------------------------------------------------------------ +# +# Ncurses 6.3 is at +# ftp://ftp.invisible-island.net/ncurses/ +# https://invisible-mirror.net/archives/ncurses/ +# https://ftp.gnu.org/gnu/ncurses/ +# +# Patches for ncurses 6.3 can be found at +# ftp://ftp.invisible-island.net/ncurses//6.3 +# https://invisible-mirror.net/archives/ncurses//6.3 +# +# ------------------------------------------------------------------------------ +# ftp://ftp.invisible-island.net/ncurses//6.3/ncurses-6.3-20211127.patch.gz +# patch by Thomas E. Dickey +# created Sun Nov 28 02:17:37 UTC 2021 +# ------------------------------------------------------------------------------ +# NEWS | 6 +# VERSION | 2 +# dist.mk | 4 +# include/Caps-ncurses | 5 +# misc/terminfo.src | 1058 ++++++++++++++++++------------------- +# package/debian-mingw/changelog | 4 +# package/debian-mingw64/changelog | 4 +# package/debian/changelog | 4 +# package/mingw-ncurses.nsi | 4 +# package/mingw-ncurses.spec | 2 +# package/ncurses.spec | 2 +# package/ncursest.spec | 2 +# 12 files changed, 561 insertions(+), 536 deletions(-) +# ------------------------------------------------------------------------------ +Index: NEWS +Prereq: 1.3749 +--- ncurses-6.3-20211120+/NEWS 2021-11-21 00:03:54.000000000 +0000 ++++ ncurses-6.3-20211127/NEWS 2021-11-27 21:35:08.000000000 +0000 +@@ -26,7 +26,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: NEWS,v 1.3749 2021/11/21 00:03:54 tom Exp $ ++-- $Id: NEWS,v 1.3750 2021/11/21 16:19:20 tom Exp $ + ------------------------------------------------------------------------------- + + This is a log of changes that ncurses has gone through since Zeyd started +@@ -46,6 +46,10 @@ + Changes through 1.9.9e did not credit all contributions; + it is not possible to add this information. + ++20211127 ++ + fix errata in description fields (report by Eric Lindblad) -TD ++ + add x10term+sl, aixterm+sl, ncr260vp+sl, ncr260vp+vt, wyse+sl -TD ++ + 20211120 + + add dim, ecma+strikeout to st-0.6 -TD + + deallocate the tparm cache when del_curterm is called for the last +Index: VERSION +--- ncurses-6.3-20211120+/VERSION 2021-11-20 12:06:33.000000000 +0000 ++++ ncurses-6.3-20211127/VERSION 2021-11-27 15:02:04.000000000 +0000 +@@ -1 +1 @@ +-5:0:10 6.3 20211120 ++5:0:10 6.3 20211127 +Index: dist.mk +Prereq: 1.1451 +--- ncurses-6.3-20211120+/dist.mk 2021-11-20 12:06:33.000000000 +0000 ++++ ncurses-6.3-20211127/dist.mk 2021-11-27 15:02:04.000000000 +0000 +@@ -26,7 +26,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: dist.mk,v 1.1451 2021/11/20 12:06:33 tom Exp $ ++# $Id: dist.mk,v 1.1452 2021/11/27 15:02:04 tom Exp $ + # Makefile for creating ncurses distributions. + # + # This only needs to be used directly as a makefile by developers, but +@@ -38,7 +38,7 @@ + # These define the major/minor/patch versions of ncurses. + NCURSES_MAJOR = 6 + NCURSES_MINOR = 3 +-NCURSES_PATCH = 20211120 ++NCURSES_PATCH = 20211127 + + # We don't append the patch to the version, since this only applies to releases + VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) +Index: include/Caps-ncurses +Prereq: 1.10 +--- ncurses-6.3-20211120+/include/Caps-ncurses 2020-09-29 19:05:19.000000000 +0000 ++++ ncurses-6.3-20211127/include/Caps-ncurses 2021-11-27 20:58:18.000000000 +0000 +@@ -1,5 +1,5 @@ + ############################################################################## +-# Copyright 2019,2020 Thomas E. Dickey # ++# Copyright 2019-2020,2021 Thomas E. Dickey # + # # + # Permission is hereby granted, free of charge, to any person obtaining a # + # copy of this software and associated documentation files (the "Software"), # +@@ -28,7 +28,7 @@ + # + # Author: Thomas E. Dickey + # +-# $Id: Caps-ncurses,v 1.10 2020/09/29 19:05:19 tom Exp $ ++# $Id: Caps-ncurses,v 1.11 2021/11/27 20:58:18 tom Exp $ + # + ############################################################################# + # +@@ -402,6 +402,7 @@ + userdef smxx str - set ECMA-48 strikeout/crossed-out attributes. + # + used_by xterm ++userdef csl str - clear status line + userdef kDC3 str - alt delete-character + userdef kDC4 str - shift+alt delete-character + userdef kDC5 str - control delete-character +Index: misc/terminfo.src +--- ncurses-6.3-20211120+/misc/terminfo.src 2021-11-20 23:59:38.000000000 +0000 ++++ ncurses-6.3-20211127/misc/terminfo.src 2021-11-27 21:53:31.000000000 +0000 +@@ -6,8 +6,8 @@ + # Report bugs and new terminal descriptions to + # bug-ncurses@gnu.org + # +-# $Revision: 1.949 $ +-# $Date: 2021/11/20 23:59:38 $ ++# $Revision: 1.970 $ ++# $Date: 2021/11/27 21:53:31 $ + # + # The original header is preserved below for reference. It is noted that there + # is a "newer" version which differs in some cosmetic details (but actually +@@ -513,20 +513,20 @@ + # and more than one page of memory. It uses local motions instead of + # direct cursor addressing, and makes almost no assumptions. It does + # assume auto margins, no padding and/or xon/xoff, and a 24x80 screen. +-ansi-mr|mem rel cup ansi, ++ansi-mr|mem rel cup ANSI, + am, xon, + cols#80, lines#24, use=vanilla, use=ansi+erase, + use=ansi+local1, + + # ansi-mini is a bare minimum ANSI terminal. This should work on anything, but + # beware of screen size problems and memory relative cursor addressing. +-ansi-mini|any ansi terminal with pessimistic assumptions, ++ansi-mini|any ANSI terminal with pessimistic assumptions, + am, xon, + cols#80, lines#24, use=vanilla, use=ansi+cup, + use=ansi+erase, + + # ansi-mtabs adds relative addressing and minimal tab support +-ansi-mtabs|any ansi terminal with pessimistic assumptions, ++ansi-mtabs|any ANSI terminal with pessimistic assumptions, + it#8, + ht=^I, use=ansi-mini, use=ansi+local1, + +@@ -579,7 +579,7 @@ + # , but now seems to be more common under + # ANSI.SYS influence. + # From: Eric S. Raymond Oct 30 1995 +-pcansi-m|pcansi-mono|ibm-pc terminal programs claiming to be ansi (mono mode), ++pcansi-m|pcansi-mono|ibm-pc terminal programs claiming to be ANSI (mono mode), + OTbs, am, mir, msgr, + cols#80, it#8, lines#24, + bel=^G, cbt=\E[Z, clear=\E[H\E[J, cr=\r, cub1=\E[D, +@@ -595,7 +595,7 @@ + pcansi-43-m|ansi43m|ibm-pc terminal programs with 43 lines (mono mode), + lines#43, use=pcansi-m, + # The color versions. All PC emulators do color... +-pcansi|ibm-pc terminal programs claiming to be ansi, ++pcansi|ibm-pc terminal programs claiming to be ANSI, + use=klone+color, use=pcansi-m, + pcansi-25|pcansi25|ibm-pc terminal programs with 25 lines, + lines#25, use=pcansi, +@@ -632,11 +632,11 @@ + # ansi-generic is a vanilla ANSI terminal. This is assumed to implement + # all the normal ANSI stuff with no extensions. It assumes + # insert/delete line/char is there, so it won't work with +-# vt100 clones. It assumes video attributes for bold, blink, ++# VT100 clones. It assumes video attributes for bold, blink, + # underline, and reverse, which won't matter much if the terminal + # can't do some of those. Padding is assumed to be zero, which + # shouldn't hurt since xon/xoff is assumed. +-ansi-generic|ansiterm|generic ansi standard terminal, ++ansi-generic|ansiterm|generic ANSI standard terminal, + am, xon, + cols#80, lines#24, use=vanilla, use=ansi+csr, use=ansi+cup, + use=ansi+rca, use=ansi+erase, use=ansi+tabs, +@@ -802,7 +802,7 @@ + kf9=\EX, khlp=\EH, khome=\EE, kich1=\EI, knp=\Eb, kpp=\Ea, + kund=\EK, nel=\r\n, rc=\Ek, rev=\Ep, ri=\EI, rmso=\Eq, + rs2=\Ev\Eq\Ee, sc=\Ej, sgr0=\Eq, smso=\Ep, +-tw100|Toswin vt100 window manager, ++tw100|Toswin VT100 window manager, + eo, mir, msgr, xon, + colors#8, cols#80, it#8, lines#24, pairs#64, vt#3, + acsc=++\,\,--..00II``aaffgghhjjkkllmmnnooppqqrrssttuuvvwwxxy +@@ -1462,20 +1462,20 @@ + tsl=\E7\E1;24r\E[?6l\E[25;%i%p1%dH, use=ansi+rep, + use=att610+cvis0, use=ecma+index, + # +-qansi|QNX ansi with console writes, ++qansi|QNX ANSI with console writes, + daisy, xhpa, use=qansi-g, + # +-qansi-t|QNX ansi without console writes, ++qansi-t|QNX ANSI without console writes, + crxm, use=qansi, + # +-qansi-m|QNX ansi with mouse, ++qansi-m|QNX ANSI with mouse, + maddr#1, + chr=\E[, cvr=\E], is1=\E[0t, mcub=\E[>1h, mcub1=\E[>7h, + mcud=\E[>1h, mcud1=\E[>1l\E[>9h, mcuf=\E[>1h\E[>9l, + mcuf1=\E[>7l, mcuu=\E[>6h, mcuu1=\E[>6l, rmicm=\E[>2l, + smicm=\E[>2h, use=qansi, + # +-qansi-w|QNX ansi for windows, ++qansi-w|QNX ANSI for windows, + xvpa, use=qansi-m, + + #### SCO consoles +@@ -1715,7 +1715,7 @@ + # NOTE: has been taken out of this entry. for reference, it should + # be . For discussion, see ICH/ICH1 VERSUS RMIR/SMIR below. + # (esr: added and to resolve NetBSD Problem Report #4583) +-pcvtXX|pcvt vt200 emulator (DEC VT220), ++pcvtXX|pcvt VT200 emulator (DEC VT220), + am, km, mir, msgr, xenl, + it#8, vt#3, + acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy +@@ -1740,52 +1740,52 @@ + smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, + use=ecma+index, use=vt220+cvis, + +-# NetBSD/FreeBSD vt220 terminal emulator console (pc keyboard & monitor) ++# NetBSD/FreeBSD VT220 terminal emulator console (pc keyboard & monitor) + # termcap entries for pure VT220-Emulation and 25, 28, 35, 40, 43 and + # 50 lines entries; 80 columns +-pcvt25|DEC vt220 emulation with 25 lines, ++pcvt25|DEC VT220 emulation with 25 lines, + cols#80, lines#25, + is2=\E[1;25r\E[25;1H, use=pcvtXX, +-pcvt28|DEC vt220 emulation with 28 lines, ++pcvt28|DEC VT220 emulation with 28 lines, + cols#80, lines#28, + is2=\E[1;28r\E[28;1H, use=pcvtXX, +-pcvt35|DEC vt220 emulation with 35 lines, ++pcvt35|DEC VT220 emulation with 35 lines, + cols#80, lines#35, + is2=\E[1;35r\E[35;1H, use=pcvtXX, +-pcvt40|DEC vt220 emulation with 40 lines, ++pcvt40|DEC VT220 emulation with 40 lines, + cols#80, lines#40, + is2=\E[1;40r\E[40;1H, use=pcvtXX, +-pcvt43|DEC vt220 emulation with 43 lines, ++pcvt43|DEC VT220 emulation with 43 lines, + cols#80, lines#43, + is2=\E[1;43r\E[43;1H, use=pcvtXX, +-pcvt50|DEC vt220 emulation with 50 lines, ++pcvt50|DEC VT220 emulation with 50 lines, + cols#80, lines#50, + is2=\E[1;50r\E[50;1H, use=pcvtXX, + +-# NetBSD/FreeBSD vt220 terminal emulator console (pc keyboard & monitor) ++# NetBSD/FreeBSD VT220 terminal emulator console (pc keyboard & monitor) + # termcap entries for pure VT220-Emulation and 25, 28, 35, 40, 43 and + # 50 lines entries; 132 columns +-pcvt25w|DEC vt220 emulation with 25 lines and 132 cols, ++pcvt25w|DEC VT220 emulation with 25 lines and 132 cols, + cols#132, lines#25, + is2=\E[1;25r\E[25;1H, use=pcvtXX, +-pcvt28w|DEC vt220 emulation with 28 lines and 132 cols, ++pcvt28w|DEC VT220 emulation with 28 lines and 132 cols, + cols#132, lines#28, + is2=\E[1;28r\E[28;1H, use=pcvtXX, +-pcvt35w|DEC vt220 emulation with 35 lines and 132 cols, ++pcvt35w|DEC VT220 emulation with 35 lines and 132 cols, + cols#132, lines#35, + is2=\E[1;35r\E[35;1H, use=pcvtXX, +-pcvt40w|DEC vt220 emulation with 40 lines and 132 cols, ++pcvt40w|DEC VT220 emulation with 40 lines and 132 cols, + cols#132, lines#40, + is2=\E[1;40r\E[40;1H, use=pcvtXX, +-pcvt43w|DEC vt220 emulation with 43 lines and 132 cols, ++pcvt43w|DEC VT220 emulation with 43 lines and 132 cols, + cols#132, lines#43, + is2=\E[1;43r\E[43;1H, use=pcvtXX, +-pcvt50w|DEC vt220 emulation with 50 lines and 132 cols, ++pcvt50w|DEC VT220 emulation with 50 lines and 132 cols, + cols#132, lines#50, + is2=\E[1;50r\E[50;1H, use=pcvtXX, + + # OpenBSD implements a color variation +-pcvt25-color|DEC vt220 emulation with 25 lines and color, ++pcvt25-color|DEC VT220 emulation with 25 lines and color, + cols#80, lines#25, + is2=\E[1;25r\E[25;1H, kf1=\EOP, kf10=\E[29~, kf11=\E[23~, + kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, +@@ -1827,7 +1827,7 @@ + arm100-w|arm100-wam|Arm(RiscPC) ncurses compatible (for 1024x768), + cols#132, lines#50, use=arm100, + +-# NetBSD/x68k console vt200 emulator. This port runs on a 68K machine ++# NetBSD/x68k console VT200 emulator. This port runs on a 68K machine + # manufactured by Sharp for the Japanese market. + # From Minoura Makoto , 12 May 1996 + x68k|x68k-ite|NetBSD/x68k ITE, +@@ -1857,16 +1857,16 @@ + %;%?%p1%p3%|%t;7%;m, + sgr0=\2330m, smso=\2337m, smul=\2334m, + +-# NetBSD "wscons" emulator in vt220 mode. ++# NetBSD "wscons" emulator in VT220 mode. + # This entry is based on the NetBSD termcap entry, correcting the ncv value. + # The emulator renders underlined text in red. Colors are otherwise usable. + # + # Testing the emulator and reading the source code (NetBSD 2.0), it appears +-# that "vt220" is inaccurate. There are a few vt220-features, but most of the +-# vt220 screens in vttest do not work with this emulator. For instance, it +-# identifies itself (primary DA response) as a vt220 with selective erase. But ++# that "vt220" is inaccurate. There are a few VT220-features, but most of the ++# VT220 screens in vttest do not work with this emulator. For instance, it ++# identifies itself (primary DA response) as a VT220 with selective erase. But + # the selective erase feature does not work. The secondary response is copied +-# from Kermit's emulation of vt220, does not correspond to actual vt220. At ++# from Kermit's emulation of VT220, does not correspond to actual VT220. At + # the level of detail in a termcap, it is a passable emulator, since ECH does + # work. Don't use it on a VMS system -TD + wsvt25|NetBSD wscons in 25 line DEC VT220 mode, +@@ -1901,9 +1901,9 @@ + # + # Testing with vttest: + # ------------------- +-# Identifies as vt220 with selective erase ++# Identifies as VT220 with selective erase + # (however, selective erase refers to DECSCA, SPA) +-# Does not implement vt52 ++# Does not implement VT52 + # Uses spaces to simulate double-size characters + # Does not support 8-bit controls + # Does not support VT220 reports +@@ -2010,33 +2010,33 @@ + sgr=\E[0%?%p1%t;2;7%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;30;1%;%? + %p6%t;1%;m, + sgr0=\E[m, smso=\E[7m, vpa=\E[%i%p1%dd, use=ecma+index, +-cons25|ansis|ansi80x25|FreeBSD console (25-line ansi mode), ++cons25|ansis|ansi80x25|FreeBSD console (25-line ANSI mode), + acsc=-\030.^Y0\333`\004a\260f\370g\361h\261i\025j\331k\277l + \332m\300n\305q\304t\303u\264v\301w\302x\263y\363z\362~ + \371, + use=cons25w, +-cons25-debian|FreeBSD console with debian backspace (25-line ansi mode), ++cons25-debian|FreeBSD console with debian backspace (25-line ANSI mode), + kbs=^?, kdch1=\E[3~, use=cons25, +-cons25-m|ansis-mono|ansi80x25-mono|FreeBSD console (25-line mono ansi mode), ++cons25-m|ansis-mono|ansi80x25-mono|FreeBSD console (25-line mono ANSI mode), + colors@, pairs@, + bold@, dim@, op@, rmul=\E[m, setab@, setaf@, + sgr=\E[0%?%p1%t;2;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;m, + smul=\E[4m, use=cons25, +-cons30|ansi80x30|FreeBSD console (30-line ansi mode), ++cons30|ansi80x30|FreeBSD console (30-line ANSI mode), + lines#30, use=cons25, +-cons30-m|ansi80x30-mono|FreeBSD console (30-line mono ansi mode), ++cons30-m|ansi80x30-mono|FreeBSD console (30-line mono ANSI mode), + lines#30, use=cons25-m, +-cons43|ansi80x43|FreeBSD console (43-line ansi mode), ++cons43|ansi80x43|FreeBSD console (43-line ANSI mode), + lines#43, use=cons25, +-cons43-m|ansi80x43-mono|FreeBSD console (43-line mono ansi mode), ++cons43-m|ansi80x43-mono|FreeBSD console (43-line mono ANSI mode), + lines#43, use=cons25-m, +-cons50|ansil|ansi80x50|FreeBSD console (50-line ansi mode), ++cons50|ansil|ansi80x50|FreeBSD console (50-line ANSI mode), + lines#50, use=cons25, +-cons50-m|ansil-mono|ansi80x50-mono|FreeBSD console (50-line mono ansi mode), ++cons50-m|ansil-mono|ansi80x50-mono|FreeBSD console (50-line mono ANSI mode), + lines#50, use=cons25-m, +-cons60|ansi80x60|FreeBSD console (60-line ansi mode), ++cons60|ansi80x60|FreeBSD console (60-line ANSI mode), + lines#60, use=cons25, +-cons60-m|ansi80x60-mono|FreeBSD console (60-line mono ansi mode), ++cons60-m|ansi80x60-mono|FreeBSD console (60-line mono ANSI mode), + lines#60, use=cons25-m, + cons25r|pc3r|ibmpc3r|cons25-koi8-r|FreeBSD console w/koi8-r cyrillic, + acsc=-\030.^Y0\215`\004a\220f\234h\221i\025j\205k\203l\202m +@@ -2200,8 +2200,8 @@ + # (// capabilities aren't in DEC's official entry -- esr) + # + # Actually (TD pointed this out at the time the acsc string was added): +-# vt52 shouldn't define full acsc since most of the cells don't match. +-# see vt100 manual page A-31. This is the list that does match: ++# VT52 shouldn't define full acsc since most of the cells don't match. ++# see VT100 manual page A-31. This is the list that does match: + # f degree + # g plus/minus + # h right-arrow +@@ -2211,10 +2211,10 @@ + # q scan-5 + # s scan-7 + # The line-drawing happens to work in several terminal emulators, but should +-# not be used as a guide to the capabilities of the vt52. Note in particular +-# that vt52 does not support line-drawing characters (the scan-X values refer ++# not be used as a guide to the capabilities of the VT52. Note in particular ++# that VT52 does not support line-drawing characters (the scan-X values refer + # to a crude plotting feature) -TD +-vt52|DEC vt52, ++vt52|DEC VT52, + OTbs, + it#8, lines#24, + acsc=+h.k0affggolpnqprrss, home=\EH, kbs=^H, nel=\r\n, +@@ -2223,7 +2223,7 @@ + + # This is more likely the "vt52" that you would see in emulation, i.e., no + # keypad, no graphics. +-vt52-basic|vt52 for emulators, ++vt52-basic|VT52 for emulators, + cols#80, it#8, lines#24, + bel=^G, clear=\EH\EJ, cr=\r, cub1=\ED, cud1=\EB, cuf1=\EC, + cup=\EY%p1%' '%+%c%p2%' '%+%c, cuu1=\EA, ed=\EJ, el=\EK, +@@ -2232,7 +2232,7 @@ + + #### DEC VT100 and compatibles + # +-# DEC terminals from the vt100 forward are collected here. Older DEC terminals ++# DEC terminals from the VT100 forward are collected here. Older DEC terminals + # and micro consoles can be found in the `obsolete' section. More details on + # the relationship between the VT100 and ANSI X3.64/ISO 6429/ECMA-48 may be + # found near the end of this file. +@@ -2341,12 +2341,12 @@ + # terminfo guidelines. That is a compromise used to assign the remaining + # keys on the keypad to kf5-kf0, used on older systems with legacy termcap + # support: +-vt100+keypad|DEC vt100 numeric keypad no fkeys, ++vt100+keypad|DEC VT100 numeric keypad no fkeys, + ka1=\EOq, ka3=\EOs, kb2=\EOr, kc1=\EOp, kc3=\EOn, +-vt100+pfkeys|DEC vt100 numeric keypad, ++vt100+pfkeys|DEC VT100 numeric keypad, + kent=\EOM, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, + use=vt100+keypad, +-vt100+fnkeys|DEC vt100 numeric keypad, ++vt100+fnkeys|DEC VT100 numeric keypad, + kf0=\EOy, kf10=\EOx, kf5=\EOt, kf6=\EOu, kf7=\EOv, kf8=\EOl, + kf9=\EOw, use=vt100+pfkeys, + # +@@ -2371,14 +2371,14 @@ + # | $Op | $On | | + # |___________________|_________|_kent_@8_| + # +-vt220+keypad|DEC vt220 numeric keypad, ++vt220+keypad|DEC VT220 numeric keypad, + ka1=\EOw, ka3=\EOy, kb2=\EOu, kc1=\EOq, kc3=\EOs, kent=\EOM, + kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, ka2=\EOx, kb1=\EOt, + kb3=\EOv, kc2=\EOr, + # +-vt100+enq|ncurses extension for vt100-style ENQ, ++vt100+enq|ncurses extension for VT100-style ENQ, + u8=\E[?1;2c, use=ansi+enq, +-vt102+enq|ncurses extension for vt102-style ENQ, ++vt102+enq|ncurses extension for VT102-style ENQ, + u8=\E[?6c, use=ansi+enq, + # + # And here, for those of you with orphaned VT100s lacking documentation, is +@@ -2415,7 +2415,7 @@ + # INTERLACE_OFF + # + # (vt100: I added / based on the init string, also . -- esr) +-vt100|vt100-am|DEC vt100 (w/advanced video), ++vt100|vt100-am|DEC VT100 (w/advanced video), + OTbs, mc5i, xenl, xon, + vt#3, + csr=\E[%i%p1%d;%p2%dr, kcub1=\EOD, kcud1=\EOB, +@@ -2427,7 +2427,7 @@ + %;m%?%p9%t\016%e\017%;$<2>, + smam=\E[?7h, smkx=\E[?1h\E=, smso=\E[7m$<2>, + use=vt100+4bsd, use=vt100+fnkeys, +-vt100+4bsd|DEC vt100 from 4.0BSD, ++vt100+4bsd|DEC VT100 from 4.0BSD, + am, msgr, + cols#80, it#8, lines#24, + acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, +@@ -2444,31 +2444,31 @@ + %;m%?%p9%t\016%e\017%;$<2>, + sgr0=\E[m\017$<2>, smacs=^N, smso=\E[1;7m$<2>, + smul=\E[4m$<2>, tbc=\E[3g, +-vt100nam|vt100-nam|vt100 no automargins, ++vt100nam|vt100-nam|VT100 no automargins, + am@, xenl@, + rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7l\E[?8h, use=vt100-am, +-vt100-vb|DEC vt100 (w/advanced video) & no beep, ++vt100-vb|DEC VT100 (w/advanced video) & no beep, + bel@, flash=\E[?5h$<100/>\E[?5l, use=vt100, + +-# Ordinary vt100 in 132 column ("wide") mode. +-vt100-w|vt100-w-am|DEC vt100 132 cols (w/advanced video), ++# Ordinary VT100 in 132 column ("wide") mode. ++vt100-w|vt100-w-am|DEC VT100 132 cols (w/advanced video), + cols#132, lines#24, + rs2=\E>\E[?3h\E[?4l\E[?5l\E[?8h, use=vt100-am, +-vt100-w-nam|vt100-nam-w|DEC vt100 132 cols (w/advanced video no automargin), ++vt100-w-nam|vt100-nam-w|DEC VT100 132 cols (w/advanced video no automargin), + cols#132, lines#14, vt@, + rs2=\E>\E[?3h\E[?4l\E[?5l\E[?8h, use=vt100-nam, + +-# vt100 with no advanced video. +-vt100-nav|vt100 without advanced video option, ++# VT100 with no advanced video. ++vt100-nav|VT100 without advanced video option, + xmc#1, + blink@, bold@, rev@, rmso=\E[m, rmul@, sgr@, sgr0@, smso=\E[7m, + smul@, use=vt100, +-vt100-nav-w|vt100-w-nav|DEC vt100 132 cols 14 lines (no advanced video option), ++vt100-nav-w|vt100-w-nav|DEC VT100 132 cols 14 lines (no advanced video option), + cols#132, lines#14, use=vt100-nav, + +-# vt100 with one of the 24 lines used as a status line. ++# VT100 with one of the 24 lines used as a status line. + # We put the status line on the top. +-vt100-s|vt100-s-top|vt100-top-s|vt100 for use with top sysline, ++vt100-s|vt100-s-top|vt100-top-s|VT100 for use with top sysline, + eslok, hs, + lines#23, + clear=\E[2;1H\E[J$<50>, csr=\E[%i%i%p1%d;%p2%dr, +@@ -2478,19 +2478,19 @@ + + # Status line at bottom. + # Clearing the screen will clobber status line. +-vt100-s-bot|vt100-bot-s|vt100 for use with bottom sysline, ++vt100-s-bot|vt100-bot-s|VT100 for use with bottom sysline, + eslok, hs, + lines#23, + dsl=\E7\E[1;24r\E8, fsl=\E8, is2=\E[1;23r\E[23;1H, + tsl=\E7\E[24;%p1%dH\E[1K, use=vt100-am, + +-# Most of the `vt100' emulators out there actually emulate a vt102 ++# Most of the `vt100' emulators out there actually emulate a VT102 + # This entry (or vt102-nsgr) is probably the right thing to use for + # these. +-vt102|DEC vt102, ++vt102|DEC VT102, + dch1=\E[P, dl1=\E[M, il1=\E[L, rmir=\E[4l, smir=\E[4h, + use=vt100, +-vt102-w|DEC vt102 in wide mode, ++vt102-w|DEC VT102 in wide mode, + cols#132, + rs3=\E[?3h, use=vt102, + +@@ -2502,18 +2502,18 @@ + # ACS support working, at the cost of making multiple-highlight changes + # slightly more expensive. + # From: Eric S. Raymond July 22 1995 +-vt102-nsgr|vt102 no sgr (use if you see snowflakes after highlight changes), ++vt102-nsgr|VT102 no sgr (use if you see snowflakes after highlight changes), + sgr@, sgr0=\E[m, use=vt102, + + # VT125 Graphics CRT. Clear screen also erases graphics +-# Some vt125's came configured with vt102 support. +-vt125|vt125 graphics terminal, ++# Some VT125's came configured with VT102 support. ++vt125|VT125 graphics terminal, + mir, + clear=\E[H\E[2J\EPpS(E)\E\\$<50>, use=vt100, + + # This isn't a DEC entry, it came from University of Wisconsin. + # (vt131: I added / based on the init string, also -- esr) +-vt131|DEC vt131, ++vt131|DEC VT131, + OTbs, am, xenl, + cols#80, it#8, lines#24, vt#3, + bel=^G, blink=\E[5m$<2/>, bold=\E[1m$<2/>, +@@ -2536,7 +2536,7 @@ + # terminal. I've never actually used a vt132 myself, so this + # is untested. + # +-vt132|DEC vt132, ++vt132|DEC VT132, + xenl, + dch1=\E[P$<7>, dl1=\E[M$<99>, il1=\E[L$<99>, ind=\n$<30>, + ip=$<7>, rmir=\E[4h, smir=\E[4l, use=vt100, +@@ -2547,7 +2547,7 @@ + # PF1--PF4 are used as F1--F4. + # + # added msgr -TD +-vt220-old|vt200-old|DEC VT220 in vt100 emulation mode, ++vt220-old|vt200-old|DEC VT220 in VT100 emulation mode, + OTbs, OTpt, am, mir, msgr, xenl, xon, + cols#80, lines#24, vt#3, + OTnl=\n, +@@ -2588,10 +2588,10 @@ + # Remove Delete + # Find Home + # Select End +-vt220+pcedit|editing-keypad for vt220 using PC keyboard, ++vt220+pcedit|editing-keypad for VT220 using PC keyboard, + kdch1=\E[3~, kend=\E[4~, khome=\E[1~, kich1=\E[2~, + knp=\E[6~, kpp=\E[5~, +-vt220+vtedit|editing-keypad for vt220 using DEC keyboard, ++vt220+vtedit|editing-keypad for VT220 using DEC keyboard, + kdch1=\E[3~, kfnd=\E[1~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~, + kslt=\E[4~, + +@@ -2635,12 +2635,12 @@ + sgr0=\E[m\E(B, smacs=\E(0$<2>, smam=\E[?7h, smir=\E[4h, + smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=vt220+vtedit, + use=ansi+pp, use=ansi+enq, +-vt220|vt200|DEC vt220, ++vt220|vt200|DEC VT220, + use=vt220+cvis, use=vt220-base, +-vt220-w|vt200-w|DEC vt220 in wide mode, ++vt220-w|vt200-w|DEC VT220 in wide mode, + cols#132, + rs3=\E[?3h, use=vt220, +-vt220-8bit|vt220-8|vt200-8bit|vt200-8|DEC vt220/200 in 8-bit mode, ++vt220-8bit|vt220-8|vt200-8bit|vt200-8|DEC VT220/200 in 8-bit mode, + OTbs, am, mc5i, mir, msgr, xenl, xon, + cols#80, it#8, lines#24, vt#3, + acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, +@@ -2671,39 +2671,39 @@ + smso=\2337m, smul=\2334m, tbc=\2333g, use=vt220+cvis8, + + # vt220d: +-# This vt220 description regards F6--F10 as the second block of function keys ++# This VT220 description regards F6--F10 as the second block of function keys + # at the top of the keyboard. This mapping follows the description given + # in the VT220 Programmer Reference Manual and agrees with the labeling +-# on some terminals that emulate the vt220. There is no support for an F5. ++# on some terminals that emulate the VT220. There is no support for an F5. + # See vt220 for an alternate mapping. + # +-vt220d|DEC VT220 in vt100 mode with DEC function key labeling, ++vt220d|DEC VT220 in VT100 mode with DEC function key labeling, + kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, + kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, + kf18=\E[32~, kf19=\E[33~, kf20=\E[34~, kf5@, kf6=\E[17~, + kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, use=vt220-old, + +-vt220-nam|v200-nam|VT220 in vt100 mode with no auto margins, ++vt220-nam|v200-nam|VT220 in VT100 mode with no auto margins, + am@, + rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7l\E[?8h, use=vt220, + + # vt220 termcap written Tue Oct 25 20:41:10 1988 by Alex Latzko + # (not an official DEC entry!) +-# The problem with real vt220 terminals is they don't send escapes when in +-# in vt220 mode. This can be gotten around two ways. 1> don't send +-# escapes or 2> put the vt220 into vt100 mode and use all the nifty +-# features of vt100 advanced video which it then has. ++# The problem with real VT220 terminals is they don't send escapes when in ++# in VT220 mode. This can be gotten around two ways. 1> don't send ++# escapes or 2> put the VT220 into VT100 mode and use all the nifty ++# features of VT100 advanced video which it then has. + # +-# This entry takes the view of putting a vt220 into vt100 mode so ++# This entry takes the view of putting a VT220 into VT100 mode so + # you can use the escape key in emacs and everything else which needs it. + # + # You probably don't want to use this on a VMS machine since VMS will think +-# it has a vt220 and will get fouled up coming out of emacs ++# it has a VT220 and will get fouled up coming out of emacs + # + # From: Alexander Latzko , 30 Dec 1996 + # (Added vt100 , to quiet a tic warning -- esr) + # added msgr -TD +-vt200-js|vt220-js|DEC vt200 series with jump scroll, ++vt200-js|vt220-js|DEC VT200 series with jump scroll, + am, msgr, + cols#80, + bel=^G, clear=\E[H\E[J, cr=\r, csr=\E[%i%p1%d;%p2%dr, +@@ -2720,13 +2720,13 @@ + smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m$<5/>, smul=\E[4m, + use=vt220+cvis, + +-# This was DEC's vt320. Use the purpose-built one below instead +-#vt320|DEC VT320 in vt100 emulation mode, ++# This was DEC's VT320. Use the purpose-built one below instead ++#vt320|DEC VT320 in VT100 emulation mode, + # use=vt220, + + # Use v320n for SCO's LYRIX. Otherwise, use Adam Thompson's vt320-nam. + # +-vt320nam|v320n|DEC VT320 in vt100 emul. mode with NO AUTO WRAP mode, ++vt320nam|v320n|DEC VT320 in VT100 emul. mode with NO AUTO WRAP mode, + am@, + rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7l\E[?8h, + use=vt220-base, +@@ -2744,8 +2744,8 @@ + # to SMASH the 1k-barrier... + # From: Adam Thompson Sept 10 1995 + # (vt320: uncommented --esr) +-vt320|vt300|DEC vt320 7 bit terminal, +- am, hs, mir, msgr, xenl, ++vt320|vt300|DEC VT320 7 bit terminal, ++ am, mir, msgr, xenl, + cols#80, lines#24, wsl#80, + acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, + bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r, +@@ -2774,16 +2774,16 @@ + smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, + use=dec+pp, use=vt220+cvis, use=vt220+keypad, use=dec+sl, + use=ansi+enq, +-vt320-nam|vt300-nam|DEC vt320 7 bit terminal with no am to make SAS happy, ++vt320-nam|vt300-nam|DEC VT320 7 bit terminal with no am to make SAS happy, + am@, + is2=\E>\E[?3l\E[?4l\E[?5l\E[?7l\E[?8h\E[1;24r\E[24;1H, + rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7l\E[?8h\E[1;24r\E[24;1H, use=vt320, + # We have to init 132-col mode, not 80-col mode. +-vt320-w|vt300-w|DEC vt320 wide 7 bit terminal, ++vt320-w|vt300-w|DEC VT320 wide 7 bit terminal, + cols#132, wsl#132, + is2=\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H, + rs2=\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H, use=vt320, +-vt320-w-nam|vt300-w-nam|DEC vt320 wide 7 bit terminal with no am, ++vt320-w-nam|vt300-w-nam|DEC VT320 wide 7 bit terminal with no am, + am@, + is2=\E>\E[?3h\E[?4l\E[?5l\E[?7l\E[?8h\E[1;24r\E[24;1H, + rs2=\E>\E[?3h\E[?4l\E[?5l\E[?7l\E[?8h\E[1;24r\E[24;1H, use=vt320-w, +@@ -2793,7 +2793,7 @@ + # host writable status line, yet another different DRCS matrix size, + # and such, but they add the DEC Technical character set, Multiple text + # pages, selectable length pages, and the like. The difference between +-# the vt330 and vt340 is that the former has only 2 planes and a monochrome ++# the VT330 and VT340 is that the former has only 2 planes and a monochrome + # monitor, the latter has 4 planes and a color monitor. These terminals + # support VT131 and ANSI block mode, but as with much of these things, + # termcap/terminfo doesn't deal with these features. +@@ -2808,7 +2808,7 @@ + # From: Daniel Glasser , 13 Oct 1993 + # (vt340: string capability "sb=\E[M" corrected to "sr"; + # also, added / based on the init string -- esr) +-vt340|dec-vt340|vt330|dec-vt330|DEC vt340 graphics terminal with 24 line page, ++vt340|dec-vt340|vt330|dec-vt330|DEC VT340 graphics terminal with 24 line page, + am, eslok, hs, mir, msgr, xenl, xon, + cols#80, it#8, lines#24, vt#3, + acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, +@@ -2841,11 +2841,11 @@ + smglr=\E[?69h\E[%i%p1%d;%p2%ds, + smgrp=\E[?69h\E[%i;%p1%ds, + +-# DEC doesn't supply a vt400 description, so we add Daniel Glasser's +-# (originally written with vt420 as its primary name, and usable for it). ++# DEC doesn't supply a VT400 description, so we add Daniel Glasser's ++# (originally written with VT420 as its primary name, and usable for it). + # +-# VT400/420 -- This terminal is a superset of the vt320. It adds the multiple +-# text pages and long text pages with selectable length of the vt340, along ++# VT400/420 -- This terminal is a superset of the VT320. It adds the multiple ++# text pages and long text pages with selectable length of the VT340, along + # with left and right margins, rectangular area text copy, fill, and erase + # operations, selected region character attribute change operations, + # page memory and rectangle checksums, insert/delete column, reception +@@ -2862,8 +2862,8 @@ + # From: Daniel Glasser , 13 Oct 1993 + # (vt400: string capability ":sb=\E[M:" corrected to ":sr=\E[M:"; + # also, added / based on the init string -- esr) +-vt400|vt400-24|dec-vt400|DEC vt400 24x80 column autowrap, +- am, eslok, hs, mir, msgr, xenl, xon, ++vt400|vt400-24|dec-vt400|DEC VT400 24x80 column autowrap, ++ am, eslok, mir, msgr, xenl, xon, + cols#80, it#8, lines#24, vt#3, + acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, + blink=\E[5m, bold=\E[1m, clear=\E[H\E[J$<10/>, cr=\r, +@@ -3032,17 +3032,17 @@ + # I can send the address if requested. + # (z340: changed garbled \E[5?l to \E[?5l, DEC smooth scroll off -- esr) + # From: Adam Thompson Sept 10 1995 +-z340|ZSTEM vt340 terminal emulator 132col 42line, ++z340|ZSTEM VT340 terminal emulator 132col 42line, + lines#42, + is2=\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h\E[1;42r\E[42;1H, + rs2=\E>\E[?3h\E[?4l\E[?5l\E[?7h\E[?8h\E[1;42r\E[42;1H, use=vt320-w, +-z340-nam|ZSTEM vt340 terminal emulator 132col 42line (no automatic margins), ++z340-nam|ZSTEM VT340 terminal emulator 132col 42line (no automatic margins), + am@, + is2=\E>\E[?3h\E[?4l\E[?5l\E[?7l\E[?8h\E[1;42r\E[42;1H, + rs2=\E>\E[?3h\E[?4l\E[?5l\E[?7l\E[?8h\E[1;42r\E[42;1H, use=z340, + + # expect-5.44.1.15/example/tkterm +-# a minimal subset of a vt100 (compare with "news-unk). ++# a minimal subset of a VT100 (compare with "news-unk). + # + # The missing "=" in smkx is not a typo (here), but an error in tkterm. + tt|tkterm|Don Libes' tk text widget terminal emulator, +@@ -3442,7 +3442,7 @@ + # ansi or dtterm). + # + the shift/control/meta key modifiers from rxvt and xterm variants are not + # recognised except for a few special cases, i.e., kRIT5 and kLFT5. +-# + the vt52 emulation does not give a usable shell because screen-clearing ++# + the VT52 emulation does not give a usable shell because screen-clearing + # does not work as expected. + # + selecting "xterm" or "xterm-16color" sets TERM to "xterm-256color". + # + OSX 10.9 (Yosemite) added more extended keys in the default configuration +@@ -3470,10 +3470,10 @@ + + # reviewed Terminal.app in El Capitan (version 2.6 build 361) -TD + # Using vttest: +-# + no vt52 mode for cursor keys, though vt52 screen works in vttest ++# + no VT52 mode for cursor keys, though VT52 screen works in vttest + # + f1-f4 map to pf1-pf4 +-# + no vt220 support aside from DECTCEM and ECH +-# + there are no protected areas. Forget about anything above vt220. ++# + no VT220 support aside from DECTCEM and ECH ++# + there are no protected areas. Forget about anything above VT220. + # + in ECMA-48 cursor movement, VPR and HPR fail. Others work. + # + vttest color 11.6.4 and 11.6.5 (bce for ED/EL and ECH/indexing) are bce + # + but bce fails for 11.6.7.2 (test repeat). +@@ -4061,7 +4061,7 @@ + # + # PuTTY 0.51 (14 December 2000) + # +-# This emulates vt100 + vt52 (plus a few vt220 features: ech, SRM, DECTCEM, as ++# This emulates VT100 + VT52 (plus a few VT220 features: ech, SRM, DECTCEM, as + # well as SCO and Atari, color palettes from Linux console). Reading the code, + # it is intended to be VT102 plus selected features. By default, it sets $TERM + # to xterm, which is incorrect, since several features are misimplemented: +@@ -4123,7 +4123,7 @@ + kp7=\EOw, kp8=\EOx, kp9=\EOy, kpADD=\EOl, kpDIV=\EOQ, + kpDOT=\EOn, kpMUL=\EOR, kpNUM=\EOP, kpSUB=\EOS, kpZRO=\EOp, + +-vt100-putty|Reset PuTTY to pure vt100, ++vt100-putty|Reset PuTTY to pure VT100, + rs2=\E<\E["p\Ec\E[?3l\E]R\E[40"p\E[61"p\E[50;1;2"p, + use=vt100, + putty-256color|PuTTY 0.58 with xterm 256-colors, +@@ -4281,14 +4281,14 @@ + # - Japanese and Russian character sets. + # + # The program does not come with terminfo or termcap entries. However, the +-# emulation (testing with vttest and ncurses) is reasonably close to vt100 (no +-# vt52 or doublesize character support; blinking is done with color). Besides ++# emulation (testing with vttest and ncurses) is reasonably close to VT100 (no ++# VT52 or doublesize character support; blinking is done with color). Besides + # the HPA, VPA extensions it also implements CPL and CNL. + # + # All of the function keys can be remapped. This description shows the default +-# mapping, as installed. Both vt100 PF1-PF4 keys and quasi-vt220 F1-F4 keys ++# mapping, as installed. Both VT100 PF1-PF4 keys and quasi-vt220 F1-F4 keys + # are supported. F13-F20 are obtained by shifting F3-F10. The editing keypad +-# is laid out like vt220, rather than the face codes on the PC keyboard, i.e, ++# is laid out like VT220, rather than the face codes on the PC keyboard, i.e, + # kfnd Insert + # kslt Delete + # kich1 Home +@@ -4327,14 +4327,14 @@ + use=vt100+enq, use=klone+color, use=vt100, + use=vt220+cvis, + +-# Version 4.59 has regular vt100 line-drawing (so it is no longer necessary ++# Version 4.59 has regular VT100 line-drawing (so it is no longer necessary + # to choose a Windows OEM font). + # + # Testing with tack: + # - it does not have xenl (suppress that) + # - underline seems to work with color (modify ncv). + # Testing with vttest: +-# - wrapping differs from vt100 (menu 1). ++# - wrapping differs from VT100 (menu 1). + # - it recognizes xterm's X10 and normal mouse tracking, but none of the + # other flavors. + # - it recognizes the dtterm window controls for reporting size in +@@ -4386,10 +4386,10 @@ + # Other notes: + # a) Fails tack's cup (cursor-addressing) test, though cup works well enough + # for casual (occasional) use. Also fails several of the vttest screens, +-# but that is not unusual for vt100 "emulators". +-# b) Does not implement vt100 keypad +-# c) Recognizes a subset of vt52 controls. +-ms-vt100|MS telnet imitating DEC vt100, ++# but that is not unusual for VT100 "emulators". ++# b) Does not implement VT100 keypad ++# c) Recognizes a subset of VT52 controls. ++ms-vt100|MS telnet imitating DEC VT100, + lines#25, + acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i + \316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u +@@ -4404,7 +4404,7 @@ + # a) This version has no function keys or numeric keypad. Unlike the older + # version, the numeric keypad is entirely ignored. + # b) The program sets $TERM to "ansi", which of course is inaccurate. +-ms-vt100-color|vtnt|windows 2000 ansi (sic), ++ms-vt100-color|vtnt|windows 2000 ANSI (sic), + bce, + dch=\E[%p1%dP, ich=\E[%p1%d@, use=ecma+color, + use=ms-vt100, +@@ -4424,7 +4424,7 @@ + # Shift \E^S + # Alt \E^A, + # Ctrl \E^C, +-ms-vt100+|vt100+|windows XP vt100+ (sic), ++ms-vt100+|vt100+|windows XP VT100+ (sic), + kdch1=\E-, kend=\Ek, kf1=\E1, kf10=\E0, kf11=\E!, kf12=\E@, + kf13=\E\023\E1, kf14=\E\023\E2, kf15=\E\023\E3, + kf16=\E\023\E4, kf17=\E\023\E5, kf18=\E\023\E6, +@@ -4441,7 +4441,7 @@ + kf6=\E6, kf7=\E7, kf8=\E8, kf9=\E9, khome=\Eh, kich1=\E+, + knp=\E/, kpp=\E?, use=ms-vt100-color, + +-ms-vt-utf8|vt-utf8|UTF-8 flavor of vt100+, ++ms-vt-utf8|vt-utf8|UTF-8 flavor of VT100+, + use=ms-vt100+, + + # Windows Terminal (Preview) +@@ -4626,6 +4626,11 @@ + rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m, + sgr0=\E[m, smam=\E[?7h, smir=\E[4h, smkx=\E[?1h\E=, + smso=\E[7m, smul=\E[4m, ++# csl is extension which clears the status line ++x10term+sl|status-line for X10 xterm, ++ eslok, hs, ++ dsl=\E[?H, fsl=\E[?F, tsl=\E[?E\E[?%i%p1%dT, csl=\E[?E, ++ + # Compatible with the R5 xterm + # (from the XFree86 3.2 distribution, removed) + # added khome/kend, rmir/smir, rmul/smul, hts based on the R5 xterm code - TD +@@ -5003,7 +5008,7 @@ + xterm+pc+edit|fragment for pc-style editing keypad, + kend=\E[4~, khome=\E[1~, + +-xterm+vt+edit|fragment for vt220-style editing keypad, ++xterm+vt+edit|fragment for VT220-style editing keypad, + kfnd=\E[1~, kslt=\E[4~, + + # These variations for alternate-screen and title-stacking were introduced by +@@ -5345,7 +5350,7 @@ + Ms=\E]52;%p1%s;%p2%s\E\\, Se=\E[ q, Ss=\E[%p1%d q, + + # This is another variant, for XFree86 4.0 xterm (T.Dickey) +-# This is an 8-bit version of xterm, which emulates DEC vt220 with ANSI color. ++# This is an 8-bit version of xterm, which emulates DEC VT220 with ANSI color. + # To use it, your decTerminalID resource must be set to 200 or above. + # + # HTS \E H \210 +@@ -5437,15 +5442,15 @@ + use=xterm+nofkeys, + + # The xterm-new description has all of the features, but is not completely +-# compatible with vt220. If you are using a Sun or PC keyboard, set the ++# compatible with VT220. If you are using a Sun or PC keyboard, set the + # sunKeyboard resource to true: + # + maps the editing keypad + # + interprets control-function-key as a second array of keys, so a +-# 12-fkey keyboard can support vt220's 20-fkeys. ++# 12-fkey keyboard can support VT220's 20-fkeys. + # + maps numeric keypad "+" to ",". + # + uses DEC-style control sequences for the application keypad. + # +-xterm-vt220|xterm emulating vt220, ++xterm-vt220|xterm emulating VT220, + npc, + kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, + kend=\E[4~, kent=\EOM, kf10=\E[21~, kf11=\E[23~, +@@ -5459,7 +5464,7 @@ + use=xterm+sm+1006, use=xterm+tmux, use=xterm+keypad, + use=xterm-basic, + +-xterm-vt52|xterm emulating DEC vt52, ++xterm-vt52|xterm emulating DEC VT52, + cols#80, it#8, lines#24, + acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, + bel=^G, clear=\EH\EJ, cr=\r, cub1=\ED, cud1=\EB, cuf1=\EC, +@@ -5524,7 +5529,7 @@ + hs, + dsl=\E]2;\E\\, fsl=\E\\, tsl=\E]2;, TS=\E]2;, + +-# In contrast, this block can be used for a DEC vt320 and up. There are two ++# In contrast, this block can be used for a DEC VT320 and up. There are two + # controls used. + # + # DECSASD (select active status display) +@@ -5618,7 +5623,7 @@ + # X11R4 (December 1989) added the control sequences document, listing the + # control sequences for the X10/X11 protocols without descriptions. It also + # mentioned the "emacs" ("T") response. Comments in button.c referred to the +-# X11 protocol as "DEC vt200 compatible", although DEC offered no such terminal. ++# X11 protocol as "DEC VT200 compatible", although DEC offered no such terminal. + # + # X11R5 (November 1993) gave a description of the mouse protocol. + # +@@ -5706,15 +5711,15 @@ + # -- MATSUMOTO Shoji) + # kterm implements acsc via built-in table of X Drawable's + kterm|kterm kanji terminal emulator (X window system), +- eslok, hs, XT, ++ XT, + ncv@, + acsc=``aajjkkllmmnnooppqqrrssttuuvvwwxx~~, +- csr=\E[%i%p1%d;%p2%dr, dsl=\E[?H, enacs=, fsl=\E[?F, +- kmous=\E[M, rc=\E8, rmacs=\E(B, rmam=\E[?7l, sc=\E7, ++ csr=\E[%i%p1%d;%p2%dr, enacs=, kmous=\E[M, rc=\E8, ++ rmacs=\E(B, rmam=\E[?7l, sc=\E7, + sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e + \E(B%;, +- sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, +- tsl=\E[?E\E[?%i%p1%dT, use=xterm-r6, use=ecma+color, ++ sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, use=x10term+sl, ++ use=xterm-r6, use=ecma+color, + kterm-color|kterm-co|kterm with ANSI colors, + ncv@, use=kterm, use=ecma+color, + +@@ -5841,20 +5846,20 @@ + cols#80, lines#24, use=xterm-sun, + + #### GNOME (VTE) +-# this describes the alpha-version of Gnome terminal shipped with Redhat 6.0 +-gnome-rh62|Gnome terminal, ++# this describes the alpha-version of GNOME terminal shipped with Redhat 6.0 ++gnome-rh62|GNOME terminal, + bce, + kdch1=^?, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, + use=xterm-color, + + # GNOME Terminal 1.4.0.4 (Redhat 7.2) + # +-# This implements a subset of vt102 with a random selection of features from ++# This implements a subset of VT102 with a random selection of features from + # other terminals such as color and function-keys. + # + # shift-f1 to shift-f10 are f11 to f20 + # +-# NumLock changes the application keypad to approximate vt100 keypad, except ++# NumLock changes the application keypad to approximate VT100 keypad, except + # that there is no escape sequence matching comma (,). + # + # Other defects observed: +@@ -5876,9 +5881,9 @@ + + # GNOME Terminal 2.0.1 (Redhat 8.0) + # +-# Documentation now claims it implements vt220 (which is demonstrably false). +-# However, it does implement ECH, which is a vt220 feature. And there are +-# workable vt100 LNM, DECALN, DECSNM modes, making it possible to display ++# Documentation now claims it implements VT220 (which is demonstrably false). ++# However, it does implement ECH, which is a VT220 feature. And there are ++# workable VT100 LNM, DECALN, DECSNM modes, making it possible to display + # more of its bugs using vttest. + # + # However, note that bce and msgr are broken in this release. Tabs (tbc and +@@ -5925,9 +5930,9 @@ + + # GNOME Terminal 2.22.3 (2008 snapshot) + # +-# In vttest, it claims to be a vt220 with national replacement character-sets, ++# In vttest, it claims to be a VT220 with national replacement character-sets, + # but aside from the identifier string, implements only a small fraction of +-# vt220's behavior, which will make it less usable on a VMS system (unclear ++# VT220's behavior, which will make it less usable on a VMS system (unclear + # what the intent of the developer is, since the NRC feature exposed in vttest + # by this change does not work). + vte-2008|VTE in GNOME Terminal snapshot 2.22.3, +@@ -6104,7 +6109,7 @@ + use=xterm+pcfkeys, use=xterm+sl-twm, + + #### Other GNOME +-# Multi-Gnome-Terminal 1.6.2 ++# Multi-GNOME-Terminal 1.6.2 + # + # This does not use VTE, and does have different behavior (compare xfce and + # gnome). +@@ -6133,18 +6138,18 @@ + # konsole. Some features such as the 1049 private mode are recognized but + # incorrectly implemented as a duplicate of the 47 private mode. + # b) even with the "vt100 (historical)" keyboard setting, the numeric keypad +-# sends PC-style escapes rather than vt100. ++# sends PC-style escapes rather than VT100. + # c) fails vttest menu 3 (Test of character sets) because it does not properly + # parse some control sequences. Also fails vttest Primary Device Attributes + # by sending a bogus code (in the source it says it's supposed to be a +-# vt220, which is doubly incorrect because it does not implement vt220 ++# VT220, which is doubly incorrect because it does not implement VT220 + # control sequences except for a few special cases). Treat it as a +-# mildly-broken vt102. ++# mildly-broken VT102. + # + # Update for konsole 1.3.2: + # The 1049 private mode works (but see the other xterm screens in vttest). +-# Primary Device Attributes now returns the code for a vt100 with advanced +-# video option. Perhaps that's intended to be a "mildly-broken vt102". ++# Primary Device Attributes now returns the code for a VT100 with advanced ++# video option. Perhaps that's intended to be a "mildly-broken Vt102". + # + # Updated for konsole 1.6.4: + # add konsole-solaris +@@ -6154,7 +6159,7 @@ + # + # Updated for konsole 2.3 (October 2008): + # vttest menu 1 shows that both konsole and gnome terminal do wrapping +-# different from xterm (and vt100's). They have the same behavior in ++# different from xterm (and VT100's). They have the same behavior in + # this detail, but it is unclear which copies the other. + # + # Deferred update for konsole 2.10 (late 2012): +@@ -6271,7 +6276,7 @@ + # KDE's "vt100" keyboard has no relationship to any terminal that DEC made, but + # it is still useful for deriving the other entries, since the developer + # provided function-keys based on xterm. +-konsole-vt100|KDE console window with vt100 (sic) keyboard, ++konsole-vt100|KDE console window with VT100 (sic) keyboard, + kbs=^?, kdch1=\E[3~, kend=\E[F, kf1=\E[11~, kf10=\E[21~, + kf11=\E[23~, kf12=\E[24~, kf13@, kf14@, kf15@, kf16@, kf17@, + kf18@, kf19@, kf2=\E[12~, kf20@, kf3=\E[13~, kf4=\E[14~, +@@ -6281,7 +6286,7 @@ + # Obsolete: vt420pc.keytab was added in June 2000, dropped from the install in + # September 2008 and removed in June 2016. The developer who removed it stated + # that it was never installed. +-konsole-vt420pc|KDE console window with vt420 pc keyboard, ++konsole-vt420pc|KDE console window with VT420 PC keyboard, + kbs=^H, kdch1=^?, use=konsole-vt100, + + # make a default entry for konsole +@@ -6349,7 +6354,7 @@ + + # This is mlterm 2.9.3's mlterm.ti, with some additions/corrections -TD + # +-# It is nominally a vt102 emulator, with features borrowed from rxvt and ++# It is nominally a VT102 emulator, with features borrowed from rxvt and + # xterm. + # + # The function keys are numbered based on shift/control/alt modifiers, except +@@ -6651,7 +6656,7 @@ + # window collapses to a single line when running several of the screens + # in vttest, e.g., the tests for cursor movement, screen features, + # double-sized characters. +-# + The vt52 test works properly, but this is an exception. Due to the ++# + The VT52 test works properly, but this is an exception. Due to the + # other bug(s) most of vttest is untestable. + # + the color test using ECH shows a gap in the bce model, like rxvt. + # +@@ -6848,7 +6853,7 @@ + %t\EU%;, + sgr0=\ES, smir=\EY, smso=\ET, smul=\EV, tbc=\Ej, + +-# vt220 Terminfo entry for the Emu emulation, corresponds to ++# VT220 terminfo entry for the Emu emulation, corresponds to + # emu -term vt220 + # with NumLock set (to make the keypad transmit kf0-kf9). + # fixes: add am, xenl, corrected sgr0 -TD +@@ -6892,29 +6897,28 @@ + # apparently implements alternate screen like xterm + # does not use padding, of course. + mvterm|vv100|SwitchTerm aka mvTERM, +- am, eslok, hs, km, mir, msgr, xenl, xon, ++ am, km, mir, msgr, xenl, xon, + colors#8, cols#80, it#8, lines#24, pairs#64, + acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, + bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r, + csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, + cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, + cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, +- dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, +- dsl=\E[?E, ed=\E[J, el=\E[K, el1=\E[1K$<3>, enacs=\E(B\E)0, +- fsl=\E[?F, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, +- ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\n, kbs=^H, +- kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf0=\EOy, +- kf10=\EOx, kf5=\EOt, kf6=\EOu, kf7=\EOv, kf8=\EOl, kf9=\EOw, +- op=\E[100m, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, +- rmcup=\E[2J\E[?47l\E8, rmkx=\E[?1l\E>, rmso=\E[m, +- rmul=\E[m, ++ dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, ++ el=\E[K, el1=\E[1K$<3>, enacs=\E(B\E)0, home=\E[H, ht=^I, ++ hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ++ ind=\n, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, ++ kcuu1=\EOA, kf0=\EOy, kf10=\EOx, kf5=\EOt, kf6=\EOu, ++ kf7=\EOv, kf8=\EOl, kf9=\EOw, op=\E[100m, rc=\E8, rev=\E[7m, ++ ri=\EM, rmacs=^O, rmcup=\E[2J\E[?47l\E8, rmkx=\E[?1l\E>, ++ rmso=\E[m, rmul=\E[m, + rs2=\E>\E[1;3;4;5;6l\E[?7h\E[100m\E[m\E[r\E[2J\E[H, + sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, + sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5 + %;m%?%p9%t\016%e\017%;, + sgr0=\E[m\017, smacs=^N, smcup=\E7\E[?47h, + smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, +- tsl=\E[?E\E[?%i%p1%dT, use=vt100+fnkeys, ++ use=vt100+fnkeys, use=x10term+sl, + + #### MTERM + # +@@ -7041,7 +7045,7 @@ + #### SIMPLETERM + # st.suckless.org + +-st|stterm| simpleterm, ++st|stterm|aka simpleterm, + use=st-0.8, + + # Reviewed 0.8.2: +@@ -7056,7 +7060,7 @@ + # + # This entry discards the ccc/initc capabilities from st-0.7 because they + # belong in st-256color. +-st-0.8|simpleterm 0.7, ++st-0.8|simpleterm 0.8, + dim=\E[2m, kcbt@, kent@, oc=\E]104\007, + sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%| + %t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m, +@@ -7287,7 +7291,7 @@ + # terminal does not respond to 80/132-column switching + # wrapping at the right margin is erratic + # there are several problems in the cursor-movements and screen-features +-# no vt52, no double-sized characters ++# no VT52, no double-sized characters + # Device attributes response says it is a vanilla VT100 + # does not respond to xterm mouse controls + # alternate screen tests do not fill the screen, return wrong position +@@ -7330,7 +7334,7 @@ + # https://github.com/borisfaure/terminology + # + # 2014/10/14: +-# Tested terminology-0.3.0, 0.6.1, using tack and vttest. This is not a vt100 ++# Tested terminology-0.3.0, 0.6.1, using tack and vttest. This is not a VT100 + # emulator, nor is it compatible with xterm, but it uses a few features from + # both -TD + # +@@ -7339,7 +7343,7 @@ + # there are pervasive problems with clearing/erasing parts of the screen + # resizing the window causes it to stop listening to the keyboard + # tack - +-# doesn't understand vt100 CPR needed for resize ++# doesn't understand VT100 CPR needed for resize + # no CBT + # no cvvis + # has invis +@@ -7359,9 +7363,9 @@ + # vttest - + # spits lots of messages from termptyesc.c especially in vttest. + # no 132-column mode +-# fails menu 1, 2 (definitely not vt100-compatible) +-# primary (claims vt420 with several options, apparently none work) and +-# secondary report says (perhaps... vt420): \E[>41;285;0c ++# fails menu 1, 2 (definitely not VT100-compatible) ++# primary (claims VT420 with several options, apparently none work) and ++# secondary report says (perhaps... VT420): \E[>41;285;0c + # CHA, HPR, VPA, CNL, CPL work + # BCE with ED/EL - fail + # BCE with ECH/indexing - fail +@@ -7458,7 +7462,7 @@ + # no DECCOLM (does not switch between 80/132 columns) + # otherwise, passes wrapping test + # no DECSCNM +-# identifies as a vt102 ++# identifies as a VT102 + # numeric keypad does not send expected codes (seen in 0.4.0) + # passes bce test + # vt220: +@@ -7552,7 +7556,7 @@ + # does not switch between 80/132 columns + # fails wrapping test, copying vte/rxvt + # no reverse-background, no blink +-# claims to be vt200: ++# claims to be VT200: + # primary \E[?62;c + # secondary \E[>1;4000;12c + # however - +@@ -7734,7 +7738,7 @@ + # sends utf-8 for meta, like xterm + # vttest + # has problems with menu #1 (wrapping) +-# DA = vt200 with 132 columns, color ++# DA = VT200 with 132 columns, color + # DA2 = 990, 100300 ("\E[>990;100300;0c") + # no VT52, no double-size characters + # vt220 ECH test works, SRM, DECSCA do not +@@ -7787,7 +7791,7 @@ + # https://github.com/emacs-mirror/emacs/blob/master/lisp/term.el + # + # The codes supported by the term.el terminal emulation in GNU Emacs 19.30 +-eterm|gnu emacs term.el terminal emulation, ++eterm|GNU Emacs term.el terminal emulation, + am, mir, xenl, + cols#80, lines#24, + bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=\r, +@@ -8127,7 +8131,7 @@ + screen-w|VT 100/ANSI X3.64 virtual terminal with 132 cols, + cols#132, use=screen4, + +-screen2|old VT 100/ANSI X3.64 virtual terminal, ++screen2|VT 100/ANSI X3.64 virtual terminal (old), + cols#80, it#8, lines#24, + cbt=\E[Z, clear=\E[2J\E[H, cr=\r, cub=\E[%p1%dD, cub1=^H, + cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C, +@@ -8141,7 +8145,7 @@ + rmul=\E[24m, rs1=\Ec, sc=\E7, sgr0=\E[m, smir=\E[4h, + smso=\E[3m, smul=\E[4m, tbc=\E[3g, + # (screen3: removed unknown ":xv:LP:G0:" -- esr) +-screen3|older VT 100/ANSI X3.64 virtual terminal, ++screen3|VT 100/ANSI X3.64 virtual terminal (old), + km, mir, msgr, + cols#80, it#8, lines#24, + bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[J, +@@ -8283,7 +8287,7 @@ + # from www.ncsa.edu. This terminfo description file is based on xterm-vt220, + # xterm+sl, and the docs at NCSA. It works well. + # +-# NCSA Telnet 2.6 for Macintosh in vt220 8-bit emulation mode ++# NCSA Telnet 2.6 for Macintosh in VT220 8-bit emulation mode + # The terminal options should be set as follows: + # Xterm sequences ON + # use VT wrap mode ON +@@ -8310,7 +8314,7 @@ + # The status-line manipulation is a mapping of the xterm-compatible control + # sequences for setting the window-title. So you must use tsl and fsl in + # pairs, since the latter ends the string that is loaded to the window-title. +-ncsa-m|ncsa-vt220-8|NCSA Telnet 2.6 for Macintosh in vt220-8 mode, ++ncsa-m|ncsa-vt220-8|NCSA Telnet 2.6 for Macintosh in VT220-8 mode, + am, km, mir, msgr, xenl, + acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, + bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r, +@@ -8339,12 +8343,12 @@ + smir=\E[4h, smso=\E[7m, smul=\E[4m, tbc=\E[3g, + u8=\E[?62;1;6c, use=vt220+cvis, use=xterm+sl, + use=ansi+enq, +-ncsa|NCSA Telnet 2.7 for Macintosh in vt220-8 mode, ++ncsa|NCSA Telnet 2.7 for Macintosh in VT220-8 mode, + use=ncsa-m, use=klone+color, +-ncsa-ns|NCSA Telnet 2.7 for Macintosh in vt220-8 mode, ++ncsa-ns|NCSA Telnet 2.7 for Macintosh in VT220-8 mode, + hs@, + dsl@, fsl@, tsl@, use=ncsa, +-ncsa-m-ns|NCSA Telnet 2.6 for Macintosh in vt220-8 mode, ++ncsa-m-ns|NCSA Telnet 2.6 for Macintosh in VT220-8 mode, + hs@, + dsl@, fsl@, tsl@, use=ncsa-m, + # alternate -TD: +@@ -8353,7 +8357,7 @@ + # codes, however, since the numeric keypad (VT100) PF1-PF4 are available on + # some keyboards and many applications require these as F1-F4. + # +-ncsa-vt220|NCSA Telnet using vt220-compatible function keys, ++ncsa-vt220|NCSA Telnet using VT220-compatible function keys, + kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, + kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, + kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf2=\EOQ, +@@ -8389,7 +8393,7 @@ + bel=^G, cr=\r, ht=^I, ind=\n, kbs=^H, kcub1=^H, kcud1=\n, + nel=\r\n, + +-elks-vt52|ELKS vt52 console, ++elks-vt52|ELKS VT52 console, + clear=\EH\EJ, cub1=\ED, cud1=\EB, cuf1=\EC, + cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, el=\EK, + home=\EH, use=elks-glasstty, +@@ -8430,7 +8434,7 @@ + #### Sun consoles + # + +-# :is1: resets scrolling region in case a previous user had used "tset vt100" ++# :is1: resets scrolling region in case a previous user had used "tset VT100" + oldsun|Sun Microsystems Workstation console, + OTbs, am, km, mir, msgr, + cols#80, it#8, lines#34, +@@ -8619,7 +8623,7 @@ + # + + # (news-unk: this had :KB=news: -- esr) +-news-unk|Sony NEWS vt100 emulator common entry, ++news-unk|Sony NEWS VT100 emulator common entry, + OTbs, OTpt, am, xenl, + cols#80, + OTnl=\n, bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, +@@ -8636,39 +8640,39 @@ + sgr0=\E[m, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, + # + # (news-29: this had :TY=ascii: --esr) +-news-29|Sony NEWS vt100 emulator with 29 lines, ++news-29|Sony NEWS VT100 emulator with 29 lines, + lines#29, use=news-unk, + # (news-29-euc: this had :TY=euc: --esr) +-news-29-euc|Sony NEWS vt100 emulator with 29 lines and EUC, ++news-29-euc|Sony NEWS VT100 emulator with 29 lines and EUC, + use=news-29, + # (news-29-sjis: this had :TY=sjis: --esr) +-news-29-sjis|Sony NEWS vt100 emulator with 29 lines and SJIS, ++news-29-sjis|Sony NEWS VT100 emulator with 29 lines and SJIS, + use=news-29, + # + # (news-33: this had :TY=ascii: --esr) +-news-33|Sony NEWS vt100 with 33 lines, ++news-33|Sony NEWS VT100 with 33 lines, + lines#33, use=news-unk, + # (news-33-euc: this had :TY=euc: --esr) +-news-33-euc|Sony NEWS vt100 with 33 lines and EUC, ++news-33-euc|Sony NEWS VT100 with 33 lines and EUC, + use=news-33, + # (news-33-sjis: this had :TY=sjis: --esr) +-news-33-sjis|Sony NEWS vt100 with 33 lines and SJIS, ++news-33-sjis|Sony NEWS VT100 with 33 lines and SJIS, + use=news-33, + # + # (news-42: this had :TY=ascii: --esr) +-news-42|Sony NEWS vt100 with 42 lines, ++news-42|Sony NEWS VT100 with 42 lines, + lines#42, use=news-unk, + # (news-42-euc: this had :TY=euc: --esr) +-news-42-euc|Sony NEWS vt100 with 42 lines and EUC, ++news-42-euc|Sony NEWS VT100 with 42 lines and EUC, + use=news-42, + # (news-42-sjis: this had :TY=sjis: --esr) +-news-42-sjis|Sony NEWS vt100 with 42 lines and SJIS, ++news-42-sjis|Sony NEWS VT100 with 42 lines and SJIS, + use=news-42, + # + # NEWS-OS old termcap entry + # + # (news-old-unk: this had :KB=news:TY=sjis: --esr) +-news-old-unk|Sony NEWS vt100 emulator common entry, ++news-old-unk|Sony NEWS VT100 emulator common entry, + OTbs, OTpt, am, xenl, + cols#80, vt#3, + OTnl=\n, bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[;H\E[2J, +@@ -8682,7 +8686,7 @@ + sgr0=\E[m, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, + # + # (nwp512: this had :DE=^H:, which I think means --esr) +-nwp512|news|nwp514|news40|vt100-bm|old Sony vt100 emulator 40 lines, ++nwp512|news|nwp514|news40|vt100-bm|old Sony VT100 emulator 40 lines, + OTbs, + lines#40, + is2=\E7\E[r\E8\EE\EE\EE\EM\EM\EM\E[?7h\E[?1l\E[?3l\E7\E[1;40 +@@ -8690,13 +8694,13 @@ + use=news-old-unk, + # + # (nwp512-a: this had :TY=ascii: and the alias vt100-bm --esr) +-nwp512-a|nwp514-a|news-a|news42|news40-a|Sony vt100 emulator 42 line, ++nwp512-a|nwp514-a|news-a|news42|news40-a|Sony VT100 emulator 42 line, + lines#42, + is2=\E[?7h\E[?1l\E[?3l\E7\E[1;42r\E8, + use=news-old-unk, + # + # (nwp-512-o: this had :KB=nwp410:DE=^H: I interpret the latter as . --esr) +-nwp512-o|nwp514-o|news-o|news40-o|vt100-bm-o|Sony vt100 emulator 40 lines, ++nwp512-o|nwp514-o|news-o|news40-o|vt100-bm-o|Sony VT100 emulator 40 lines, + OTbs, + lines#40, + is2=\E7\E[r\E8\EE\EE\EE\EM\EM\EM\E[?7h\E[?1l\E[?3l\E7\E[1;40 +@@ -8704,7 +8708,7 @@ + use=news-old-unk, + # + # (nwp513: this had :DE=^H: and the alias vt100-bm --esr) +-nwp513|nwp518|nwe501|newscbm|news31|Sony vt100 emulator 33 lines, ++nwp513|nwp518|nwe501|newscbm|news31|Sony VT100 emulator 33 lines, + OTbs, + lines#31, + is2=\E7\E[r\E8\EE\EE\EE\EM\EM\EM\E[?7h\E[?1l\E[?3l\E7\E[1;31 +@@ -8713,7 +8717,7 @@ + # + # (nwp513-a: this had :TY=ascii: and :DE=^H:, which I interpret as ; --esr) + # also the alias vt100-bm. +-nwp513-a|nwp518-a|nwe501-a|nwp251-a|newscbm-a|news31-a|newscbm33|news33|old Sony vt100 emulator 33 lines, ++nwp513-a|nwp518-a|nwe501-a|nwp251-a|newscbm-a|news31-a|newscbm33|news33|old Sony VT100 emulator 33 lines, + OTbs, + lines#33, + is2=\E7\E[r\E8\EE\EE\EE\EM\EM\EM\E[?7h\E[?1l\E[?3l\E7\E[1;33 +@@ -8721,7 +8725,7 @@ + use=news-old-unk, + # + # (nwp513-o: had :DE=^H:, I think that's ; also the alias vt100-bm --esr) +-nwp513-o|nwp518-o|nwe501-o|nwp251-o|newscbm-o|news31-o|old Sony vt100 emulator 33 lines, ++nwp513-o|nwp518-o|nwe501-o|nwp251-o|newscbm-o|news31-o|old Sony VT100 emulator 33 lines, + OTbs, + lines#31, + is2=\E7\E[r\E8\EE\EE\EE\EM\EM\EM\E[?7h\E[?1l\E[?3l\E7\E[1;31 +@@ -8729,7 +8733,7 @@ + use=news-old-unk, + # + # (news28: this had :DE=^H:, I think that's , and :KB=nws1200: --esr) +-news28|Sony vt100 emulator 28 lines, ++news28|Sony VT100 emulator 28 lines, + OTbs, + lines#28, + is2=\E7\E[r\E8\EE\EE\EE\EM\EM\EM\E[?7h\E[?1l\E[?3l\E7\E[1;28 +@@ -8737,14 +8741,14 @@ + use=news-old-unk, + # + # (news29: this had :TY=ascii:KB=nws1200:\ --esr) +-news29|news28-a|Sony vt100 emulator 29 lines, ++news29|news28-a|Sony VT100 emulator 29 lines, + lines#29, + is2=\E7\E[r\E8\EE\EE\EE\EM\EM\EM\E[?7h\E[?1l\E[?3l\E7\E[1;29 + r\E8, + use=news-old-unk, + # + # (news511: this had :TY=sjis: --esr) +-nwp511|nwp-511|nwp-511 vt100, ++nwp511|nwp-511|nwp-511 VT100, + OTbs, OTpt, am, xenl, + cols#80, lines#24, + clear=\E[;H\E[2J$<20/>, cub1=\E[D, cud1=\E[B, cuf1=\E[C, +@@ -8758,14 +8762,14 @@ + rs2=\E7\E[r\E8\E[?5l\E[?1l\E>\E[?7h\E[?8h, + smso=\E[7m$<2/>, smul=\E[4m$<2/>, + # (news517: this had :TY=sjis:. --esr) +-nwp517|nwp-517|nwp-517 vt200 80 cols 30 rows, ++nwp517|nwp-517|nwp-517 VT200 80 cols 30 rows, + eslok, hs, + cols#80, lines#30, + OTi2=\E[2$~\n, dsl=\E[1$~, fsl=\E[0$}, + is2=\E7\E[r\E8\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, + tsl=\E[1$}\E[;%df, use=vt220-base, + # (news517-w: this had :TY=sjis:. --esr) +-nwp517-w|nwp-517-w|nwp-517 vt200 132 cols 50 rows, ++nwp517-w|nwp-517-w|nwp-517 VT200 132 cols 50 rows, + eslok, hs, + cols#132, lines#50, + OTi2=\E[2$~\n, dsl=\E[1$~, fsl=\E[0$}, +@@ -8852,7 +8856,7 @@ + rmso=\E[0;37;40m, rmul=\E[0;37;40m, rs1=\Ec, + setaf=\E[3%p1%dm, sgr0=\E[0;10m, smso=\E[1;37;46m, + smul=\E[0;36;40m, use=ansi-emx, +-mono-emx|stupid monochrome ansi terminal with only one kind of emphasis, ++mono-emx|stupid monochrome ANSI terminal with only one kind of emphasis, + am, + cols#80, it#8, lines#24, + clear=\E[H\E[2J$<50>, cub1=\E[D, cud1=\E[B, cuf1=\E[C, +@@ -9533,7 +9537,7 @@ + hp2621p|HP 2621 with printer, + mc4=\E&p13C, mc5=\E&p11C, use=hp2621, + +-hp2621p-a|hp2621p with fn as arrows, ++hp2621p-a|HP 2621p with fn as arrows, + use=hp+pfk+arrows, use=hp2621p, + + # hp2621 with k45 keyboard +@@ -10049,7 +10053,7 @@ + # From: Victor Duchovni + # (hp700-wy: removed obsolete ":nl=^J:"; + # replaced /usr/share/tabset/hp700-wy with std because , -- esr) +-hp700-wy|HP700/41 emulating wyse30, ++hp700-wy|HP 700/41 emulating Wyse30, + OTbs, am, bw, mir, msgr, + cols#80, it#8, lines#24, xmc#1, + cbt=\EI, clear=^Z, cr=\r, cub1=^H, cud1=^V, cuf1=^L, +@@ -10543,7 +10547,7 @@ + # + # The qvt101 and qvt102 listed here are long obsolete; so is the qvt101+ + # built to replace them, and a qvt119+ which was a 101+ with available wide +-# mode (132 columns). There was a qvt103 which added vt100/vt131 emulations ++# mode (132 columns). There was a qvt103 which added VT100/VT131 emulations + # and an ANSI-compatible qvt203 that replaced it. Qume started producing + # ANSI-compatible terminals with the qvt323 and qvt61. + # +@@ -10554,7 +10558,7 @@ + # popular lines such as ADDS, and dual-host capabilities. The qvt82 is + # designed for use as a SCO ANSI terminal. The qvt70 is a color terminal + # with many emulations including Wyse370, Wyse 325, etc. Their newest +-# model is the qvt520, which is vt420-compatible. ++# model is the qvt520, which is VT420-compatible. + # + # There are some ancient printing Qume terminals under `Daisy Wheel Printers' + # +@@ -10800,7 +10804,7 @@ + + # (tvi912: removed obsolete ":ma=^K^P^L :", added and + # from BRL entry -- esr) +-tvi912|tvi914|tvi920|old TeleVideo 912/914/920, ++tvi912|tvi914|tvi920|TeleVideo 912/914/920 (old), + OTbs, OTpt, am, msgr, + cols#80, it#8, lines#24, xmc#1, + bel=^G, clear=^Z, cr=\r, cub1=^H, cud1=\n, cuf1=^L, +@@ -11739,11 +11743,11 @@ + # Visual 50 from Beau Shekita, BTL-Whippany + # Recently I hacked together the following termcap for Visual + # Technology's Visual 50 terminal. It's a slight modification of +-# the vt52 termcap. +-# It's intended to run when the Visual 50 is in vt52 emulation mode +-# (I know what you're thinking; if it's emulating a vt52, then why ++# the VT52 termcap. ++# It's intended to run when the Visual 50 is in VT52 emulation mode ++# (I know what you're thinking; if it's emulating a VT52, then why + # another termcap? Well, it turns out that the Visual 50 can handle +-# and db(?) among other things, which the vt52 can't) ++# and db(?) among other things, which the VT52 can't) + # The termcap works OK for the most part. The only problem is on + # character inserts. The whole line gets painfully redrawn for each + # character typed. Any suggestions? +@@ -11822,7 +11826,7 @@ + # an initialization file should be made for the 300 and they could be stuck + # in it. + # (vi300: added / based on init string -- esr) +-vi300|Visual 300 ansi x3.64, ++vi300|Visual 300 ANSI x3.64, + am, bw, mir, xenl, + cols#80, lines#24, + bel=^G, cbt=\E[Z, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\E[B, +@@ -11867,7 +11871,7 @@ + # The visual 550 is a visual 300 with Tektronix graphics, + # and with 33 lines. clear screen is modified here to + # also clear the graphics. +-vi550|Visual 550 ansi x3.64, ++vi550|Visual 550 ANSI x3.64, + lines#33, + clear=\030\E[H\E[2J, use=vi300, + +@@ -11917,26 +11921,26 @@ + # should be used. + # + wy30|wyse30|Wyse 30, +- am, bw, hs, mc5i, mir, msgr, xon, +- cols#80, lh#1, lines#24, lw#8, ma#1, nlab#8, wsl#45, ++ am, bw, mc5i, mir, msgr, xon, ++ cols#80, lh#1, lines#24, lw#8, ma#1, nlab#8, + acsc=0wa_h[jukslrmqnxqzttuyv]wpxv, bel=^G, cbt=\EI, + civis=\E`0, clear=\E+$<80>, cnorm=\E`1, cr=\r, cub1=^H, + cud1=\n, cuf1=^L, cup=\E=%p1%{32}%+%c%p2%{32}%+%c, + cuu1=^K, dch1=\EW$<10>, dim=\E`7\E), dl1=\ER$<1>, +- dsl=\EF\r, ed=\EY$<80>, el=\ET, flash=\E`8$<100/>\E`9, +- fsl=\r, home=^^, ht=\011$<1>, hts=\E1, il1=\EE$<2>, +- ind=\n$<2>, ip=$<2>, is2=\E'\E(\E\^3\E`9\016\024, +- kHOM=\E{, kbs=^H, kcbt=\EI, kcub1=^H, kcud1=\n, kcuf1=^L, +- kcuu1=^K, kdch1=\EW, kdl1=\ER, ked=\EY, kel=\ET, kent=\E7, +- kf1=^A@\r, kf2=^AA\r, kf3=^AB\r, kf4=^AC\r, kf5=^AD\r, +- kf6=^AE\r, kf7=^AF\r, kf8=^AG\r, khome=^^, kich1=\EQ, +- kil1=\EE, knp=\EK, kpp=\EJ, krpl=\Er, ll=^^^K, mc0=\EP, mc4=^T, +- mc5=^X, nel=\r\n, pfx=\Ez%p1%{63}%+%c%p2%s\177, ++ ed=\EY$<80>, el=\ET, flash=\E`8$<100/>\E`9, home=^^, ++ ht=\011$<1>, hts=\E1, il1=\EE$<2>, ind=\n$<2>, ip=$<2>, ++ is2=\E'\E(\E\^3\E`9\016\024, kHOM=\E{, kbs=^H, kcbt=\EI, ++ kcub1=^H, kcud1=\n, kcuf1=^L, kcuu1=^K, kdch1=\EW, kdl1=\ER, ++ ked=\EY, kel=\ET, kent=\E7, kf1=^A@\r, kf2=^AA\r, kf3=^AB\r, ++ kf4=^AC\r, kf5=^AD\r, kf6=^AE\r, kf7=^AF\r, kf8=^AG\r, ++ khome=^^, kich1=\EQ, kil1=\EE, knp=\EK, kpp=\EJ, krpl=\Er, ++ ll=^^^K, mc0=\EP, mc4=^T, mc5=^X, nel=\r\n, ++ pfx=\Ez%p1%{63}%+%c%p2%s\177, + pln=\Ez%p1%{47}%+%c%p2%s\r, prot=\E`7\E), ri=\Ej$<3>, + rmacs=\EH^C, rmir=\Er, rmln=\EA11, rmso=\E(, + sgr=%?%p1%p5%p8%|%|%t\E`7\E)%e\E(%;%?%p9%t\EH\002%e\EH\003%;, + sgr0=\E(\EH\003, smacs=\EH^B, smir=\Eq, smln=\EA10, +- smso=\E`7\E), tbc=\E0, tsl=\EF, ++ smso=\E`7\E), tbc=\E0, use=wyse+sl, + # + # This terminal description uses the non-hidden attribute mode + # (with magic cookie). +@@ -11969,32 +11973,36 @@ + # to correctly handle multiple attributes on a screen. + # + wy50|wyse50|Wyse 50, +- am, bw, hs, mc5i, mir, msgr, xon, +- cols#80, lh#1, lines#24, lw#8, ma#1, nlab#8, wsl#45, ++ am, bw, mc5i, mir, msgr, xon, ++ cols#80, lh#1, lines#24, lw#8, ma#1, nlab#8, + acsc=a;j5k3l2m1n8q:t4u9v=w0x6, bel=^G, cbt=\EI, + civis=\E`0, clear=\E+$<20>, cnorm=\E`1, cr=\r, cub1=^H, + cud1=\n, cuf1=^L, cup=\E=%p1%{32}%+%c%p2%{32}%+%c, +- cuu1=^K, dch1=\EW$<1>, dim=\E`7\E), dl1=\ER, dsl=\EF\r, +- ed=\EY$<20>, el=\ET, flash=\E`8$<100/>\E`9, fsl=\r, +- home=^^, ht=^I, hts=\E1, il1=\EE, ind=\n$<2>, ip=$<1>, +- is1=\E`:\E`9$<30>, is2=\016\024\E'\E(, kHOM=\E{, kbs=^H, +- kcbt=\EI, kcub1=^H, kcud1=\n, kcuf1=^L, kcuu1=^K, kdch1=\EW, +- kdl1=\ER, ked=\EY, kel=\ET, kent=\E7, kf1=^A@\r, kf10=^AI\r, +- kf11=^AJ\r, kf12=^AK\r, kf13=^AL\r, kf14=^AM\r, kf15=^AN\r, +- kf16=^AO\r, kf2=^AA\r, kf3=^AB\r, kf4=^AC\r, kf5=^AD\r, +- kf6=^AE\r, kf7=^AF\r, kf8=^AG\r, kf9=^AH\r, khome=^^, +- kich1=\EQ, kil1=\EE, knp=\EK, kpp=\EJ, kprt=\EP, krpl=\Er, +- ll=^^^K, mc0=\EP, mc4=^T, mc5=^X, nel=\r\n, ++ cuu1=^K, dch1=\EW$<1>, dim=\E`7\E), dl1=\ER, ed=\EY$<20>, ++ el=\ET, flash=\E`8$<100/>\E`9, home=^^, ht=^I, hts=\E1, ++ il1=\EE, ind=\n$<2>, ip=$<1>, is1=\E`:\E`9$<30>, ++ is2=\016\024\E'\E(, kHOM=\E{, kbs=^H, kcbt=\EI, kcub1=^H, ++ kcud1=\n, kcuf1=^L, kcuu1=^K, kdch1=\EW, kdl1=\ER, ked=\EY, ++ kel=\ET, kent=\E7, kf1=^A@\r, kf10=^AI\r, kf11=^AJ\r, ++ kf12=^AK\r, kf13=^AL\r, kf14=^AM\r, kf15=^AN\r, kf16=^AO\r, ++ kf2=^AA\r, kf3=^AB\r, kf4=^AC\r, kf5=^AD\r, kf6=^AE\r, ++ kf7=^AF\r, kf8=^AG\r, kf9=^AH\r, khome=^^, kich1=\EQ, ++ kil1=\EE, knp=\EK, kpp=\EJ, kprt=\EP, krpl=\Er, ll=^^^K, ++ mc0=\EP, mc4=^T, mc5=^X, nel=\r\n, + pfx=\Ez%p1%{63}%+%c%p2%s\177, + pln=\Ez%p1%{47}%+%c%p2%s\r, prot=\E`7\E), rev=\E`6\E), + ri=\Ej, rmacs=\EH^C, rmir=\Er, rmln=\EA11, rmso=\E(, + sgr=%?%p1%p3%|%t\E`6\E)%e%p5%p8%|%t\E`7\E)%e\E(%;%?%p9%t\EH + \002%e\EH\003%;, + sgr0=\E(\EH\003, smacs=\EH^B, smir=\Eq, smln=\EA10, +- smso=\E`6\E), tbc=\E0, tsl=\EF, kF1=^A`\r, kF10=^Ai\r, +- kF11=^Aj\r, kF12=^Ak\r, kF13=^Al\r, kF14=^Am\r, kF15=^An\r, +- kF16=^Ao\r, kF2=^Aa\r, kF3=^Ab\r, kF4=^Ac\r, kF5=^Ad\r, +- kF6=^Ae\r, kF7=^Af\r, kF8=^Ag\r, kF9=^Ah\r, ++ smso=\E`6\E), tbc=\E0, kF1=^A`\r, kF10=^Ai\r, kF11=^Aj\r, ++ kF12=^Ak\r, kF13=^Al\r, kF14=^Am\r, kF15=^An\r, kF16=^Ao\r, ++ kF2=^Aa\r, kF3=^Ab\r, kF4=^Ac\r, kF5=^Ad\r, kF6=^Ae\r, ++ kF7=^Af\r, kF8=^Ag\r, kF9=^Ah\r, use=wyse+sl, ++wyse+sl|status line for Wyse terminals, ++ hs, ++ wsl#45, ++ dsl=\EF\r, fsl=\r, tsl=\EF, + # + # This terminal description uses the non-hidden attribute mode + # (with magic cookie). +@@ -12047,16 +12055,16 @@ + # + # Bug: The capability resets attributes. + wy350|wyse350|Wyse 350, +- am, bw, hs, mc5i, mir, xon, ++ am, bw, mc5i, mir, xon, + colors#8, cols#80, lh#1, lines#24, lw#8, ncv#55, nlab#8, pairs#8, +- wsl#45, xmc#1, ++ xmc#1, + acsc=0wa_h[jukslrmqnxqzttuyv]wpxv, bel=^G, blink=\EG2, + cbt=\EI, civis=\E`0, clear=\E+$<20>, cnorm=\E`1, cr=\r, + cub1=^H, cud1=\n, cuf1=^L, + cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K, dch1=\EW$<1>, +- dim=\EGp, dl1=\ER, dsl=\EF\r, ed=\EY$<20>, el=\ET, +- flash=\E`8$<100/>\E`9, fsl=\r, home=^^, ht=^I, hts=\E1, +- il1=\EE, ind=\n$<2>, ip=$<1>, is1=\E`:\E`9$<30>, ++ dim=\EGp, dl1=\ER, ed=\EY$<20>, el=\ET, ++ flash=\E`8$<100/>\E`9, home=^^, ht=^I, hts=\E1, il1=\EE, ++ ind=\n$<2>, ip=$<1>, is1=\E`:\E`9$<30>, + is2=\016\024\E'\E(, is3=\E%?, kHOM=\E{, kbs=^H, kcbt=\EI, + kcub1=^H, kcud1=\n, kcuf1=^L, kcuu1=^K, kdch1=\EW, kdl1=\ER, + ked=\EY, kel=\ET, kent=\E7, kf1=^A@\r, kf10=^AI\r, +@@ -12077,7 +12085,7 @@ + %{64}%|%;%;%gA%+%{48}%+%c%?%p8%t\E)%e\E(%;%?%p9%t\EH + \002%e\EH\003%;, + sgr0=\EG0\E(\EH\003%{0}%PA%{0}%PC, smacs=\EG0\EH\002, +- smir=\Eq, smln=\EA10, tbc=\E0, tsl=\EF, use=adm+sgr, ++ smir=\Eq, smln=\EA10, tbc=\E0, use=adm+sgr, use=wyse+sl, + wy350-vb|wyse350-vb|Wyse 350 visible bell, + bel@, use=wy350, + wy350-w|wyse350-w|Wyse 350 132-column, +@@ -12108,15 +12116,15 @@ + # then set . + # + wy120|wyse120|wy150|wyse150|Wyse 120/150, +- am, bw, hs, km, mc5i, mir, msgr, xon, +- cols#80, it#8, lh#1, lines#24, lw#8, nlab#8, pb#9601, wsl#45, ++ am, bw, km, mc5i, mir, msgr, xon, ++ cols#80, it#8, lh#1, lines#24, lw#8, nlab#8, pb#9601, + acsc=+/\,.0[a2fxgqh1ihjYk?lZm@nEqDtCu4vAwBx3yszr{c~~, + bel=^G, blink=\EG2, cbt=\EI, civis=\E`0, clear=\E+$<50>, + cnorm=\E`1, cr=\r, cub1=^H, cud1=\n, cuf1=^L, + cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K, dch1=\EW$<7>, +- dim=\EGp, dl1=\ER$<3>, dsl=\EF\r, ed=\EY$<50>, el=\ET$<4>, +- flash=\E`8$<100/>\E`9, fsl=\r, home=^^, ht=\011$<1>, +- hts=\E1, il1=\EE$<3>, ind=\n$<3>, ip=$<2>, is1=\EcB0\EcC1, ++ dim=\EGp, dl1=\ER$<3>, ed=\EY$<50>, el=\ET$<4>, ++ flash=\E`8$<100/>\E`9, home=^^, ht=\011$<1>, hts=\E1, ++ il1=\EE$<3>, ind=\n$<3>, ip=$<2>, is1=\EcB0\EcC1, + is2=\Ed$\EcD\E'\Er\EH\003\Ed/\EO\Ee1\Ed*\E`@\E`9\E`1\016 + \024\El, + is3=\EwJ\Ew1$<150>, kHOM=\E{, kbs=^H, kcbt=\EI, kcub1=^H, +@@ -12138,7 +12146,7 @@ + %{64}%|%;%?%p7%t%{1}%|%;%c, + sgr0=\E(\EH\003\EG0\EcD, smacs=\EcE, smam=\Ed/, + smcup=\Ew0, smir=\Eq, smln=\EA10, smso=\EGt, smxon=\Ec21, +- tbc=\E0, tsl=\EF, use=adm+sgr, ++ tbc=\E0, use=adm+sgr, use=wyse+sl, + # + wy120-w|wyse120-w|wy150-w|wyse150-w|Wyse 120/150 132-column, + cols#132, lw#7, nlab#16, wsl#97, +@@ -12171,7 +12179,7 @@ + # -> do the initialization + # -> set up display memory (2 pages) + # +-# The Wyse 60's that have vt100 emulation are slower than the ++# The Wyse 60's that have VT100 emulation are slower than the + # older Wyse 60's. This change happened mid-1987. + # The capabilities effected are + # +@@ -12190,16 +12198,16 @@ + # (wy60: we use \E{ rather than ^^ for home (both are documented) to avoid + # a bug reported by Robert Dunn, -- esr) + wy60|wyse60|Wyse 60, +- am, bw, hs, km, mc5i, mir, msgr, +- cols#80, lh#1, lines#24, lw#8, nlab#8, wsl#45, ++ am, bw, km, mc5i, mir, msgr, ++ cols#80, lh#1, lines#24, lw#8, nlab#8, + acsc=+/\,.0[a2fxgqh1ihjYk?lZm@nEqDtCu4vAwBx3yszr{c~~, + bel=^G, blink=\EG2, cbt=\EI, civis=\E`0, clear=\E+$<100>, + cnorm=\E`1, cr=\r, cub1=^H, cud1=\n, cuf1=^L, + cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K, +- dch1=\EW$<11>, dclk=\E`b, dim=\EGp, dl1=\ER$<5>, dsl=\EF\r, +- ed=\EY$<100>, el=\ET, flash=\E`8$<100/>\E`9, fsl=\r, +- home=\E{, ht=\011$<1>, hts=\E1, il1=\EE$<4>, ind=\n$<5>, +- ip=$<3>, is1=\EcB0\EcC1, ++ dch1=\EW$<11>, dclk=\E`b, dim=\EGp, dl1=\ER$<5>, ++ ed=\EY$<100>, el=\ET, flash=\E`8$<100/>\E`9, home=\E{, ++ ht=\011$<1>, hts=\E1, il1=\EE$<4>, ind=\n$<5>, ip=$<3>, ++ is1=\EcB0\EcC1, + is2=\Ed$\EcD\E'\Er\EH\003\Ed/\EO\Ee1\Ed*\E`@\E`9\E`1\016 + \024\El, + is3=\EwJ\Ew1$<150>, kHOM=\E{, kbs=^H, kcbt=\EI, kcub1=^H, +@@ -12221,10 +12229,10 @@ + %{64}%|%;%?%p7%t%{1}%|%;%c, + sgr0=\E(\EH\003\EG0\EcD, smacs=\EcE, smam=\Ed/, + smcup=\Ew0, smir=\Eq, smln=\EA10, smso=\EGt, smxon=\Ec21, +- tbc=\E0, tsl=\EF, kF1=^A`\r, kF10=^Ai\r, kF11=^Aj\r, +- kF12=^Ak\r, kF13=^Al\r, kF14=^Am\r, kF15=^An\r, kF16=^Ao\r, +- kF2=^Aa\r, kF3=^Ab\r, kF4=^Ac\r, kF5=^Ad\r, kF6=^Ae\r, +- kF7=^Af\r, kF8=^Ag\r, kF9=^Ah\r, use=adm+sgr, ++ tbc=\E0, kF1=^A`\r, kF10=^Ai\r, kF11=^Aj\r, kF12=^Ak\r, ++ kF13=^Al\r, kF14=^Am\r, kF15=^An\r, kF16=^Ao\r, kF2=^Aa\r, ++ kF3=^Ab\r, kF4=^Ac\r, kF5=^Ad\r, kF6=^Ae\r, kF7=^Af\r, ++ kF8=^Ag\r, kF9=^Ah\r, use=adm+sgr, use=wyse+sl, + # + wy60-w|wyse60-w|Wyse 60 132-column, + cols#132, lw#7, nlab#16, wsl#97, +@@ -12309,7 +12317,7 @@ + # - can't redefine function keys (anyway, key redefinition in ANSI mode + # is too much complex to be described); + # - meta key can't be described (the terminal forgets it when reset); +-# The xon-xoff handshaking can't be disabled while in ansi personality, so ++# The xon-xoff handshaking can't be disabled while in ANSI personality, so + # emacs can't work at speed greater than 9600 baud. No padding is needed at + # this speed. + # dch1 has been commented out because it causes annoying glittering when +@@ -12319,7 +12327,7 @@ + # thing is that vi goes crazy if smir-rmir are present and both dch-dch1 are + # not, so smir and rmir are commented out as well. + # From: Francesco Potorti` , 24 Aug 1998 +-wy99-ansi|Wyse WY-99GT in ansi mode (int'l PC keyboard), ++wy99-ansi|Wyse WY-99GT in ANSI mode (int'l PC keyboard), + am, km, mc5i, mir, msgr, xenl, + cols#80, it#8, lines#25, vt#3, + acsc=``aaffggjjkkllmmnnooqqssttuuvvwwxx{{||}}~~, +@@ -12356,7 +12364,7 @@ + + # This is the american terminal. Here tabs work fine. + # From: Francesco Potorti` , 24 Aug 1998 +-wy99a-ansi|Wyse WY-99GT in ansi mode (US PC keyboard), ++wy99a-ansi|Wyse WY-99GT in ANSI mode (US PC keyboard), + hts=\EH, is3=\E[?5l, rs3=\E[?5l, tbc=\E[3g, use=wy99-ansi, + + # This terminal (firmware version 02) has a lot of bugs: +@@ -12369,16 +12377,16 @@ + # DTR handshaking, you can use even greater speeds. + # From: Francesco Potorti` , 24 Aug 1998 + wy99f|wy99fgt|wy-99fgt|Wyse WY-99GT (int'l PC keyboard), +- am, bw, hs, km, mc5i, mir, msgr, xon, +- cols#80, it#8, lines#25, wsl#46, ++ am, bw, km, mc5i, mir, msgr, xon, ++ cols#80, it#8, lines#25, + acsc='x+y.w_vi~j(k'l&m%n)o9q*s8t-u.v\,w+x=, bel=^G, + blink=\EG2, cbt=\EI, civis=\E`0, clear=\E'\E(\032, + cnorm=\E`4\E`1, cr=\r, cub1=^H, cud1=\Ej, cuf1=^L, + cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K, +- cvvis=\E`2\E`1, dch1=\EW, dim=\EGp, dl1=\ER, dsl=\EF\r, +- ed=\EY$<8*>, el=\ET$<8>, enacs=\Ec@1J$<2000>, +- flash=\E\^1$<30/>\E\^0, fsl=\r, home=^^, ht=^I, il1=\EE, +- ind=\n, invis=\EG3, ++ cvvis=\E`2\E`1, dch1=\EW, dim=\EGp, dl1=\ER, ed=\EY$<8*>, ++ el=\ET$<8>, enacs=\Ec@1J$<2000>, ++ flash=\E\^1$<30/>\E\^0, home=^^, ht=^I, il1=\EE, ind=\n, ++ invis=\EG3, + is2=\Eu\Ee6\EC\EDF\Ec21\Ec31\Ec62\Ec72\Ee;\016\E'\EeL\E`9\E + \^0\E`1\E`4\Ee.\E`:\Ee1\EG0\E(\Ed/\Ee4\Ed*\EO\E`I\Er\Ee" + \EcD\024, +@@ -12398,7 +12406,7 @@ + %{2}%+%;%?%p5%t%{64}%+%;%?%p7%t%{1}%+%;%c%?%p8%t\E)%;%? + %p9%t\EcE%e\EcD%;, + sgr0=\E(\EG0, smacs=\EcE, smam=\Ed/, smcup=\Ec20\Ec30, +- smir=\Eq, smso=\EG4, smxon=\Ec21\Ec31, tsl=\EF, ++ smir=\Eq, smso=\EG4, smxon=\Ec21\Ec31, use=wyse+sl, + + # This is the american terminal. Here tabs work. + # From: Francesco Potorti` , 24 Aug 1998 +@@ -12427,15 +12435,15 @@ + # (wy160: we use \E{ rather than ^^ for home (both are documented) to avoid + # a bug reported by Robert Dunn, -- esr) + wy160|wyse160|Wyse 160, +- am, bw, hs, km, mc5i, mir, msgr, ++ am, bw, km, mc5i, mir, msgr, + cols#80, lh#1, lines#24, lw#8, nlab#8, wsl#38, + acsc=+/\,.0[a2fxgqh1ihjYk?lZm@nEqDtCu4vAwBx3yszr{c~~, + bel=^G, blink=\EG2, cbt=\EI, civis=\E`0, clear=\E+$<30>, + cnorm=\E`1, cr=\r, cub1=^H, cud1=\n, cuf1=^L, + cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K, dch1=\EW$<5>, +- dclk=\E`b, dim=\EGp, dl1=\ER$<1>, dsl=\EF\r, ed=\EY$<30>, +- el=\ET$<5>, flash=\E`8$<100/>\E`9, fsl=\r, home=\E{, ht=^I, +- hts=\E1, il1=\EE$<1>, ind=\n$<1>, ip=$<2>, is1=\EcB0\EcC1, ++ dclk=\E`b, dim=\EGp, dl1=\ER$<1>, ed=\EY$<30>, el=\ET$<5>, ++ flash=\E`8$<100/>\E`9, home=\E{, ht=^I, hts=\E1, ++ il1=\EE$<1>, ind=\n$<1>, ip=$<2>, is1=\EcB0\EcC1, + is2=\Ed$\EcD\E'\Er\EH\003\Ed/\EO\Ee1\Ed*\E`@\E`9\E`1\016 + \024\El, + is3=\Ew0$<100>, kHOM=\E{, kbs=^H, kcbt=\EI, kcub1=^H, +@@ -12457,7 +12465,7 @@ + %{64}%|%;%?%p7%t%{1}%|%;%c, + sgr0=\E(\EH\003\EG0\EcD, smacs=\EcE, smam=\Ed/, + smcup=\Ew1, smir=\Eq, smln=\EA10, smso=\EGt, smxon=\Ec21, +- tbc=\E0, tsl=\EF, use=adm+sgr, ++ tbc=\E0, use=adm+sgr, use=wyse+sl, + # + wy160-w|wyse160-w|Wyse 160 132-column, + cols#132, lw#7, nlab#16, wsl#90, +@@ -12493,7 +12501,7 @@ + wy160-w-vb|wy160-wvb|wyse160-wvb|Wyse 160 132-column visible bell, + bel@, use=wy160-w, + # +-# The Wyse 75 is a vt100 lookalike without advanced video. ++# The Wyse 75 is a VT100 lookalike without advanced video. + # + # The Wyse 75 can support one attribute (e.g. Dim, Inverse, + # Underline) without magic cookies. The following description +@@ -12564,10 +12572,10 @@ + pb@, + bel@, use=wy75-w, + # +-# Wyse 85 emulating a vt220 7 bit mode. ++# Wyse 85 emulating a VT220 7 bit mode. + # 24 line screen with status line. + # +-# The vt220 mode permits more function keys but it wipes out ++# The VT220 mode permits more function keys but it wipes out + # the escape key. I strongly recommend that be set to + # escape (esc). + # The terminal may have to be set for 8 data bits and 2 stop +@@ -12670,7 +12678,7 @@ + smkx=\E[?1l\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, + tsl=\E[40h\E7\E[25;%i%p1%dH, use=vt220+cvis, + # +-# Wyse 185 emulating a vt320 7 bit mode. ++# Wyse 185 emulating a VT320 7 bit mode. + # + # This terminal always displays 25 lines. These lines may be used + # as 24 data lines and a terminal status line (top or bottom) or +@@ -12743,14 +12751,14 @@ + # lines 25 columns 80 + # + wy325|wyse325|Wyse epc, +- am, bw, hs, mc5i, mir, +- cols#80, lh#1, lines#24, lw#8, nlab#8, pb#9601, wsl#45, ++ am, bw, mc5i, mir, ++ cols#80, lh#1, lines#24, lw#8, nlab#8, pb#9601, + acsc=+/\,.0[a2fxgqh1ihjYk?lZm@nEqDtCu4vAwBx3yszr{c~~, + bel=^G, blink=\EG2, cbt=\EI, civis=\E`0, clear=\E+$<50>, + cnorm=\E`1, cr=\r, cub1=^H, cud1=\n, cuf1=^L, + cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K, dch1=\EW$<7>, +- dim=\EGp, dl1=\ER$<3>, dsl=\EF\r, ed=\EY$<50>, el=\ET$<4>, +- flash=\E`8$<100/>\E`9, fsl=\r, home=^^, ht=^I, hts=\E1, ++ dim=\EGp, dl1=\ER$<3>, ed=\EY$<50>, el=\ET$<4>, ++ flash=\E`8$<100/>\E`9, home=^^, ht=^I, hts=\E1, + il1=\EE$<3>, ind=\n$<3>, ip=$<2>, is1=\EcB0\EcC1, + is2=\EcD\E'\Er\EH\003\Ed/\EO\Ee1\Ed*\E`@\E`9\E`1\016\024 + \El, +@@ -12773,7 +12781,7 @@ + %{64}%|%;%?%p7%t%{1}%|%;%c, + sgr0=\E(\EH\003\EG0\EcD, smacs=\EcE, smam=\Ed/, + smcup=\Ew1, smir=\Eq, smln=\EA10, smso=\EGt, tbc=\E0, +- tsl=\EF, use=adm+sgr, ++ use=adm+sgr, use=wyse+sl, + + # + # lines 24 columns 80 vb +@@ -13008,7 +13016,7 @@ + # is2 -> do the initialization + # is3 -> If this string is empty then rs3 gets sent. + # +-# Wyse 520 emulating a vt420 7 bit mode with default ANSI keyboard ++# Wyse 520 emulating a VT420 7 bit mode with default ANSI keyboard + # - The BS key is programmed to generate BS in smcup since + # is2 doesn't seem to work. + # - Remove and shift/Remove: delete a character +@@ -13078,7 +13086,7 @@ + flash=\E[30h\E\,$<100/>\E[30l, use=wy520-w, + # + # +-# Wyse 520 emulating a vt420 7 bit mode. ++# Wyse 520 emulating a VT420 7 bit mode. + # The DEL key is programmed to generate BS in is2. + # With EPC keyboard. + # - 'End' key will clear till end of line on EPC keyboard +@@ -13232,7 +13240,7 @@ + clear=\EH\EJ, ed@, el@, + is2=K2 UCB IBMPC Kermit 1.2 8-30-84\n, use=kermit, + # IBMPC Kermit 1.20 +-# Cannot use line 25, now acts funny like ansi special scrolling region. ++# Cannot use line 25, now acts funny like ANSI special scrolling region. + # Initialization must escape from that region by cursor position to line 24. + # Cannot use character insert because 1.20 goes crazy if insert at col 80. + # Does not use :am: because autowrap is lost when kermit dropped and restarted. +@@ -13246,7 +13254,7 @@ + rmir@, rmso=\Eq, smir@, smso=\Ep, use=kermit, + # MS-DOS Kermit 2.27 for the IBMPC + # Straight ascii keyboard. :sr=\EI: not avail. many versions + bug prone in vi. +-# Cannot use line 25, now acts funny like ansi special scrolling region. ++# Cannot use line 25, now acts funny like ANSI special scrolling region. + # Initialization must escape from that region by cursor position to line 24. + # Does not use am: because autowrap is lost when kermit dropped and restarted. + # Reverse video for standout like H19. +@@ -13288,7 +13296,7 @@ + # at support for the VT320 itself. + # Please send changes with explanations to bug-gnu-emacs@prep.ai.mit.edu. + # (vt320-k3: I added / based on the init string -- esr) +-vt320-k3|MS-Kermit 3.00's vt320 emulation, ++vt320-k3|MS-Kermit 3.00's VT320 emulation, + am, eslok, hs, km, mir, msgr, xenl, + cols#80, it#8, lines#49, pb#9600, vt#3, + acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, +@@ -13318,7 +13326,7 @@ + # From: Joseph Gil 13 Dec 1991 + # ACS capabilities from Philippe De Muyter 30 May 1996 + # (I removed a bogus boolean :mo: and added , , -- esr) +-vt320-k311|DEC vt320 series as defined by kermit 3.11, ++vt320-k311|DEC VT320 series as defined by kermit 3.11, + am, eslok, hs, mir, msgr, xenl, xon, + cols#80, it#8, lines#24, vt#3, + acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, +@@ -13533,7 +13541,7 @@ + mc0@, mc4@, mc5@, use=att2300, + + # Must setup RETURN KEY - CR, REC'VD LF - INDEX. +-# Seems upward compatible with vt100, plus ins/del line/char. ++# Seems upward compatible with VT100, plus ins/del line/char. + # On sgr, the protection parameter is ignored. + # No check is made to make sure that only 3 parameters are output. + # standout= reverse + half-intensity = 3 | 5. +@@ -13587,9 +13595,9 @@ + cols#132, wsl#132, + is1=\E[?3h\E)0, rs2=\Ec\E[?3h\E[2;0y, use=att4410, + +-# 5410 in terms of a vt100 ++# 5410 in terms of a VT100 + # (v5410: added / based on init string -- esr) +-v5410|att5410 in terms of a vt100, ++v5410|att5410 in terms of a VT100, + am, mir, msgr, xon, + cols#80, it#8, lines#24, vt#3, + acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, +@@ -15032,8 +15040,8 @@ + sgr=\E[%?%p2%t4;%;%?%p4%t5;%;%?%p6%t1;%;%?%p1%p2%|%p3%!%|%t7 + ;%;%?%p7%t8;%;m\016, + sgr0=\E[7m\016, smso=\E[m, smul=\E[4;7m, +-# Ambassador with the DEC option, for partial vt100 compatibility. +-aaa+dec|Ann Arbor Ambassador in DEC vt100 mode, ++# Ambassador with the DEC option, for partial VT100 compatibility. ++aaa+dec|Ann Arbor Ambassador in DEC VT100 mode, + acsc=aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}, + csr=\E[%i%p1%d;%p2%dr, enacs=\E(B\E)0, rmacs=^O, + sgr=\E[%?%p2%t4;%;%?%p4%t5;%;%?%p6%t1;%;%?%p1%p3%|%!%t7;%;%? +@@ -15230,14 +15238,14 @@ + + # Regent: lowest common denominator, works on all regents. + # (regent: renamed ":bc:" to ":le:" -- esr) +-regent|Adds Regent Series, ++regent|ADDS Regent Series, + OTbs, am, + cols#80, lines#24, + bel=^G, clear=^L, cr=\r, cub1=^U, cud1=\n, cuf1=^F, cuu1=^Z, + home=\EY\s\s, ind=\n, ll=^A, + # Regent 100 has a bug where if computer sends escape when user is holding + # down shift key it gets confused, so we avoid escape. +-regent100|Adds Regent 100, ++regent100|ADDS Regent 100, + xmc#1, + bel=^G, + cup=\013%p1%'\s'%+%c\020%p2%{10}%/%{16}%*%p2%{10}%m%+%c, +@@ -15245,23 +15253,23 @@ + kf5=^B6\r, kf6=^B7\r, kf7=^B8\r, lf0=F1, lf1=F2, lf2=F3, + lf3=F4, lf4=F5, lf5=F6, lf6=F7, lf7=F8, rmso=\E0@, rmul=\E0@, + sgr0=\E0@, smso=\E0P, smul=\E0`, use=regent, +-regent20|Adds Regent 20, ++regent20|ADDS Regent 20, + bel=^G, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, ed=\Ek, el=\EK, + use=regent, +-regent25|Adds Regent 25, ++regent25|ADDS Regent 25, + bel=^G, kcub1=^U, kcud1=\n, kcuf1=^F, kcuu1=^Z, khome=^A, + use=regent20, +-regent40|Adds Regent 40, ++regent40|ADDS Regent 40, + xmc#1, + bel=^G, dl1=\El$<2*>, il1=\EM$<2*>, kf1=^B1\r, kf2=^B2\r, + kf3=^B3\r, kf4=^B4\r, kf5=^B5\r, kf6=^B6\r, kf7=^B7\r, + kf8=^B8\r, lf0=F1, lf1=F2, lf2=F3, lf3=F4, lf4=F5, lf5=F6, + lf6=F7, lf7=F8, rmso=\E0@, rmul=\E0@, sgr0=\E0@, smso=\E0P, + smul=\E0`, use=regent25, +-regent40+|Adds Regent 40+, ++regent40+|ADDS Regent 40+, + is2=\EB, use=regent40, + # It uses a different code for mapping acs vs dim/blink. +-regent60|regent200|adds200|Adds Regent 60, ++regent60|regent200|adds200|ADDS Regent 60, + acsc=jLkDl@mHnhq`tXuTv\\wPxd, dch1=\EE, ed=\Ek, + is2=\EV\EB, kbs=^H, kcbt=\EO, kdch1=\EE, kich1=\EF, + krmir=\EF, rmacs=\E2, rmir=\EF, rmso=\ER\E0@\EV, smacs=\E1, +@@ -15407,7 +15415,7 @@ + kcuu1=\EOA, rmkx=\E[?1l\E>, smkx=\E[?1h\E=, + # From: Tim Wood Fri Sep 27 09:39:12 PDT 1985 + # (cit101: added / based on init string, merged this with c101 -- esr) +-cit101|citc|C.itoh fast vt100, ++cit101|citc|C. Itoh fast VT100, + OTbs, am, xenl, + cols#80, lines#24, + bel=^G, clear=\E[H\E[2J, cnorm=\E[V\E8, cub1=^H, cud1=\E[B, +@@ -15455,7 +15463,7 @@ + # on. I also set up mine for parity (but you may not need it). Then + # save the setup with ^S. + # (cit101e-rv: added empty to suppress a tic warning. --esr) +-cit101e-rv|C.Itoh CIT-101e (sets reverse video), ++cit101e-rv|C. Itoh CIT-101e (sets reverse video), + am, eo, mir, msgr, xenl, xon, + cols#80, it#8, lines#24, + OTnl=\EM, bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, +@@ -15522,7 +15530,7 @@ + smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, + + # C. Itoh printers begin here +-citoh|ci8510|8510|C.Itoh 8510a, ++citoh|ci8510|8510|C. Itoh 8510a, + cols#80, it#8, + bold=\E!, cub1@, + is2=\E(009\,017\,025\,033\,041\,049\,057\,065\,073., +@@ -15640,15 +15648,15 @@ + # to have been at least two models, the 33 and the 50. + # + +-# The 50 seems to be a top end vt220 clone, with the addition of a higher ++# The 50 seems to be a top end VT220 clone, with the addition of a higher + # screen resolution, a larger screen, at least 1 page of memory above and + # below the screen, apparently pages of memory right and left of the screen + # which can be panned, and about 75 function keys (15 function keys x normal, + # shift, control, func A, func B). It also has more setup possibilities than +-# the vt220. The monitor case is dated November 1978 and the keyboard case is ++# the VT220. The monitor case is dated November 1978 and the keyboard case is + # May 1982. + # +-# The vt100 emulation works as is. The entry below describes the rather ++# The VT100 emulation works as is. The entry below describes the rather + # non-conformant (but more featureful) ANSI mode. + # + # From: Stephen Peterson , 27 May 1995 +@@ -17067,7 +17075,7 @@ + # Aux Parity 0=Off 1=On + # Aux Bits/Char 0=7 1=8 + # CRT Saver 0=Off 1=On +-# dm80/1 is a vt100 lookalike, but it doesn't seem to need any padding. ++# dm80/1 is a VT100 lookalike, but it doesn't seem to need any padding. + dm80|dmdt80|dt80|Datamedia dt80/1, + clear=\E[2J\E[H, cud1=\n, cuf1=\E[C, + cup=%i\E[%p1%d;%p2%dH, cuu1=\E[A, ed=\E[J, el=\E[K, +@@ -17075,8 +17083,8 @@ + rmso=\E[m, rmul=\E[m, sgr0=\E[m\017$<2>, smso=\E[7m, + smul=\E[4m, use=vt100+4bsd, + # except in 132 column mode, where it needs a little padding. +-# This is still less padding than the vt100, and you can always turn on +-# the ^S/^Q handshaking, so you can use vt100 flavors for things like ++# This is still less padding than the VT100, and you can always turn on ++# the ^S/^Q handshaking, so you can use VT100 flavors for things like + # reverse video. + dm80w|dmdt80w|dt80w|Datamedia dt80/1 in 132 char mode, + cols#132, +@@ -17230,7 +17238,7 @@ + # (f100: added empty to suppress a tic warning; + # made this relative to adm+sgr -- note that isn't + # known to work for f100 but does on the f110. --esr) +-f100|freedom|freedom100|freedom model 100, ++f100|freedom|freedom100|Liberty Freedom model 100, + OTbs, am, bw, hs, mir, msgr, xon, + cols#80, lines#24, + acsc=, bel=^G, cbt=\EI, clear=^Z, cr=\r, cub1=^H, cud1=\n, +@@ -17244,7 +17252,7 @@ + kf8=^AG\r, kf9=^AH\r, khome=^^, ri=\Ej, rmacs=\E$, rmir=\Er, + smacs=\E%%, smir=\Eq, tbc=\E3, tsl=\Eg\Ef, + vpa=\E[%p1%{32}%+%c, use=adm+sgr, +-f100-rv|freedom-rv|freedom 100 in reverse video, ++f100-rv|freedom-rv|Liberty Freedom 100 in reverse video, + flash=\Ed$<200>\Eb, is2=\Eg\Ef\r\Eb, use=f100, + # The f110 and f200 have problems with vi(1). They use the ^V + # code for the down cursor key. When kcud1 is defined in terminfo +@@ -17988,27 +17996,27 @@ + # -- added rmacs, smacs based on manpage -TD + # Note that we could use ibm+16color, but that is not how IBM defines this one. + aixterm|IBM Aixterm Terminal Emulator, +- eslok, hs, +- acsc=jjkkllmmnnqqttuuvvwwxx, bold=\E[1m, dsl=\E[?E, +- fsl=\E[?F, rc=\E8, ri@, rmacs=\E(B, s0ds=\E(B, s1ds=\E(0, +- sc=\E7, ++ acsc=jjkkllmmnnqqttuuvvwwxx, bold=\E[1m, rc=\E8, ri@, ++ rmacs=\E(B, s0ds=\E(B, s1ds=\E(0, sc=\E7, + sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p6%t;1%;%?%p7 + %t;8%;m%?%p9%t\E(0%e\E(B%;, +- sgr0=\E[0;10m\E(B, smacs=\E(0, tsl=\E[?%p1%dT, +- use=ibm6154, +-aixterm-m|IBM AIXterm Monochrome Terminal Emulator, ++ sgr0=\E[0;10m\E(B, smacs=\E(0, use=ibm6154, ++ use=aixterm+sl, ++aixterm+sl|status line for AIXterm, + eslok, hs, +- acsc=jjkkllmmnnqqttuuvvwwxx, bold=\E[1m, dsl=\E[?E, +- fsl=\E[?F, ri@, s0ds=\E(B, s1ds=\E(0, ++ dsl=\E[?E, fsl=\E[?F, tsl=\E[?%p1%dT, ++ ++aixterm-m|IBM AIXterm Monochrome Terminal Emulator, ++ acsc=jjkkllmmnnqqttuuvvwwxx, bold=\E[1m, ri@, s0ds=\E(B, ++ s1ds=\E(0, + sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p6%t;1%;%?%p7 + %t;8%;m%?%p9%t\E(0%e\E(B%;, +- sgr0=\E[0;10m\E(B, tsl=\E[?%p1%dT, use=ibm6153, ++ sgr0=\E[0;10m\E(B, use=ibm6153, use=aixterm+sl, + aixterm-m-old|old IBM AIXterm Monochrome Terminal Emulator, +- eslok, hs, +- bold=\E[1m, dsl=\E[?E, fsl=\E[?F, ri@, ++ bold=\E[1m, ri@, + sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p6%t;1%;%?%p7 + %t;8%;m, +- tsl=\E[?%p1%dT, use=ibm6153, ++ use=ibm6153, use=aixterm+sl, + jaixterm|IBM Kanji Aixterm Terminal Eemulator, + acsc@, rmacs@, + sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p6%t;1%;%?%p7%t;8 +@@ -18501,7 +18509,7 @@ + # ========================================= + # + # Prism-1, Prism-2 and P99: +-# Ancient Microdata and CMC terminals, vaguely like Adds Regent 25. ++# Ancient Microdata and CMC terminals, vaguely like ADDS Regent 25. + # + # Prism-4 and Prism-5: + # Slightly less ancient range of Microdata terminals. Follow-on from +@@ -18861,7 +18869,7 @@ + kcuf1=^L, kcuu1=^K, ri=\EI, rmir=^Z, rmso=\E;, rmul=\E7, + smir=\EE, smso=\E:, smul=\E6, + # This is the preferred mode (but ^X can't be used as a kill character) +-mime2a|mime2a-v|microterm mime2a (emulating an enhanced vt52), ++mime2a|mime2a-v|microterm mime2a (emulating an enhanced VT52), + OTbs, + cols#80, it#8, lines#24, + bel=^G, clear=\EL, cr=\r, cub1=^H, cud1=\n, cuf1=\EC, +@@ -18962,26 +18970,26 @@ + # capabilities.X + # + # The Intecolor emulation of the NCR 2900/260C color terminal is basically a +-# DEC vt200/300 with color capabilities added. +-ncr260intan|NCR Intecolor emulation of the 2900_260C with an ANSI keyboard, ++# DEC VT200/300 with color capabilities added. ++ncr260intan|NCR Intecolor emulation of the 2900/260C with an ANSI keyboard, + colors#8, pairs#64, + op=\E[0m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, + use=ncr260vt300an, + # The Intecolor emulation of the NCR 2900/260C color terminal is basically a +-# DEC vt200/300 with color capabilities added. +-ncr260intwan|NCR Intecolor emulation of the 2900_260C with an ANSI keyboard, ++# DEC VT200/300 with color capabilities added. ++ncr260intwan|NCR Intecolor emulation of the 2900/260C with an ANSI keyboard, + colors#8, pairs#64, + op=\E[0m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, + use=ncr260vt300wan, + # The Intecolor emulation of the NCR 2900/260C color terminal is basically a +-# DEC vt200/300 with color capabilities added. +-ncr260intpp|NCR Intecolor emulation of the 2900_260C with a PC+ keyboard, ++# DEC VT200/300 with color capabilities added. ++ncr260intpp|NCR Intecolor emulation of the 2900/260C with a PC+ keyboard, + colors#8, pairs#64, + op=\E[0m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, + use=ncr260vt300pp, + # The Intecolor emulation of the NCR 2900/260C color terminal is basically a +-# DEC vt200/300 with color capabilities added. +-ncr260intwpp|NCR Intecolor emulation of the 2900_260C with a PC+ keyboard in 132 column mode, ++# DEC VT200/300 with color capabilities added. ++ncr260intwpp|NCR Intecolor emulation of the 2900/260C with a PC+ keyboard in 132 column mode, + colors#8, pairs#64, + op=\E[0m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, + use=ncr260vt300wpp, +@@ -18993,16 +19001,16 @@ + # attributes can be removed. + # Mapping to ASCII character set ('acsc' capability) can also be + # restored if needed. +-ncr260vppp|NCR 2900_260 viewpoint, +- am, bw, hs, km, mc5i, mir, msgr, xon, ++ncr260vppp|NCR 2900/260 viewpoint, ++ am, bw, km, mc5i, mir, msgr, xon, + cols#80, lines#24, nlab#32, xmc#1, + acsc=07a?h;j5k3l2m1n8q:t4u9v=w0x6, bel=^G, blink=\EG2, + cbt=\EI, civis=\E`0, clear=\014$<40>, cnorm=\E`5, + cr=\r$<2>, cub1=\010$<2>, cud1=\n$<2>, cuf1=\006$<2>, + cup=\EY%p1%{32}%+%c%p2%{32}%+%c$<5>, cuu1=\032$<2>, +- dch1=\EW$<2>, dim=\EGp, dl1=\El$<2>, dsl=\E`c, ed=\Ek$<2>, +- el=\EK$<2>, fsl=\r, home=\036$<2>, ht=^I, hts=\E1, +- il1=\EM$<2>, ind=\n$<2>, invis=\EG1, ++ dch1=\EW$<2>, dim=\EGp, dl1=\El$<2>, ed=\Ek$<2>, ++ el=\EK$<2>, home=\036$<2>, ht=^I, hts=\E1, il1=\EM$<2>, ++ ind=\n$<2>, invis=\EG1, + is2=\Ee6\E~%$<100>\E+\E`:\Ed/\E`1\EO\Ee4\Ec@0@\Ec@1A\EcB0 + \EcC1\Ee7$<100>, + kDC=\El, kEND=\Ek, kHOM=^A, kPRT=\E7, kRIT=^F, ka1=^A, ka3=\EJ, +@@ -19022,8 +19030,13 @@ + rs2=\Ee6\E~%$<100>\E+\E`:\Ed/\E`1\EO\Ee4\Ec@0@\Ec@1A\EcB0 + \EcC1\Ee7$<100>, + sgr0=\EG0\EH\003, smacs=\EcB1\EH\002, smir=\Eq, +- smso=\EG4, smul=\EG8, smxon=\Ec21, tsl=\EF, +-ncr260vpwpp|NCR 2900_260 viewpoint wide mode, ++ smso=\EG4, smul=\EG8, smxon=\Ec21, use=ncr260vp+sl, ++ ++ncr260vp+sl|NCR 2900/260 viewpoint, ++ hs, ++ dsl=\E`c, fsl=\r, tsl=\EF, ++ ++ncr260vpwpp|NCR 2900/260 viewpoint wide mode, + cols#132, + cup=\Ea%i%p1%dR%p2%dC$<30>, + is2=\Ee6\E~%$<100>\E+\E`;\Ed/\E`1\EO\Ee4\Ec@0@\Ec@1A\EcB0 +@@ -19031,8 +19044,9 @@ + rs2=\Ee6\E~%$<100>\E+\E`;\Ed/\E`1\EO\Ee4\Ec@0@\Ec@1A\EcB0 + \EcC1\Ee7$<100>, + use=ncr260vppp, +-ncr260vt100an|NCR 2900_260 vt100 with ansi kybd, +- am, hs, mir, msgr, xenl, xon, ++ ++ncr260vt100an|NCR 2900/260 VT100 with ANSI keyboard, ++ am, mir, msgr, xenl, xon, + cols#80, lines#24, nlab#32, + acsc=``aaffggjjkkllmmnnooqqssttuuvvwwxx~~, bel=^G, + blink=\E[5m, bold=\E[1m, clear=\E[2J\E[1;1H$<20>, +@@ -19041,12 +19055,11 @@ + cuf=\E[%p1%dC$<5>, cuf1=\E[C$<5>, + cup=\E[%i%p1%d;%p2%dH$<10>, cuu=\E[%p1%dA$<5>, + cuu1=\E[A$<5>, dch=\E[%p1%dP$<5>, dch1=\E[1P$<5>, +- dl=\E[%p1%dM$<5>, dl1=\E[M$<5>, dsl=\E[0$~\E[1$~, +- ech=\E[%p1%dX, ed=\E[0J$<5>, el=\E[0K$<3>, el1=\E[1K$<3>, +- fsl=\E[0$}, home=\E[H$<1>, hpa=\E[%p1%dG$<40>, ht=^I, +- hts=\EH, ich=\E[%p1%d@$<5>, il=\E[%p1%dL$<5>, +- il1=\E[L$<5>, ind=\ED$<5>, indn=\E[%p1%dE$<5>, +- invis=\E[8m, ++ dl=\E[%p1%dM$<5>, dl1=\E[M$<5>, ech=\E[%p1%dX, ++ ed=\E[0J$<5>, el=\E[0K$<3>, el1=\E[1K$<3>, home=\E[H$<1>, ++ hpa=\E[%p1%dG$<40>, ht=^I, hts=\EH, ich=\E[%p1%d@$<5>, ++ il=\E[%p1%dL$<5>, il1=\E[L$<5>, ind=\ED$<5>, ++ indn=\E[%p1%dE$<5>, invis=\E[8m, + is2=\E[!p\E[?7;19;67h\E[?1;3;4l\E(B\E)0\017\E[2J\E[1;1H\E>$< + 200>, + kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, +@@ -19060,9 +19073,12 @@ + %;%?%p7%t;8%;m%?%p9%t\016%e\017%;$<20>, + sgr0=\E[0m\017$<20>, smacs=^N, smir=\E[4h, + smkx=\E[?1h\E=, smso=\E[1;7m, smul=\E[4m, tbc=\E[3g, +- tsl=\E[2$~\E[1$}, vpa=\E[%p1%dd$<40>, use=vt220+vtedit, +- use=vt220+cvis, use=vt220+keypad, +-ncr260vt100wan|NCR 2900_260 vt100 wide mode ansi kybd, ++ vpa=\E[%p1%dd$<40>, use=vt220+vtedit, use=vt220+cvis, ++ use=vt220+keypad, use=ncr260vt+sl, ++ncr260vt+sl|NCR 2900/260 VT100 status line, ++ hs, ++ dsl=\E[0$~\E[1$~, fsl=\E[0$}, tsl=\E[2$~\E[1$}, ++ncr260vt100wan|NCR 2900/260 VT100 wide mode ANSI keyboard, + cols#132, + cup=\E[%i%p1%d;%p2%dH$<30>, + is2=\E[!p\E[?3;7;19;67h\E[?1;4l\E(B\E)0\017\E[2J\E[1;1H\E>$< +@@ -19070,7 +19086,7 @@ + rs2=\E[!p\E[?3;7;19;67h\E[?1;4l\E(B\E)0\017\E[2J\E[1;1H\E>$< + 200>, + use=ncr260vt100an, +-ncr260vt100pp|NCR 2900_260 vt100 with PC+ kybd, ++ncr260vt100pp|NCR 2900/260 VT100 with PC+ keyboard, + is2=\E[!p\E[?7;19;67h\E[?1;3;4l\E(B\E)0\017\E[2J\E[1;1H\E>$< + 200>, + ka1=\E[H, ka3=\EOu, kb2=\E[V, kc3=\E[U, kcub1=\E[D, +@@ -19080,7 +19096,7 @@ + rs2=\E[!p\E[?7;19;67h\E[?1;3;4l\E(B\E)0\017\E[2J\E[1;1H\E>$< + 200>, + smkx=\E=, use=ncr260vt100an, +-ncr260vt100wpp|NCR 2900_260 vt100 wide mode pc+ kybd, ++ncr260vt100wpp|NCR 2900/260 VT100 wide mode PC+ keyboard, + cols#132, + cup=\E[%i%p1%d;%p2%dH$<30>, + is2=\E[!p\E[?3;7;19;67h\E[?1;4l\E(B\E)0\017\E[2J\E[1;1H\E>$< +@@ -19088,8 +19104,8 @@ + rs2=\E[!p\E[?3;7;19;67h\E[?1;4l\E(B\E)0\017\E[2J\E[1;1H\E>$< + 200>, + use=ncr260vt100pp, +-ncr260vt200an|NCR 2900_260 vt200 with ansi kybd, +- am, hs, mir, msgr, xenl, xon, ++ncr260vt200an|NCR 2900/260 VT200 with ANSI keyboard, ++ am, mir, msgr, xenl, xon, + cols#80, lines#24, nlab#32, + acsc=``aaffggjjkkllmmnnooqqssttuuvvwwxx~~, bel=^G, + blink=\E[5m, bold=\E[1m, clear=\E[2J\E[1;1H$<20>, +@@ -19098,11 +19114,11 @@ + cud1=\E[B$<5>, cuf=\E[%p1%dC$<5>, cuf1=\E[C$<5>, + cup=\E[%i%p1%d;%p2%dH$<10>, cuu=\E[%p1%dA$<5>, + cuu1=\E[A$<5>, dch=\E[%p1%dP$<5>, dch1=\E[1P$<5>, +- dl=\E[%p1%dM$<5>, dl1=\E[M$<5>, dsl=\E[0$~\E[1$~, +- ech=\E[%p1%dX$<5>, ed=\E[0J, el=\E[0K$<5>, el1=\E[1K$<5>, +- fsl=\E[0$}, home=\E[H, hpa=\E[%p1%dG$<40>, ht=^I, hts=\EH, +- ich=\E[%p1%d@$<5>, il=\E[%p1%dL$<5>, il1=\E[L$<5>, +- ind=\ED$<5>, indn=\E[%p1%dE$<5>, invis=\E[8m, ++ dl=\E[%p1%dM$<5>, dl1=\E[M$<5>, ech=\E[%p1%dX$<5>, ++ ed=\E[0J, el=\E[0K$<5>, el1=\E[1K$<5>, home=\E[H, ++ hpa=\E[%p1%dG$<40>, ht=^I, hts=\EH, ich=\E[%p1%d@$<5>, ++ il=\E[%p1%dL$<5>, il1=\E[L$<5>, ind=\ED$<5>, ++ indn=\E[%p1%dE$<5>, invis=\E[8m, + is2=\E[!p\E[?7;19;67h\E[?1;3;4l\E(B\E)0\017\E[2J\E[1;1H\E>$< + 200>, + kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, +@@ -19125,20 +19141,20 @@ + %;%?%p7%t;8%;m%?%p9%t\016%e\017%;$<20>, + sgr0=\E[0m\017$<20>, smacs=\016$<20>, smam=\E[?7h, + smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, +- tbc=\E[3g, tsl=\E[2$~\E[1$}, vpa=\E[%p1%dd$<40>, +- use=vt220+vtedit, use=vt220+cvis, use=vt220+keypad, +-ncr260vt200wan|NCR 2900_260 vt200 wide mode ansi kybd, ++ tbc=\E[3g, vpa=\E[%p1%dd$<40>, use=vt220+vtedit, ++ use=vt220+cvis, use=vt220+keypad, use=ncr260vt+sl, ++ncr260vt200wan|NCR 2900/260 VT200 wide mode ANSI keyboard, + cols#132, + cup=\E[%i%p1%d;%p2%dH$<30>, + is2=\E[!p\E[?3;7;19;67h\E[?4l\E(B\E)0\017\E[2J\E[1;1H$<200>, + rs2=\E[!p\E[?3;7;19;67h\E[?4l\E(B\E)0\017\E[2J\E[1;1H$<200>, use=ncr260vt200an, +-ncr260vt200pp|NCR 2900_260 vt200 with pc+ kybd, ++ncr260vt200pp|NCR 2900/260 VT200 with PC+ keyboard, + ka1=\E[H, ka3=\EOu, kb2=\E[V, kc3=\E[U, kcub1=\E[D, + kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[4~, + kend=\E[1~, khome=\E[H, kich1=\E[2~, knp=\E[6~, kpp=\E[5~, + lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4, rmkx=\E>, smkx=\E=, + use=ncr260vt200an, +-ncr260vt200wpp|NCR 2900_260 vt200 wide mode pc+ kybd, ++ncr260vt200wpp|NCR 2900/260 VT200 wide mode PC+ keyboard, + cols#132, + cup=\E[%i%p1%d;%p2%dH$<30>, + is2=\E[!p\E[?3;7;19;67h\E[?1;4l\E(B\E)0\017\E[2J\E[1;1H\E>$< +@@ -19146,8 +19162,8 @@ + rs2=\E[!p\E[?3;7;19;67h\E[?1;4l\E(B\E)0\017\E[2J\E[1;1H\E>$< + 200>, + use=ncr260vt200pp, +-ncr260vt300an|NCR 2900_260 vt300 with ansi kybd, +- am, hs, mir, msgr, xenl, xon, ++ncr260vt300an|NCR 2900/260 VT300 with ANSI keyboard, ++ am, mir, msgr, xenl, xon, + cols#80, lines#24, nlab#32, + acsc=``aaffggjjkkllmmnnooqqssttuuvvwwxx~~, bel=^G, + blink=\E[5m, bold=\E[1m, clear=\E[2J\E[1;1H$<20>, +@@ -19156,11 +19172,11 @@ + cud1=\E[B$<5>, cuf=\E[%p1%dC$<5>, cuf1=\E[C$<5>, + cup=\E[%i%p1%d;%p2%dH$<10>, cuu=\E[%p1%dA$<5>, + cuu1=\E[A$<5>, dch=\E[%p1%dP$<5>, dch1=\E[1P$<5>, +- dl=\E[%p1%dM$<5>, dl1=\E[M$<5>, dsl=\E[0$~\E[1$~, +- ech=\E[%p1%dX$<5>, ed=\E[0J, el=\E[0K$<5>, el1=\E[1K$<5>, +- fsl=\E[0$}, home=\E[H, hpa=\E[%p1%dG$<40>, ht=^I, hts=\EH, +- ich=\E[%p1%d@$<5>, il=\E[%p1%dL$<5>, il1=\E[L$<5>, +- ind=\ED$<5>, indn=\E[%p1%dE$<5>, invis=\E[8m, ++ dl=\E[%p1%dM$<5>, dl1=\E[M$<5>, ech=\E[%p1%dX$<5>, ++ ed=\E[0J, el=\E[0K$<5>, el1=\E[1K$<5>, home=\E[H, ++ hpa=\E[%p1%dG$<40>, ht=^I, hts=\EH, ich=\E[%p1%d@$<5>, ++ il=\E[%p1%dL$<5>, il1=\E[L$<5>, ind=\ED$<5>, ++ indn=\E[%p1%dE$<5>, invis=\E[8m, + is2=\E[!p\E[?7;19;67h\E[?1;3;4l\E[1;0%w\E(B\E)0\017\E[2J\E[1 + ;1H\E>$<200>, + kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, +@@ -19182,9 +19198,9 @@ + %;%?%p7%t;8%;m%?%p9%t\016%e\017%;$<20>, + sgr0=\E[0m\017$<20>, smacs=\016$<20>, smam=\E[?7h, + smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, +- tbc=\E[3g, tsl=\E[2$~\E[1$}, vpa=\E[%p1%dd$<40>, +- use=vt220+vtedit, use=vt220+cvis, use=vt220+keypad, +-ncr260vt300wan|NCR 2900_260 vt300 wide mode ansi kybd, ++ tbc=\E[3g, vpa=\E[%p1%dd$<40>, use=vt220+vtedit, ++ use=vt220+cvis, use=vt220+keypad, use=ncr260vt+sl, ++ncr260vt300wan|NCR 2900/260 VT300 wide mode ANSI keyboard, + cols#132, + cup=\E[%i%p1%d;%p2%dH$<30>, + is2=\E[!p\E[?3;7;19;67h\E[?4l\E[1;0%w\E(B\E)0\017\E[2J\E[1;1 +@@ -19192,13 +19208,13 @@ + rs2=\E[!p\E[?3;7;19;67h\E[?4l\E[1;0%w\E(B\E)0\017\E[2J\E[1;1 + H$<200>, + use=ncr260vt300an, +-ncr260vt300pp|NCR 2900_260 vt300 with pc+ kybd, ++ncr260vt300pp|NCR 2900/260 VT300 with PC+ keyboard, + ka1=\E[H, ka3=\EOu, kb2=\E[V, kc3=\E[U, kcub1=\E[D, + kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[4~, + kend=\E[1~, khome=\E[H, kich1=\E[2~, knp=\E[6~, kpp=\E[5~, + lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4, rmkx=\E>, smkx=\E=, + use=ncr260vt300an, +-NCR260VT300WPP|ncr260vt300wpp|NCR 2900_260 vt300 wide mode pc+ kybd, ++ncr260vt300wpp|NCR260VT300WPP|NCR 2900/260 VT300 wide mode PC+ keyboard, + cols#132, + cup=\E[%i%p1%d;%p2%dH$<30>, + is2=\E[!p\E[?3;7;19;67h\E[?1;4l\E[1;0%w\E(B\E)0\017\E[2J\E[1 +@@ -19220,16 +19236,16 @@ + # if the 'pairs' capability is defined. Un-Comment the 'pairs' + # capability and recompile if you wish to have it included. + # +-ncr260wy325pp|NCR 2900_260 Wyse 325, +- am, bw, hs, km, mc5i, mir, msgr, xon, ++ncr260wy325pp|NCR 2900/260 Wyse 325, ++ am, bw, km, mc5i, mir, msgr, xon, + colors#16, cols#80, lines#24, ncv#33, nlab#32, + acsc=07a?h;j5k3l2m1n8q:t4u9v=w0x6, bel=^G, blink=\EG2, + cbt=\EI, civis=\E`0, clear=\E*$<10>, cnorm=\E`1, cr=\r, + cub1=\010$<5>, cud1=\n$<5>, cuf1=\014$<5>, + cup=\E=%p1%{32}%+%c%p2%{32}%+%c$<10>, cuu1=\013$<5>, +- cvvis=\E`5, dch1=\EW$<50>, dl1=\ER$<5>, dsl=\E`c, +- ed=\Ey$<5>, el=\Et$<5>, fsl=\r, home=\036$<5>, ht=^I, +- hts=\E1, il1=\EE$<5>, ind=\n$<5>, invis=\EG1, ++ cvvis=\E`5, dch1=\EW$<50>, dl1=\ER$<5>, ed=\Ey$<5>, ++ el=\Et$<5>, home=\036$<5>, ht=^I, hts=\E1, il1=\EE$<5>, ++ ind=\n$<5>, invis=\EG1, + is2=\Ee6\Ed/\Ee1\Ed*\Er\EO\E`1\E`:\E`@\E~!\E"\Ee4\Ex@\E`9 + \Ee7$<100>, + kDC=\ER, kEND=\EY, kHOM=\E{, kNXT=\EK, kPRT=\E7, kPRV=\EJ, +@@ -19257,8 +19273,8 @@ + %t%{63}%e%p1%{15}%=%t%{56}%;\Edy%c11$<100>, + sgr0=\EG0\EcB0\EcD$<15>, smacs=\EH\002\EcB1, smam=\Ed/, + smir=\Eq, smso=\EGt, smul=\EG8, smxon=\Ec21, tbc=\E0, +- tsl=\EF, +-ncr260wy325wpp|NCR 2900_260 Wyse 325 wide mode, ++ use=ncr260vp+sl, ++ncr260wy325wpp|NCR 2900/260 Wyse 325 wide mode, + cols#132, + cup=\Ea%i%p1%dR%p2%dC$<30>, + is2=\Ee6\Ed/\Ee1\Ed*\Er\EO\E`1\E`;\E`@\E~!\E"\Ee4\Ex@\E`9 +@@ -19282,16 +19298,16 @@ + # with the 'pairs' capability defined as below. If you wish to + # have it included, Un-comment it and recompile (using 'tic'). + # +-ncr260wy350pp|NCR 2900_260 Wyse 350, +- am, bw, hs, km, mc5i, mir, msgr, xon, ++ncr260wy350pp|NCR 2900/260 Wyse 350, ++ am, bw, km, mc5i, mir, msgr, xon, + colors#16, cols#80, lines#24, ncv#33, nlab#32, pairs#16, xmc#1, + acsc=07a?h;j5k3l2m1n8q:t4u9v=w0x6, bel=^G, blink=\EG2, + cbt=\EI, civis=\E`0, clear=\E+$<20>, cnorm=\E`1, cr=\r, + cub1=\010$<5>, cud1=\n$<5>, cuf1=\014$<5>, + cup=\E=%p1%{32}%+%c%p2%{32}%+%c$<40>, cuu1=\013$<5>, +- cvvis=\E`5, dch1=\EW$<50>, dim=\EGp, dl1=\ER$<5>, dsl=\E`c, +- ed=\Ey$<5>, el=\Et$<5>, fsl=\r, home=\036$<10>, ht=^I, +- hts=\E1, il1=\EE$<5>, ind=\n$<5>, invis=\EG1, ++ cvvis=\E`5, dch1=\EW$<50>, dim=\EGp, dl1=\ER$<5>, ++ ed=\Ey$<5>, el=\Et$<5>, home=\036$<10>, ht=^I, hts=\E1, ++ il1=\EE$<5>, ind=\n$<5>, invis=\EG1, + is2=\Ee6\Ed/\Ee1\Ed*\Er\EO\E`1\E`:\E`@\E~!\E"\Ee4\Ex@\E`9 + \Ee7$<100>, + kDC=\ER, kEND=\EY, kHOM=\E{, kPRT=\E7, kRIT=^L, ka1=^^, kbs=^H, +@@ -19319,8 +19335,8 @@ + %{14}%=%t%{111}%e%p1%{15}%=%t%{56}%;\Em0%c$<100>, + sgr0=\EG0\EH\003\EcD, smacs=\EH\002\EcB1, smam=\Ed/, + smir=\Eq, smso=\EGt, smul=\EG8, smxon=\Ec21, tbc=\E0, +- tsl=\EF, +-ncr260wy350wpp|NCR 2900_260 Wyse 350 wide mode, ++ use=ncr260vp+sl, ++ncr260wy350wpp|NCR 2900/260 Wyse 350 wide mode, + cols#132, + cup=\Ea%i%p1%dR%p2%dC$<30>, + is2=\Ee6\Ed/\Ee1\Ed*\Er\EO\E`1\E`;\E`@\E~!\E"\Ee4\Ex@\E`9 +@@ -19338,17 +19354,16 @@ + # restored if needed. + # (ncr260wy50+pp: originally contained commented-out + # , as well as the commented-out one there -- esr) +-ncr260wy50+pp|NCR 2900_260 Wyse 50+, +- am, bw, hs, km, mc5i, mir, msgr, xon, ++ncr260wy50+pp|NCR 2900/260 Wyse 50+, ++ am, bw, km, mc5i, mir, msgr, xon, + cols#80, lines#24, nlab#32, xmc#1, + acsc=0wa_h[jukslrmqnxqzttuyv]wpxv, bel=^G, blink=\EG2, + cbt=\EI$<5>, civis=\E`0, clear=\E+$<20>, cnorm=\E`1, cr=\r, + cub1=\010$<5>, cud1=\n$<5>, cuf1=\014$<5>, + cup=\E=%p1%{32}%+%c%p2%{32}%+%c$<30>, cuu1=\013$<5>, +- cvvis=\E`5, dch1=\EW$<50>, dim=\EGp, dl1=\ER$<5>, dsl=\E`c, +- ed=\EY$<5>, el=\ET$<5>, fsl=\r, home=\036$<10>, +- ht=\011$<5>, hts=\E1$<5>, il1=\EE$<5>, ind=\n$<5>, +- invis=\EG1, ++ cvvis=\E`5, dch1=\EW$<50>, dim=\EGp, dl1=\ER$<5>, ++ ed=\EY$<5>, el=\ET$<5>, home=\036$<10>, ht=\011$<5>, ++ hts=\E1$<5>, il1=\EE$<5>, ind=\n$<5>, invis=\EG1, + is2=\Ee6\E~"$<100>\E+\Ed/\Ee1\Ed*\Er\EO\E`1\E`:\E`@\E~!\E" + \Ee4\Ex@\E`9\Ee7$<100>, + kDC=\ER, kEND=\EY, kHOM=\E{, kPRT=\E7, kRIT=^L, ka1=^^, kbs=^H, +@@ -19368,8 +19383,9 @@ + rs2=\Ee6\E~"$<100>\E+\Ed/\Ee1\Ed*\Er\EO\E`1\E`:\E`@\E~!\E" + \Ee4\Ex@\E`9\Ee7$<100>, + sgr0=\EG0\EH\003$<15>, smacs=\EH^B, smam=\Ed/, smir=\Eq, +- smso=\EGt, smul=\EG8, smxon=\Ec21, tbc=\E0$<5>, tsl=\EF, +-ncr260wy50+wpp|NCR 2900_260 Wyse 50+ wide mode, ++ smso=\EGt, smul=\EG8, smxon=\Ec21, tbc=\E0$<5>, ++ use=ncr260vp+sl, ++ncr260wy50+wpp|NCR 2900/260 Wyse 50+ wide mode, + cols#132, + cup=\Ea%i%p1%dR%p2%dC$<30>, + is2=\Ee6\E~"$<100>\E+\Ed/\Ee1\Ed*\Er\EO\E`1\E`;\E`@\E~!\E" +@@ -19377,17 +19393,16 @@ + rs2=\Ee6\E~"$<100>\E+\Ed/\Ee1\Ed*\Er\EO\E`1\E`;\E`@\E~!\E" + \Ee4\Ex@\E`9\Ee7$<200>, + use=ncr260wy50+pp, +-ncr260wy60pp|NCR 2900_260 Wyse 60, +- am, bw, hs, km, mc5i, mir, msgr, xon, ++ncr260wy60pp|NCR 2900/260 Wyse 60, ++ am, bw, km, mc5i, mir, msgr, xon, + cols#80, lines#24, nlab#32, + acsc=07a?h;j5k3l2m1n8q:t4u9v=w0x6, bel=^G, blink=\EG2, + cbt=\EI$<15>, civis=\E`0, clear=\E*$<100>, cnorm=\E`1, + cr=\r, cub1=\010$<5>, cud1=\n$<5>, cuf1=\014$<5>, + cup=\E=%p1%{32}%+%c%p2%{32}%+%c$<10>, cuu1=\013$<5>, +- cvvis=\E`5, dch1=\EW$<50>, dl1=\ER$<5>, dsl=\E`c, +- ed=\Ey$<5>, el=\Et$<5>, fsl=\r, home=\036$<25>, +- ht=\011$<15>, hts=\E1$<15>, il1=\EE$<5>, ind=\n$<5>, +- invis=\EG1, ++ cvvis=\E`5, dch1=\EW$<50>, dl1=\ER$<5>, ed=\Ey$<5>, ++ el=\Et$<5>, home=\036$<25>, ht=\011$<15>, hts=\E1$<15>, ++ il1=\EE$<5>, ind=\n$<5>, invis=\EG1, + is2=\Ee6\E~4$<100>\E+\Ed/\Ee1\Ed*\Er\EO\E`1\E`:\E`@\E~!\E" + \Ee4\Ex@\E`9\Ee7$<100>, + kDC=\ER, kEND=\EY, kHOM=\E{, kNXT=\EK, kPRT=\E7, kPRV=\EJ, +@@ -19408,8 +19423,8 @@ + \Ee4\Ex@\E`9\Ee7$<100>, + sgr0=\EG0\EcB0\EcD$<15>, smacs=\EH^B, smam=\Ed/, + smir=\Eq, smso=\EGt, smul=\EG8, smxon=\Ec21, tbc=\E0$<15>, +- tsl=\EF, +-ncr260wy60wpp|NCR 2900_260 Wyse 60 wide mode, ++ use=ncr260vp+sl, ++ncr260wy60wpp|NCR 2900/260 Wyse 60 wide mode, + cols#132, + cup=\Ea%i%p1%dR%p2%dC$<30>, + is2=\Ee6\E~4$<100>\E+\Ed/\Ee1\Ed*\Er\EO\E`1\E`;\E`@\E~!\E" +@@ -19417,43 +19432,43 @@ + rs2=\Ee6\E~4$<100>\E+\Ed/\Ee1\Ed*\Er\EO\E`1\E`;\E`@\E~!\E" + \Ee4\Ex@\E`9\Ee7$<100>, + use=ncr260wy60pp, +-ncr160vppp|NCR 2900_160 viewpoint, ++ncr160vppp|NCR 2900/160 viewpoint, + use=ncr260vppp, +-ncr160vpwpp|NCR 2900_160 viewpoint wide mode, ++ncr160vpwpp|NCR 2900/160 viewpoint wide mode, + use=ncr260vpwpp, +-ncr160vt100an|NCR 2900_160 vt100 with ansi kybd, ++ncr160vt100an|NCR 2900/160 VT100 with ANSI keyboard, + use=ncr260vt100an, +-ncr160vt100pp|NCR 2900_160 vt100 with PC+ kybd, ++ncr160vt100pp|NCR 2900/160 VT100 with PC+ keyboard, + use=ncr260vt100pp, +-ncr160vt100wan|NCR 2900_160 vt100 wide mode ansi kybd, ++ncr160vt100wan|NCR 2900/160 VT100 wide mode ANSI keyboard, + use=ncr260vt100wan, +-ncr160vt100wpp|NCR 2900_160 vt100 wide mode pc+ kybd, ++ncr160vt100wpp|NCR 2900/160 VT100 wide mode PC+ keyboard, + use=ncr260vt100wpp, +-ncr160vt200an|NCR 2900_160 vt200 with ansi kybd, ++ncr160vt200an|NCR 2900/160 VT200 with ANSI keyboard, + use=ncr260vt200an, +-ncr160vt200pp|NCR 2900_160 vt200 with pc+ kybd, ++ncr160vt200pp|NCR 2900/160 VT200 with PC+ keyboard, + use=ncr260vt200pp, +-ncr160vt200wan|NCR 2900_160 vt200 wide mode ansi kybd, ++ncr160vt200wan|NCR 2900/160 VT200 wide mode ANSI keyboard, + use=ncr260vt200wan, +-ncr160vt200wpp|NCR 2900_160 vt200 wide mode pc+ kybd, ++ncr160vt200wpp|NCR 2900/160 VT200 wide mode PC+ keyboard, + use=ncr260vt200wpp, +-ncr160vt300an|NCR 2900_160 vt300 with ansi kybd, ++ncr160vt300an|NCR 2900/160 VT300 with ANSI keyboard, + use=ncr260vt300an, +-ncr160vt300pp|NCR 2900_160 vt300 with pc+ kybd, ++ncr160vt300pp|NCR 2900/160 VT300 with PC+ keyboard, + use=ncr260vt300pp, +-ncr160vt300wan|NCR 2900_160 vt300 wide mode ansi kybd, ++ncr160vt300wan|NCR 2900/160 VT300 wide mode ANSI keyboard, + use=ncr260vt300wan, +-ncr160vt300wpp|NCR 2900_160 vt300 wide mode pc+ kybd, ++ncr160vt300wpp|NCR 2900/160 VT300 wide mode PC+ keyboard, + use=ncr260vt300wpp, +-ncr160wy50+pp|NCR 2900_160 Wyse 50+, ++ncr160wy50+pp|NCR 2900/160 Wyse 50+, + use=ncr260wy50+pp, +-ncr160wy50+wpp|NCR 2900_160 Wyse 50+ wide mode, ++ncr160wy50+wpp|NCR 2900/160 Wyse 50+ wide mode, + use=ncr260wy50+wpp, +-ncr160wy60pp|NCR 2900_160 Wyse 60, ++ncr160wy60pp|NCR 2900/160 Wyse 60, + use=ncr260wy60pp, +-ncr160wy60wpp|NCR 2900_160 Wyse 60 wide mode, ++ncr160wy60wpp|NCR 2900/160 Wyse 60 wide mode, + use=ncr260wy60wpp, +-ncrvt100an|ncrvt100pp|NCR vt100 for the 2900 terminal, ++ncrvt100an|ncrvt100pp|NCR VT100 for the 2900 terminal, + am, hs, mc5i, mir, msgr, xon, + cols#80, it#8, lines#24, nlab#32, + acsc=``aaffgghhiijjkkllmmnnqqttuuvvwwxxyyzz~~, +@@ -19724,7 +19739,7 @@ + + # This entry is for the Sperry UTS30 terminal running the TTY + # utility under control of CP/M Plus 1R1. The functionality +-# provided is comparable to the DEC vt100. ++# provided is comparable to the DEC VT100. + # (uts30: I added / based on the init string -- esr) + uts30|Sperry UTS30 with cp/m@1R1, + am, bw, hs, +@@ -19803,7 +19818,7 @@ + use=vt220+cvis, + dt100w|dt-100w|Tandy DT-100 terminal (wide mode), + cols#132, use=dt100, +-dt110|Tandy DT-110 emulating ansi, ++dt110|Tandy DT-110 emulating ANSI, + xon, + cols#80, lines#24, + acsc=jjkkllmmnnqqttuuvvwwxx, bel=^G, clear=\E[H\E[2J, +@@ -19979,7 +19994,7 @@ + smul=\E[=5;<2m, tbc=\E[1g, + + # (tek4105-30: I added / based on the init string -- esr) +-tek4105-30|Tektronix 4015 emulating 30 line vt100, ++tek4105-30|Tektronix 4015 emulating 30 line VT100, + am, mir, msgr, xenl, xon, + cols#80, it#8, lines#30, vt#3, + acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, +@@ -20142,7 +20157,7 @@ + # is no way to scroll. + # + # Note that there is a floppy for free from Tek that makes the +-# 4112 emulate the vt52 (use the vt52 termcap). There is also ++# 4112 emulate the VT52 (use the VT52 termcap). There is also + # an expected enhancement that will use ANSI standard sequences. + # + # 4112 in non-dialog area pretending to scroll. It really wraps +@@ -20150,7 +20165,7 @@ + # + # 'vi' works reasonably well with this entry. + # +-otek4112|o4112-nd|otek4113|otek4114|old Tektronix 4110 series, ++otek4112|o4112-nd|otek4113|otek4114|Tektronix 4110 series (old), + am, + cols#80, lines#34, + bel=^G, clear=\E^L, cr=\r, cub1=^H, cud1=\n, cuu1=^K, ind=\n, +@@ -20198,7 +20213,7 @@ + ll=\ELF hl @, rmso=\EMT1, smso=\EMT2, uc=\010\EMG1_\EMG0, + # This entry is from Tek. Inc. (Brian Biehl) + # (tek4115: :bc: renamed to :le:, / added based on init string -- esr) +-otek4115|Tektronix 4115, ++otek4115|Tektronix 4115 (old), + OTbs, am, da, db, eo, + cols#80, it#8, lines#34, + cbt=\E[Z, clear=\E[H\E[2J, +@@ -20214,7 +20229,7 @@ + rmkx=\E>, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smam=\E[?7h, + smcup=\E%!0\ELBB2\E%!1, smir=\E[4h, smkx=\E=, smso=\E[7m, + smul=\E[4m, +-tek4115|newer Tektronix 4115 entry with more ANSI capabilities, ++tek4115|Tektronix 4115 entry with more ANSI capabilities (new), + am, xon, + cols#80, lines#34, + bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[J, +@@ -20230,7 +20245,7 @@ + %;%?%p7%t8;%;m, + sgr0=\E[m, smam=\E[?7h, smso=\E[7m, smul=\E[4m, tbc=\E[3g, + vpa=\E[%p1%{1}%+%dd, use=ansi+rep, +-# The tek4125 emulates a vt100 incorrectly - the scrolling region ++# The tek4125 emulates a VT100 incorrectly - the scrolling region + # command is ignored. The following entry replaces with the needed + # , , and ; removes some cursor pad commands that the tek4125 + # chokes on; and adds a lot of initialization for the Tektronix dialog area. +@@ -20300,7 +20315,7 @@ + # + # am is not defined because the wrap around occurs not when the char. + # is placed in the 80'th column, but when we are attempting to type +-# the 81'st character on the line. (esr: hmm, this is like the vt100 ++# the 81'st character on the line. (esr: hmm, this is like the VT100 + # version of xenl, perhaps am + xenl would work!) + # + # Bold, dim, and standout are simulated by colors and thus not allowed +@@ -20697,12 +20712,12 @@ + # These entries assume that the 'Auto Wraparound' is enabled. + # Xon-Xoff flow control should also be enabled. + # +-# The vt100 uses :rs2: and :rf: rather than :is2:/:tbc:/:hts: because the tab ++# The VT100 uses :rs2: and :rf: rather than :is2:/:tbc:/:hts: because the tab + # settings are in non-volatile memory and don't need to be reset upon login. + # Also setting the number of columns glitches the screen annoyingly. + # You can type "reset" to get them set. + # +-lisaterm|Apple Lisa or Lisa/2 running LisaTerm vt100 emulation, ++lisaterm|Apple Lisa or Lisa/2 running LisaTerm VT100 emulation, + OTbs, OTpt, am, xenl, xon, + OTkn#4, cols#80, it#8, lines#24, vt#3, + bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r, +@@ -21060,7 +21075,7 @@ + rmso=\Eq, sgr0=\Eq, smir=\E@, smso=\Ep, + + # According to the Venix 1.1 manual, the PC console is similar +-# to a DEC vt52. Differences seem to be (1) arrow keys send ++# to a DEC VT52. Differences seem to be (1) arrow keys send + # different strings, (2) enhanced standout, (3) added insert/delete line. + # Note in particular that it doesn't have automatic margins. + # There are other keys (f1-f10, kpp, knp, kcbt, kich1, kdch1) but they +@@ -21085,7 +21100,7 @@ + # wrap mode is reset by . Using =\E[S caused errors so I + # used \ED instead. + # From: bf347@lafn.org (David Lawyer), 28 Jun 1997 +-mai|basic4|MAI Basic Four in ansi mode, ++mai|basic4|MAI Basic Four in ANSI mode, + am, da, db, mir, msgr, + cols#82, it#8, lines#25, + bel=^G, blink=\E[5m, bold=\E[1m, clear=^]^_, cnorm=\E[?7h, +@@ -21314,7 +21329,7 @@ + # + # Fonctionne par exemple avec Midnight Commander (mc). + +-minitel2-80|minitel 2 (80cols) avec filets vt100 (DEC), ++minitel2-80|minitel 2 (80cols) avec filets VT100 (DEC), + G0, + acsc=ffggjjkkllmmnnooqqssttuuvvwwxxyyzz||}}, + enacs=\E)0, rmacs=^O, smacs=^N, u6=\E[%i%d;%dR, +@@ -21449,7 +21464,7 @@ + \n\n\n\n\n\n\n\n\n\n, + use=vt220+pcedit, use=vt220+cvis, use=linux+decid, + +-# 1. Using double-shapes for vt100 graphical chars (eg: mc). ++# 1. Using double-shapes for VT100 graphical chars (eg: mc). + # 2. Native brown color corrected to good yellow color. + # 3. Adding "Insert" and "Delete Line" keys as ESC Up and ESC Down arrow keys. + # 4. Suppressed nonexistent underlined mode (normally as bright). +@@ -21693,7 +21708,7 @@ + # The bitgraph was a large white box that contained a monochrome bitmap + # display, and a 68000 to run it. You could download code and run it on + # the cpu, it had 128kb (I think) of memory. I used one in the late +-# 70's, sure beat a vt100. It had one strange feature tho -- it used ++# 70's, sure beat a VT100. It had one strange feature tho -- it used + # the cpu to bitblt pixels to scroll, it took longer than the refresh + # rate, and looked like a rubber sheet stretching, then snapping + # upwards. It had everything the early mac had, except a floppy drive a +@@ -21869,13 +21884,13 @@ + # Description written by J. Staerck (BULL SA) + # Copyright (c) 1989 BULL SA + #--------------------------------------------------------------------------- +-# This entry is used for terminals with vt320 emulation mode ++# This entry is used for terminals with VT320 emulation mode + # and following set-up : + # 8 bit ISO Latin Character Set (ISO 8859-1), + # 7 bit Control Characters, + # 80 columns screen. +-# Hereafter are some DEC vt terminals' commands. (valid on vt200 and 300) +-# They are used in string capabilities with vt220-320 emulation mode. ++# Hereafter are some DEC vt terminals' commands. (valid on VT200 and 300) ++# They are used in string capabilities with VT220-320 emulation mode. + # In the following DEC definitions, two kinds of terminfo databases are + # provided : + # 1. the first with Command Sequence Introducer starting with escape +@@ -21928,17 +21943,17 @@ + # RM DECNKM numeric keypad appl.: esc [ ? 6 6 l + # SM DECKBUM clavier informatique esc [ ? 6 8 h + # RM DECKBUM clavier bureautique: esc [ ? 6 8 l +-# DECSCL vt300 mode 8-bit ctrl: esc [ 6 3 " p +-# or DECSCL vt300 mode 8-bit ctrl: esc [ 6 3 ; 0 " p +-# or DECSCL vt300 mode 8-bit ctrl: esc [ 6 3 ; 2 " p +-# DECSCL vt300 mode 7-bit ctrl: esc [ 6 3 ; 1 " p ++# DECSCL VT300 mode 8-bit ctrl: esc [ 6 3 " p ++# or DECSCL VT300 mode 8-bit ctrl: esc [ 6 3 ; 0 " p ++# or DECSCL VT300 mode 8-bit ctrl: esc [ 6 3 ; 2 " p ++# DECSCL VT300 mode 7-bit ctrl: esc [ 6 3 ; 1 " p + # Char. and Line attributes: esc [ Ps ... Ps m + # with: 0 All off, 1 Bold, 4 Underline, 5 Blinking, 7 Reverse + # and : 22 Bold off, 24 Underline off, 25 Blinking off, 27 Reverse off + # + + # This entry covers BQ303, BQ306, BQ310, Q303, Q306, Q310 +-bq300|Bull vt320 ISO Latin 1 80 columns terminal, ++bq300|Bull VT320 ISO Latin 1 80 columns terminal, + am, eo, eslok, hs, km, mir, msgr, xenl, xon, + cols#80, it#8, lines#24, vt#3, wsl#80, + acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, +@@ -21972,24 +21987,24 @@ + smcup=\E[?7l\E[?1l\E(B, smir=\E[4h, smso=\E[7m, + smul=\E[4m, tbc=\E[3g, tsl=\E[1$}\E[2$~, + use=vt220+vtedit, use=ansi+pp, use=vt220+cvis, +-bq300-rv|Bull vt320 reverse 80 columns, ++bq300-rv|Bull VT320 reverse 80 columns, + flash=\E[?5l$<50>\E[?5h, + is2=\E[?2h\E[?3l\E[?5h\E[?7h\E[?8h\E>\E[?1l\E\sF\E[?42l\E[?4 + l, + use=bq300, +-bq300-w|Bull vt320 132 columns, ++bq300-w|Bull VT320 132 columns, + cols#132, wsl#132, + is2=\E[?2h\E[?3h\E[?5l\E[?7h\E[?8h\E>\E[?1l\E\sF\E[?42l\E[?4 + l, + rs2=\E[?3h, use=bq300, +-bq300-w-rv|Bull vt320 reverse mode 132 columns, ++bq300-w-rv|Bull VT320 reverse mode 132 columns, + cols#132, wsl#132, + flash=\E[?5l$<50>\E[?5h, + is2=\E[?2h\E[?3h\E[?5h\E[?7h\E[?8h\E>\E[?1l\E\sF\E[?42l\E[?4 + l, + rs2=\E[?3h, use=bq300, + +-# This entry is used for terminals with vt320 emulation mode ++# This entry is used for terminals with VT320 emulation mode + # and following set-up : + # 8 bit ISO Latin Character Set (ISO 8859-1), + # 8 bit Control Characters, (CSI coded as x9B for ESC [) +@@ -22036,14 +22051,14 @@ + # RM DECTCEM Invisible cursor: csi ? 2 5 l + # SM DECNCRM 7 bits NCR set: csi ? 4 2 h + # RM DECNCRM Multi or ISO latin: csi ? 4 2 l +-# DECSCL vt300 mode 8-bit ctrl: csi 6 3 " p +-# or DECSCL vt300 mode 8-bit ctrl: csi 6 3 ; 0 " p +-# DECSCL vt300 mode 7-bit ctrl: csi 6 3 ; 1 " p ++# DECSCL VT300 mode 8-bit ctrl: csi 6 3 " p ++# or DECSCL VT300 mode 8-bit ctrl: csi 6 3 ; 0 " p ++# DECSCL VT300 mode 7-bit ctrl: csi 6 3 ; 1 " p + # Char. and Line attributes: csi Ps ... Ps m + # with: 0 All off, 1 Bold, 4 Underline, 5 Blinking, 7 Reverse + # and : 22 Bold off, 24 Underline off, 25 Blinking off, 27 Reverse off + # (bq300-8: ,,,,, to get under 1024 --esr) +-bq300-8|Bull vt320 full 8 bits 80 columns, ++bq300-8|Bull VT320 full 8 bits 80 columns, + am, eo, eslok, hs, km, mc5i, mir, msgr, xenl, xon, + cols#80, it#8, lines#24, vt#3, wsl#80, + acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, +@@ -22080,24 +22095,24 @@ + smcup=\233?7l\233?1l\E(B, smir=\2334h, smso=\2337m, + smul=\2334m, tbc=\2333g, tsl=\2331$}\2332$~, + use=vt220+cvis8, +-bq300-8rv|Bull vt320 8-bit reverse mode 80 columns, ++bq300-8rv|Bull VT320 8-bit reverse mode 80 columns, + flash=\233?5l$<50>\233?5h, + is2=\E[?2h\E[?3l\E[?5h\E[?7h\E[?8h\E>\E[?1l\E\sG\E[?42l\E[?4 + l, + use=bq300-8, +-bq300-8w|Bull vt320 8-bit 132 columns, ++bq300-8w|Bull VT320 8-bit 132 columns, + cols#132, wsl#132, + is2=\E[?2h\E[?3h\E[?5l\E[?7h\E[?8h\E>\E[?1l\E\sG\E[?42l\E[?4 + l, + rs2=\233?3h, use=bq300-8, +-bq300-w-8rv|Bull vt320 8-bit reverse mode 132 columns, ++bq300-w-8rv|Bull VT320 8-bit reverse mode 132 columns, + cols#132, wsl#132, + flash=\233?5l$<50>\233?5h, + is2=\E[?2h\E[?3h\E[?5h\E[?7h\E[?8h\E>\E[?1l\E\sG\E[?42l\E[?4 + l, + rs2=\233?3h, use=bq300-8, + +-# This entry is used for terminals with vt320 emulation mode ++# This entry is used for terminals with VT320 emulation mode + # a 102 keys keyboard (PC scancode !) and following set-up : + # 8 bit ISO Latin Character Set (ISO 8859-1), + # 7 bit Control Characters, +@@ -22355,7 +22370,7 @@ + wind=\E\014\E\016%p1%'\0'%+%c%p2%'\0'%+%c%p3%'\0'%+%c%p4%' + \0'%+%c\025, + +-#### DEC terminals (Obsolete types: DECwriter and vt40/42/50) ++#### DEC terminals (Obsolete types: DECwriter and VT40/42/50) + # + # These entries came from DEC's official terminfos for its older terminals + # (which happen to be identical to the AT&T/SCO terminal descriptions), +@@ -22367,9 +22382,9 @@ + # + # DECScope of course had no "function keys", but this building block assigns + # the three blank keys at the top of the auxiliary (numeric) keypad, using +-# the same analogy as vt100 (also lacking function-keys). ++# the same analogy as VT100 (also lacking function-keys). + # +-# These assignments use the same layout for 0-9 as vt100+keypad; the vt52 ++# These assignments use the same layout for 0-9 as VT100+keypad; the VT52 + # keypad had its cursor-keys on the right-column as shown -TD + # _______________________________________ + # | PF1 | PF2 | PF3 | c-up | +@@ -22402,18 +22417,18 @@ + cols#72, lines#40, + bel=^G, cr=\r, cub1=^H, cud1=\n, + +-vt50|DEC vt50, ++vt50|DEC VT50, + OTbs, + cols#80, lines#12, + bel=^G, clear=\EH\EJ, cr=\r, cub1=^H, cud1=\n, cuf1=\EC, + cuu1=\EA, ed=\EJ, el=\EK, ht=^I, ind=\n, u8=\E/A, u9=\EZ, +-vt50h|DEC vt50h, ++vt50h|DEC VT50h, + cub1=\ED, cud1=\EB, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, + kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, u8=\E/[HJ], + use=vt52+keypad, use=vt50, + + # (vt61: there's a BSD termcap that claims , ) +-vt61|vt-61|vt61.5|DEC vt61, ++vt61|vt-61|vt61.5|DEC VT61, + cols#80, lines#24, + bel=^G, clear=\EH\EJ$<120>, cr=\r$<20>, cub1=^H, cud1=\n, + cuf1=\EC$<20>, cup=\EY%p1%{32}%+%c%p2%{32}%+%c$<20>, +@@ -22522,7 +22537,7 @@ + # + + # (ddr: I added / based on the init string -- esr) +-ddr|rebus3180|ddr3180|Rebus/DDR 3180 vt100 emulator, ++ddr|rebus3180|ddr3180|Rebus/DDR 3180 VT100 emulator, + OTbs, am, xenl, + cols#80, it#8, lines#24, vt#3, + blink=\E[5m$<2/>, bold=\E[1m$<2/>, +@@ -22603,7 +22618,7 @@ + # S402 0 0 0 0 0 0 0 0 + # (h19: I added / based on the init string; + # also added empty to suppress a tic warning -- esr) +-h19-a|h19a|heath-ansi|heathkit-a|Heathkit h19 ansi mode, ++h19-a|h19a|heath-ansi|heathkit-a|Heathkit h19 ANSI mode, + OTbs, am, mir, msgr, + cols#80, it#8, lines#24, + acsc=, bel=^G, clear=\E[2J, cnorm=\E[>4l, cr=\r, cub1=^H, +@@ -22686,7 +22701,7 @@ + # line will be really slow", you say. Well there is a sort of a + # solution to that too. There is an insert character option on + # the Z29 that will insert one character. Unfortunately, it +-# involves putting the terminal into ansi mode, inserting the ++# involves putting the terminal into ANSI mode, inserting the + # character, and changing it back to H19 mode. All this takes 12 + # characters. Pretty expensive to insert one character, but it + # works. Either Emacs doesn't try to use its inserting hack when +@@ -22710,14 +22725,14 @@ + lf0=home, ri=\EI$<2/>, rmacs=\EF, rmir=\EO, rmso=\Eq, + rmul=\Es0, smacs=\EG, smir=\E@, smso=\Ep, smul=\Es8, + tsl=\Ej\Ex5\Ex1\EY8%+ \Eo, +-# z29 in ansi mode. Assumes that the cursor is in the correct state, and that ++# z29 in ANSI mode. Assumes that the cursor is in the correct state, and that + # the world is stable. causes the terminal to be reset to the state + # indicated by the name. kc -> key click, nkc -> no key click, uc -> underscore + # cursor, bc -> block cursor. + # From: Mike Meyers + # (z29a: replaced nonexistent because +-# looks vt100-compatible -- esr) +-z29a|z29a-kc-bc|h29a-kc-bc|Heath/Zenith 29 in ansi mode, ++# looks VT100-compatible -- esr) ++z29a|z29a-kc-bc|h29a-kc-bc|Heath/Zenith 29 in ANSI mode, + OTbs, OTpt, am, eslok, hs, mir, msgr, + OTkn#10, cols#80, it#8, lines#24, + OTbc=\ED, bel=^G, blink=\E[5m, bold=\E[2m, clear=\E[2J, +@@ -22737,15 +22752,15 @@ + \E[11m, + sc=\E[s, sgr0=\E[m, smcup=\E[?7l, smso=\E[7;2m, smul=\E[4m, + tbc=\E[3g, tsl=\E[s\E[>5;1h\E[25;%i%dH\E[1K, +-z29a-kc-uc|h29a-kc-uc|Zenith z29 ansi mode with keyclick and underscore cursor, ++z29a-kc-uc|h29a-kc-uc|Zenith z29 ANSI mode with keyclick and underscore cursor, + rs1=\E<\E[1;24r\E[24;1H\E[?7h\E[>1;2;3;4;5;6;7;8;9l\E[m\E[11 + m, + use=z29a, +-z29a-nkc-bc|h29a-nkc-bc|Zenith z29 ansi mode with block cursor and no keyclick, ++z29a-nkc-bc|h29a-nkc-bc|Zenith z29 ANSI mode with block cursor and no keyclick, + rs1=\E<\E[1;24r\E[24;1H\E[?7h\E[>2;4h\E[>1;3;5;6;7;8;9l\E[m + \E[11m, + use=z29a, +-z29a-nkc-uc|h29a-nkc-uc|Zenith z29 ansi mode with underscore cursor and no keyclick, ++z29a-nkc-uc|h29a-nkc-uc|Zenith z29 ANSI mode with underscore cursor and no keyclick, + rs1=\E<\E[1;24r\E[24;1H\E[?7h\E[>2h\E[>1;3;4;5;6;7;8;9l\E[m + \E[11m, + use=z29a, +@@ -22929,7 +22944,7 @@ + # graphics and DEC VT100/VT52 + ADM-3A emulation with a VT220-style keyboard. + # + +-modgraph|mod24|modgraph terminal emulating vt100, ++modgraph|mod24|modgraph terminal emulating VT100, + xenl@, + cols#80, lines#24, + cvvis=\E\^9;0s\E\^7;1s, +@@ -23249,7 +23264,7 @@ + # sets 80 col mode, normal video, autowrap on (for ). + # Seems to be no way to get rid of status line. + # The manual for this puppy was dated June 1981. It claims to be VT52- +-# compatible but looks more vt100-like. ++# compatible but looks more VT100-like. + tab132|tab|tab132-15|tab 132/15, + da, db, + OTdN@, cols#80, lines#24, lm#96, +@@ -23377,7 +23392,7 @@ + # + # Texas Instruments 916 VDT 7 bit control mode + # +-ti916|ti916-220-7|Texas Instruments 916 VDT 8859/1 vt220 mode 7 bit CTRL, ++ti916|ti916-220-7|Texas Instruments 916 VDT 8859/1 VT220 mode 7 bit CTRL, + da, db, in, msgr, + cbt=\E[Z, clear=\E[H\E[2J$<6>, cub=\E[%p1%dD, + cud=\E[%p1%dB, cuf=\E[%p1%dC, cup=\E[%i%p1%d;%p2%dH, +@@ -23396,7 +23411,7 @@ + # + # Texas Instruments 916 VDT 8 bit control mode + # +-ti916-8|ti916-220-8|Texas Instruments 916 VDT 8859/1 8 vt220 mode bit CTRL, ++ti916-8|ti916-220-8|Texas Instruments 916 VDT 8859/1 8 VT220 mode bit CTRL, + kcmd=\23329~, kcub1=\233D, kcud1=\233B, kcuf1=\233C, + kcuu1=\233A, kdch1=\233P, kent=\n, kf1=\23317~, + kf10=\23328~, kf11=\23329~, kf12=\23331~, kf2=\23318~, +@@ -23406,12 +23421,12 @@ + # + # Texas Instruments 916 VDT 8859/1 7 bit control 132 column mode + # +-ti916-132|Texas Instruments 916 VDT vt220 132 column, ++ti916-132|Texas Instruments 916 VDT VT220 132 column, + cols#132, use=ti916, + # + # Texas Instruments 916 VDT 8859/1 8 bit control 132 column mode + # +-ti916-8-132|Texas Instruments 916 VDT 8-bit vt220 132 column, ++ti916-8-132|Texas Instruments 916 VDT 8-bit VT220 132 column, + cols#132, use=ti916-8, + ti924|Texas Instruments 924 VDT 8859/1 7 bit CTRL, + OTbs, am, xon, +@@ -24005,7 +24020,7 @@ + # Software (formerly Peripherals Computers & Supplies, Inc) of + # 2457 Perkiomen Ave., Reading, PA 19606, 1-800-876-8376. They can + # also be reached at support@synergy.com. +-versaterm|VersaTerm vt100 emulator for the Macintosh, ++versaterm|VersaTerm VT100 emulator for the Macintosh, + am, xenl, + cols#80, it#8, lines#24, + bel=^G, blink=\E[5m$<2/>, bold=\E[1m$<2/>, +@@ -24181,7 +24196,7 @@ + dch1=\E6, home=\ET, ht=^I, ich1=\E5, il1=\E3, ind=\n, kbs=^H, + kcub1=^H, kcud1=\n, nel=\r\n, ri=\Ew, + # The d800 was an early portable terminal from c.1984-85 that looked a lot +-# like the original Compaq `lunchbox' portable (but no handle). It had a vt220 ++# like the original Compaq `lunchbox' portable (but no handle). It had a VT220 + # mode (which is what this entry looks like) and several other lesser-known + # emulations. + d800|Direct 800/A, +@@ -25195,6 +25210,7 @@ + # + #### Miscellaneous extensions: + # ++# csr clears the status line + # gsbom/grbom are used to enable/disable real bold (not intensity bright) mode. + # This was implemented for the Hurd. + # rmxx/smxx describes the ECMA-48 strikeout/crossed-out attributes, as an +@@ -27300,4 +27316,8 @@ + # 2021-11-20 + # + add dim, ecma+strikeout to st-0.6 -TD + # ++# 2021-11-27 ++# + fix errata in description fields (report by Eric Lindblad) -TD ++# + add x10term+sl, aixterm+sl, ncr260vp+sl, ncr260vp+vt, wyse+sl -TD ++# + ######## SHANTIH! SHANTIH! SHANTIH! +Index: package/debian-mingw/changelog +--- ncurses-6.3-20211120+/package/debian-mingw/changelog 2021-11-20 12:06:33.000000000 +0000 ++++ ncurses-6.3-20211127/package/debian-mingw/changelog 2021-11-21 16:19:20.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20211120) unstable; urgency=low ++ncurses6 (6.3+20211127) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sat, 20 Nov 2021 07:06:33 -0500 ++ -- Thomas E. Dickey Sun, 21 Nov 2021 11:19:20 -0500 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian-mingw64/changelog +--- ncurses-6.3-20211120+/package/debian-mingw64/changelog 2021-11-20 12:06:33.000000000 +0000 ++++ ncurses-6.3-20211127/package/debian-mingw64/changelog 2021-11-21 16:19:20.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20211120) unstable; urgency=low ++ncurses6 (6.3+20211127) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sat, 20 Nov 2021 07:06:33 -0500 ++ -- Thomas E. Dickey Sun, 21 Nov 2021 11:19:20 -0500 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian/changelog +--- ncurses-6.3-20211120+/package/debian/changelog 2021-11-20 12:06:33.000000000 +0000 ++++ ncurses-6.3-20211127/package/debian/changelog 2021-11-21 16:19:20.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20211120) unstable; urgency=low ++ncurses6 (6.3+20211127) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sat, 20 Nov 2021 07:06:33 -0500 ++ -- Thomas E. Dickey Sun, 21 Nov 2021 11:19:20 -0500 + + ncurses6 (5.9-20120608) unstable; urgency=low + +Index: package/mingw-ncurses.nsi +Prereq: 1.493 +--- ncurses-6.3-20211120+/package/mingw-ncurses.nsi 2021-11-20 12:06:33.000000000 +0000 ++++ ncurses-6.3-20211127/package/mingw-ncurses.nsi 2021-11-21 16:19:20.000000000 +0000 +@@ -1,4 +1,4 @@ +-; $Id: mingw-ncurses.nsi,v 1.493 2021/11/20 12:06:33 tom Exp $ ++; $Id: mingw-ncurses.nsi,v 1.494 2021/11/21 16:19:20 tom Exp $ + + ; TODO add examples + ; TODO bump ABI to 6 +@@ -10,7 +10,7 @@ + !define VERSION_MAJOR "6" + !define VERSION_MINOR "3" + !define VERSION_YYYY "2021" +-!define VERSION_MMDD "1120" ++!define VERSION_MMDD "1127" + !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} + + !define MY_ABI "5" +Index: package/mingw-ncurses.spec +--- ncurses-6.3-20211120+/package/mingw-ncurses.spec 2021-11-20 12:06:33.000000000 +0000 ++++ ncurses-6.3-20211127/package/mingw-ncurses.spec 2021-11-21 16:19:20.000000000 +0000 +@@ -3,7 +3,7 @@ + Summary: shared libraries for terminal handling + Name: mingw32-ncurses6 + Version: 6.3 +-Release: 20211120 ++Release: 20211127 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncurses.spec +--- ncurses-6.3-20211120+/package/ncurses.spec 2021-11-20 12:06:33.000000000 +0000 ++++ ncurses-6.3-20211127/package/ncurses.spec 2021-11-21 16:19:20.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: shared libraries for terminal handling + Name: ncurses6 + Version: 6.3 +-Release: 20211120 ++Release: 20211127 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncursest.spec +--- ncurses-6.3-20211120+/package/ncursest.spec 2021-11-20 12:06:33.000000000 +0000 ++++ ncurses-6.3-20211127/package/ncursest.spec 2021-11-21 16:19:20.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: Curses library with POSIX thread support. + Name: ncursest6 + Version: 6.3 +-Release: 20211120 ++Release: 20211127 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz diff --git a/system/ncurses/ncurses-6.3-20211204.patch b/system/ncurses/ncurses-6.3-20211204.patch new file mode 100644 index 000000000..7020ce7f7 --- /dev/null +++ b/system/ncurses/ncurses-6.3-20211204.patch @@ -0,0 +1,5913 @@ +# ncurses 6.3 - patch 20211204 - Thomas E. Dickey +# +# ------------------------------------------------------------------------------ +# +# Ncurses 6.3 is at +# ftp://ftp.invisible-island.net/ncurses/ +# https://invisible-mirror.net/archives/ncurses/ +# https://ftp.gnu.org/gnu/ncurses/ +# +# Patches for ncurses 6.3 can be found at +# ftp://ftp.invisible-island.net/ncurses/6.3 +# https://invisible-mirror.net/archives/ncurses/6.3 +# +# ------------------------------------------------------------------------------ +# ftp://ftp.invisible-island.net/ncurses/6.3/ncurses-6.3-20211204.patch.gz +# patch by Thomas E. Dickey +# created Mon Dec 6 21:34:05 UTC 2021 +# ------------------------------------------------------------------------------ +# Ada95/include/ncurses_defs | 7 +# NEWS | 5 +# VERSION | 2 +# aclocal.m4 | 59 + +# configure | 1752 ++++++++++++++++++++----------------- +# configure.in | 8 +# dist.mk | 4 +# include/ncurses_defs | 4 +# package/debian-mingw/changelog | 4 +# package/debian-mingw64/changelog | 4 +# package/debian/changelog | 4 +# package/mingw-ncurses.nsi | 4 +# package/mingw-ncurses.spec | 2 +# package/ncurses.spec | 2 +# package/ncursest.spec | 2 +# progs/tset.c | 8 +# 16 files changed, 1044 insertions(+), 827 deletions(-) +# ------------------------------------------------------------------------------ +Index: Ada95/include/ncurses_defs +Prereq: 1.46 +--- ncurses-6.3-20211127+/Ada95/include/ncurses_defs 2021-06-17 21:20:30.000000000 +0000 ++++ ncurses-6.3-20211204/Ada95/include/ncurses_defs 2021-12-04 23:08:11.000000000 +0000 +@@ -1,4 +1,4 @@ +-# $Id: ncurses_defs,v 1.46 2021/06/17 21:20:30 tom Exp $ ++# $Id: ncurses_defs,v 1.47 2021/12/04 23:08:11 tom Exp $ + ############################################################################## + # Copyright 2020,2021 Thomas E. Dickey # + # Copyright 2008-2012,2013 Free Software Foundation, Inc. # +@@ -63,7 +63,6 @@ + HAVE_GETOPT_H + HAVE_GETPARX 1 + HAVE_GETTIMEOFDAY +-HAVE_GETTTYNAM + HAVE_GETWIN 1 + HAVE_GPM_H + HAVE_GPP_BUILTIN_H +@@ -111,10 +110,7 @@ + HAVE_RESIZE_TERM + HAVE_RIPOFFLINE 1 + HAVE_SELECT +-HAVE_SETBUF +-HAVE_SETBUFFER + HAVE_SETUPTERM 1 +-HAVE_SETVBUF + HAVE_SIGACTION + HAVE_SIGVEC + HAVE_SIZECHANGE +@@ -143,7 +139,6 @@ + HAVE_TIGETNUM 1 + HAVE_TIGETSTR 1 + HAVE_TIMES +-HAVE_TTYENT_H + HAVE_TYPEAHEAD 1 + HAVE_TYPEINFO + HAVE_TYPE_ATTR_T +Index: NEWS +Prereq: 1.3750 +--- ncurses-6.3-20211127+/NEWS 2021-11-27 21:35:08.000000000 +0000 ++++ ncurses-6.3-20211204/NEWS 2021-12-04 23:03:57.000000000 +0000 +@@ -26,7 +26,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: NEWS,v 1.3750 2021/11/21 16:19:20 tom Exp $ ++-- $Id: NEWS,v 1.3753 2021/12/04 23:03:57 tom Exp $ + ------------------------------------------------------------------------------- + + This is a log of changes that ncurses has gone through since Zeyd started +@@ -46,6 +46,9 @@ + Changes through 1.9.9e did not credit all contributions; + it is not possible to add this information. + ++20211204 ++ + improve configure check for getttynam (report by Werner Fink). ++ + 20211127 + + fix errata in description fields (report by Eric Lindblad) -TD + + add x10term+sl, aixterm+sl, ncr260vp+sl, ncr260vp+vt, wyse+sl -TD +Index: VERSION +--- ncurses-6.3-20211127+/VERSION 2021-11-27 15:02:04.000000000 +0000 ++++ ncurses-6.3-20211204/VERSION 2021-12-04 12:21:05.000000000 +0000 +@@ -1 +1 @@ +-5:0:10 6.3 20211127 ++5:0:10 6.3 20211204 +Index: aclocal.m4 +Prereq: 1.997 +--- ncurses-6.3-20211127+/aclocal.m4 2021-11-20 19:56:38.000000000 +0000 ++++ ncurses-6.3-20211204/aclocal.m4 2021-12-04 23:30:56.000000000 +0000 +@@ -29,7 +29,7 @@ + dnl + dnl Author: Thomas E. Dickey 1995-on + dnl +-dnl $Id: aclocal.m4,v 1.997 2021/11/20 19:56:38 tom Exp $ ++dnl $Id: aclocal.m4,v 1.999 2021/12/04 23:30:56 tom Exp $ + dnl Macros used in NCURSES auto-configuration script. + dnl + dnl These macros are maintained separately from NCURSES. The copyright on +@@ -2544,6 +2544,61 @@ + fi + ]) + dnl --------------------------------------------------------------------------- ++dnl CF_FUNC_GETTTYNAM version: 1 updated: 2021/12/04 18:29:47 ++dnl ----------------- ++dnl Check if the 4.3BSD function getttyname exists, as well as if ++dnl defines the _PATH_TTYS symbol. If the corresponding file exists, but the ++dnl other checks fail, just define HAVE_PATH_TTYS. ++AC_DEFUN([CF_FUNC_GETTTYNAM],[ ++AC_CACHE_CHECK(if _PATH_TTYS is defined in ttyent.h,cf_cv_PATH_TTYS,[ ++AC_TRY_COMPILE([ ++#include ++#include ],[ ++FILE *fp = fopen(_PATH_TTYS, "r"); (void)fp], ++ [cf_cv_PATH_TTYS=yes], ++ [cf_cv_PATH_TTYS=no])]) ++ ++if test $cf_cv_PATH_TTYS = no ++then ++ for cf_ttys in /etc/ttytype /etc/ttys ++ do ++ if test -f $cf_ttys ++ then ++ cf_cv_PATH_TTYS=maybe ++ AC_DEFINE(_PATH_TTYS,$cf_ttys,[define to pathname of file containing mapping from tty name to terminal type]) ++ break ++ fi ++ done ++fi ++ ++if test $cf_cv_PATH_TTYS != no ++then ++ AC_CACHE_CHECK(if _PATH_TTYS file exists,cf_cv_have_PATH_TTYS,[ ++ AC_TRY_RUN([ ++#include ++#include ++int main(void) { ++ FILE *fp = fopen(_PATH_TTYS, "r"); ++ ${cf_cv_main_return:-return} (fp == 0); ++}], ++ [cf_cv_have_PATH_TTYS=yes], ++ [cf_cv_have_PATH_TTYS=no], ++ [cf_cv_have_PATH_TTYS=unknown])]) ++ test "$cf_cv_have_PATH_TTYS" = no && cf_cv_PATH_TTYS=no ++fi ++ ++if test $cf_cv_PATH_TTYS != no ++then ++ AC_DEFINE(HAVE_PATH_TTYS,1,[define to 1 if system can map tty name to terminal type]) ++ AC_CACHE_CHECK(for getttynam,cf_cv_func_getttynam,[ ++ AC_TRY_LINK([#include ], ++ [struct ttyent *fp = getttynam("/dev/tty"); (void)fp], ++ [cf_cv_func_getttynam=yes], ++ [cf_cv_func_getttynam=no])]) ++ test "$cf_cv_func_getttynam" = yes && AC_DEFINE(HAVE_GETTTYNAM) ++fi ++])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_FUNC_MEMMOVE version: 9 updated: 2017/01/21 11:06:25 + dnl --------------- + dnl Check for memmove, or a bcopy that can handle overlapping copy. If neither +@@ -9238,7 +9293,7 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_WITH_PKG_CONFIG_LIBDIR version: 18 updated: 2021/11/20 12:48:37 ++dnl CF_WITH_PKG_CONFIG_LIBDIR version: 19 updated: 2021/11/20 14:57:36 + dnl ------------------------- + dnl Allow the choice of the pkg-config library directory to be overridden. + dnl +Index: configure +--- ncurses-6.3-20211127+/configure 2021-11-20 19:57:11.000000000 +0000 ++++ ncurses-6.3-20211204/configure 2021-12-04 23:19:34.000000000 +0000 +@@ -20054,29 +20054,28 @@ + sys/select.h \ + sys/time.h \ + sys/times.h \ +-ttyent.h \ + unistd.h \ + wctype.h \ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:20063: checking for $ac_header" >&5 ++echo "$as_me:20062: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20069 "configure" ++#line 20068 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:20073: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:20072: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:20079: \$? = $ac_status" >&5 ++ echo "$as_me:20078: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -20095,7 +20094,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:20098: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:20097: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:20110: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20117 "configure" ++#line 20116 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:20121: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:20120: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:20127: \$? = $ac_status" >&5 ++ echo "$as_me:20126: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -20143,7 +20142,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:20146: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:20145: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:20155: checking for header declaring getopt variables" >&5 + echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6 + if test "${cf_cv_getopt_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -20163,7 +20162,7 @@ + for cf_header in stdio.h stdlib.h unistd.h getopt.h + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20166 "configure" ++#line 20165 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -20176,16 +20175,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20179: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20178: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20182: \$? = $ac_status" >&5 ++ echo "$as_me:20181: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20185: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20184: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20188: \$? = $ac_status" >&5 ++ echo "$as_me:20187: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_getopt_header=$cf_header + break +@@ -20197,7 +20196,7 @@ + done + + fi +-echo "$as_me:20200: result: $cf_cv_getopt_header" >&5 ++echo "$as_me:20199: result: $cf_cv_getopt_header" >&5 + echo "${ECHO_T}$cf_cv_getopt_header" >&6 + if test "$cf_cv_getopt_header" != none ; then + +@@ -20214,14 +20213,14 @@ + + fi + +-echo "$as_me:20217: checking if external environ is declared" >&5 ++echo "$as_me:20216: checking if external environ is declared" >&5 + echo $ECHO_N "checking if external environ is declared... $ECHO_C" >&6 + if test "${cf_cv_dcl_environ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20224 "configure" ++#line 20223 "configure" + #include "confdefs.h" + + #ifdef HAVE_STDLIB_H +@@ -20237,16 +20236,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20240: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20239: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20243: \$? = $ac_status" >&5 ++ echo "$as_me:20242: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20246: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20245: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20249: \$? = $ac_status" >&5 ++ echo "$as_me:20248: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_dcl_environ=yes + else +@@ -20257,7 +20256,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:20260: result: $cf_cv_dcl_environ" >&5 ++echo "$as_me:20259: result: $cf_cv_dcl_environ" >&5 + echo "${ECHO_T}$cf_cv_dcl_environ" >&6 + + if test "$cf_cv_dcl_environ" = no ; then +@@ -20272,14 +20271,14 @@ + + # It's possible (for near-UNIX clones) that the data doesn't exist + +-echo "$as_me:20275: checking if external environ exists" >&5 ++echo "$as_me:20274: checking if external environ exists" >&5 + echo $ECHO_N "checking if external environ exists... $ECHO_C" >&6 + if test "${cf_cv_have_environ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20282 "configure" ++#line 20281 "configure" + #include "confdefs.h" + + #undef environ +@@ -20294,16 +20293,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:20297: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20296: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20300: \$? = $ac_status" >&5 ++ echo "$as_me:20299: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:20303: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20302: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20306: \$? = $ac_status" >&5 ++ echo "$as_me:20305: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have_environ=yes + else +@@ -20314,7 +20313,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + fi +-echo "$as_me:20317: result: $cf_cv_have_environ" >&5 ++echo "$as_me:20316: result: $cf_cv_have_environ" >&5 + echo "${ECHO_T}$cf_cv_have_environ" >&6 + + if test "$cf_cv_have_environ" = yes ; then +@@ -20327,13 +20326,13 @@ + + fi + +-echo "$as_me:20330: checking for getenv" >&5 ++echo "$as_me:20329: checking for getenv" >&5 + echo $ECHO_N "checking for getenv... $ECHO_C" >&6 + if test "${ac_cv_func_getenv+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20336 "configure" ++#line 20335 "configure" + #include "confdefs.h" + #define getenv autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -20364,16 +20363,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:20367: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20366: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20370: \$? = $ac_status" >&5 ++ echo "$as_me:20369: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:20373: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20372: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20376: \$? = $ac_status" >&5 ++ echo "$as_me:20375: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_getenv=yes + else +@@ -20383,19 +20382,19 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:20386: result: $ac_cv_func_getenv" >&5 ++echo "$as_me:20385: result: $ac_cv_func_getenv" >&5 + echo "${ECHO_T}$ac_cv_func_getenv" >&6 + + for ac_func in putenv setenv strdup + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:20392: checking for $ac_func" >&5 ++echo "$as_me:20391: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20398 "configure" ++#line 20397 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -20426,16 +20425,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:20429: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20428: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20432: \$? = $ac_status" >&5 ++ echo "$as_me:20431: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:20435: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20434: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20438: \$? = $ac_status" >&5 ++ echo "$as_me:20437: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -20445,7 +20444,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:20448: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:20447: result: `eval echo '${'"$as_ac_var"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 + if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:20457: checking if getenv returns consistent values" >&5 + echo $ECHO_N "checking if getenv returns consistent values... $ECHO_C" >&6 + if test "${cf_cv_consistent_getenv+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -20465,7 +20464,7 @@ + cf_cv_consistent_getenv=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20468 "configure" ++#line 20467 "configure" + #include "confdefs.h" + + #include +@@ -20574,15 +20573,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:20577: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20576: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20580: \$? = $ac_status" >&5 ++ echo "$as_me:20579: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:20582: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20581: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20585: \$? = $ac_status" >&5 ++ echo "$as_me:20584: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_consistent_getenv=yes + else +@@ -20595,7 +20594,7 @@ + fi + + fi +-echo "$as_me:20598: result: $cf_cv_consistent_getenv" >&5 ++echo "$as_me:20597: result: $cf_cv_consistent_getenv" >&5 + echo "${ECHO_T}$cf_cv_consistent_getenv" >&6 + + if test "x$cf_cv_consistent_getenv" = xno +@@ -20610,18 +20609,18 @@ + if test "x$cf_cv_consistent_getenv" = xno && \ + test "x$cf_with_trace" = xyes + then +- { echo "$as_me:20613: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5 ++ { echo "$as_me:20612: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5 + echo "$as_me: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&2;} + fi + +-echo "$as_me:20617: checking if sys/time.h works with sys/select.h" >&5 ++echo "$as_me:20616: checking if sys/time.h works with sys/select.h" >&5 + echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6 + if test "${cf_cv_sys_time_select+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20624 "configure" ++#line 20623 "configure" + #include "confdefs.h" + + #include +@@ -20641,16 +20640,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20644: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20643: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20647: \$? = $ac_status" >&5 ++ echo "$as_me:20646: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20650: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20649: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20653: \$? = $ac_status" >&5 ++ echo "$as_me:20652: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_sys_time_select=yes + else +@@ -20662,7 +20661,7 @@ + + fi + +-echo "$as_me:20665: result: $cf_cv_sys_time_select" >&5 ++echo "$as_me:20664: result: $cf_cv_sys_time_select" >&5 + echo "${ECHO_T}$cf_cv_sys_time_select" >&6 + test "$cf_cv_sys_time_select" = yes && + cat >>confdefs.h <<\EOF +@@ -20677,13 +20676,13 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_main_return="return" + +-echo "$as_me:20680: checking for an ANSI C-conforming const" >&5 ++echo "$as_me:20679: checking for an ANSI C-conforming const" >&5 + echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 + if test "${ac_cv_c_const+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20686 "configure" ++#line 20685 "configure" + #include "confdefs.h" + + int +@@ -20741,16 +20740,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20744: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20743: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20747: \$? = $ac_status" >&5 ++ echo "$as_me:20746: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20750: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20749: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20753: \$? = $ac_status" >&5 ++ echo "$as_me:20752: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_c_const=yes + else +@@ -20760,7 +20759,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:20763: result: $ac_cv_c_const" >&5 ++echo "$as_me:20762: result: $ac_cv_c_const" >&5 + echo "${ECHO_T}$ac_cv_c_const" >&6 + if test $ac_cv_c_const = no; then + +@@ -20770,7 +20769,7 @@ + + fi + +-echo "$as_me:20773: checking for inline" >&5 ++echo "$as_me:20772: checking for inline" >&5 + echo $ECHO_N "checking for inline... $ECHO_C" >&6 + if test "${ac_cv_c_inline+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -20778,7 +20777,7 @@ + ac_cv_c_inline=no + for ac_kw in inline __inline__ __inline; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20781 "configure" ++#line 20780 "configure" + #include "confdefs.h" + #ifndef __cplusplus + static $ac_kw int static_foo () {return 0; } +@@ -20787,16 +20786,16 @@ + + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20790: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20789: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20793: \$? = $ac_status" >&5 ++ echo "$as_me:20792: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20796: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20795: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20799: \$? = $ac_status" >&5 ++ echo "$as_me:20798: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_c_inline=$ac_kw; break + else +@@ -20807,7 +20806,7 @@ + done + + fi +-echo "$as_me:20810: result: $ac_cv_c_inline" >&5 ++echo "$as_me:20809: result: $ac_cv_c_inline" >&5 + echo "${ECHO_T}$ac_cv_c_inline" >&6 + case $ac_cv_c_inline in + inline | yes) ;; +@@ -20833,7 +20832,7 @@ + : + elif test "$GCC" = yes + then +- echo "$as_me:20836: checking if $CC supports options to tune inlining" >&5 ++ echo "$as_me:20835: checking if $CC supports options to tune inlining" >&5 + echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6 + if test "${cf_cv_gcc_inline+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -20842,7 +20841,7 @@ + cf_save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS --param max-inline-insns-single=1200" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20845 "configure" ++#line 20844 "configure" + #include "confdefs.h" + inline int foo(void) { return 1; } + int +@@ -20854,16 +20853,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20857: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20856: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20860: \$? = $ac_status" >&5 ++ echo "$as_me:20859: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20863: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20862: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20866: \$? = $ac_status" >&5 ++ echo "$as_me:20865: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_gcc_inline=yes + else +@@ -20875,7 +20874,7 @@ + CFLAGS=$cf_save_CFLAGS + + fi +-echo "$as_me:20878: result: $cf_cv_gcc_inline" >&5 ++echo "$as_me:20877: result: $cf_cv_gcc_inline" >&5 + echo "${ECHO_T}$cf_cv_gcc_inline" >&6 + if test "$cf_cv_gcc_inline" = yes ; then + +@@ -20981,7 +20980,7 @@ + fi + fi + +-echo "$as_me:20984: checking for signal global datatype" >&5 ++echo "$as_me:20983: checking for signal global datatype" >&5 + echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6 + if test "${cf_cv_sig_atomic_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -20993,7 +20992,7 @@ + "int" + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20996 "configure" ++#line 20995 "configure" + #include "confdefs.h" + + #include +@@ -21017,16 +21016,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:21020: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21019: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21023: \$? = $ac_status" >&5 ++ echo "$as_me:21022: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:21026: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21025: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21029: \$? = $ac_status" >&5 ++ echo "$as_me:21028: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_sig_atomic_t=$cf_type + else +@@ -21040,7 +21039,7 @@ + + fi + +-echo "$as_me:21043: result: $cf_cv_sig_atomic_t" >&5 ++echo "$as_me:21042: result: $cf_cv_sig_atomic_t" >&5 + echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6 + test "$cf_cv_sig_atomic_t" != no && + cat >>confdefs.h <&5 ++echo "$as_me:21051: checking for type of chtype" >&5 + echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 + if test "${cf_cv_typeof_chtype+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -21059,7 +21058,7 @@ + cf_cv_typeof_chtype=long + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21062 "configure" ++#line 21061 "configure" + #include "confdefs.h" + + #define WANT_BITS 31 +@@ -21094,15 +21093,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:21097: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21096: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21100: \$? = $ac_status" >&5 ++ echo "$as_me:21099: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:21102: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21101: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21105: \$? = $ac_status" >&5 ++ echo "$as_me:21104: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_typeof_chtype=`cat cf_test.out` + else +@@ -21117,7 +21116,7 @@ + + fi + +-echo "$as_me:21120: result: $cf_cv_typeof_chtype" >&5 ++echo "$as_me:21119: result: $cf_cv_typeof_chtype" >&5 + echo "${ECHO_T}$cf_cv_typeof_chtype" >&6 + + cat >>confdefs.h <&5 ++echo "$as_me:21131: checking if unsigned literals are legal" >&5 + echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6 + if test "${cf_cv_unsigned_literals+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21139 "configure" ++#line 21138 "configure" + #include "confdefs.h" + + int +@@ -21148,16 +21147,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:21151: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21150: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21154: \$? = $ac_status" >&5 ++ echo "$as_me:21153: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:21157: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21156: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21160: \$? = $ac_status" >&5 ++ echo "$as_me:21159: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_unsigned_literals=yes + else +@@ -21169,7 +21168,7 @@ + + fi + +-echo "$as_me:21172: result: $cf_cv_unsigned_literals" >&5 ++echo "$as_me:21171: result: $cf_cv_unsigned_literals" >&5 + echo "${ECHO_T}$cf_cv_unsigned_literals" >&6 + + cf_cv_1UL="1" +@@ -21185,14 +21184,14 @@ + + ### Checks for external-data + +-echo "$as_me:21188: checking if external errno is declared" >&5 ++echo "$as_me:21187: checking if external errno is declared" >&5 + echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6 + if test "${cf_cv_dcl_errno+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21195 "configure" ++#line 21194 "configure" + #include "confdefs.h" + + #ifdef HAVE_STDLIB_H +@@ -21210,16 +21209,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:21213: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21212: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21216: \$? = $ac_status" >&5 ++ echo "$as_me:21215: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:21219: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21218: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21222: \$? = $ac_status" >&5 ++ echo "$as_me:21221: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_dcl_errno=yes + else +@@ -21230,7 +21229,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:21233: result: $cf_cv_dcl_errno" >&5 ++echo "$as_me:21232: result: $cf_cv_dcl_errno" >&5 + echo "${ECHO_T}$cf_cv_dcl_errno" >&6 + + if test "$cf_cv_dcl_errno" = no ; then +@@ -21245,14 +21244,14 @@ + + # It's possible (for near-UNIX clones) that the data doesn't exist + +-echo "$as_me:21248: checking if external errno exists" >&5 ++echo "$as_me:21247: checking if external errno exists" >&5 + echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6 + if test "${cf_cv_have_errno+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21255 "configure" ++#line 21254 "configure" + #include "confdefs.h" + + #undef errno +@@ -21267,16 +21266,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21270: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21269: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21273: \$? = $ac_status" >&5 ++ echo "$as_me:21272: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21276: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21275: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21279: \$? = $ac_status" >&5 ++ echo "$as_me:21278: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have_errno=yes + else +@@ -21287,7 +21286,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + fi +-echo "$as_me:21290: result: $cf_cv_have_errno" >&5 ++echo "$as_me:21289: result: $cf_cv_have_errno" >&5 + echo "${ECHO_T}$cf_cv_have_errno" >&6 + + if test "$cf_cv_have_errno" = yes ; then +@@ -21300,7 +21299,7 @@ + + fi + +-echo "$as_me:21303: checking if data-only library module links" >&5 ++echo "$as_me:21302: checking if data-only library module links" >&5 + echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6 + if test "${cf_cv_link_dataonly+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -21308,20 +21307,20 @@ + + rm -f conftest.a + cat >conftest.$ac_ext <&5 ++ if { (eval echo "$as_me:21313: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21317: \$? = $ac_status" >&5 ++ echo "$as_me:21316: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then + mv conftest.o data.o && \ + ( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null + fi + rm -f conftest.$ac_ext data.o + cat >conftest.$ac_ext <&5 ++ if { (eval echo "$as_me:21336: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21340: \$? = $ac_status" >&5 ++ echo "$as_me:21339: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then + mv conftest.o func.o && \ + ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null +@@ -21350,7 +21349,7 @@ + cf_cv_link_dataonly=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21353 "configure" ++#line 21352 "configure" + #include "confdefs.h" + + int main(void) +@@ -21361,15 +21360,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:21364: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21363: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21367: \$? = $ac_status" >&5 ++ echo "$as_me:21366: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:21369: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21368: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21372: \$? = $ac_status" >&5 ++ echo "$as_me:21371: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_link_dataonly=yes + else +@@ -21384,7 +21383,7 @@ + + fi + +-echo "$as_me:21387: result: $cf_cv_link_dataonly" >&5 ++echo "$as_me:21386: result: $cf_cv_link_dataonly" >&5 + echo "${ECHO_T}$cf_cv_link_dataonly" >&6 + + if test "$cf_cv_link_dataonly" = no ; then +@@ -21403,7 +21402,6 @@ + getegid \ + geteuid \ + getopt \ +-getttynam \ + issetugid \ + localeconv \ + poll \ +@@ -21428,13 +21426,13 @@ + + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:21431: checking for $ac_func" >&5 ++echo "$as_me:21429: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21437 "configure" ++#line 21435 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -21465,16 +21463,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21468: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21466: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21471: \$? = $ac_status" >&5 ++ echo "$as_me:21469: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21474: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21472: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21477: \$? = $ac_status" >&5 ++ echo "$as_me:21475: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -21484,7 +21482,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:21487: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:21485: result: `eval echo '${'"$as_ac_var"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 + if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo $ECHO_N "checking if _PATH_TTYS is defined in ttyent.h... $ECHO_C" >&6 ++if test "${cf_cv_PATH_TTYS+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ++cat >"conftest.$ac_ext" <<_ACEOF ++#line 21502 "configure" ++#include "confdefs.h" ++ ++#include ++#include ++int ++main (void) ++{ ++ ++FILE *fp = fopen(_PATH_TTYS, "r"); (void)fp ++ ; ++ return 0; ++} ++_ACEOF ++rm -f "conftest.$ac_objext" ++if { (eval echo "$as_me:21517: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:21520: \$? = $ac_status" >&5 ++ (exit "$ac_status"); } && ++ { ac_try='test -s "conftest.$ac_objext"' ++ { (eval echo "$as_me:21523: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:21526: \$? = $ac_status" >&5 ++ (exit "$ac_status"); }; }; then ++ cf_cv_PATH_TTYS=yes ++else ++ echo "$as_me: failed program was:" >&5 ++cat "conftest.$ac_ext" >&5 ++cf_cv_PATH_TTYS=no ++fi ++rm -f "conftest.$ac_objext" "conftest.$ac_ext" ++fi ++echo "$as_me:21536: result: $cf_cv_PATH_TTYS" >&5 ++echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6 ++ ++if test $cf_cv_PATH_TTYS = no ++then ++ for cf_ttys in /etc/ttytype /etc/ttys ++ do ++ if test -f $cf_ttys ++ then ++ cf_cv_PATH_TTYS=maybe ++ ++cat >>confdefs.h <<\EOF ++#define _PATH_TTYS $cf_ttys ++EOF ++ ++ break ++ fi ++ done ++fi ++ ++if test $cf_cv_PATH_TTYS != no ++then ++ echo "$as_me:21558: checking if _PATH_TTYS file exists" >&5 ++echo $ECHO_N "checking if _PATH_TTYS file exists... $ECHO_C" >&6 ++if test "${cf_cv_have_PATH_TTYS+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ++ if test "$cross_compiling" = yes; then ++ cf_cv_have_PATH_TTYS=unknown ++else ++ cat >"conftest.$ac_ext" <<_ACEOF ++#line 21568 "configure" ++#include "confdefs.h" ++ ++#include ++#include ++int main(void) { ++ FILE *fp = fopen(_PATH_TTYS, "r"); ++ ${cf_cv_main_return:-return} (fp == 0); ++} ++_ACEOF ++rm -f "conftest$ac_exeext" ++if { (eval echo "$as_me:21579: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:21582: \$? = $ac_status" >&5 ++ (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' ++ { (eval echo "$as_me:21584: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:21587: \$? = $ac_status" >&5 ++ (exit "$ac_status"); }; }; then ++ cf_cv_have_PATH_TTYS=yes ++else ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 ++cat "conftest.$ac_ext" >&5 ++cf_cv_have_PATH_TTYS=no ++fi ++rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" ++fi ++fi ++echo "$as_me:21599: result: $cf_cv_have_PATH_TTYS" >&5 ++echo "${ECHO_T}$cf_cv_have_PATH_TTYS" >&6 ++ test "$cf_cv_have_PATH_TTYS" = no && cf_cv_PATH_TTYS=no ++fi ++ ++if test $cf_cv_PATH_TTYS != no ++then ++ ++cat >>confdefs.h <<\EOF ++#define HAVE_PATH_TTYS 1 ++EOF ++ ++ echo "$as_me:21611: checking for getttynam" >&5 ++echo $ECHO_N "checking for getttynam... $ECHO_C" >&6 ++if test "${cf_cv_func_getttynam+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ++ cat >"conftest.$ac_ext" <<_ACEOF ++#line 21618 "configure" ++#include "confdefs.h" ++#include ++int ++main (void) ++{ ++struct ttyent *fp = getttynam("/dev/tty"); (void)fp ++ ; ++ return 0; ++} ++_ACEOF ++rm -f "conftest.$ac_objext" "conftest$ac_exeext" ++if { (eval echo "$as_me:21630: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:21633: \$? = $ac_status" >&5 ++ (exit "$ac_status"); } && ++ { ac_try='test -s "conftest$ac_exeext"' ++ { (eval echo "$as_me:21636: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:21639: \$? = $ac_status" >&5 ++ (exit "$ac_status"); }; }; then ++ cf_cv_func_getttynam=yes ++else ++ echo "$as_me: failed program was:" >&5 ++cat "conftest.$ac_ext" >&5 ++cf_cv_func_getttynam=no ++fi ++rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" ++fi ++echo "$as_me:21649: result: $cf_cv_func_getttynam" >&5 ++echo "${ECHO_T}$cf_cv_func_getttynam" >&6 ++ test "$cf_cv_func_getttynam" = yes && cat >>confdefs.h <<\EOF ++#define HAVE_GETTTYNAM 1 ++EOF ++ ++fi ++ + if test "x$ac_cv_func_getopt" = xno && \ + test "x$cf_with_progs$cf_with_tests" != xnono; then +- { { echo "$as_me:21499: error: getopt is required for building programs" >&5 ++ { { echo "$as_me:21659: error: getopt is required for building programs" >&5 + echo "$as_me: error: getopt is required for building programs" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -21505,7 +21665,7 @@ + then + if test "x$ac_cv_func_vsnprintf" = xyes + then +- { echo "$as_me:21508: WARNING: will use vsnprintf instead of safe-sprintf option" >&5 ++ { echo "$as_me:21668: WARNING: will use vsnprintf instead of safe-sprintf option" >&5 + echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;} + else + +@@ -21518,14 +21678,14 @@ + + if test "x$with_getcap" = "xyes" ; then + +-echo "$as_me:21521: checking for terminal-capability database functions" >&5 ++echo "$as_me:21681: checking for terminal-capability database functions" >&5 + echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6 + if test "${cf_cv_cgetent+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21528 "configure" ++#line 21688 "configure" + #include "confdefs.h" + + #include +@@ -21545,16 +21705,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21548: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21708: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21551: \$? = $ac_status" >&5 ++ echo "$as_me:21711: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21554: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21714: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21557: \$? = $ac_status" >&5 ++ echo "$as_me:21717: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_cgetent=yes + else +@@ -21565,7 +21725,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + fi +-echo "$as_me:21568: result: $cf_cv_cgetent" >&5 ++echo "$as_me:21728: result: $cf_cv_cgetent" >&5 + echo "${ECHO_T}$cf_cv_cgetent" >&6 + + if test "$cf_cv_cgetent" = yes +@@ -21575,14 +21735,14 @@ + #define HAVE_BSD_CGETENT 1 + EOF + +-echo "$as_me:21578: checking if cgetent uses const parameter" >&5 ++echo "$as_me:21738: checking if cgetent uses const parameter" >&5 + echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6 + if test "${cf_cv_cgetent_const+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21585 "configure" ++#line 21745 "configure" + #include "confdefs.h" + + #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers" +@@ -21605,16 +21765,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21608: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21768: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21611: \$? = $ac_status" >&5 ++ echo "$as_me:21771: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21614: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21774: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21617: \$? = $ac_status" >&5 ++ echo "$as_me:21777: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_cgetent_const=yes + else +@@ -21625,7 +21785,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + fi +-echo "$as_me:21628: result: $cf_cv_cgetent_const" >&5 ++echo "$as_me:21788: result: $cf_cv_cgetent_const" >&5 + echo "${ECHO_T}$cf_cv_cgetent_const" >&6 + if test "$cf_cv_cgetent_const" = yes + then +@@ -21639,14 +21799,14 @@ + + fi + +-echo "$as_me:21642: checking for isascii" >&5 ++echo "$as_me:21802: checking for isascii" >&5 + echo $ECHO_N "checking for isascii... $ECHO_C" >&6 + if test "${cf_cv_have_isascii+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21649 "configure" ++#line 21809 "configure" + #include "confdefs.h" + #include + int +@@ -21658,16 +21818,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21661: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21821: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21664: \$? = $ac_status" >&5 ++ echo "$as_me:21824: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21667: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21827: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21670: \$? = $ac_status" >&5 ++ echo "$as_me:21830: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have_isascii=yes + else +@@ -21678,7 +21838,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + fi +-echo "$as_me:21681: result: $cf_cv_have_isascii" >&5 ++echo "$as_me:21841: result: $cf_cv_have_isascii" >&5 + echo "${ECHO_T}$cf_cv_have_isascii" >&6 + test "$cf_cv_have_isascii" = yes && + cat >>confdefs.h <<\EOF +@@ -21686,10 +21846,10 @@ + EOF + + if test "$ac_cv_func_sigaction" = yes; then +-echo "$as_me:21689: checking whether sigaction needs _POSIX_SOURCE" >&5 ++echo "$as_me:21849: checking whether sigaction needs _POSIX_SOURCE" >&5 + echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21692 "configure" ++#line 21852 "configure" + #include "confdefs.h" + + #include +@@ -21703,16 +21863,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:21706: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21866: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21709: \$? = $ac_status" >&5 ++ echo "$as_me:21869: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:21712: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21872: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21715: \$? = $ac_status" >&5 ++ echo "$as_me:21875: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + sigact_bad=no + else +@@ -21720,7 +21880,7 @@ + cat "conftest.$ac_ext" >&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21723 "configure" ++#line 21883 "configure" + #include "confdefs.h" + + #define _POSIX_SOURCE +@@ -21735,16 +21895,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:21738: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21898: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21741: \$? = $ac_status" >&5 ++ echo "$as_me:21901: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:21744: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21904: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21747: \$? = $ac_status" >&5 ++ echo "$as_me:21907: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + sigact_bad=yes + +@@ -21760,11 +21920,11 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +-echo "$as_me:21763: result: $sigact_bad" >&5 ++echo "$as_me:21923: result: $sigact_bad" >&5 + echo "${ECHO_T}$sigact_bad" >&6 + fi + +-echo "$as_me:21767: checking if nanosleep really works" >&5 ++echo "$as_me:21927: checking if nanosleep really works" >&5 + echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6 + if test "${cf_cv_func_nanosleep+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -21774,7 +21934,7 @@ + cf_cv_func_nanosleep=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21777 "configure" ++#line 21937 "configure" + #include "confdefs.h" + + #include +@@ -21799,15 +21959,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:21802: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21962: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21805: \$? = $ac_status" >&5 ++ echo "$as_me:21965: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:21807: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21967: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21810: \$? = $ac_status" >&5 ++ echo "$as_me:21970: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_nanosleep=yes + else +@@ -21819,7 +21979,7 @@ + rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" + fi + fi +-echo "$as_me:21822: result: $cf_cv_func_nanosleep" >&5 ++echo "$as_me:21982: result: $cf_cv_func_nanosleep" >&5 + echo "${ECHO_T}$cf_cv_func_nanosleep" >&6 + + test "$cf_cv_func_nanosleep" = "yes" && +@@ -21836,23 +21996,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:21839: checking for $ac_header" >&5 ++echo "$as_me:21999: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21845 "configure" ++#line 22005 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:21849: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:22009: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:21855: \$? = $ac_status" >&5 ++ echo "$as_me:22015: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -21871,7 +22031,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:21874: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:22034: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++ echo "$as_me:22051: checking whether termios.h needs _POSIX_SOURCE" >&5 + echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21894 "configure" ++#line 22054 "configure" + #include "confdefs.h" + #include + int +@@ -21903,16 +22063,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:21906: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:22066: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21909: \$? = $ac_status" >&5 ++ echo "$as_me:22069: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:21912: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22072: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21915: \$? = $ac_status" >&5 ++ echo "$as_me:22075: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + termios_bad=no + else +@@ -21920,7 +22080,7 @@ + cat "conftest.$ac_ext" >&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21923 "configure" ++#line 22083 "configure" + #include "confdefs.h" + + #define _POSIX_SOURCE +@@ -21934,16 +22094,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:21937: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:22097: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21940: \$? = $ac_status" >&5 ++ echo "$as_me:22100: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:21943: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22103: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21946: \$? = $ac_status" >&5 ++ echo "$as_me:22106: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + termios_bad=unknown + else +@@ -21959,19 +22119,19 @@ + + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +- echo "$as_me:21962: result: $termios_bad" >&5 ++ echo "$as_me:22122: result: $termios_bad" >&5 + echo "${ECHO_T}$termios_bad" >&6 + fi + fi + +-echo "$as_me:21967: checking for tcgetattr" >&5 ++echo "$as_me:22127: checking for tcgetattr" >&5 + echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6 + if test "${cf_cv_have_tcgetattr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21974 "configure" ++#line 22134 "configure" + #include "confdefs.h" + + #include +@@ -21999,16 +22159,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22002: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22162: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22005: \$? = $ac_status" >&5 ++ echo "$as_me:22165: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22008: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22168: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22011: \$? = $ac_status" >&5 ++ echo "$as_me:22171: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have_tcgetattr=yes + else +@@ -22018,21 +22178,21 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:22021: result: $cf_cv_have_tcgetattr" >&5 ++echo "$as_me:22181: result: $cf_cv_have_tcgetattr" >&5 + echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6 + test "$cf_cv_have_tcgetattr" = yes && + cat >>confdefs.h <<\EOF + #define HAVE_TCGETATTR 1 + EOF + +-echo "$as_me:22028: checking for vsscanf function or workaround" >&5 ++echo "$as_me:22188: checking for vsscanf function or workaround" >&5 + echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6 + if test "${cf_cv_func_vsscanf+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22035 "configure" ++#line 22195 "configure" + #include "confdefs.h" + + #include +@@ -22048,16 +22208,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22051: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22211: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22054: \$? = $ac_status" >&5 ++ echo "$as_me:22214: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22057: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22217: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22060: \$? = $ac_status" >&5 ++ echo "$as_me:22220: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_vsscanf=vsscanf + else +@@ -22065,7 +22225,7 @@ + cat "conftest.$ac_ext" >&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22068 "configure" ++#line 22228 "configure" + #include "confdefs.h" + + #include +@@ -22087,16 +22247,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22090: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22250: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22093: \$? = $ac_status" >&5 ++ echo "$as_me:22253: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22096: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22256: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22099: \$? = $ac_status" >&5 ++ echo "$as_me:22259: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_vsscanf=vfscanf + else +@@ -22104,7 +22264,7 @@ + cat "conftest.$ac_ext" >&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22107 "configure" ++#line 22267 "configure" + #include "confdefs.h" + + #include +@@ -22126,16 +22286,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22129: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22289: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22132: \$? = $ac_status" >&5 ++ echo "$as_me:22292: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22135: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22295: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22138: \$? = $ac_status" >&5 ++ echo "$as_me:22298: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_vsscanf=_doscan + else +@@ -22150,7 +22310,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:22153: result: $cf_cv_func_vsscanf" >&5 ++echo "$as_me:22313: result: $cf_cv_func_vsscanf" >&5 + echo "${ECHO_T}$cf_cv_func_vsscanf" >&6 + + case "$cf_cv_func_vsscanf" in +@@ -22176,23 +22336,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:22179: checking for $ac_header" >&5 ++echo "$as_me:22339: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22185 "configure" ++#line 22345 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:22189: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:22349: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:22195: \$? = $ac_status" >&5 ++ echo "$as_me:22355: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -22211,7 +22371,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:22214: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:22374: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:22384: checking for working mkstemp" >&5 + echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 + if test "${cf_cv_func_mkstemp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -22232,7 +22392,7 @@ + cf_cv_func_mkstemp=maybe + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22235 "configure" ++#line 22395 "configure" + #include "confdefs.h" + + #include +@@ -22273,15 +22433,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:22276: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22436: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22279: \$? = $ac_status" >&5 ++ echo "$as_me:22439: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:22281: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22441: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22284: \$? = $ac_status" >&5 ++ echo "$as_me:22444: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_mkstemp=yes + +@@ -22296,16 +22456,16 @@ + fi + + fi +-echo "$as_me:22299: result: $cf_cv_func_mkstemp" >&5 ++echo "$as_me:22459: result: $cf_cv_func_mkstemp" >&5 + echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 + if test "x$cf_cv_func_mkstemp" = xmaybe ; then +- echo "$as_me:22302: checking for mkstemp" >&5 ++ echo "$as_me:22462: checking for mkstemp" >&5 + echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 + if test "${ac_cv_func_mkstemp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22308 "configure" ++#line 22468 "configure" + #include "confdefs.h" + #define mkstemp autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -22336,16 +22496,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22339: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22499: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22342: \$? = $ac_status" >&5 ++ echo "$as_me:22502: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22345: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22505: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22348: \$? = $ac_status" >&5 ++ echo "$as_me:22508: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_mkstemp=yes + else +@@ -22355,7 +22515,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:22358: result: $ac_cv_func_mkstemp" >&5 ++echo "$as_me:22518: result: $ac_cv_func_mkstemp" >&5 + echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 + + fi +@@ -22376,21 +22536,21 @@ + fi + + if test "x$cross_compiling" = xyes ; then +- { echo "$as_me:22379: WARNING: cross compiling: assume setvbuf params not reversed" >&5 ++ { echo "$as_me:22539: WARNING: cross compiling: assume setvbuf params not reversed" >&5 + echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;} + else +- echo "$as_me:22382: checking whether setvbuf arguments are reversed" >&5 ++ echo "$as_me:22542: checking whether setvbuf arguments are reversed" >&5 + echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6 + if test "${ac_cv_func_setvbuf_reversed+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:22388: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:22548: error: cannot run test program while cross compiling" >&5 + echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22393 "configure" ++#line 22553 "configure" + #include "confdefs.h" + #include + /* If setvbuf has the reversed format, exit 0. */ +@@ -22407,15 +22567,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:22410: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22570: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22413: \$? = $ac_status" >&5 ++ echo "$as_me:22573: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:22415: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22575: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22418: \$? = $ac_status" >&5 ++ echo "$as_me:22578: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_setvbuf_reversed=yes + else +@@ -22428,7 +22588,7 @@ + fi + rm -f core ./core.* ./*.core + fi +-echo "$as_me:22431: result: $ac_cv_func_setvbuf_reversed" >&5 ++echo "$as_me:22591: result: $ac_cv_func_setvbuf_reversed" >&5 + echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6 + if test $ac_cv_func_setvbuf_reversed = yes; then + +@@ -22439,13 +22599,13 @@ + fi + + fi +-echo "$as_me:22442: checking for intptr_t" >&5 ++echo "$as_me:22602: checking for intptr_t" >&5 + echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6 + if test "${ac_cv_type_intptr_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22448 "configure" ++#line 22608 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -22460,16 +22620,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:22463: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:22623: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:22466: \$? = $ac_status" >&5 ++ echo "$as_me:22626: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:22469: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22629: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22472: \$? = $ac_status" >&5 ++ echo "$as_me:22632: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_intptr_t=yes + else +@@ -22479,7 +22639,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:22482: result: $ac_cv_type_intptr_t" >&5 ++echo "$as_me:22642: result: $ac_cv_type_intptr_t" >&5 + echo "${ECHO_T}$ac_cv_type_intptr_t" >&6 + if test "$ac_cv_type_intptr_t" = yes; then + : +@@ -22491,13 +22651,13 @@ + + fi + +-echo "$as_me:22494: checking for ssize_t" >&5 ++echo "$as_me:22654: checking for ssize_t" >&5 + echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6 + if test "${ac_cv_type_ssize_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22500 "configure" ++#line 22660 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -22512,16 +22672,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:22515: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:22675: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:22518: \$? = $ac_status" >&5 ++ echo "$as_me:22678: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:22521: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22681: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22524: \$? = $ac_status" >&5 ++ echo "$as_me:22684: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_ssize_t=yes + else +@@ -22531,7 +22691,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:22534: result: $ac_cv_type_ssize_t" >&5 ++echo "$as_me:22694: result: $ac_cv_type_ssize_t" >&5 + echo "${ECHO_T}$ac_cv_type_ssize_t" >&6 + if test "$ac_cv_type_ssize_t" = yes; then + : +@@ -22543,14 +22703,14 @@ + + fi + +-echo "$as_me:22546: checking for type sigaction_t" >&5 ++echo "$as_me:22706: checking for type sigaction_t" >&5 + echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6 + if test "${cf_cv_type_sigaction+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22553 "configure" ++#line 22713 "configure" + #include "confdefs.h" + + #include +@@ -22563,16 +22723,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:22566: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:22726: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:22569: \$? = $ac_status" >&5 ++ echo "$as_me:22729: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:22572: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22732: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22575: \$? = $ac_status" >&5 ++ echo "$as_me:22735: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_type_sigaction=yes + else +@@ -22583,14 +22743,14 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi + +-echo "$as_me:22586: result: $cf_cv_type_sigaction" >&5 ++echo "$as_me:22746: result: $cf_cv_type_sigaction" >&5 + echo "${ECHO_T}$cf_cv_type_sigaction" >&6 + test "$cf_cv_type_sigaction" = yes && + cat >>confdefs.h <<\EOF + #define HAVE_TYPE_SIGACTION 1 + EOF + +-echo "$as_me:22593: checking declaration of size-change" >&5 ++echo "$as_me:22753: checking declaration of size-change" >&5 + echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6 + if test "${cf_cv_sizechange+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -22611,7 +22771,7 @@ + + fi + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22614 "configure" ++#line 22774 "configure" + #include "confdefs.h" + #include + #ifdef HAVE_TERMIOS_H +@@ -22661,16 +22821,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:22664: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:22824: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:22667: \$? = $ac_status" >&5 ++ echo "$as_me:22827: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:22670: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22830: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22673: \$? = $ac_status" >&5 ++ echo "$as_me:22833: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_sizechange=yes + else +@@ -22689,7 +22849,7 @@ + done + + fi +-echo "$as_me:22692: result: $cf_cv_sizechange" >&5 ++echo "$as_me:22852: result: $cf_cv_sizechange" >&5 + echo "${ECHO_T}$cf_cv_sizechange" >&6 + if test "$cf_cv_sizechange" != no ; then + +@@ -22707,13 +22867,13 @@ + esac + fi + +-echo "$as_me:22710: checking for memmove" >&5 ++echo "$as_me:22870: checking for memmove" >&5 + echo $ECHO_N "checking for memmove... $ECHO_C" >&6 + if test "${ac_cv_func_memmove+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22716 "configure" ++#line 22876 "configure" + #include "confdefs.h" + #define memmove autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -22744,16 +22904,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22747: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22907: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22750: \$? = $ac_status" >&5 ++ echo "$as_me:22910: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22753: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22913: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22756: \$? = $ac_status" >&5 ++ echo "$as_me:22916: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_memmove=yes + else +@@ -22763,19 +22923,19 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:22766: result: $ac_cv_func_memmove" >&5 ++echo "$as_me:22926: result: $ac_cv_func_memmove" >&5 + echo "${ECHO_T}$ac_cv_func_memmove" >&6 + if test "$ac_cv_func_memmove" = yes; then + : + else + +-echo "$as_me:22772: checking for bcopy" >&5 ++echo "$as_me:22932: checking for bcopy" >&5 + echo $ECHO_N "checking for bcopy... $ECHO_C" >&6 + if test "${ac_cv_func_bcopy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22778 "configure" ++#line 22938 "configure" + #include "confdefs.h" + #define bcopy autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -22806,16 +22966,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22809: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22969: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22812: \$? = $ac_status" >&5 ++ echo "$as_me:22972: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22815: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22975: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22818: \$? = $ac_status" >&5 ++ echo "$as_me:22978: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_bcopy=yes + else +@@ -22825,11 +22985,11 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:22828: result: $ac_cv_func_bcopy" >&5 ++echo "$as_me:22988: result: $ac_cv_func_bcopy" >&5 + echo "${ECHO_T}$ac_cv_func_bcopy" >&6 + if test "$ac_cv_func_bcopy" = yes; then + +- echo "$as_me:22832: checking if bcopy does overlapping moves" >&5 ++ echo "$as_me:22992: checking if bcopy does overlapping moves" >&5 + echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6 + if test "${cf_cv_good_bcopy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -22839,7 +22999,7 @@ + cf_cv_good_bcopy=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22842 "configure" ++#line 23002 "configure" + #include "confdefs.h" + + int main(void) { +@@ -22853,15 +23013,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:22856: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23016: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22859: \$? = $ac_status" >&5 ++ echo "$as_me:23019: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:22861: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23021: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22864: \$? = $ac_status" >&5 ++ echo "$as_me:23024: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_good_bcopy=yes + else +@@ -22874,7 +23034,7 @@ + fi + + fi +-echo "$as_me:22877: result: $cf_cv_good_bcopy" >&5 ++echo "$as_me:23037: result: $cf_cv_good_bcopy" >&5 + echo "${ECHO_T}$cf_cv_good_bcopy" >&6 + + else +@@ -22901,13 +23061,13 @@ + for ac_func in posix_openpt + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:22904: checking for $ac_func" >&5 ++echo "$as_me:23064: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22910 "configure" ++#line 23070 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -22938,16 +23098,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22941: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23101: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22944: \$? = $ac_status" >&5 ++ echo "$as_me:23104: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22947: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23107: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22950: \$? = $ac_status" >&5 ++ echo "$as_me:23110: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -22957,7 +23117,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:22960: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:23120: result: `eval echo '${'"$as_ac_var"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 + if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:23130: checking if poll really works" >&5 + echo $ECHO_N "checking if poll really works... $ECHO_C" >&6 + if test "${cf_cv_working_poll+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -22977,7 +23137,7 @@ + cf_cv_working_poll=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22980 "configure" ++#line 23140 "configure" + #include "confdefs.h" + + #include +@@ -23029,15 +23189,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:23032: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23192: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23035: \$? = $ac_status" >&5 ++ echo "$as_me:23195: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:23037: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23197: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23040: \$? = $ac_status" >&5 ++ echo "$as_me:23200: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_working_poll=yes + else +@@ -23049,21 +23209,21 @@ + rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" + fi + fi +-echo "$as_me:23052: result: $cf_cv_working_poll" >&5 ++echo "$as_me:23212: result: $cf_cv_working_poll" >&5 + echo "${ECHO_T}$cf_cv_working_poll" >&6 + test "$cf_cv_working_poll" = "yes" && + cat >>confdefs.h <<\EOF + #define HAVE_WORKING_POLL 1 + EOF + +-echo "$as_me:23059: checking for va_copy" >&5 ++echo "$as_me:23219: checking for va_copy" >&5 + echo $ECHO_N "checking for va_copy... $ECHO_C" >&6 + if test "${cf_cv_have_va_copy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23066 "configure" ++#line 23226 "configure" + #include "confdefs.h" + + #include +@@ -23080,16 +23240,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23083: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23243: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23086: \$? = $ac_status" >&5 ++ echo "$as_me:23246: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23089: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23249: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23092: \$? = $ac_status" >&5 ++ echo "$as_me:23252: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have_va_copy=yes + else +@@ -23099,7 +23259,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:23102: result: $cf_cv_have_va_copy" >&5 ++echo "$as_me:23262: result: $cf_cv_have_va_copy" >&5 + echo "${ECHO_T}$cf_cv_have_va_copy" >&6 + + if test "$cf_cv_have_va_copy" = yes; +@@ -23111,14 +23271,14 @@ + + else # !cf_cv_have_va_copy + +-echo "$as_me:23114: checking for __va_copy" >&5 ++echo "$as_me:23274: checking for __va_copy" >&5 + echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6 + if test "${cf_cv_have___va_copy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23121 "configure" ++#line 23281 "configure" + #include "confdefs.h" + + #include +@@ -23135,16 +23295,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23138: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23298: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23141: \$? = $ac_status" >&5 ++ echo "$as_me:23301: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23144: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23304: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23147: \$? = $ac_status" >&5 ++ echo "$as_me:23307: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have___va_copy=yes + else +@@ -23154,7 +23314,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:23157: result: $cf_cv_have___va_copy" >&5 ++echo "$as_me:23317: result: $cf_cv_have___va_copy" >&5 + echo "${ECHO_T}$cf_cv_have___va_copy" >&6 + + if test "$cf_cv_have___va_copy" = yes +@@ -23166,14 +23326,14 @@ + + else # !cf_cv_have___va_copy + +-echo "$as_me:23169: checking for __builtin_va_copy" >&5 ++echo "$as_me:23329: checking for __builtin_va_copy" >&5 + echo $ECHO_N "checking for __builtin_va_copy... $ECHO_C" >&6 + if test "${cf_cv_have___builtin_va_copy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23176 "configure" ++#line 23336 "configure" + #include "confdefs.h" + + #include +@@ -23190,16 +23350,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23193: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23353: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23196: \$? = $ac_status" >&5 ++ echo "$as_me:23356: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23199: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23359: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23202: \$? = $ac_status" >&5 ++ echo "$as_me:23362: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have___builtin_va_copy=yes + else +@@ -23209,7 +23369,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:23212: result: $cf_cv_have___builtin_va_copy" >&5 ++echo "$as_me:23372: result: $cf_cv_have___builtin_va_copy" >&5 + echo "${ECHO_T}$cf_cv_have___builtin_va_copy" >&6 + + test "$cf_cv_have___builtin_va_copy" = yes && +@@ -23227,14 +23387,14 @@ + ;; + + (*) +- echo "$as_me:23230: checking if we can simply copy va_list" >&5 ++ echo "$as_me:23390: checking if we can simply copy va_list" >&5 + echo $ECHO_N "checking if we can simply copy va_list... $ECHO_C" >&6 + if test "${cf_cv_pointer_va_list+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23237 "configure" ++#line 23397 "configure" + #include "confdefs.h" + + #include +@@ -23251,16 +23411,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23254: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23414: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23257: \$? = $ac_status" >&5 ++ echo "$as_me:23417: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23260: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23420: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23263: \$? = $ac_status" >&5 ++ echo "$as_me:23423: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_pointer_va_list=yes + else +@@ -23270,19 +23430,19 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:23273: result: $cf_cv_pointer_va_list" >&5 ++echo "$as_me:23433: result: $cf_cv_pointer_va_list" >&5 + echo "${ECHO_T}$cf_cv_pointer_va_list" >&6 + + if test "$cf_cv_pointer_va_list" = no + then +- echo "$as_me:23278: checking if we can copy va_list indirectly" >&5 ++ echo "$as_me:23438: checking if we can copy va_list indirectly" >&5 + echo $ECHO_N "checking if we can copy va_list indirectly... $ECHO_C" >&6 + if test "${cf_cv_array_va_list+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23285 "configure" ++#line 23445 "configure" + #include "confdefs.h" + + #include +@@ -23299,16 +23459,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23302: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23462: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23305: \$? = $ac_status" >&5 ++ echo "$as_me:23465: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23308: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23468: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23311: \$? = $ac_status" >&5 ++ echo "$as_me:23471: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_array_va_list=yes + else +@@ -23318,7 +23478,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:23321: result: $cf_cv_array_va_list" >&5 ++echo "$as_me:23481: result: $cf_cv_array_va_list" >&5 + echo "${ECHO_T}$cf_cv_array_va_list" >&6 + test "$cf_cv_array_va_list" = yes && + cat >>confdefs.h <<\EOF +@@ -23329,13 +23489,13 @@ + ;; + esac + +-echo "$as_me:23332: checking for pid_t" >&5 ++echo "$as_me:23492: checking for pid_t" >&5 + echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 + if test "${ac_cv_type_pid_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23338 "configure" ++#line 23498 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -23350,16 +23510,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:23353: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:23513: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:23356: \$? = $ac_status" >&5 ++ echo "$as_me:23516: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:23359: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23519: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23362: \$? = $ac_status" >&5 ++ echo "$as_me:23522: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_pid_t=yes + else +@@ -23369,7 +23529,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:23372: result: $ac_cv_type_pid_t" >&5 ++echo "$as_me:23532: result: $ac_cv_type_pid_t" >&5 + echo "${ECHO_T}$ac_cv_type_pid_t" >&6 + if test "$ac_cv_type_pid_t" = yes; then + : +@@ -23384,23 +23544,23 @@ + for ac_header in unistd.h vfork.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:23387: checking for $ac_header" >&5 ++echo "$as_me:23547: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23393 "configure" ++#line 23553 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:23397: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:23557: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:23403: \$? = $ac_status" >&5 ++ echo "$as_me:23563: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -23419,7 +23579,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:23422: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:23582: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:23595: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23441 "configure" ++#line 23601 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -23469,16 +23629,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23472: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23632: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23475: \$? = $ac_status" >&5 ++ echo "$as_me:23635: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23478: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23638: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23481: \$? = $ac_status" >&5 ++ echo "$as_me:23641: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_var=yes" + else +@@ -23488,7 +23648,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:23491: result: `eval echo '${'"$as_ac_var"'}'`" >&5 ++echo "$as_me:23651: result: `eval echo '${'"$as_ac_var"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 + if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then + cat >>confdefs.h <&5 ++ echo "$as_me:23663: checking for working fork" >&5 + echo $ECHO_N "checking for working fork... $ECHO_C" >&6 + if test "${ac_cv_func_fork_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -23523,15 +23683,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:23526: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23686: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23529: \$? = $ac_status" >&5 ++ echo "$as_me:23689: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:23531: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23691: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23534: \$? = $ac_status" >&5 ++ echo "$as_me:23694: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_fork_works=yes + else +@@ -23543,7 +23703,7 @@ + rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" + fi + fi +-echo "$as_me:23546: result: $ac_cv_func_fork_works" >&5 ++echo "$as_me:23706: result: $ac_cv_func_fork_works" >&5 + echo "${ECHO_T}$ac_cv_func_fork_works" >&6 + + fi +@@ -23557,12 +23717,12 @@ + ac_cv_func_fork_works=yes + ;; + esac +- { echo "$as_me:23560: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 ++ { echo "$as_me:23720: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 + echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;} + fi + ac_cv_func_vfork_works=$ac_cv_func_vfork + if test "x$ac_cv_func_vfork" = xyes; then +- echo "$as_me:23565: checking for working vfork" >&5 ++ echo "$as_me:23725: checking for working vfork" >&5 + echo $ECHO_N "checking for working vfork... $ECHO_C" >&6 + if test "${ac_cv_func_vfork_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -23571,7 +23731,7 @@ + ac_cv_func_vfork_works=cross + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23574 "configure" ++#line 23734 "configure" + #include "confdefs.h" + /* Thanks to Paul Eggert for this test. */ + #include +@@ -23668,15 +23828,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:23671: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23831: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23674: \$? = $ac_status" >&5 ++ echo "$as_me:23834: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:23676: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23836: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23679: \$? = $ac_status" >&5 ++ echo "$as_me:23839: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_vfork_works=yes + else +@@ -23688,13 +23848,13 @@ + rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" + fi + fi +-echo "$as_me:23691: result: $ac_cv_func_vfork_works" >&5 ++echo "$as_me:23851: result: $ac_cv_func_vfork_works" >&5 + echo "${ECHO_T}$ac_cv_func_vfork_works" >&6 + + fi; + if test "x$ac_cv_func_fork_works" = xcross; then + ac_cv_func_vfork_works=ac_cv_func_vfork +- { echo "$as_me:23697: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 ++ { echo "$as_me:23857: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 + echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;} + fi + +@@ -23719,7 +23879,7 @@ + + fi + +-echo "$as_me:23722: checking if fopen accepts explicit binary mode" >&5 ++echo "$as_me:23882: checking if fopen accepts explicit binary mode" >&5 + echo $ECHO_N "checking if fopen accepts explicit binary mode... $ECHO_C" >&6 + if test "${cf_cv_fopen_bin_r+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -23729,7 +23889,7 @@ + cf_cv_fopen_bin_r=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23732 "configure" ++#line 23892 "configure" + #include "confdefs.h" + + #include +@@ -23762,15 +23922,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:23765: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23925: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23768: \$? = $ac_status" >&5 ++ echo "$as_me:23928: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:23770: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23930: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23773: \$? = $ac_status" >&5 ++ echo "$as_me:23933: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_fopen_bin_r=yes + else +@@ -23783,7 +23943,7 @@ + fi + + fi +-echo "$as_me:23786: result: $cf_cv_fopen_bin_r" >&5 ++echo "$as_me:23946: result: $cf_cv_fopen_bin_r" >&5 + echo "${ECHO_T}$cf_cv_fopen_bin_r" >&6 + test "x$cf_cv_fopen_bin_r" != xno && + cat >>confdefs.h <<\EOF +@@ -23792,7 +23952,7 @@ + + # special check for test/ditto.c + +-echo "$as_me:23795: checking for openpty in -lutil" >&5 ++echo "$as_me:23955: checking for openpty in -lutil" >&5 + echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6 + if test "${ac_cv_lib_util_openpty+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -23800,7 +23960,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lutil $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23803 "configure" ++#line 23963 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -23819,16 +23979,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23822: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23982: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23825: \$? = $ac_status" >&5 ++ echo "$as_me:23985: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23828: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23988: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23831: \$? = $ac_status" >&5 ++ echo "$as_me:23991: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_util_openpty=yes + else +@@ -23839,7 +23999,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:23842: result: $ac_cv_lib_util_openpty" >&5 ++echo "$as_me:24002: result: $ac_cv_lib_util_openpty" >&5 + echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6 + if test "$ac_cv_lib_util_openpty" = yes; then + cf_cv_lib_util=yes +@@ -23847,7 +24007,7 @@ + cf_cv_lib_util=no + fi + +-echo "$as_me:23850: checking for openpty header" >&5 ++echo "$as_me:24010: checking for openpty header" >&5 + echo $ECHO_N "checking for openpty header... $ECHO_C" >&6 + if test "${cf_cv_func_openpty+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -23874,7 +24034,7 @@ + for cf_header in pty.h libutil.h util.h + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23877 "configure" ++#line 24037 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -23891,16 +24051,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23894: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24054: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23897: \$? = $ac_status" >&5 ++ echo "$as_me:24057: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23900: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24060: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23903: \$? = $ac_status" >&5 ++ echo "$as_me:24063: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_func_openpty=$cf_header +@@ -23918,7 +24078,7 @@ + LIBS="$cf_save_LIBS" + + fi +-echo "$as_me:23921: result: $cf_cv_func_openpty" >&5 ++echo "$as_me:24081: result: $cf_cv_func_openpty" >&5 + echo "${ECHO_T}$cf_cv_func_openpty" >&6 + + if test "$cf_cv_func_openpty" != no ; then +@@ -23991,7 +24151,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23994 "configure" ++#line 24154 "configure" + #include "confdefs.h" + #include + int +@@ -24003,16 +24163,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:24006: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24166: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24009: \$? = $ac_status" >&5 ++ echo "$as_me:24169: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:24012: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24172: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24015: \$? = $ac_status" >&5 ++ echo "$as_me:24175: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -24029,7 +24189,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:24032: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:24192: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -24065,7 +24225,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me:-configure}:24068: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:24228: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -24076,7 +24236,7 @@ + else + case "$with_hashed_db" in + (./*|../*|/*) +- { echo "$as_me:24079: WARNING: no such directory $with_hashed_db" >&5 ++ { echo "$as_me:24239: WARNING: no such directory $with_hashed_db" >&5 + echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;} + ;; + (*) +@@ -24148,7 +24308,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24151 "configure" ++#line 24311 "configure" + #include "confdefs.h" + #include + int +@@ -24160,16 +24320,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:24163: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24323: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24166: \$? = $ac_status" >&5 ++ echo "$as_me:24326: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:24169: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24329: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24172: \$? = $ac_status" >&5 ++ echo "$as_me:24332: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -24186,7 +24346,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:24189: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:24349: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -24266,7 +24426,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me:-configure}:24269: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:24429: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -24283,23 +24443,23 @@ + fi + esac + +-echo "$as_me:24286: checking for db.h" >&5 ++echo "$as_me:24446: checking for db.h" >&5 + echo $ECHO_N "checking for db.h... $ECHO_C" >&6 + if test "${ac_cv_header_db_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24292 "configure" ++#line 24452 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:24296: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:24456: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:24302: \$? = $ac_status" >&5 ++ echo "$as_me:24462: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -24318,11 +24478,11 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:24321: result: $ac_cv_header_db_h" >&5 ++echo "$as_me:24481: result: $ac_cv_header_db_h" >&5 + echo "${ECHO_T}$ac_cv_header_db_h" >&6 + if test "$ac_cv_header_db_h" = yes; then + +-echo "$as_me:24325: checking for version of db" >&5 ++echo "$as_me:24485: checking for version of db" >&5 + echo $ECHO_N "checking for version of db... $ECHO_C" >&6 + if test "${cf_cv_hashed_db_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -24333,10 +24493,10 @@ + for cf_db_version in 1 2 3 4 5 6 + do + +-echo "${as_me:-configure}:24336: testing checking for db version $cf_db_version ..." 1>&5 ++echo "${as_me:-configure}:24496: testing checking for db version $cf_db_version ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24339 "configure" ++#line 24499 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -24366,16 +24526,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:24369: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24529: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24372: \$? = $ac_status" >&5 ++ echo "$as_me:24532: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:24375: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24535: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24378: \$? = $ac_status" >&5 ++ echo "$as_me:24538: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_hashed_db_version=$cf_db_version +@@ -24389,16 +24549,16 @@ + done + + fi +-echo "$as_me:24392: result: $cf_cv_hashed_db_version" >&5 ++echo "$as_me:24552: result: $cf_cv_hashed_db_version" >&5 + echo "${ECHO_T}$cf_cv_hashed_db_version" >&6 + + if test "$cf_cv_hashed_db_version" = unknown ; then +- { { echo "$as_me:24396: error: Cannot determine version of db" >&5 ++ { { echo "$as_me:24556: error: Cannot determine version of db" >&5 + echo "$as_me: error: Cannot determine version of db" >&2;} + { (exit 1); exit 1; }; } + else + +-echo "$as_me:24401: checking for db libraries" >&5 ++echo "$as_me:24561: checking for db libraries" >&5 + echo $ECHO_N "checking for db libraries... $ECHO_C" >&6 + if test "${cf_cv_hashed_db_libs+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -24428,10 +24588,10 @@ + + fi + +-echo "${as_me:-configure}:24431: testing checking for library $cf_db_libs ..." 1>&5 ++echo "${as_me:-configure}:24591: testing checking for library $cf_db_libs ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24434 "configure" ++#line 24594 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -24486,16 +24646,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:24489: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24649: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:24492: \$? = $ac_status" >&5 ++ echo "$as_me:24652: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:24495: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24655: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24498: \$? = $ac_status" >&5 ++ echo "$as_me:24658: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + if test -n "$cf_db_libs" ; then +@@ -24515,11 +24675,11 @@ + done + + fi +-echo "$as_me:24518: result: $cf_cv_hashed_db_libs" >&5 ++echo "$as_me:24678: result: $cf_cv_hashed_db_libs" >&5 + echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6 + + if test "$cf_cv_hashed_db_libs" = unknown ; then +- { { echo "$as_me:24522: error: Cannot determine library for db" >&5 ++ { { echo "$as_me:24682: error: Cannot determine library for db" >&5 + echo "$as_me: error: Cannot determine library for db" >&2;} + { (exit 1); exit 1; }; } + elif test "$cf_cv_hashed_db_libs" != default ; then +@@ -24545,7 +24705,7 @@ + + else + +- { { echo "$as_me:24548: error: Cannot find db.h" >&5 ++ { { echo "$as_me:24708: error: Cannot find db.h" >&5 + echo "$as_me: error: Cannot find db.h" >&2;} + { (exit 1); exit 1; }; } + +@@ -24560,7 +24720,7 @@ + + # Just in case, check if the C compiler has a bool type. + +-echo "$as_me:24563: checking if we should include stdbool.h" >&5 ++echo "$as_me:24723: checking if we should include stdbool.h" >&5 + echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 + + if test "${cf_cv_header_stdbool_h+set}" = set; then +@@ -24568,7 +24728,7 @@ + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24571 "configure" ++#line 24731 "configure" + #include "confdefs.h" + + int +@@ -24580,23 +24740,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:24583: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24743: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24586: \$? = $ac_status" >&5 ++ echo "$as_me:24746: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:24589: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24749: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24592: \$? = $ac_status" >&5 ++ echo "$as_me:24752: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_header_stdbool_h=0 + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24599 "configure" ++#line 24759 "configure" + #include "confdefs.h" + + #ifndef __BEOS__ +@@ -24612,16 +24772,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:24615: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24775: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24618: \$? = $ac_status" >&5 ++ echo "$as_me:24778: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:24621: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24781: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24624: \$? = $ac_status" >&5 ++ echo "$as_me:24784: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_header_stdbool_h=1 + else +@@ -24635,13 +24795,13 @@ + fi + + if test "$cf_cv_header_stdbool_h" = 1 +-then echo "$as_me:24638: result: yes" >&5 ++then echo "$as_me:24798: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +-else echo "$as_me:24640: result: no" >&5 ++else echo "$as_me:24800: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:24644: checking for builtin bool type" >&5 ++echo "$as_me:24804: checking for builtin bool type" >&5 + echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 + + if test "${cf_cv_cc_bool_type+set}" = set; then +@@ -24649,7 +24809,7 @@ + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24652 "configure" ++#line 24812 "configure" + #include "confdefs.h" + + #include +@@ -24664,16 +24824,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:24667: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24827: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24670: \$? = $ac_status" >&5 ++ echo "$as_me:24830: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:24673: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24833: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24676: \$? = $ac_status" >&5 ++ echo "$as_me:24836: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_cc_bool_type=1 + else +@@ -24686,9 +24846,9 @@ + fi + + if test "$cf_cv_cc_bool_type" = 1 +-then echo "$as_me:24689: result: yes" >&5 ++then echo "$as_me:24849: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +-else echo "$as_me:24691: result: no" >&5 ++else echo "$as_me:24851: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -24705,10 +24865,10 @@ + + cf_save="$LIBS" + LIBS="$LIBS $CXXLIBS" +- echo "$as_me:24708: checking if we already have C++ library" >&5 ++ echo "$as_me:24868: checking if we already have C++ library" >&5 + echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24711 "configure" ++#line 24871 "configure" + #include "confdefs.h" + + #include +@@ -24722,16 +24882,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:24725: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24885: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:24728: \$? = $ac_status" >&5 ++ echo "$as_me:24888: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:24731: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24891: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24734: \$? = $ac_status" >&5 ++ echo "$as_me:24894: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_have_libstdcpp=yes + else +@@ -24740,7 +24900,7 @@ + cf_have_libstdcpp=no + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +- echo "$as_me:24743: result: $cf_have_libstdcpp" >&5 ++ echo "$as_me:24903: result: $cf_have_libstdcpp" >&5 + echo "${ECHO_T}$cf_have_libstdcpp" >&6 + LIBS="$cf_save" + +@@ -24759,7 +24919,7 @@ + ;; + esac + +- echo "$as_me:24762: checking for library $cf_stdcpp_libname" >&5 ++ echo "$as_me:24922: checking for library $cf_stdcpp_libname" >&5 + echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6 + if test "${cf_cv_libstdcpp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -24785,7 +24945,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24788 "configure" ++#line 24948 "configure" + #include "confdefs.h" + + #include +@@ -24799,16 +24959,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:24802: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24962: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:24805: \$? = $ac_status" >&5 ++ echo "$as_me:24965: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:24808: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24968: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24811: \$? = $ac_status" >&5 ++ echo "$as_me:24971: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_libstdcpp=yes + else +@@ -24820,7 +24980,7 @@ + LIBS="$cf_save" + + fi +-echo "$as_me:24823: result: $cf_cv_libstdcpp" >&5 ++echo "$as_me:24983: result: $cf_cv_libstdcpp" >&5 + echo "${ECHO_T}$cf_cv_libstdcpp" >&6 + test "$cf_cv_libstdcpp" = yes && { + cf_add_libs="$CXXLIBS" +@@ -24842,7 +25002,7 @@ + fi + fi + +- echo "$as_me:24845: checking whether $CXX understands -c and -o together" >&5 ++ echo "$as_me:25005: checking whether $CXX understands -c and -o together" >&5 + echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6 + if test "${cf_cv_prog_CXX_c_o+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -24857,15 +25017,15 @@ + # We do the test twice because some compilers refuse to overwrite an + # existing .o file with -o, though they will create one. + ac_try='$CXX $CXXFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5' +-if { (eval echo "$as_me:24860: \"$ac_try\"") >&5 ++if { (eval echo "$as_me:25020: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24863: \$? = $ac_status" >&5 ++ echo "$as_me:25023: \$? = $ac_status" >&5 + (exit "$ac_status"); } && +- test -f conftest2.$ac_objext && { (eval echo "$as_me:24865: \"$ac_try\"") >&5 ++ test -f conftest2.$ac_objext && { (eval echo "$as_me:25025: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24868: \$? = $ac_status" >&5 ++ echo "$as_me:25028: \$? = $ac_status" >&5 + (exit "$ac_status"); }; + then + eval cf_cv_prog_CXX_c_o=yes +@@ -24876,10 +25036,10 @@ + + fi + if test "$cf_cv_prog_CXX_c_o" = yes; then +- echo "$as_me:24879: result: yes" >&5 ++ echo "$as_me:25039: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:24882: result: no" >&5 ++ echo "$as_me:25042: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -24899,7 +25059,7 @@ + ;; + esac + if test "$GXX" = yes; then +- echo "$as_me:24902: checking for lib$cf_gpp_libname" >&5 ++ echo "$as_me:25062: checking for lib$cf_gpp_libname" >&5 + echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6 + cf_save="$LIBS" + +@@ -24920,7 +25080,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24923 "configure" ++#line 25083 "configure" + #include "confdefs.h" + + #include <$cf_gpp_libname/builtin.h> +@@ -24934,16 +25094,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:24937: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:25097: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:24940: \$? = $ac_status" >&5 ++ echo "$as_me:25100: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:24943: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25103: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24946: \$? = $ac_status" >&5 ++ echo "$as_me:25106: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cxx_library=yes + +@@ -24980,7 +25140,7 @@ + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 24983 "configure" ++#line 25143 "configure" + #include "confdefs.h" + + #include +@@ -24994,16 +25154,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:24997: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:25157: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:25000: \$? = $ac_status" >&5 ++ echo "$as_me:25160: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:25003: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25163: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25006: \$? = $ac_status" >&5 ++ echo "$as_me:25166: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cxx_library=yes + +@@ -25036,7 +25196,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS="$cf_save" +- echo "$as_me:25039: result: $cf_cxx_library" >&5 ++ echo "$as_me:25199: result: $cf_cxx_library" >&5 + echo "${ECHO_T}$cf_cxx_library" >&6 + fi + +@@ -25052,7 +25212,7 @@ + ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + ac_main_return="return" +-echo "$as_me:25055: checking how to run the C++ preprocessor" >&5 ++echo "$as_me:25215: checking how to run the C++ preprocessor" >&5 + echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 + if test -z "$CXXCPP"; then + if test "${ac_cv_prog_CXXCPP+set}" = set; then +@@ -25069,18 +25229,18 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25072 "configure" ++#line 25232 "configure" + #include "confdefs.h" + #include + Syntax error + _ACEOF +-if { (eval echo "$as_me:25077: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:25237: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:25083: \$? = $ac_status" >&5 ++ echo "$as_me:25243: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -25103,17 +25263,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25106 "configure" ++#line 25266 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:25110: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:25270: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:25116: \$? = $ac_status" >&5 ++ echo "$as_me:25276: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -25150,7 +25310,7 @@ + else + ac_cv_prog_CXXCPP=$CXXCPP + fi +-echo "$as_me:25153: result: $CXXCPP" >&5 ++echo "$as_me:25313: result: $CXXCPP" >&5 + echo "${ECHO_T}$CXXCPP" >&6 + ac_preproc_ok=false + for ac_cxx_preproc_warn_flag in '' yes +@@ -25160,18 +25320,18 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25163 "configure" ++#line 25323 "configure" + #include "confdefs.h" + #include + Syntax error + _ACEOF +-if { (eval echo "$as_me:25168: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:25328: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:25174: \$? = $ac_status" >&5 ++ echo "$as_me:25334: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -25194,17 +25354,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25197 "configure" ++#line 25357 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:25201: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:25361: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:25207: \$? = $ac_status" >&5 ++ echo "$as_me:25367: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -25232,7 +25392,7 @@ + if $ac_preproc_ok; then + : + else +- { { echo "$as_me:25235: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 ++ { { echo "$as_me:25395: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 + echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -25247,23 +25407,23 @@ + for ac_header in typeinfo + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:25250: checking for $ac_header" >&5 ++echo "$as_me:25410: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25256 "configure" ++#line 25416 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:25260: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:25420: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:25266: \$? = $ac_status" >&5 ++ echo "$as_me:25426: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -25282,7 +25442,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:25285: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:25445: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:25458: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25304 "configure" ++#line 25464 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:25308: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:25468: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:25314: \$? = $ac_status" >&5 ++ echo "$as_me:25474: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -25330,7 +25490,7 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:25333: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 ++echo "$as_me:25493: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 + echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 + if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 ++ echo "$as_me:25504: checking if iostream uses std-namespace" >&5 + echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25347 "configure" ++#line 25507 "configure" + #include "confdefs.h" + + #include +@@ -25361,16 +25521,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25364: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25524: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25367: \$? = $ac_status" >&5 ++ echo "$as_me:25527: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25370: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25530: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25373: \$? = $ac_status" >&5 ++ echo "$as_me:25533: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_iostream_namespace=yes + else +@@ -25379,7 +25539,7 @@ + cf_iostream_namespace=no + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +- echo "$as_me:25382: result: $cf_iostream_namespace" >&5 ++ echo "$as_me:25542: result: $cf_iostream_namespace" >&5 + echo "${ECHO_T}$cf_iostream_namespace" >&6 + if test "$cf_iostream_namespace" = yes ; then + +@@ -25390,7 +25550,7 @@ + fi + fi + +-echo "$as_me:25393: checking if we should include stdbool.h" >&5 ++echo "$as_me:25553: checking if we should include stdbool.h" >&5 + echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 + + if test "${cf_cv_header_stdbool_h+set}" = set; then +@@ -25398,7 +25558,7 @@ + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25401 "configure" ++#line 25561 "configure" + #include "confdefs.h" + + int +@@ -25410,23 +25570,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25413: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25573: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25416: \$? = $ac_status" >&5 ++ echo "$as_me:25576: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25419: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25579: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25422: \$? = $ac_status" >&5 ++ echo "$as_me:25582: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_header_stdbool_h=0 + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25429 "configure" ++#line 25589 "configure" + #include "confdefs.h" + + #ifndef __BEOS__ +@@ -25442,16 +25602,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25445: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25605: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25448: \$? = $ac_status" >&5 ++ echo "$as_me:25608: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25451: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25611: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25454: \$? = $ac_status" >&5 ++ echo "$as_me:25614: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_header_stdbool_h=1 + else +@@ -25465,13 +25625,13 @@ + fi + + if test "$cf_cv_header_stdbool_h" = 1 +-then echo "$as_me:25468: result: yes" >&5 ++then echo "$as_me:25628: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +-else echo "$as_me:25470: result: no" >&5 ++else echo "$as_me:25630: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:25474: checking for builtin bool type" >&5 ++echo "$as_me:25634: checking for builtin bool type" >&5 + echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 + + if test "${cf_cv_builtin_bool+set}" = set; then +@@ -25479,7 +25639,7 @@ + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25482 "configure" ++#line 25642 "configure" + #include "confdefs.h" + + #include +@@ -25494,16 +25654,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25497: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25657: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25500: \$? = $ac_status" >&5 ++ echo "$as_me:25660: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25503: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25663: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25506: \$? = $ac_status" >&5 ++ echo "$as_me:25666: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_builtin_bool=1 + else +@@ -25516,19 +25676,19 @@ + fi + + if test "$cf_cv_builtin_bool" = 1 +-then echo "$as_me:25519: result: yes" >&5 ++then echo "$as_me:25679: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +-else echo "$as_me:25521: result: no" >&5 ++else echo "$as_me:25681: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:25525: checking for bool" >&5 ++echo "$as_me:25685: checking for bool" >&5 + echo $ECHO_N "checking for bool... $ECHO_C" >&6 + if test "${ac_cv_type_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25531 "configure" ++#line 25691 "configure" + #include "confdefs.h" + + #include +@@ -25564,16 +25724,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25567: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25727: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25570: \$? = $ac_status" >&5 ++ echo "$as_me:25730: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25573: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25733: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25576: \$? = $ac_status" >&5 ++ echo "$as_me:25736: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_bool=yes + else +@@ -25583,10 +25743,10 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:25586: result: $ac_cv_type_bool" >&5 ++echo "$as_me:25746: result: $ac_cv_type_bool" >&5 + echo "${ECHO_T}$ac_cv_type_bool" >&6 + +-echo "$as_me:25589: checking size of bool" >&5 ++echo "$as_me:25749: checking size of bool" >&5 + echo $ECHO_N "checking size of bool... $ECHO_C" >&6 + if test "${ac_cv_sizeof_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -25595,7 +25755,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25598 "configure" ++#line 25758 "configure" + #include "confdefs.h" + + #include +@@ -25628,21 +25788,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25631: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25791: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25634: \$? = $ac_status" >&5 ++ echo "$as_me:25794: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25637: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25797: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25640: \$? = $ac_status" >&5 ++ echo "$as_me:25800: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25645 "configure" ++#line 25805 "configure" + #include "confdefs.h" + + #include +@@ -25675,16 +25835,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25678: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25838: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25681: \$? = $ac_status" >&5 ++ echo "$as_me:25841: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25684: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25844: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25687: \$? = $ac_status" >&5 ++ echo "$as_me:25847: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid; break + else +@@ -25700,7 +25860,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25703 "configure" ++#line 25863 "configure" + #include "confdefs.h" + + #include +@@ -25733,16 +25893,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25736: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25896: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25739: \$? = $ac_status" >&5 ++ echo "$as_me:25899: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25742: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25902: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25745: \$? = $ac_status" >&5 ++ echo "$as_me:25905: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=$ac_mid; break + else +@@ -25758,7 +25918,7 @@ + while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25761 "configure" ++#line 25921 "configure" + #include "confdefs.h" + + #include +@@ -25791,16 +25951,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:25794: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25954: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25797: \$? = $ac_status" >&5 ++ echo "$as_me:25957: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:25800: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25960: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25803: \$? = $ac_status" >&5 ++ echo "$as_me:25963: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid + else +@@ -25813,12 +25973,12 @@ + ac_cv_sizeof_bool=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:25816: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:25976: error: cannot run test program while cross compiling" >&5 + echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25821 "configure" ++#line 25981 "configure" + #include "confdefs.h" + + #include +@@ -25855,15 +26015,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:25858: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:26018: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:25861: \$? = $ac_status" >&5 ++ echo "$as_me:26021: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:25863: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26023: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25866: \$? = $ac_status" >&5 ++ echo "$as_me:26026: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sizeof_bool=`cat conftest.val` + else +@@ -25879,13 +26039,13 @@ + ac_cv_sizeof_bool=0 + fi + fi +-echo "$as_me:25882: result: $ac_cv_sizeof_bool" >&5 ++echo "$as_me:26042: result: $ac_cv_sizeof_bool" >&5 + echo "${ECHO_T}$ac_cv_sizeof_bool" >&6 + cat >>confdefs.h <&5 ++echo "$as_me:26048: checking for type of bool" >&5 + echo $ECHO_N "checking for type of bool... $ECHO_C" >&6 + if test "${cf_cv_type_of_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -25904,7 +26064,7 @@ + + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 25907 "configure" ++#line 26067 "configure" + #include "confdefs.h" + + #include +@@ -25946,15 +26106,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:25949: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:26109: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:25952: \$? = $ac_status" >&5 ++ echo "$as_me:26112: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:25954: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26114: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25957: \$? = $ac_status" >&5 ++ echo "$as_me:26117: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_type_of_bool=`cat cf_test.out` + if test -z "$cf_cv_type_of_bool"; then +@@ -25971,19 +26131,19 @@ + rm -f cf_test.out + + fi +-echo "$as_me:25974: result: $cf_cv_type_of_bool" >&5 ++echo "$as_me:26134: result: $cf_cv_type_of_bool" >&5 + echo "${ECHO_T}$cf_cv_type_of_bool" >&6 + + if test "$cf_cv_type_of_bool" = unknown ; then + case .$NCURSES_BOOL in + (.auto|.) NCURSES_BOOL=unsigned;; + esac +- { echo "$as_me:25981: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 ++ { echo "$as_me:26141: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} + cf_cv_type_of_bool=$NCURSES_BOOL + fi + +-echo "$as_me:25986: checking for special defines needed for etip.h" >&5 ++echo "$as_me:26146: checking for special defines needed for etip.h" >&5 + echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6 + cf_save_CXXFLAGS="$CXXFLAGS" + cf_result="none" +@@ -26001,7 +26161,7 @@ + test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}" + test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26004 "configure" ++#line 26164 "configure" + #include "confdefs.h" + + #include +@@ -26015,16 +26175,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26018: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26178: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26021: \$? = $ac_status" >&5 ++ echo "$as_me:26181: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26024: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26184: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26027: \$? = $ac_status" >&5 ++ echo "$as_me:26187: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + test -n "$cf_math" && cat >>confdefs.h <&5 ++echo "$as_me:26208: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + CXXFLAGS="$cf_save_CXXFLAGS" + + if test -n "$CXX"; then +-echo "$as_me:26053: checking if $CXX accepts parameter initialization" >&5 ++echo "$as_me:26213: checking if $CXX accepts parameter initialization" >&5 + echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6 + if test "${cf_cv_cpp_param_init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26067,7 +26227,7 @@ + cf_cv_cpp_param_init=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26070 "configure" ++#line 26230 "configure" + #include "confdefs.h" + + class TEST { +@@ -26086,15 +26246,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:26089: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:26249: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:26092: \$? = $ac_status" >&5 ++ echo "$as_me:26252: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:26094: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26254: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26097: \$? = $ac_status" >&5 ++ echo "$as_me:26257: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_cpp_param_init=yes + else +@@ -26113,7 +26273,7 @@ + ac_main_return="return" + + fi +-echo "$as_me:26116: result: $cf_cv_cpp_param_init" >&5 ++echo "$as_me:26276: result: $cf_cv_cpp_param_init" >&5 + echo "${ECHO_T}$cf_cv_cpp_param_init" >&6 + fi + test "$cf_cv_cpp_param_init" = yes && +@@ -26123,7 +26283,7 @@ + + if test -n "$CXX"; then + +-echo "$as_me:26126: checking if $CXX accepts static_cast" >&5 ++echo "$as_me:26286: checking if $CXX accepts static_cast" >&5 + echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6 + if test "${cf_cv_cpp_static_cast+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26137,7 +26297,7 @@ + ac_main_return="return" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26140 "configure" ++#line 26300 "configure" + #include "confdefs.h" + + class NCursesPanel +@@ -26181,16 +26341,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26184: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26344: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26187: \$? = $ac_status" >&5 ++ echo "$as_me:26347: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26190: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26350: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26193: \$? = $ac_status" >&5 ++ echo "$as_me:26353: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_cpp_static_cast=yes + else +@@ -26208,7 +26368,7 @@ + ac_main_return="return" + + fi +-echo "$as_me:26211: result: $cf_cv_cpp_static_cast" >&5 ++echo "$as_me:26371: result: $cf_cv_cpp_static_cast" >&5 + echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6 + + fi +@@ -26257,13 +26417,13 @@ + else + if test "$cf_cv_header_stdbool_h" = 1 ; then + +-echo "$as_me:26260: checking for bool" >&5 ++echo "$as_me:26420: checking for bool" >&5 + echo $ECHO_N "checking for bool... $ECHO_C" >&6 + if test "${ac_cv_type_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26266 "configure" ++#line 26426 "configure" + #include "confdefs.h" + + #include +@@ -26299,16 +26459,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26302: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26462: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26305: \$? = $ac_status" >&5 ++ echo "$as_me:26465: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26308: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26468: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26311: \$? = $ac_status" >&5 ++ echo "$as_me:26471: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_bool=yes + else +@@ -26318,10 +26478,10 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:26321: result: $ac_cv_type_bool" >&5 ++echo "$as_me:26481: result: $ac_cv_type_bool" >&5 + echo "${ECHO_T}$ac_cv_type_bool" >&6 + +-echo "$as_me:26324: checking size of bool" >&5 ++echo "$as_me:26484: checking size of bool" >&5 + echo $ECHO_N "checking size of bool... $ECHO_C" >&6 + if test "${ac_cv_sizeof_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26330,7 +26490,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26333 "configure" ++#line 26493 "configure" + #include "confdefs.h" + + #include +@@ -26363,21 +26523,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26366: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26526: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26369: \$? = $ac_status" >&5 ++ echo "$as_me:26529: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26372: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26532: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26375: \$? = $ac_status" >&5 ++ echo "$as_me:26535: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26380 "configure" ++#line 26540 "configure" + #include "confdefs.h" + + #include +@@ -26410,16 +26570,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26413: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26573: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26416: \$? = $ac_status" >&5 ++ echo "$as_me:26576: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26419: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26579: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26422: \$? = $ac_status" >&5 ++ echo "$as_me:26582: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid; break + else +@@ -26435,7 +26595,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26438 "configure" ++#line 26598 "configure" + #include "confdefs.h" + + #include +@@ -26468,16 +26628,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26471: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26631: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26474: \$? = $ac_status" >&5 ++ echo "$as_me:26634: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26477: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26637: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26480: \$? = $ac_status" >&5 ++ echo "$as_me:26640: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=$ac_mid; break + else +@@ -26493,7 +26653,7 @@ + while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26496 "configure" ++#line 26656 "configure" + #include "confdefs.h" + + #include +@@ -26526,16 +26686,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:26529: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26689: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:26532: \$? = $ac_status" >&5 ++ echo "$as_me:26692: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:26535: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26695: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26538: \$? = $ac_status" >&5 ++ echo "$as_me:26698: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid + else +@@ -26548,12 +26708,12 @@ + ac_cv_sizeof_bool=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:26551: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:26711: error: cannot run test program while cross compiling" >&5 + echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26556 "configure" ++#line 26716 "configure" + #include "confdefs.h" + + #include +@@ -26590,15 +26750,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:26593: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:26753: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:26596: \$? = $ac_status" >&5 ++ echo "$as_me:26756: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:26598: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26758: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26601: \$? = $ac_status" >&5 ++ echo "$as_me:26761: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sizeof_bool=`cat conftest.val` + else +@@ -26614,13 +26774,13 @@ + ac_cv_sizeof_bool=0 + fi + fi +-echo "$as_me:26617: result: $ac_cv_sizeof_bool" >&5 ++echo "$as_me:26777: result: $ac_cv_sizeof_bool" >&5 + echo "${ECHO_T}$ac_cv_sizeof_bool" >&6 + cat >>confdefs.h <&5 ++echo "$as_me:26783: checking for type of bool" >&5 + echo $ECHO_N "checking for type of bool... $ECHO_C" >&6 + if test "${cf_cv_type_of_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26639,7 +26799,7 @@ + + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 26642 "configure" ++#line 26802 "configure" + #include "confdefs.h" + + #include +@@ -26681,15 +26841,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:26684: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:26844: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:26687: \$? = $ac_status" >&5 ++ echo "$as_me:26847: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:26689: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26849: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26692: \$? = $ac_status" >&5 ++ echo "$as_me:26852: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_type_of_bool=`cat cf_test.out` + if test -z "$cf_cv_type_of_bool"; then +@@ -26706,26 +26866,26 @@ + rm -f cf_test.out + + fi +-echo "$as_me:26709: result: $cf_cv_type_of_bool" >&5 ++echo "$as_me:26869: result: $cf_cv_type_of_bool" >&5 + echo "${ECHO_T}$cf_cv_type_of_bool" >&6 + + if test "$cf_cv_type_of_bool" = unknown ; then + case .$NCURSES_BOOL in + (.auto|.) NCURSES_BOOL=unsigned;; + esac +- { echo "$as_me:26716: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 ++ { echo "$as_me:26876: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} + cf_cv_type_of_bool=$NCURSES_BOOL + fi + + else +- echo "$as_me:26722: checking for fallback type of bool" >&5 ++ echo "$as_me:26882: checking for fallback type of bool" >&5 + echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6 + case "$host_cpu" in + (i?86) cf_cv_type_of_bool=char ;; + (*) cf_cv_type_of_bool=int ;; + esac +- echo "$as_me:26728: result: $cf_cv_type_of_bool" >&5 ++ echo "$as_me:26888: result: $cf_cv_type_of_bool" >&5 + echo "${ECHO_T}$cf_cv_type_of_bool" >&6 + fi + fi +@@ -26754,7 +26914,7 @@ + + if test "$cf_with_ada" != "no" ; then + if test "$with_libtool" != "no"; then +- { echo "$as_me:26757: WARNING: libtool does not support Ada - disabling feature" >&5 ++ { echo "$as_me:26917: WARNING: libtool does not support Ada - disabling feature" >&5 + echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;} + cf_with_ada=no + fi +@@ -26771,7 +26931,7 @@ + unset cf_TEMP_gnat + # Extract the first word of "$cf_prog_gnat", so it can be a program name with args. + set dummy $cf_prog_gnat; ac_word=$2 +-echo "$as_me:26774: checking for $ac_word" >&5 ++echo "$as_me:26934: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26788,7 +26948,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word" +- echo "$as_me:26791: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:26951: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -26800,10 +26960,10 @@ + cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat + + if test -n "$cf_TEMP_gnat"; then +- echo "$as_me:26803: result: $cf_TEMP_gnat" >&5 ++ echo "$as_me:26963: result: $cf_TEMP_gnat" >&5 + echo "${ECHO_T}$cf_TEMP_gnat" >&6 + else +- echo "$as_me:26806: result: no" >&5 ++ echo "$as_me:26966: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -26813,7 +26973,7 @@ + unset cf_cv_gnat_version + unset cf_TEMP_gnat + +-echo "$as_me:26816: checking for $cf_prog_gnat version" >&5 ++echo "$as_me:26976: checking for $cf_prog_gnat version" >&5 + echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6 + if test "${cf_cv_gnat_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26824,7 +26984,7 @@ + sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` + + fi +-echo "$as_me:26827: result: $cf_cv_gnat_version" >&5 ++echo "$as_me:26987: result: $cf_cv_gnat_version" >&5 + echo "${ECHO_T}$cf_cv_gnat_version" >&6 + test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no + eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version +@@ -26853,7 +27013,7 @@ + cd conftest.src + for cf_gprconfig in Ada C + do +- echo "$as_me:26856: checking for gprconfig name for $cf_gprconfig" >&5 ++ echo "$as_me:27016: checking for gprconfig name for $cf_gprconfig" >&5 + echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6 + if test "$cf_gprconfig" = C + then +@@ -26872,10 +27032,10 @@ + if test -n "$cf_gprconfig_value" + then + eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value" +- echo "$as_me:26875: result: $cf_gprconfig_value" >&5 ++ echo "$as_me:27035: result: $cf_gprconfig_value" >&5 + echo "${ECHO_T}$cf_gprconfig_value" >&6 + else +- echo "$as_me:26878: result: missing" >&5 ++ echo "$as_me:27038: result: missing" >&5 + echo "${ECHO_T}missing" >&6 + cf_ada_config="#" + break +@@ -26888,7 +27048,7 @@ + if test "x$cf_ada_config" != "x#" + then + +-echo "$as_me:26891: checking for gnat version" >&5 ++echo "$as_me:27051: checking for gnat version" >&5 + echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 + if test "${cf_cv_gnat_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26899,7 +27059,7 @@ + sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` + + fi +-echo "$as_me:26902: result: $cf_cv_gnat_version" >&5 ++echo "$as_me:27062: result: $cf_cv_gnat_version" >&5 + echo "${ECHO_T}$cf_cv_gnat_version" >&6 + test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no + +@@ -26908,7 +27068,7 @@ + cf_cv_prog_gnat_correct=yes + ;; + (*) +- { echo "$as_me:26911: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 ++ { echo "$as_me:27071: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 + echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} + cf_cv_prog_gnat_correct=no + ;; +@@ -26916,7 +27076,7 @@ + + # Extract the first word of "m4", so it can be a program name with args. + set dummy m4; ac_word=$2 +-echo "$as_me:26919: checking for $ac_word" >&5 ++echo "$as_me:27079: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_M4_exists+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -26931,7 +27091,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_M4_exists="yes" +-echo "$as_me:26934: found $ac_dir/$ac_word" >&5 ++echo "$as_me:27094: found $ac_dir/$ac_word" >&5 + break + done + +@@ -26940,20 +27100,20 @@ + fi + M4_exists=$ac_cv_prog_M4_exists + if test -n "$M4_exists"; then +- echo "$as_me:26943: result: $M4_exists" >&5 ++ echo "$as_me:27103: result: $M4_exists" >&5 + echo "${ECHO_T}$M4_exists" >&6 + else +- echo "$as_me:26946: result: no" >&5 ++ echo "$as_me:27106: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + if test "$ac_cv_prog_M4_exists" = no; then + cf_cv_prog_gnat_correct=no +- { echo "$as_me:26952: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 ++ { echo "$as_me:27112: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 + echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;} + fi + if test "$cf_cv_prog_gnat_correct" = yes; then +- echo "$as_me:26956: checking if GNAT works" >&5 ++ echo "$as_me:27116: checking if GNAT works" >&5 + echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 + + rm -rf ./conftest* ./*~conftest* +@@ -26981,7 +27141,7 @@ + fi + rm -rf ./conftest* ./*~conftest* + +- echo "$as_me:26984: result: $cf_cv_prog_gnat_correct" >&5 ++ echo "$as_me:27144: result: $cf_cv_prog_gnat_correct" >&5 + echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 + fi + else +@@ -26993,7 +27153,7 @@ + + ADAFLAGS="$ADAFLAGS -gnatpn" + +- echo "$as_me:26996: checking optimization options for ADAFLAGS" >&5 ++ echo "$as_me:27156: checking optimization options for ADAFLAGS" >&5 + echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 + case "$CFLAGS" in + (*-g*) +@@ -27010,10 +27170,10 @@ + + ;; + esac +- echo "$as_me:27013: result: $ADAFLAGS" >&5 ++ echo "$as_me:27173: result: $ADAFLAGS" >&5 + echo "${ECHO_T}$ADAFLAGS" >&6 + +-echo "$as_me:27016: checking if GNATPREP supports -T option" >&5 ++echo "$as_me:27176: checking if GNATPREP supports -T option" >&5 + echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6 + if test "${cf_cv_gnatprep_opt_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -27023,11 +27183,11 @@ + gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes + + fi +-echo "$as_me:27026: result: $cf_cv_gnatprep_opt_t" >&5 ++echo "$as_me:27186: result: $cf_cv_gnatprep_opt_t" >&5 + echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6 + test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS" + +-echo "$as_me:27030: checking if GNAT supports generics" >&5 ++echo "$as_me:27190: checking if GNAT supports generics" >&5 + echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 + case "$cf_cv_gnat_version" in + (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9]) +@@ -27037,7 +27197,7 @@ + cf_gnat_generics=no + ;; + esac +-echo "$as_me:27040: result: $cf_gnat_generics" >&5 ++echo "$as_me:27200: result: $cf_gnat_generics" >&5 + echo "${ECHO_T}$cf_gnat_generics" >&6 + + if test "$cf_gnat_generics" = yes +@@ -27049,7 +27209,7 @@ + cf_generic_objects= + fi + +-echo "$as_me:27052: checking if GNAT supports SIGINT" >&5 ++echo "$as_me:27212: checking if GNAT supports SIGINT" >&5 + echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6 + if test "${cf_cv_gnat_sigint+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -27097,7 +27257,7 @@ + rm -rf ./conftest* ./*~conftest* + + fi +-echo "$as_me:27100: result: $cf_cv_gnat_sigint" >&5 ++echo "$as_me:27260: result: $cf_cv_gnat_sigint" >&5 + echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 + + if test "$cf_cv_gnat_sigint" = yes ; then +@@ -27110,7 +27270,7 @@ + cf_gnat_projects=no + + if test "$enable_gnat_projects" != no ; then +-echo "$as_me:27113: checking if GNAT supports project files" >&5 ++echo "$as_me:27273: checking if GNAT supports project files" >&5 + echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 + case "$cf_cv_gnat_version" in + (3.[0-9]*) +@@ -27173,15 +27333,15 @@ + esac + ;; + esac +-echo "$as_me:27176: result: $cf_gnat_projects" >&5 ++echo "$as_me:27336: result: $cf_gnat_projects" >&5 + echo "${ECHO_T}$cf_gnat_projects" >&6 + fi # enable_gnat_projects + + if test "$cf_gnat_projects" = yes + then +- echo "$as_me:27182: checking if GNAT supports libraries" >&5 ++ echo "$as_me:27342: checking if GNAT supports libraries" >&5 + echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 +- echo "$as_me:27184: result: $cf_gnat_libraries" >&5 ++ echo "$as_me:27344: result: $cf_gnat_libraries" >&5 + echo "${ECHO_T}$cf_gnat_libraries" >&6 + fi + +@@ -27201,7 +27361,7 @@ + then + USE_GNAT_MAKE_GPR="" + else +- { echo "$as_me:27204: WARNING: use old makefile rules since tools are missing" >&5 ++ { echo "$as_me:27364: WARNING: use old makefile rules since tools are missing" >&5 + echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;} + fi + fi +@@ -27213,7 +27373,7 @@ + USE_GNAT_LIBRARIES="#" + fi + +-echo "$as_me:27216: checking for ada-compiler" >&5 ++echo "$as_me:27376: checking for ada-compiler" >&5 + echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6 + + # Check whether --with-ada-compiler or --without-ada-compiler was given. +@@ -27224,12 +27384,12 @@ + cf_ada_compiler=gnatmake + fi; + +-echo "$as_me:27227: result: $cf_ada_compiler" >&5 ++echo "$as_me:27387: result: $cf_ada_compiler" >&5 + echo "${ECHO_T}$cf_ada_compiler" >&6 + + cf_ada_package=terminal_interface + +-echo "$as_me:27232: checking for ada-include" >&5 ++echo "$as_me:27392: checking for ada-include" >&5 + echo $ECHO_N "checking for ada-include... $ECHO_C" >&6 + + # Check whether --with-ada-include or --without-ada-include was given. +@@ -27265,7 +27425,7 @@ + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:27268: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:27428: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -27274,10 +27434,10 @@ + fi + eval ADA_INCLUDE="$withval" + +-echo "$as_me:27277: result: $ADA_INCLUDE" >&5 ++echo "$as_me:27437: result: $ADA_INCLUDE" >&5 + echo "${ECHO_T}$ADA_INCLUDE" >&6 + +-echo "$as_me:27280: checking for ada-objects" >&5 ++echo "$as_me:27440: checking for ada-objects" >&5 + echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6 + + # Check whether --with-ada-objects or --without-ada-objects was given. +@@ -27313,7 +27473,7 @@ + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:27316: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:27476: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -27322,10 +27482,10 @@ + fi + eval ADA_OBJECTS="$withval" + +-echo "$as_me:27325: result: $ADA_OBJECTS" >&5 ++echo "$as_me:27485: result: $ADA_OBJECTS" >&5 + echo "${ECHO_T}$ADA_OBJECTS" >&6 + +-echo "$as_me:27328: checking if an Ada95 shared-library should be built" >&5 ++echo "$as_me:27488: checking if an Ada95 shared-library should be built" >&5 + echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6 + + # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given. +@@ -27335,14 +27495,14 @@ + else + with_ada_sharedlib=no + fi; +-echo "$as_me:27338: result: $with_ada_sharedlib" >&5 ++echo "$as_me:27498: result: $with_ada_sharedlib" >&5 + echo "${ECHO_T}$with_ada_sharedlib" >&6 + + if test "x$with_ada_sharedlib" != xno + then + if test "x$cf_gnat_projects" != xyes + then +- { echo "$as_me:27345: WARNING: disabling shared-library since GNAT projects are not supported" >&5 ++ { echo "$as_me:27505: WARNING: disabling shared-library since GNAT projects are not supported" >&5 + echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;} + with_ada_sharedlib=no + fi +@@ -27362,7 +27522,7 @@ + + # allow the Ada binding to be renamed + +-echo "$as_me:27365: checking for ada-libname" >&5 ++echo "$as_me:27525: checking for ada-libname" >&5 + echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6 + + # Check whether --with-ada-libname or --without-ada-libname was given. +@@ -27378,7 +27538,7 @@ + ;; + esac + +-echo "$as_me:27381: result: $ADA_LIBNAME" >&5 ++echo "$as_me:27541: result: $ADA_LIBNAME" >&5 + echo "${ECHO_T}$ADA_LIBNAME" >&6 + + fi +@@ -27389,13 +27549,13 @@ + + # do this "late" to avoid conflict with header-checks + if test "x$with_widec" = xyes ; then +- echo "$as_me:27392: checking for wchar_t" >&5 ++ echo "$as_me:27552: checking for wchar_t" >&5 + echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6 + if test "${ac_cv_type_wchar_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27398 "configure" ++#line 27558 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -27410,16 +27570,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:27413: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27573: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27416: \$? = $ac_status" >&5 ++ echo "$as_me:27576: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:27419: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27579: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27422: \$? = $ac_status" >&5 ++ echo "$as_me:27582: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_type_wchar_t=yes + else +@@ -27429,10 +27589,10 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:27432: result: $ac_cv_type_wchar_t" >&5 ++echo "$as_me:27592: result: $ac_cv_type_wchar_t" >&5 + echo "${ECHO_T}$ac_cv_type_wchar_t" >&6 + +-echo "$as_me:27435: checking size of wchar_t" >&5 ++echo "$as_me:27595: checking size of wchar_t" >&5 + echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6 + if test "${ac_cv_sizeof_wchar_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -27441,7 +27601,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27444 "configure" ++#line 27604 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -27453,21 +27613,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:27456: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27616: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27459: \$? = $ac_status" >&5 ++ echo "$as_me:27619: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:27462: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27622: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27465: \$? = $ac_status" >&5 ++ echo "$as_me:27625: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27470 "configure" ++#line 27630 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -27479,16 +27639,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:27482: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27642: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27485: \$? = $ac_status" >&5 ++ echo "$as_me:27645: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:27488: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27648: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27491: \$? = $ac_status" >&5 ++ echo "$as_me:27651: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid; break + else +@@ -27504,7 +27664,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27507 "configure" ++#line 27667 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -27516,16 +27676,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:27519: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27679: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27522: \$? = $ac_status" >&5 ++ echo "$as_me:27682: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:27525: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27685: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27528: \$? = $ac_status" >&5 ++ echo "$as_me:27688: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=$ac_mid; break + else +@@ -27541,7 +27701,7 @@ + while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27544 "configure" ++#line 27704 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -27553,16 +27713,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:27556: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27716: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27559: \$? = $ac_status" >&5 ++ echo "$as_me:27719: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:27562: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27722: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27565: \$? = $ac_status" >&5 ++ echo "$as_me:27725: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid + else +@@ -27575,12 +27735,12 @@ + ac_cv_sizeof_wchar_t=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:27578: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:27738: error: cannot run test program while cross compiling" >&5 + echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 27583 "configure" ++#line 27743 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -27596,15 +27756,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:27599: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:27759: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:27602: \$? = $ac_status" >&5 ++ echo "$as_me:27762: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:27604: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27764: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27607: \$? = $ac_status" >&5 ++ echo "$as_me:27767: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sizeof_wchar_t=`cat conftest.val` + else +@@ -27620,7 +27780,7 @@ + ac_cv_sizeof_wchar_t=0 + fi + fi +-echo "$as_me:27623: result: $ac_cv_sizeof_wchar_t" >&5 ++echo "$as_me:27783: result: $ac_cv_sizeof_wchar_t" >&5 + echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6 + cat >>confdefs.h <&6 + +-echo "${as_me:-configure}:27636: testing test failed (assume 2) ..." 1>&5 ++echo "${as_me:-configure}:27796: testing test failed (assume 2) ..." 1>&5 + + sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp + mv confdefs.tmp confdefs.h +@@ -27651,7 +27811,7 @@ + ### chooses to split module lists into libraries. + ### + ### (see CF_LIB_RULES). +-echo "$as_me:27654: checking for library subsets" >&5 ++echo "$as_me:27814: checking for library subsets" >&5 + echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 + LIB_SUBSETS= + +@@ -27705,7 +27865,7 @@ + test "x$with_widec" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar" + test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs" + +-echo "$as_me:27708: result: $LIB_SUBSETS" >&5 ++echo "$as_me:27868: result: $LIB_SUBSETS" >&5 + echo "${ECHO_T}$LIB_SUBSETS" >&6 + + ### Construct the list of include-directories to be generated +@@ -27736,7 +27896,7 @@ + fi + + ### Build up pieces for makefile rules +-echo "$as_me:27739: checking default library suffix" >&5 ++echo "$as_me:27899: checking default library suffix" >&5 + echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -27747,10 +27907,10 @@ + (shared) DFT_ARG_SUFFIX='' ;; + esac + test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" +-echo "$as_me:27750: result: $DFT_ARG_SUFFIX" >&5 ++echo "$as_me:27910: result: $DFT_ARG_SUFFIX" >&5 + echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 + +-echo "$as_me:27753: checking default library-dependency suffix" >&5 ++echo "$as_me:27913: checking default library-dependency suffix" >&5 + echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 + + case X$DFT_LWR_MODEL in +@@ -27833,10 +27993,10 @@ + DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}" + DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}" + fi +-echo "$as_me:27836: result: $DFT_DEP_SUFFIX" >&5 ++echo "$as_me:27996: result: $DFT_DEP_SUFFIX" >&5 + echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 + +-echo "$as_me:27839: checking default object directory" >&5 ++echo "$as_me:27999: checking default object directory" >&5 + echo $ECHO_N "checking default object directory... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -27852,11 +28012,11 @@ + DFT_OBJ_SUBDIR='obj_s' ;; + esac + esac +-echo "$as_me:27855: result: $DFT_OBJ_SUBDIR" >&5 ++echo "$as_me:28015: result: $DFT_OBJ_SUBDIR" >&5 + echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 + + if test "x$cf_with_cxx" = xyes ; then +-echo "$as_me:27859: checking c++ library-dependency suffix" >&5 ++echo "$as_me:28019: checking c++ library-dependency suffix" >&5 + echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6 + if test "$with_libtool" != "no"; then + # libtool thinks it can make c++ shared libraries (perhaps only g++) +@@ -27949,7 +28109,7 @@ + fi + + fi +-echo "$as_me:27952: result: $CXX_LIB_SUFFIX" >&5 ++echo "$as_me:28112: result: $CXX_LIB_SUFFIX" >&5 + echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 + + fi +@@ -28125,19 +28285,19 @@ + + if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED" + then +- echo "$as_me:28128: checking if linker supports switching between static/dynamic" >&5 ++ echo "$as_me:28288: checking if linker supports switching between static/dynamic" >&5 + echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6 + + rm -f libconftest.a + cat >conftest.$ac_ext < + int cf_ldflags_static(FILE *fp) { return fflush(fp); } + EOF +- if { (eval echo "$as_me:28137: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:28297: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:28140: \$? = $ac_status" >&5 ++ echo "$as_me:28300: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then + ( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null + ( eval $RANLIB libconftest.a ) 2>&5 >/dev/null +@@ -28148,10 +28308,10 @@ + + LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 28151 "configure" ++#line 28311 "configure" + #include "confdefs.h" + +-#line 28154 "configure" ++#line 28314 "configure" + #include + int cf_ldflags_static(FILE *fp); + +@@ -28166,16 +28326,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:28169: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:28329: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:28172: \$? = $ac_status" >&5 ++ echo "$as_me:28332: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:28175: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:28335: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:28178: \$? = $ac_status" >&5 ++ echo "$as_me:28338: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + # some linkers simply ignore the -dynamic +@@ -28198,7 +28358,7 @@ + rm -f libconftest.* + LIBS="$cf_save_LIBS" + +- echo "$as_me:28201: result: $cf_ldflags_static" >&5 ++ echo "$as_me:28361: result: $cf_ldflags_static" >&5 + echo "${ECHO_T}$cf_ldflags_static" >&6 + + if test "$cf_ldflags_static" != yes +@@ -28214,7 +28374,7 @@ + ;; + esac + +-echo "$as_me:28217: checking where we will install curses.h" >&5 ++echo "$as_me:28377: checking where we will install curses.h" >&5 + echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 + + includesubdir= +@@ -28224,7 +28384,7 @@ + then + includesubdir="/ncurses${USE_LIB_SUFFIX}" + fi +-echo "$as_me:28227: result: ${includedir}${includesubdir}" >&5 ++echo "$as_me:28387: result: ${includedir}${includesubdir}" >&5 + echo "${ECHO_T}${includedir}${includesubdir}" >&6 + + ### Resolve a conflict between normal and wide-curses by forcing applications +@@ -28232,7 +28392,7 @@ + if test "$with_overwrite" != no ; then + if test "$NCURSES_LIBUTF8" = 1 ; then + NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)' +- { echo "$as_me:28235: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 ++ { echo "$as_me:28395: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 + echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;} + fi + fi +@@ -28260,7 +28420,7 @@ + + # pkgsrc uses these + +-echo "$as_me:28263: checking for desired basename for form library" >&5 ++echo "$as_me:28423: checking for desired basename for form library" >&5 + echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6 + + # Check whether --with-form-libname or --without-form-libname was given. +@@ -28280,10 +28440,10 @@ + ;; + esac + +-echo "$as_me:28283: result: $FORM_NAME" >&5 ++echo "$as_me:28443: result: $FORM_NAME" >&5 + echo "${ECHO_T}$FORM_NAME" >&6 + +-echo "$as_me:28286: checking for desired basename for menu library" >&5 ++echo "$as_me:28446: checking for desired basename for menu library" >&5 + echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6 + + # Check whether --with-menu-libname or --without-menu-libname was given. +@@ -28303,10 +28463,10 @@ + ;; + esac + +-echo "$as_me:28306: result: $MENU_NAME" >&5 ++echo "$as_me:28466: result: $MENU_NAME" >&5 + echo "${ECHO_T}$MENU_NAME" >&6 + +-echo "$as_me:28309: checking for desired basename for panel library" >&5 ++echo "$as_me:28469: checking for desired basename for panel library" >&5 + echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6 + + # Check whether --with-panel-libname or --without-panel-libname was given. +@@ -28326,10 +28486,10 @@ + ;; + esac + +-echo "$as_me:28329: result: $PANEL_NAME" >&5 ++echo "$as_me:28489: result: $PANEL_NAME" >&5 + echo "${ECHO_T}$PANEL_NAME" >&6 + +-echo "$as_me:28332: checking for desired basename for cxx library" >&5 ++echo "$as_me:28492: checking for desired basename for cxx library" >&5 + echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6 + + # Check whether --with-cxx-libname or --without-cxx-libname was given. +@@ -28349,13 +28509,13 @@ + ;; + esac + +-echo "$as_me:28352: result: $CXX_NAME" >&5 ++echo "$as_me:28512: result: $CXX_NAME" >&5 + echo "${ECHO_T}$CXX_NAME" >&6 + + ### Construct the list of subdirectories for which we'll customize makefiles + ### with the appropriate compile-rules. + +-echo "$as_me:28358: checking for src modules" >&5 ++echo "$as_me:28518: checking for src modules" >&5 + echo $ECHO_N "checking for src modules... $ECHO_C" >&6 + + # dependencies and linker-arguments for test-programs +@@ -28424,7 +28584,7 @@ + fi + fi + done +-echo "$as_me:28427: result: $cf_cv_src_modules" >&5 ++echo "$as_me:28587: result: $cf_cv_src_modules" >&5 + echo "${ECHO_T}$cf_cv_src_modules" >&6 + + TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" +@@ -28585,7 +28745,7 @@ + (*-D_XOPEN_SOURCE_EXTENDED*) + test -n "$verbose" && echo " moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6 + +-echo "${as_me:-configure}:28588: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 ++echo "${as_me:-configure}:28748: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 + + CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED" + CPPFLAGS=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'` +@@ -28596,7 +28756,7 @@ + + # Help to automatically enable the extended curses features when using either + # the *-config or the ".pc" files by adding defines. +-echo "$as_me:28599: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5 ++echo "$as_me:28759: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5 + echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6 + PKG_CFLAGS= + for cf_loop1 in $CPPFLAGS_after_XOPEN +@@ -28612,7 +28772,7 @@ + done + test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1" + done +-echo "$as_me:28615: result: $PKG_CFLAGS" >&5 ++echo "$as_me:28775: result: $PKG_CFLAGS" >&5 + echo "${ECHO_T}$PKG_CFLAGS" >&6 + + # AC_CHECK_SIZEOF demands a literal parameter, no variables. So we do this. +@@ -28673,7 +28833,7 @@ + cf_filter_syms=$cf_dft_filter_syms + test -n "$verbose" && echo " will map symbols to ABI=$cf_cv_abi_version" 1>&6 + +-echo "${as_me:-configure}:28676: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 ++echo "${as_me:-configure}:28836: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 + + fi + +@@ -28700,7 +28860,7 @@ + + # This is used for the *-config script and *.pc data files. + +-echo "$as_me:28703: checking for linker search path" >&5 ++echo "$as_me:28863: checking for linker search path" >&5 + echo $ECHO_N "checking for linker search path... $ECHO_C" >&6 + if test "${cf_cv_ld_searchpath+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -28748,7 +28908,7 @@ + cf_pathlist="$cf_pathlist /lib /usr/lib" + ;; + (*) +- { echo "$as_me:28751: WARNING: problem with Solaris architecture" >&5 ++ { echo "$as_me:28911: WARNING: problem with Solaris architecture" >&5 + echo "$as_me: WARNING: problem with Solaris architecture" >&2;} + ;; + esac +@@ -28789,7 +28949,7 @@ + test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib + + fi +-echo "$as_me:28792: result: $cf_cv_ld_searchpath" >&5 ++echo "$as_me:28952: result: $cf_cv_ld_searchpath" >&5 + echo "${ECHO_T}$cf_cv_ld_searchpath" >&6 + + LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'` +@@ -28879,7 +29039,7 @@ + : "${CONFIG_STATUS=./config.status}" + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ echo "$as_me:28882: creating $CONFIG_STATUS" >&5 ++{ echo "$as_me:29042: creating $CONFIG_STATUS" >&5 + echo "$as_me: creating $CONFIG_STATUS" >&6;} + cat >"$CONFIG_STATUS" <<_ACEOF + #! $SHELL +@@ -29058,7 +29218,7 @@ + echo "$ac_cs_version"; exit 0 ;; + --he | --h) + # Conflict between --help and --header +- { { echo "$as_me:29061: error: ambiguous option: $1 ++ { { echo "$as_me:29221: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&5 + echo "$as_me: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&2;} +@@ -29077,7 +29237,7 @@ + ac_need_defaults=false;; + + # This is an error. +- -*) { { echo "$as_me:29080: error: unrecognized option: $1 ++ -*) { { echo "$as_me:29240: error: unrecognized option: $1 + Try \`$0 --help' for more information." >&5 + echo "$as_me: error: unrecognized option: $1 + Try \`$0 --help' for more information." >&2;} +@@ -29203,7 +29363,7 @@ + "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; + "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; +- *) { { echo "$as_me:29206: error: invalid argument: $ac_config_target" >&5 ++ *) { { echo "$as_me:29366: error: invalid argument: $ac_config_target" >&5 + echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +@@ -29715,7 +29875,7 @@ + esac + + if test x"$ac_file" != x-; then +- { echo "$as_me:29718: creating $ac_file" >&5 ++ { echo "$as_me:29878: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi +@@ -29733,7 +29893,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:29736: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:29896: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -29746,7 +29906,7 @@ + echo "$srcdir/$f" + else + # /dev/null tree +- { { echo "$as_me:29749: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:29909: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -29762,7 +29922,7 @@ + if test -n "$ac_seen"; then + ac_used=`grep '@datarootdir@' "$ac_item"` + if test -z "$ac_used"; then +- { echo "$as_me:29765: WARNING: datarootdir was used implicitly but not set: ++ { echo "$as_me:29925: WARNING: datarootdir was used implicitly but not set: + $ac_seen" >&5 + echo "$as_me: WARNING: datarootdir was used implicitly but not set: + $ac_seen" >&2;} +@@ -29771,7 +29931,7 @@ + fi + ac_seen=`grep '${datarootdir}' "$ac_item"` + if test -n "$ac_seen"; then +- { echo "$as_me:29774: WARNING: datarootdir was used explicitly but not set: ++ { echo "$as_me:29934: WARNING: datarootdir was used explicitly but not set: + $ac_seen" >&5 + echo "$as_me: WARNING: datarootdir was used explicitly but not set: + $ac_seen" >&2;} +@@ -29808,7 +29968,7 @@ + ac_init=`${EGREP-egrep} '[ ]*'$ac_name'[ ]*=' "$ac_file"` + if test -z "$ac_init"; then + ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` +- { echo "$as_me:29811: WARNING: Variable $ac_name is used but was not set: ++ { echo "$as_me:29971: WARNING: Variable $ac_name is used but was not set: + $ac_seen" >&5 + echo "$as_me: WARNING: Variable $ac_name is used but was not set: + $ac_seen" >&2;} +@@ -29819,7 +29979,7 @@ + ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out + if test -s $tmp/out; then + ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` +- { echo "$as_me:29822: WARNING: Some variables may not be substituted: ++ { echo "$as_me:29982: WARNING: Some variables may not be substituted: + $ac_seen" >&5 + echo "$as_me: WARNING: Some variables may not be substituted: + $ac_seen" >&2;} +@@ -29868,7 +30028,7 @@ + * ) ac_file_in=$ac_file.in ;; + esac + +- test x"$ac_file" != x- && { echo "$as_me:29871: creating $ac_file" >&5 ++ test x"$ac_file" != x- && { echo "$as_me:30031: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + + # First look for the input files in the build tree, otherwise in the +@@ -29879,7 +30039,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:29882: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:30042: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -29892,7 +30052,7 @@ + echo "$srcdir/$f" + else + # /dev/null tree +- { { echo "$as_me:29895: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:30055: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -29950,7 +30110,7 @@ + rm -f $tmp/in + if test x"$ac_file" != x-; then + if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then +- { echo "$as_me:29953: $ac_file is unchanged" >&5 ++ { echo "$as_me:30113: $ac_file is unchanged" >&5 + echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +@@ -30337,7 +30497,7 @@ + (cygdll|msysdll|mingw|msvcdll) + test "x$with_shared_cxx" = xno && test -n "$verbose" && echo " overriding CXX_MODEL to SHARED" 1>&6 + +-echo "${as_me:-configure}:30340: testing overriding CXX_MODEL to SHARED ..." 1>&5 ++echo "${as_me:-configure}:30500: testing overriding CXX_MODEL to SHARED ..." 1>&5 + + with_shared_cxx=yes + ;; +Index: configure.in +Prereq: 1.737 +--- ncurses-6.3-20211127+/configure.in 2021-10-30 14:14:11.000000000 +0000 ++++ ncurses-6.3-20211204/configure.in 2021-12-04 23:10:01.000000000 +0000 +@@ -29,7 +29,7 @@ + dnl + dnl Author: Thomas E. Dickey 1995-on + dnl +-dnl $Id: configure.in,v 1.737 2021/10/30 14:14:11 tom Exp $ ++dnl $Id: configure.in,v 1.738 2021/12/04 23:10:01 tom Exp $ + dnl Process this file with autoconf to produce a configure script. + dnl + dnl For additional information, see +@@ -38,7 +38,7 @@ + dnl + dnl --------------------------------------------------------------------------- + AC_PREREQ(2.52.20210101) +-AC_REVISION($Revision: 1.737 $) ++AC_REVISION($Revision: 1.738 $) + AC_INIT(ncurses/base/lib_initscr.c) + AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) + +@@ -1737,7 +1737,6 @@ + sys/select.h \ + sys/time.h \ + sys/times.h \ +-ttyent.h \ + unistd.h \ + wctype.h \ + ) +@@ -1792,7 +1791,6 @@ + getegid \ + geteuid \ + getopt \ +-getttynam \ + issetugid \ + localeconv \ + poll \ +@@ -1816,6 +1814,8 @@ + vsnprintf \ + ) + ++CF_FUNC_GETTTYNAM ++ + if test "x$ac_cv_func_getopt" = xno && \ + test "x$cf_with_progs$cf_with_tests" != xnono; then + AC_MSG_ERROR(getopt is required for building programs) +Index: dist.mk +Prereq: 1.1452 +--- ncurses-6.3-20211127+/dist.mk 2021-11-27 15:02:04.000000000 +0000 ++++ ncurses-6.3-20211204/dist.mk 2021-12-04 12:21:05.000000000 +0000 +@@ -26,7 +26,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: dist.mk,v 1.1452 2021/11/27 15:02:04 tom Exp $ ++# $Id: dist.mk,v 1.1453 2021/12/04 12:21:05 tom Exp $ + # Makefile for creating ncurses distributions. + # + # This only needs to be used directly as a makefile by developers, but +@@ -38,7 +38,7 @@ + # These define the major/minor/patch versions of ncurses. + NCURSES_MAJOR = 6 + NCURSES_MINOR = 3 +-NCURSES_PATCH = 20211127 ++NCURSES_PATCH = 20211204 + + # We don't append the patch to the version, since this only applies to releases + VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) +Index: include/ncurses_defs +Prereq: 1.97 +--- ncurses-6.3-20211127+/include/ncurses_defs 2021-06-26 18:56:32.000000000 +0000 ++++ ncurses-6.3-20211204/include/ncurses_defs 2021-12-04 23:01:31.000000000 +0000 +@@ -1,4 +1,4 @@ +-# $Id: ncurses_defs,v 1.97 2021/06/26 18:56:32 tom Exp $ ++# $Id: ncurses_defs,v 1.98 2021/12/04 23:01:31 tom Exp $ + ############################################################################## + # Copyright 2018-2020,2021 Thomas E. Dickey # + # Copyright 2000-2016,2017 Free Software Foundation, Inc. # +@@ -122,6 +122,7 @@ + HAVE_NC_ALLOC_H + HAVE_NEWPAD 1 + HAVE_PANEL_H ++HAVE_PATH_TTYS + HAVE_PCRE2POSIX_H + HAVE_PCREPOSIX_H + HAVE_POLL +@@ -186,7 +187,6 @@ + HAVE_TIMES + HAVE_TPUTS_SP + HAVE_TSEARCH +-HAVE_TTYENT_H + HAVE_TYPEAHEAD 1 + HAVE_TYPEINFO + HAVE_TYPE_ATTR_T +Index: package/debian-mingw/changelog +--- ncurses-6.3-20211127+/package/debian-mingw/changelog 2021-11-21 16:19:20.000000000 +0000 ++++ ncurses-6.3-20211204/package/debian-mingw/changelog 2021-12-04 12:21:05.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20211127) unstable; urgency=low ++ncurses6 (6.3+20211204) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sun, 21 Nov 2021 11:19:20 -0500 ++ -- Thomas E. Dickey Sat, 04 Dec 2021 07:21:05 -0500 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian-mingw64/changelog +--- ncurses-6.3-20211127+/package/debian-mingw64/changelog 2021-11-21 16:19:20.000000000 +0000 ++++ ncurses-6.3-20211204/package/debian-mingw64/changelog 2021-12-04 12:21:05.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20211127) unstable; urgency=low ++ncurses6 (6.3+20211204) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sun, 21 Nov 2021 11:19:20 -0500 ++ -- Thomas E. Dickey Sat, 04 Dec 2021 07:21:05 -0500 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian/changelog +--- ncurses-6.3-20211127+/package/debian/changelog 2021-11-21 16:19:20.000000000 +0000 ++++ ncurses-6.3-20211204/package/debian/changelog 2021-12-04 12:21:05.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20211127) unstable; urgency=low ++ncurses6 (6.3+20211204) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sun, 21 Nov 2021 11:19:20 -0500 ++ -- Thomas E. Dickey Sat, 04 Dec 2021 07:21:05 -0500 + + ncurses6 (5.9-20120608) unstable; urgency=low + +Index: package/mingw-ncurses.nsi +Prereq: 1.494 +--- ncurses-6.3-20211127+/package/mingw-ncurses.nsi 2021-11-21 16:19:20.000000000 +0000 ++++ ncurses-6.3-20211204/package/mingw-ncurses.nsi 2021-12-04 12:21:05.000000000 +0000 +@@ -1,4 +1,4 @@ +-; $Id: mingw-ncurses.nsi,v 1.494 2021/11/21 16:19:20 tom Exp $ ++; $Id: mingw-ncurses.nsi,v 1.495 2021/12/04 12:21:05 tom Exp $ + + ; TODO add examples + ; TODO bump ABI to 6 +@@ -10,7 +10,7 @@ + !define VERSION_MAJOR "6" + !define VERSION_MINOR "3" + !define VERSION_YYYY "2021" +-!define VERSION_MMDD "1127" ++!define VERSION_MMDD "1204" + !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} + + !define MY_ABI "5" +Index: package/mingw-ncurses.spec +--- ncurses-6.3-20211127+/package/mingw-ncurses.spec 2021-11-21 16:19:20.000000000 +0000 ++++ ncurses-6.3-20211204/package/mingw-ncurses.spec 2021-12-04 12:21:05.000000000 +0000 +@@ -3,7 +3,7 @@ + Summary: shared libraries for terminal handling + Name: mingw32-ncurses6 + Version: 6.3 +-Release: 20211127 ++Release: 20211204 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncurses.spec +--- ncurses-6.3-20211127+/package/ncurses.spec 2021-11-21 16:19:20.000000000 +0000 ++++ ncurses-6.3-20211204/package/ncurses.spec 2021-12-04 12:21:05.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: shared libraries for terminal handling + Name: ncurses6 + Version: 6.3 +-Release: 20211127 ++Release: 20211204 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncursest.spec +--- ncurses-6.3-20211127+/package/ncursest.spec 2021-11-21 16:19:20.000000000 +0000 ++++ ncurses-6.3-20211204/package/ncursest.spec 2021-12-04 12:21:05.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: Curses library with POSIX thread support. + Name: ncursest6 + Version: 6.3 +-Release: 20211127 ++Release: 20211204 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: progs/tset.c +Prereq: 1.130 +--- ncurses-6.3-20211127+/progs/tset.c 2021-10-02 18:08:09.000000000 +0000 ++++ ncurses-6.3-20211204/progs/tset.c 2021-12-04 23:02:13.000000000 +0000 +@@ -91,14 +91,14 @@ + #include + #include + +-#if HAVE_GETTTYNAM && HAVE_TTYENT_H ++#if HAVE_GETTTYNAM + #include + #endif + #ifdef NeXT + char *ttyname(int fd); + #endif + +-MODULE_ID("$Id: tset.c,v 1.130 2021/10/02 18:08:09 tom Exp $") ++MODULE_ID("$Id: tset.c,v 1.131 2021/12/04 23:02:13 tom Exp $") + + #ifndef environ + extern char **environ; +@@ -545,12 +545,14 @@ + int errret; + char *p; + const char *ttype; ++#if HAVE_PATH_TTYS + #if HAVE_GETTTYNAM + struct ttyent *t; + #else + FILE *fp; + #endif + char *ttypath; ++#endif /* HAVE_PATH_TTYS */ + + (void) fd; + +@@ -563,6 +565,7 @@ + if ((ttype = getenv("TERM")) != 0) + goto map; + ++#if HAVE_PATH_TTYS + if ((ttypath = ttyname(fd)) != 0) { + p = _nc_basename(ttypath); + #if HAVE_GETTTYNAM +@@ -600,6 +603,7 @@ + } + #endif /* HAVE_GETTTYNAM */ + } ++#endif /* HAVE_PATH_TTYS */ + + /* If still undefined, use "unknown". */ + ttype = "unknown"; diff --git a/system/ncurses/ncurses-6.3-20211211.patch b/system/ncurses/ncurses-6.3-20211211.patch new file mode 100644 index 000000000..7a83f4e79 --- /dev/null +++ b/system/ncurses/ncurses-6.3-20211211.patch @@ -0,0 +1,544 @@ +# ncurses 6.3 - patch 20211211 - Thomas E. Dickey +# +# ------------------------------------------------------------------------------ +# +# Ncurses 6.3 is at +# ftp://ftp.invisible-island.net/ncurses/ +# https://invisible-mirror.net/archives/ncurses/ +# https://ftp.gnu.org/gnu/ncurses/ +# +# Patches for ncurses 6.3 can be found at +# ftp://ftp.invisible-island.net/ncurses/6.3 +# https://invisible-mirror.net/archives/ncurses/6.3 +# +# ------------------------------------------------------------------------------ +# ftp://ftp.invisible-island.net/ncurses/6.3/ncurses-6.3-20211211.patch.gz +# patch by Thomas E. Dickey +# created Sun Dec 12 01:11:22 UTC 2021 +# ------------------------------------------------------------------------------ +# Ada95/gen/gen.c | 7 - +# MANIFEST | 1 +# NEWS | 5 +# VERSION | 2 +# dist.mk | 4 +# ncurses-6.3-20211211/test/combine.c | 204 ++++++++++++++++++++++++++++++++++ +# ncurses/base/lib_delwin.c | 5 +# package/debian-mingw/changelog | 4 +# package/debian-mingw64/changelog | 4 +# package/debian/changelog | 4 +# package/mingw-ncurses.nsi | 4 +# package/mingw-ncurses.spec | 2 +# package/ncurses.spec | 2 +# package/ncursest.spec | 2 +# progs/tic.c | 7 - +# test/modules | 3 +# test/programs | 3 +# 17 files changed, 237 insertions(+), 26 deletions(-) +# ------------------------------------------------------------------------------ +Index: Ada95/gen/gen.c +Prereq: 1.77 +--- ncurses-6.3-20211204+/Ada95/gen/gen.c 2020-08-16 18:05:05.000000000 +0000 ++++ ncurses-6.3-20211211/Ada95/gen/gen.c 2021-12-11 21:03:21.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2020 Thomas E. Dickey * ++ * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 1998-2014,2016 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -35,7 +35,7 @@ + + /* + Version Control +- $Id: gen.c,v 1.77 2020/08/16 18:05:05 tom Exp $ ++ $Id: gen.c,v 1.78 2021/12/11 21:03:21 tom Exp $ + --------------------------------------------------------------------------*/ + /* + This program prints on its standard output the source for the +@@ -95,7 +95,7 @@ + const char *name, + size_t value) + { +- fprintf(fp, " %-28s : constant := %lu;\n", name, value); ++ fprintf(fp, " %-28s : constant := %lu;\n", name, (unsigned long)value); + } + + #define PRINT_NAMED_CONSTANT(name) \ +@@ -490,6 +490,7 @@ + print_comment(fp, "Field_Options from opts(3FORM)"); + PRINT_NAMED_BITMASK(Field_Options, O_NL_OVERLOAD); + PRINT_NAMED_BITMASK(Field_Options, O_BS_OVERLOAD); ++ + /* Field_Options_Size is defined below */ + + print_comment(fp, "MEVENT structure from mouse(3NCURSES)"); +Index: MANIFEST +--- ncurses-6.3-20211204+/MANIFEST 2021-10-20 22:50:11.000000000 +0000 ++++ ncurses-6.3-20211211/MANIFEST 2021-12-11 21:06:27.000000000 +0000 +@@ -1111,6 +1111,7 @@ + ./test/color_content.c + ./test/color_name.h + ./test/color_set.c ++./test/combine.c + ./test/configure + ./test/configure.in + ./test/demo_altkeys.c +Index: NEWS +Prereq: 1.3753 +--- ncurses-6.3-20211204+/NEWS 2021-12-04 23:03:57.000000000 +0000 ++++ ncurses-6.3-20211211/NEWS 2021-12-11 21:46:44.000000000 +0000 +@@ -26,7 +26,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: NEWS,v 1.3753 2021/12/04 23:03:57 tom Exp $ ++-- $Id: NEWS,v 1.3755 2021/12/11 21:46:44 tom Exp $ + ------------------------------------------------------------------------------- + + This is a log of changes that ncurses has gone through since Zeyd started +@@ -46,6 +46,9 @@ + Changes through 1.9.9e did not credit all contributions; + it is not possible to add this information. + ++20211211 ++ + add test/combine.c, to demo/test combining characters. ++ + 20211204 + + improve configure check for getttynam (report by Werner Fink). + +Index: VERSION +--- ncurses-6.3-20211204+/VERSION 2021-12-04 12:21:05.000000000 +0000 ++++ ncurses-6.3-20211211/VERSION 2021-12-11 13:00:34.000000000 +0000 +@@ -1 +1 @@ +-5:0:10 6.3 20211204 ++5:0:10 6.3 20211211 +Index: dist.mk +Prereq: 1.1453 +--- ncurses-6.3-20211204+/dist.mk 2021-12-04 12:21:05.000000000 +0000 ++++ ncurses-6.3-20211211/dist.mk 2021-12-11 13:00:34.000000000 +0000 +@@ -26,7 +26,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: dist.mk,v 1.1453 2021/12/04 12:21:05 tom Exp $ ++# $Id: dist.mk,v 1.1454 2021/12/11 13:00:34 tom Exp $ + # Makefile for creating ncurses distributions. + # + # This only needs to be used directly as a makefile by developers, but +@@ -38,7 +38,7 @@ + # These define the major/minor/patch versions of ncurses. + NCURSES_MAJOR = 6 + NCURSES_MINOR = 3 +-NCURSES_PATCH = 20211204 ++NCURSES_PATCH = 20211211 + + # We don't append the patch to the version, since this only applies to releases + VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) +Index: ncurses/base/lib_delwin.c +Prereq: 1.23 +--- ncurses-6.3-20211204+/ncurses/base/lib_delwin.c 2021-11-15 23:05:32.000000000 +0000 ++++ ncurses-6.3-20211211/ncurses/base/lib_delwin.c 2021-12-11 23:56:25.000000000 +0000 +@@ -43,16 +43,17 @@ + + #include + +-MODULE_ID("$Id: lib_delwin.c,v 1.23 2021/11/15 23:05:32 tom Exp $") ++MODULE_ID("$Id: lib_delwin.c,v 1.24 2021/12/11 23:56:25 tom Exp $") + + static bool + cannot_delete(WINDOW *win) + { +- WINDOWLIST *p; + bool result = TRUE; ++ + if (IS_PAD(win)) { + result = FALSE; + } else { ++ WINDOWLIST *p; + #ifdef USE_SP_WINDOWLIST + SCREEN *sp = _nc_screen_of(win); + #endif +Index: package/debian-mingw/changelog +--- ncurses-6.3-20211204+/package/debian-mingw/changelog 2021-12-04 12:21:05.000000000 +0000 ++++ ncurses-6.3-20211211/package/debian-mingw/changelog 2021-12-11 13:00:34.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20211204) unstable; urgency=low ++ncurses6 (6.3+20211211) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sat, 04 Dec 2021 07:21:05 -0500 ++ -- Thomas E. Dickey Sat, 11 Dec 2021 08:00:34 -0500 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian-mingw64/changelog +--- ncurses-6.3-20211204+/package/debian-mingw64/changelog 2021-12-04 12:21:05.000000000 +0000 ++++ ncurses-6.3-20211211/package/debian-mingw64/changelog 2021-12-11 13:00:34.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20211204) unstable; urgency=low ++ncurses6 (6.3+20211211) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sat, 04 Dec 2021 07:21:05 -0500 ++ -- Thomas E. Dickey Sat, 11 Dec 2021 08:00:34 -0500 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian/changelog +--- ncurses-6.3-20211204+/package/debian/changelog 2021-12-04 12:21:05.000000000 +0000 ++++ ncurses-6.3-20211211/package/debian/changelog 2021-12-11 13:00:34.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20211204) unstable; urgency=low ++ncurses6 (6.3+20211211) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sat, 04 Dec 2021 07:21:05 -0500 ++ -- Thomas E. Dickey Sat, 11 Dec 2021 08:00:34 -0500 + + ncurses6 (5.9-20120608) unstable; urgency=low + +Index: package/mingw-ncurses.nsi +Prereq: 1.495 +--- ncurses-6.3-20211204+/package/mingw-ncurses.nsi 2021-12-04 12:21:05.000000000 +0000 ++++ ncurses-6.3-20211211/package/mingw-ncurses.nsi 2021-12-11 13:00:34.000000000 +0000 +@@ -1,4 +1,4 @@ +-; $Id: mingw-ncurses.nsi,v 1.495 2021/12/04 12:21:05 tom Exp $ ++; $Id: mingw-ncurses.nsi,v 1.496 2021/12/11 13:00:34 tom Exp $ + + ; TODO add examples + ; TODO bump ABI to 6 +@@ -10,7 +10,7 @@ + !define VERSION_MAJOR "6" + !define VERSION_MINOR "3" + !define VERSION_YYYY "2021" +-!define VERSION_MMDD "1204" ++!define VERSION_MMDD "1211" + !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} + + !define MY_ABI "5" +Index: package/mingw-ncurses.spec +--- ncurses-6.3-20211204+/package/mingw-ncurses.spec 2021-12-04 12:21:05.000000000 +0000 ++++ ncurses-6.3-20211211/package/mingw-ncurses.spec 2021-12-11 13:00:34.000000000 +0000 +@@ -3,7 +3,7 @@ + Summary: shared libraries for terminal handling + Name: mingw32-ncurses6 + Version: 6.3 +-Release: 20211204 ++Release: 20211211 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncurses.spec +--- ncurses-6.3-20211204+/package/ncurses.spec 2021-12-04 12:21:05.000000000 +0000 ++++ ncurses-6.3-20211211/package/ncurses.spec 2021-12-11 13:00:34.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: shared libraries for terminal handling + Name: ncurses6 + Version: 6.3 +-Release: 20211204 ++Release: 20211211 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncursest.spec +--- ncurses-6.3-20211204+/package/ncursest.spec 2021-12-04 12:21:05.000000000 +0000 ++++ ncurses-6.3-20211211/package/ncursest.spec 2021-12-11 13:00:34.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: Curses library with POSIX thread support. + Name: ncursest6 + Version: 6.3 +-Release: 20211204 ++Release: 20211211 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: progs/tic.c +Prereq: 1.307 +--- ncurses-6.3-20211204+/progs/tic.c 2021-10-05 08:07:05.000000000 +0000 ++++ ncurses-6.3-20211211/progs/tic.c 2021-12-12 00:00:33.000000000 +0000 +@@ -49,7 +49,7 @@ + #include + #include + +-MODULE_ID("$Id: tic.c,v 1.307 2021/10/05 08:07:05 tom Exp $") ++MODULE_ID("$Id: tic.c,v 1.308 2021/12/12 00:00:33 tom Exp $") + + #define STDIN_NAME "" + +@@ -682,7 +682,6 @@ + main(int argc, char *argv[]) + { + char my_tmpname[PATH_MAX]; +- char my_altfile[PATH_MAX]; + int v_opt = -1; + int smart_defaults = TRUE; + char *termcap; +@@ -933,6 +932,7 @@ + } + + if (tmp_fp == NULL) { ++ char my_altfile[PATH_MAX]; + tmp_fp = open_input(source_file, my_altfile); + if (!strcmp(source_file, "-")) { + source_file = STDIN_NAME; +@@ -2717,12 +2717,11 @@ + static void + check_conflict(TERMTYPE2 *tp) + { +- bool conflict = FALSE; +- + if (!(_nc_syntax == SYN_TERMCAP && capdump)) { + char *check = calloc((size_t) (NUM_STRINGS(tp) + 1), sizeof(char)); + NAME_VALUE *given = get_fkey_list(tp); + unsigned j, k; ++ bool conflict = FALSE; + + if (check == NULL) + failed("check_conflict"); +Index: test/combine.c +--- /dev/null 2021-12-11 17:04:04.096000000 +0000 ++++ ncurses-6.3-20211211/test/combine.c 2021-12-12 01:10:28.000000000 +0000 +@@ -0,0 +1,204 @@ ++/**************************************************************************** ++ * Copyright 2021 Thomas E. Dickey * ++ * * ++ * Permission is hereby granted, free of charge, to any person obtaining a * ++ * copy of this software and associated documentation files (the * ++ * "Software"), to deal in the Software without restriction, including * ++ * without limitation the rights to use, copy, modify, merge, publish, * ++ * distribute, distribute with modifications, sublicense, and/or sell * ++ * copies of the Software, and to permit persons to whom the Software is * ++ * furnished to do so, subject to the following conditions: * ++ * * ++ * The above copyright notice and this permission notice shall be included * ++ * in all copies or substantial portions of the Software. * ++ * * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * ++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * ++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * ++ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * ++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * ++ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * ++ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ++ * * ++ * Except as contained in this notice, the name(s) of the above copyright * ++ * holders shall not be used in advertising or otherwise to promote the * ++ * sale, use or other dealings in this Software without prior written * ++ * authorization. * ++ ****************************************************************************/ ++/* ++ * $Id: combine.c,v 1.7 2021/12/12 01:10:28 tom Exp $ ++ */ ++ ++#include ++ ++#if USE_WIDEC_SUPPORT ++ ++static int c_opt; ++static int r_opt; ++ ++static int ++next_char(int value) ++{ ++ do { ++ ++value; ++ } while (!iswprint((wint_t) value)); ++ return value; ++} ++ ++static void ++do_row(int row, int base_ch, int over_ch) ++{ ++ int col = 0; ++ bool done = FALSE; ++ bool reverse = (r_opt && !(row % 2)); ++ ++ move(row, col); ++ printw("[U+%04X]", over_ch); ++ do { ++ if (c_opt) { ++ wchar_t source[2]; ++ cchar_t target; ++ attr_t attr = reverse ? A_REVERSE : A_NORMAL; ++ ++ source[1] = 0; ++ ++ source[0] = base_ch; ++ setcchar(&target, source, attr, 0, NULL); ++ add_wch(&target); ++ ++ source[0] = over_ch; ++ setcchar(&target, source, attr, 0, NULL); ++ add_wch(&target); ++ } else { ++ wchar_t data[3]; ++ ++ data[0] = base_ch; ++ data[1] = over_ch; ++ data[2] = 0; ++ if (reverse) ++ attr_on(A_REVERSE, NULL); ++ addwstr(data); ++ if (reverse) ++ attr_off(A_REVERSE, NULL); ++ } ++ col = getcurx(stdscr); ++ base_ch = next_char(base_ch); ++ done = (col + 1 >= COLS); ++ } while (!done); ++} ++ ++#define LAST_OVER 0x6f ++ ++static int ++next_over(int value) ++{ ++ if (++value > LAST_OVER) ++ value = 0; ++ return value; ++} ++ ++static int ++prev_over(int value) ++{ ++ if (--value < 0) ++ value = LAST_OVER; ++ return value; ++} ++ ++static void ++do_all(int over_it) ++{ ++ int row; ++ ++ for (row = 0; row < LINES; ++row) { ++ do_row(row, ' ', 0x300 + over_it); ++ over_it = next_over(over_it); ++ } ++} ++ ++static void ++usage(void) ++{ ++ static const char *msg[] = ++ { ++ "Usage: combine [options]", ++ "", ++ "Demonstrate combining-characters.", ++ "", ++ "Options:", ++ " -c use cchar_t data rather than wchar_t string", ++ " -r draw even-numbered rows in reverse-video", ++ }; ++ unsigned n; ++ for (n = 0; n < SIZEOF(msg); ++n) { ++ fprintf(stderr, "%s\n", msg[n]); ++ } ++ ExitProgram(EXIT_FAILURE); ++} ++ ++int ++main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) ++{ ++ int n; ++ int over_it = 0; ++ bool done = FALSE; ++ ++ while ((n = getopt(argc, argv, "cr")) != -1) { ++ switch (n) { ++ case 'c': ++ c_opt = TRUE; ++ break; ++ case 'r': ++ r_opt = TRUE; ++ break; ++ default: ++ usage(); ++ break; ++ } ++ } ++ ++ setlocale(LC_ALL, ""); ++ initscr(); ++ cbreak(); ++ noecho(); ++ keypad(stdscr, TRUE); ++ ++ do { ++ do_all(over_it); ++ switch (getch()) { ++ case 'q': ++ case QUIT: ++ case ESCAPE: ++ done = TRUE; ++ break; ++ case KEY_HOME: ++ case '0': ++ over_it = 0; ++ break; ++ case KEY_END: ++ case '$': ++ over_it = LAST_OVER; ++ break; ++ case KEY_UP: ++ case '-': ++ over_it = prev_over(over_it); ++ break; ++ case KEY_DOWN: ++ case '+': ++ over_it = next_over(over_it); ++ break; ++ } ++ } while (!done); ++ ++ endwin(); ++ ++ ExitProgram(EXIT_SUCCESS); ++} ++#else ++int ++main(void) ++{ ++ printf("This program requires wide-curses functions\n"); ++ ExitProgram(EXIT_FAILURE); ++} ++#endif +Index: test/modules +Prereq: 1.74 +--- ncurses-6.3-20211204+/test/modules 2021-02-13 16:33:43.000000000 +0000 ++++ ncurses-6.3-20211211/test/modules 2021-12-11 17:41:34.000000000 +0000 +@@ -1,4 +1,4 @@ +-# $Id: modules,v 1.74 2021/02/13 16:33:43 tom Exp $ ++# $Id: modules,v 1.75 2021/12/11 17:41:34 tom Exp $ + ############################################################################## + # Copyright 2018-2020,2021 Thomas E. Dickey # + # Copyright 1998-2016,2017 Free Software Foundation, Inc. # +@@ -42,6 +42,7 @@ + clip_printw progs $(srcdir) $(HEADER_DEPS) $(srcdir)/popup_msg.h + color_content progs $(srcdir) $(HEADER_DEPS) + color_set progs $(srcdir) $(HEADER_DEPS) ++combine progs $(srcdir) $(HEADER_DEPS) + demo_altkeys progs $(srcdir) $(HEADER_DEPS) + demo_defkey progs $(srcdir) $(HEADER_DEPS) + demo_forms progs $(srcdir) $(HEADER_DEPS) $(srcdir)/edit_field.h +Index: test/programs +Prereq: 1.49 +--- ncurses-6.3-20211204+/test/programs 2021-03-13 20:37:44.000000000 +0000 ++++ ncurses-6.3-20211211/test/programs 2021-12-11 17:46:18.000000000 +0000 +@@ -1,4 +1,4 @@ +-# $Id: programs,v 1.49 2021/03/13 20:37:44 tom Exp $ ++# $Id: programs,v 1.50 2021/12/11 17:46:18 tom Exp $ + ############################################################################## + # Copyright 2018-2020,2021 Thomas E. Dickey # + # Copyright 2006-2016,2017 Free Software Foundation, Inc. # +@@ -40,6 +40,7 @@ + clip_printw $(LDFLAGS_CURSES) $(LOCAL_LIBS) clip_printw popup_msg + color_content $(LDFLAGS_CURSES) $(LOCAL_LIBS) color_content + color_set $(LDFLAGS_CURSES) $(LOCAL_LIBS) color_set ++combine $(LDFLAGS_CURSES) $(LOCAL_LIBS) combine popup_msg + demo_altkeys $(LDFLAGS_CURSES) $(LOCAL_LIBS) demo_altkeys + demo_defkey $(LDFLAGS_CURSES) $(LOCAL_LIBS) demo_defkey + demo_forms $(LDFLAGS_DEFAULT) $(LOCAL_LIBS) demo_forms edit_field popup_msg diff --git a/system/ncurses/ncurses-6.3-20211219.patch b/system/ncurses/ncurses-6.3-20211219.patch new file mode 100644 index 000000000..d4ffd19e2 --- /dev/null +++ b/system/ncurses/ncurses-6.3-20211219.patch @@ -0,0 +1,784 @@ +# ncurses 6.3 - patch 20211219 - Thomas E. Dickey +# +# ------------------------------------------------------------------------------ +# +# Ncurses 6.3 is at +# ftp://ftp.invisible-island.net/ncurses/ +# https://invisible-mirror.net/archives/ncurses/ +# https://ftp.gnu.org/gnu/ncurses/ +# +# Patches for ncurses 6.3 can be found at +# ftp://ftp.invisible-island.net/ncurses/6.3 +# https://invisible-mirror.net/archives/ncurses/6.3 +# +# ------------------------------------------------------------------------------ +# ftp://ftp.invisible-island.net/ncurses/6.3/ncurses-6.3-20211219.patch.gz +# patch by Thomas E. Dickey +# created Mon Dec 20 00:46:47 UTC 2021 +# ------------------------------------------------------------------------------ +# NEWS | 7 +- +# VERSION | 2 +# dist.mk | 4 - +# package/debian-mingw/changelog | 4 - +# package/debian-mingw64/changelog | 4 - +# package/debian/changelog | 4 - +# package/mingw-ncurses.nsi | 4 - +# package/mingw-ncurses.spec | 2 +# package/ncurses.spec | 2 +# package/ncursest.spec | 2 +# test/Makefile.in | 13 ++- +# test/combine.c | 117 ++++++++++++++++++++++++++++++++--- +# test/mk-test.awk | 40 +++++++++-- +# test/movewindow.c | 12 --- +# test/package/debian/rules | 15 ++-- +# test/package/ncurses-examples.spec | 27 ++++---- +# test/popup_msg.c | 6 - +# test/programs | 4 - +# test/test.priv.h | 10 ++ +# 19 files changed, 207 insertions(+), 72 deletions(-) +# ------------------------------------------------------------------------------ +Index: NEWS +Prereq: 1.3755 +--- ncurses-6.3-20211211+/NEWS 2021-12-11 21:46:44.000000000 +0000 ++++ ncurses-6.3-20211219/NEWS 2021-12-19 11:24:57.000000000 +0000 +@@ -26,7 +26,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: NEWS,v 1.3755 2021/12/11 21:46:44 tom Exp $ ++-- $Id: NEWS,v 1.3759 2021/12/19 11:24:57 tom Exp $ + ------------------------------------------------------------------------------- + + This is a log of changes that ncurses has gone through since Zeyd started +@@ -46,6 +46,11 @@ + Changes through 1.9.9e did not credit all contributions; + it is not possible to add this information. + ++20211219 ++ + install ncurses-examples programs in libexecdir, adding a wrapper ++ script to invoke those. ++ + add help-screen and screen-dump to test/combine.c ++ + 20211211 + + add test/combine.c, to demo/test combining characters. + +Index: VERSION +--- ncurses-6.3-20211211+/VERSION 2021-12-11 13:00:34.000000000 +0000 ++++ ncurses-6.3-20211219/VERSION 2021-12-19 11:24:57.000000000 +0000 +@@ -1 +1 @@ +-5:0:10 6.3 20211211 ++5:0:10 6.3 20211219 +Index: dist.mk +Prereq: 1.1454 +--- ncurses-6.3-20211211+/dist.mk 2021-12-11 13:00:34.000000000 +0000 ++++ ncurses-6.3-20211219/dist.mk 2021-12-19 11:24:57.000000000 +0000 +@@ -26,7 +26,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: dist.mk,v 1.1454 2021/12/11 13:00:34 tom Exp $ ++# $Id: dist.mk,v 1.1456 2021/12/19 11:24:57 tom Exp $ + # Makefile for creating ncurses distributions. + # + # This only needs to be used directly as a makefile by developers, but +@@ -38,7 +38,7 @@ + # These define the major/minor/patch versions of ncurses. + NCURSES_MAJOR = 6 + NCURSES_MINOR = 3 +-NCURSES_PATCH = 20211211 ++NCURSES_PATCH = 20211219 + + # We don't append the patch to the version, since this only applies to releases + VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) +Index: package/debian-mingw/changelog +--- ncurses-6.3-20211211+/package/debian-mingw/changelog 2021-12-11 13:00:34.000000000 +0000 ++++ ncurses-6.3-20211219/package/debian-mingw/changelog 2021-12-19 11:24:57.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20211211) unstable; urgency=low ++ncurses6 (6.3+20211219) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sat, 11 Dec 2021 08:00:34 -0500 ++ -- Thomas E. Dickey Sun, 19 Dec 2021 06:24:57 -0500 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian-mingw64/changelog +--- ncurses-6.3-20211211+/package/debian-mingw64/changelog 2021-12-11 13:00:34.000000000 +0000 ++++ ncurses-6.3-20211219/package/debian-mingw64/changelog 2021-12-19 11:24:57.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20211211) unstable; urgency=low ++ncurses6 (6.3+20211219) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sat, 11 Dec 2021 08:00:34 -0500 ++ -- Thomas E. Dickey Sun, 19 Dec 2021 06:24:57 -0500 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian/changelog +--- ncurses-6.3-20211211+/package/debian/changelog 2021-12-11 13:00:34.000000000 +0000 ++++ ncurses-6.3-20211219/package/debian/changelog 2021-12-19 11:24:57.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20211211) unstable; urgency=low ++ncurses6 (6.3+20211219) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sat, 11 Dec 2021 08:00:34 -0500 ++ -- Thomas E. Dickey Sun, 19 Dec 2021 06:24:57 -0500 + + ncurses6 (5.9-20120608) unstable; urgency=low + +Index: package/mingw-ncurses.nsi +Prereq: 1.496 +--- ncurses-6.3-20211211+/package/mingw-ncurses.nsi 2021-12-11 13:00:34.000000000 +0000 ++++ ncurses-6.3-20211219/package/mingw-ncurses.nsi 2021-12-19 11:24:57.000000000 +0000 +@@ -1,4 +1,4 @@ +-; $Id: mingw-ncurses.nsi,v 1.496 2021/12/11 13:00:34 tom Exp $ ++; $Id: mingw-ncurses.nsi,v 1.498 2021/12/19 11:24:57 tom Exp $ + + ; TODO add examples + ; TODO bump ABI to 6 +@@ -10,7 +10,7 @@ + !define VERSION_MAJOR "6" + !define VERSION_MINOR "3" + !define VERSION_YYYY "2021" +-!define VERSION_MMDD "1211" ++!define VERSION_MMDD "1219" + !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} + + !define MY_ABI "5" +Index: package/mingw-ncurses.spec +--- ncurses-6.3-20211211+/package/mingw-ncurses.spec 2021-12-11 13:00:34.000000000 +0000 ++++ ncurses-6.3-20211219/package/mingw-ncurses.spec 2021-12-19 11:24:57.000000000 +0000 +@@ -3,7 +3,7 @@ + Summary: shared libraries for terminal handling + Name: mingw32-ncurses6 + Version: 6.3 +-Release: 20211211 ++Release: 20211219 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncurses.spec +--- ncurses-6.3-20211211+/package/ncurses.spec 2021-12-11 13:00:34.000000000 +0000 ++++ ncurses-6.3-20211219/package/ncurses.spec 2021-12-19 11:24:57.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: shared libraries for terminal handling + Name: ncurses6 + Version: 6.3 +-Release: 20211211 ++Release: 20211219 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncursest.spec +--- ncurses-6.3-20211211+/package/ncursest.spec 2021-12-11 13:00:34.000000000 +0000 ++++ ncurses-6.3-20211219/package/ncursest.spec 2021-12-19 11:24:57.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: Curses library with POSIX thread support. + Name: ncursest6 + Version: 6.3 +-Release: 20211211 ++Release: 20211219 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: test/Makefile.in +Prereq: 1.129 +--- ncurses-6.3-20211211+/test/Makefile.in 2021-07-03 15:45:33.000000000 +0000 ++++ ncurses-6.3-20211219/test/Makefile.in 2021-12-18 23:00:28.000000000 +0000 +@@ -1,4 +1,4 @@ +-# $Id: Makefile.in,v 1.129 2021/07/03 15:45:33 tom Exp $ ++# $Id: Makefile.in,v 1.130 2021/12/18 23:00:28 tom Exp $ + ############################################################################## + # Copyright 2020,2021 Thomas E. Dickey # + # Copyright 1998-2017,2018 Free Software Foundation, Inc. # +@@ -44,6 +44,8 @@ + x = @EXEEXT@ + o = .@OBJEXT@ + ++PACKAGE = @PACKAGE@ ++ + MODEL = ../@DFT_OBJ_SUBDIR@ + top_srcdir = @top_srcdir@ + srcdir = @srcdir@ +@@ -52,18 +54,19 @@ + datarootdir = @datarootdir@ + + bindir = @bindir@ ++libexecdir = @libexecdir@ + libdir = @libdir@ +-includedir = @includedir@ +-includesubdir = @includesubdir@ + datarootdir = @datarootdir@ + datadir = @datadir@ + ++real_bindir = $(libexecdir)/$(PACKAGE) ++ + BINDIR = $(DESTDIR)$(bindir) ++LIBEXECDIR = $(DESTDIR)$(libexecdir) + LIBDIR = $(DESTDIR)$(libdir) +-INCLUDEDIR = $(DESTDIR)$(includedir)$(includesubdir) + DATADIR = $(DESTDIR)$(datadir) + +-PACKAGE = @PACKAGE@ ++REAL_BINDIR = $(LIBEXECDIR)/$(PACKAGE) + + LIBTOOL = @LIBTOOL@ + LIBTOOL_OPTS = @LIBTOOL_OPTS@ +Index: test/combine.c +Prereq: 1.7 +--- ncurses-6.3-20211211+/test/combine.c 2021-12-12 01:10:28.000000000 +0000 ++++ ncurses-6.3-20211219/test/combine.c 2021-12-18 21:04:00.000000000 +0000 +@@ -26,13 +26,16 @@ + * authorization. * + ****************************************************************************/ + /* +- * $Id: combine.c,v 1.7 2021/12/12 01:10:28 tom Exp $ ++ * $Id: combine.c,v 1.17 2021/12/18 21:04:00 tom Exp $ + */ + + #include + + #if USE_WIDEC_SUPPORT + ++#include ++#include ++ + static int c_opt; + static int r_opt; + +@@ -45,6 +48,15 @@ + return value; + } + ++static int ++prev_char(int value) ++{ ++ do { ++ --value; ++ } while (!iswprint((wint_t) value)); ++ return value; ++} ++ + static void + do_row(int row, int base_ch, int over_ch) + { +@@ -62,18 +74,18 @@ + + source[1] = 0; + +- source[0] = base_ch; ++ source[0] = (wchar_t) base_ch; + setcchar(&target, source, attr, 0, NULL); + add_wch(&target); + +- source[0] = over_ch; ++ source[0] = (wchar_t) over_ch; + setcchar(&target, source, attr, 0, NULL); + add_wch(&target); + } else { + wchar_t data[3]; + +- data[0] = base_ch; +- data[1] = over_ch; ++ data[0] = (wchar_t) base_ch; ++ data[1] = (wchar_t) over_ch; + data[2] = 0; + if (reverse) + attr_on(A_REVERSE, NULL); +@@ -106,17 +118,68 @@ + } + + static void +-do_all(int over_it) ++do_all(int left_at, int over_it) + { + int row; + + for (row = 0; row < LINES; ++row) { +- do_row(row, ' ', 0x300 + over_it); ++ do_row(row, left_at, 0x300 + over_it); + over_it = next_over(over_it); + } + } + + static void ++show_help(WINDOW *current) ++{ ++ /* *INDENT-OFF* */ ++ static struct { ++ int key; ++ CONST_FMT char * msg; ++ } help[] = { ++ { HELP_KEY_1, "Show this screen" }, ++ { CTRL('L'), "Repaint screen" }, ++ { '$', "Scroll to end of combining-character range" }, ++ { '+', "Scroll to next combining-character in range" }, ++ { KEY_DOWN, "(same as \"+\")" }, ++ { '-', "Scroll to previous combining-character in range" }, ++ { KEY_UP, "(same as \"-\")" }, ++ { '0', "Scroll to beginning of combining-character range" }, ++ { 'c', "Toggle command-line option \"-c\"" }, ++ { 'd', "Dump screen using scr_dump unless \"-l\" option used" }, ++ { 'h', "Scroll test-data left one column" }, ++ { 'j', "Scroll test-data down one row" }, ++ { 'k', "Scroll test-data up one row" }, ++ { 'l', "Scroll test-data right one column" }, ++ { 'q', "Quit" }, ++ { ESCAPE, "(same as \"q\")" }, ++ { QUIT, "(same as \"q\")" }, ++ { 'r', "Toggle command-line option \"-r\"" }, ++ }; ++ /* *INDENT-ON* */ ++ ++ char **msgs = typeCalloc(char *, SIZEOF(help) + 3); ++ size_t s; ++ int d = 0; ++ ++ msgs[d++] = strdup("Test diacritic combining-characters range " ++ "U+0300..U+036F"); ++ msgs[d++] = strdup(""); ++ for (s = 0; s < SIZEOF(help); ++s) { ++ char *name = strdup(keyname(help[s].key)); ++ size_t need = (11 + strlen(name) + strlen(help[s].msg)); ++ msgs[d] = typeMalloc(char, need); ++ _nc_SPRINTF(msgs[d], _nc_SLIMIT(need) "%-10s%s", name, help[s].msg); ++ free(name); ++ ++d; ++ } ++ popup_msg2(current, msgs); ++ for (s = 0; msgs[s] != 0; ++s) { ++ free(msgs[s]); ++ } ++ free(msgs); ++} ++ ++static void + usage(void) + { + static const char *msg[] = +@@ -127,6 +190,7 @@ + "", + "Options:", + " -c use cchar_t data rather than wchar_t string", ++ " -l FILE log window-dumps to this file", + " -r draw even-numbered rows in reverse-video", + }; + unsigned n; +@@ -140,14 +204,22 @@ + main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) + { + int n; ++ int left_at = ' '; + int over_it = 0; + bool done = FALSE; ++ bool log_option = FALSE; ++ const char *dump_log = "combine.log"; + +- while ((n = getopt(argc, argv, "cr")) != -1) { ++ while ((n = getopt(argc, argv, "cl:r")) != -1) { + switch (n) { + case 'c': + c_opt = TRUE; + break; ++ case 'l': ++ log_option = TRUE; ++ if (!open_dump(optarg)) ++ usage(); ++ break; + case 'r': + r_opt = TRUE; + break; +@@ -164,13 +236,38 @@ + keypad(stdscr, TRUE); + + do { +- do_all(over_it); ++ do_all(left_at, over_it); + switch (getch()) { ++ case HELP_KEY_1: ++ show_help(stdscr); ++ break; + case 'q': + case QUIT: + case ESCAPE: + done = TRUE; + break; ++ case CTRL('L'): ++ redrawwin(stdscr); ++ break; ++ case 'd': ++ if (log_option) ++ dump_window(stdscr); ++ else ++ scr_dump(dump_log); ++ break; ++ case 'h': ++ if (left_at > ' ') ++ left_at = prev_char(left_at); ++ break; ++ case 'l': ++ left_at = next_char(left_at); ++ break; ++ case 'c': ++ c_opt = !c_opt; ++ break; ++ case 'r': ++ r_opt = !r_opt; ++ break; + case KEY_HOME: + case '0': + over_it = 0; +@@ -180,10 +277,12 @@ + over_it = LAST_OVER; + break; + case KEY_UP: ++ case 'k': + case '-': + over_it = prev_over(over_it); + break; + case KEY_DOWN: ++ case 'j': + case '+': + over_it = next_over(over_it); + break; +Index: test/mk-test.awk +Prereq: 1.25 +--- ncurses-6.3-20211211+/test/mk-test.awk 2021-04-24 23:10:40.000000000 +0000 ++++ ncurses-6.3-20211219/test/mk-test.awk 2021-12-19 16:54:36.000000000 +0000 +@@ -1,4 +1,4 @@ +-# $Id: mk-test.awk,v 1.25 2021/04/24 23:10:40 tom Exp $ ++# $Id: mk-test.awk,v 1.30 2021/12/19 16:54:36 tom Exp $ + ############################################################################## + # Copyright 2019-2020,2021 Thomas E. Dickey # + # Copyright 2006-2017,2018 Free Software Foundation, Inc. # +@@ -93,19 +93,38 @@ + print "" + if (INSTALL == "yes") { + print "# we might install the test-programs" ++ print "$(PACKAGE) :" ++ print " @echo \"creating $(PACKAGE) script\"" ++ print " @$(SHELL) -c '\\" ++ print " L=$(real_bindir); \\" ++ print " rm -f $@; \\" ++ print " echo \"#!$(SHELL)\" > $@;\\" ++ print " echo \"PATH=\\\"$$L\\\":\\$$PATH\" >>$@;\\" ++ print " echo \"export PATH\" >>$@;\\" ++ print " echo \"if test \\$$# != 0; then\" >>$@;\\" ++ print " echo \" exec \\\"\\$$@\\\"\" >>$@;\\" ++ print " echo \"elif test -t 1; then\" >>$@;\\" ++ print " echo \" cd \\\"$$L\\\" || exit\" >>$@;\\" ++ print " echo \" ls -l | \\$${PAGER:-less}\" >>$@;\\" ++ print " echo \"fi\" >>$@;\\" ++ print " echo \"echo \\\"usage: $@ [program]\\\"\" >>$@'" ++ print "" + print "install \\" +- print "install.test: $(BINDIR) $(DATADIR) $(TESTS)" ++ print "install.test: $(PACKAGE) $(BINDIR) $(REAL_BINDIR) $(DATADIR) $(TESTS)" ++ ++ print " @echo \"installing $(PACKAGE) -> $(BINDIR)/\"" ++ print " @$(INSTALL_SCRIPT) $(PACKAGE) $(BINDIR)" + + print " @$(SHELL) -c 'for src in $(TESTS); do \\" + print " dst=`echo $$src | $(TRANSFORM)`; \\" +- print " echo \"installing $$src -> $(BINDIR)/$$dst\"; \\" +- print " $(INSTALL_PROG) $$src $(BINDIR)/$$dst; \\" ++ print " echo \"installing $$src -> $(REAL_BINDIR)/$$dst\"; \\" ++ print " $(INSTALL_PROG) $$src $(REAL_BINDIR)/$$dst; \\" + print " done'" + + print " @$(SHELL) -c 'for src in $(SCRIPTS); do \\" + print " dst=`echo $$src | sed -e 's,^.*/,,' | $(TRANSFORM)`; \\" +- print " echo \"installing $$src -> $(BINDIR)/$$dst\"; \\" +- print " $(INSTALL_SCRIPT) $$src $(BINDIR)/$$dst; \\" ++ print " echo \"installing $$src -> $(REAL_BINDIR)/$$dst\"; \\" ++ print " $(INSTALL_SCRIPT) $$src $(REAL_BINDIR)/$$dst; \\" + print " done'" + + print " @$(SHELL) -c 'for src in $(DATAFILES); do \\" +@@ -117,14 +136,16 @@ + print "uninstall \\" + print "uninstall.test:" + ++ print " -rm -f $(BINDIR)/$(PACKAGE)" ++ + print " @$(SHELL) -c 'for src in $(TESTS); do \\" + print " dst=`echo $$src | $(TRANSFORM)`; \\" +- print " rm -f $(BINDIR)/$$dst; \\" ++ print " rm -f $(REAL_BINDIR)/$$dst; \\" + print " done'" + + print " @$(SHELL) -c 'for src in $(SCRIPTS); do \\" + print " dst=`echo $$src | sed -e 's,^.*/,,' | $(TRANSFORM)`; \\" +- print " rm -f $(BINDIR)/$$dst; \\" ++ print " rm -f $(REAL_BINDIR)/$$dst; \\" + print " done'" + + print " @$(SHELL) -c 'for src in $(DATAFILES); do \\" +@@ -144,6 +165,7 @@ + print "clean :: mostlyclean" + print " -$(SHELL) -c \"if test -n '$x' ; then $(MAKE) clean x=''; fi\"" + print " -rm -rf *$o screendump *.lis $(TESTS) .libs *.dSYM" ++ print " -rm -f $(PACKAGE)" + print "" + print "distclean :: clean" + print " -rm -f Makefile ncurses_cfg.h config.status config.log" +@@ -152,7 +174,7 @@ + print "" + print "lint:" + print " $(SHELL) -c 'for N in $(TESTS); do echo LINT:$$N; $(LINT) $(LINT_OPTS) $(CPPFLAGS) $(srcdir)/$$N.c $(LINT_LIBS); done'" +- print "$(BINDIR) $(DATADIR) :" ++ print "$(BINDIR) $(REAL_BINDIR) $(DATADIR) :" + print " mkdir -p $@" + + +Index: test/movewindow.c +Prereq: 1.51 +--- ncurses-6.3-20211211+/test/movewindow.c 2020-02-02 23:34:34.000000000 +0000 ++++ ncurses-6.3-20211219/test/movewindow.c 2021-12-18 18:57:55.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2018-2019,2020 Thomas E. Dickey * ++ * Copyright 2018-2020,2021 Thomas E. Dickey * + * Copyright 2006-2013,2017 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -27,7 +27,7 @@ + * authorization. * + ****************************************************************************/ + /* +- * $Id: movewindow.c,v 1.51 2020/02/02 23:34:34 tom Exp $ ++ * $Id: movewindow.c,v 1.52 2021/12/18 18:57:55 tom Exp $ + * + * Demonstrate move functions for windows and derived windows from the curses + * library. +@@ -55,14 +55,6 @@ + #undef derwin + #endif + +-#if defined(NCURSES_CONST) +-#define CONST_FMT NCURSES_CONST +-#elif defined(PDCURSES) +-#define CONST_FMT const +-#else +-#define CONST_FMT /* nothing */ +-#endif +- + #undef LINE_MAX + + #define LINE_MIN 2 +Index: test/package/debian/rules +--- ncurses-6.3-20211211+/test/package/debian/rules 2017-08-11 14:52:01.000000000 +0000 ++++ ncurses-6.3-20211219/test/package/debian/rules 2021-12-19 00:23:00.000000000 +0000 +@@ -74,8 +74,7 @@ + mkdir -p t/ncurses6 + + cd t/ncurses6; $(configure) \ +- --bindir=\$${prefix}/bin/$(NCURSES_PKG) \ +- --datadir=\$${prefix}/share/$(NCURSES_PKG) \ ++ --datadir=\$${datarootdir}/$(NCURSES_PKG) \ + --with-screen=ncursesw6 + + touch $@ +@@ -87,8 +86,7 @@ + mkdir -p t/ncursest6 + + cd t/ncursest6; $(configure) \ +- --bindir=\$${prefix}/bin/$(NCURSEST_PKG) \ +- --datadir=\$${prefix}/share/$(NCURSEST_PKG) \ ++ --datadir=\$${datarootdir}/$(NCURSEST_PKG) \ + --with-screen=ncursestw6 + + touch $@ +@@ -113,7 +111,9 @@ + dh_installdirs $(verbose) + dh_prep $(verbose) -p$(NCURSES_PKG) + +- $(MAKE) -C t/ncurses6 install DESTDIR=$(CURDIR)/debian/$(NCURSES_PKG) ++ $(MAKE) -C t/ncurses6 install \ ++ PACKAGE=$(NCURSES_PKG) \ ++ DESTDIR=$(CURDIR)/debian/$(NCURSES_PKG) + + touch $@ + +@@ -123,7 +123,9 @@ + dh_installdirs $(verbose) + dh_prep $(verbose) -p$(NCURSEST_PKG) + +- $(MAKE) -C t/ncursest6 install DESTDIR=$(CURDIR)/debian/$(NCURSEST_PKG) ++ $(MAKE) -C t/ncursest6 install \ ++ PACKAGE=$(NCURSEST_PKG) \ ++ DESTDIR=$(CURDIR)/debian/$(NCURSEST_PKG) + + touch $@ + +@@ -151,6 +153,7 @@ + rm -f $(PACKAGES.arch:%=install-%-stamp) + dh_testdir + dh_testroot ++ dh_installdocs $(verbose) $(PACKAGES.arch:%=-p%) + dh_installchangelogs $(verbose) $(PACKAGES.arch:%=-p%) NEWS + dh_strip $(verbose) $(PACKAGES.arch:%=-p%) + dh_compress $(verbose) $(PACKAGES.arch:%=-p%) +Index: test/package/ncurses-examples.spec +Prereq: 1.16 +--- ncurses-6.3-20211211+/test/package/ncurses-examples.spec 2019-11-23 21:11:34.000000000 +0000 ++++ ncurses-6.3-20211219/test/package/ncurses-examples.spec 2021-12-19 00:13:46.000000000 +0000 +@@ -3,13 +3,13 @@ + %global AltProgram ncursest-examples + %global AppVersion MAJOR.MINOR + %global AppRelease YYYYMMDD +-# $Id: ncurses-examples.spec,v 1.16 2019/11/23 21:11:34 tom Exp $ ++# $Id: ncurses-examples.spec,v 1.21 2021/12/19 00:13:46 tom Exp $ + Name: %{AppProgram} + Version: %{AppVersion} + Release: %{AppRelease} + License: MIT + Group: Applications/Development +-URL: ftp://ftp.invisible-island.net/%{AppProgram} ++URL: ftp://ftp.invisible-island.net/pub/%{AppProgram} + Source0: %{AppProgram}-%{AppRelease}.tgz + Packager: Thomas Dickey + +@@ -50,8 +50,7 @@ + %configure \ + --target %{_target_platform} \ + --prefix=%{_prefix} \ +- --bindir=%{_bindir}/%{AppProgram} \ +- --datadir=%{_datadir}/%{AppProgram} \ ++ --datadir=%{_datarootdir}/%{AppProgram} \ + --with-screen=ncursesw6dev \ + --disable-rpath-hack + +@@ -66,8 +65,7 @@ + %configure \ + --target %{_target_platform} \ + --prefix=%{_prefix} \ +- --bindir=%{_bindir}/%{AltProgram} \ +- --datadir=%{_datadir}/%{AltProgram} \ ++ --datadir=%{_datarootdir}/%{AltProgram} \ + --with-screen=ncursestw6dev \ + --disable-rpath-hack + +@@ -78,11 +76,11 @@ + [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT + + pushd BUILD-%{AppProgram} +-make install DESTDIR=$RPM_BUILD_ROOT ++make install PACKAGE=%{AppProgram} DESTDIR=$RPM_BUILD_ROOT + popd + + pushd BUILD-%{AltProgram} +-make install DESTDIR=$RPM_BUILD_ROOT ++make install PACKAGE=%{AltProgram} DESTDIR=$RPM_BUILD_ROOT + popd + + %clean +@@ -95,17 +93,22 @@ + + %files -n %{AppProgram} + %defattr(-,root,root) +-%{_bindir}/%{AppProgram}/* +-%{_datadir}/%{AppProgram}/* ++%{_bindir}/%{AppProgram} ++%{_libexecdir}/%{AppProgram}/* ++%{_datarootdir}/%{AppProgram}/* + + %files -n %{AltProgram} + %defattr(-,root,root) +-%{_bindir}/%{AltProgram}/* +-%{_datadir}/%{AltProgram}/* ++%{_bindir}/%{AltProgram} ++%{_libexecdir}/%{AltProgram}/* ++%{_datarootdir}/%{AltProgram}/* + + %changelog + # each patch should add its ChangeLog entries here + ++* Sat Dec 18 2021 Thomas Dickey ++- use libexecdir for programs rather than subdir of bindir ++ + * Sat Nov 16 2019 Thomas Dickey + - modify clean-rule to work around Fedora NFS bugs. + +Index: test/popup_msg.c +Prereq: 1.10 +--- ncurses-6.3-20211211+/test/popup_msg.c 2020-02-02 23:34:34.000000000 +0000 ++++ ncurses-6.3-20211219/test/popup_msg.c 2021-12-18 21:19:19.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2018,2020 Thomas E. Dickey * ++ * Copyright 2018-2020,2021 Thomas E. Dickey * + * Copyright 2017 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -27,7 +27,7 @@ + * authorization. * + ****************************************************************************/ + /* +- * $Id: popup_msg.c,v 1.10 2020/02/02 23:34:34 tom Exp $ ++ * $Id: popup_msg.c,v 1.11 2021/12/18 21:19:19 tom Exp $ + * + * Show a multi-line message in a window which may extend beyond the screen. + * +@@ -87,7 +87,7 @@ + + if ((help = newwin(high, wide, y0, x0)) == 0) + return; +- if ((data = newpad(length + 1, width)) == 0) { ++ if ((data = newpad(length + 1, width + 1)) == 0) { + delwin(help); + return; + } +Index: test/programs +Prereq: 1.50 +--- ncurses-6.3-20211211+/test/programs 2021-12-11 17:46:18.000000000 +0000 ++++ ncurses-6.3-20211219/test/programs 2021-12-18 18:46:56.000000000 +0000 +@@ -1,4 +1,4 @@ +-# $Id: programs,v 1.50 2021/12/11 17:46:18 tom Exp $ ++# $Id: programs,v 1.51 2021/12/18 18:46:56 tom Exp $ + ############################################################################## + # Copyright 2018-2020,2021 Thomas E. Dickey # + # Copyright 2006-2016,2017 Free Software Foundation, Inc. # +@@ -40,7 +40,7 @@ + clip_printw $(LDFLAGS_CURSES) $(LOCAL_LIBS) clip_printw popup_msg + color_content $(LDFLAGS_CURSES) $(LOCAL_LIBS) color_content + color_set $(LDFLAGS_CURSES) $(LOCAL_LIBS) color_set +-combine $(LDFLAGS_CURSES) $(LOCAL_LIBS) combine popup_msg ++combine $(LDFLAGS_CURSES) $(LOCAL_LIBS) combine dump_window popup_msg + demo_altkeys $(LDFLAGS_CURSES) $(LOCAL_LIBS) demo_altkeys + demo_defkey $(LDFLAGS_CURSES) $(LOCAL_LIBS) demo_defkey + demo_forms $(LDFLAGS_DEFAULT) $(LOCAL_LIBS) demo_forms edit_field popup_msg +Index: test/test.priv.h +Prereq: 1.197 +--- ncurses-6.3-20211211+/test/test.priv.h 2021-04-25 00:00:24.000000000 +0000 ++++ ncurses-6.3-20211219/test/test.priv.h 2021-12-18 18:55:10.000000000 +0000 +@@ -30,7 +30,7 @@ + /**************************************************************************** + * Author: Thomas E. Dickey 1996-on * + ****************************************************************************/ +-/* $Id: test.priv.h,v 1.197 2021/04/25 00:00:24 tom Exp $ */ ++/* $Id: test.priv.h,v 1.198 2021/12/18 18:55:10 tom Exp $ */ + + #ifndef __TEST_PRIV_H + #define __TEST_PRIV_H 1 +@@ -1148,6 +1148,14 @@ + #define CONST_MENUS /* nothing */ + #endif + ++#if defined(NCURSES_CONST) ++#define CONST_FMT NCURSES_CONST ++#elif defined(PDCURSES) ++#define CONST_FMT const ++#else ++#define CONST_FMT /* nothing */ ++#endif ++ + /* + * Simplify setting up demo of threading with these macros. + */ diff --git a/system/ncurses/ncurses-6.3-20211225.patch b/system/ncurses/ncurses-6.3-20211225.patch new file mode 100644 index 000000000..657515610 --- /dev/null +++ b/system/ncurses/ncurses-6.3-20211225.patch @@ -0,0 +1,27027 @@ +# ncurses 6.3 - patch 20211225 - Thomas E. Dickey +# +# ------------------------------------------------------------------------------ +# +# Ncurses 6.3 is at +# ftp://ftp.invisible-island.net/ncurses/ +# https://invisible-mirror.net/archives/ncurses/ +# https://ftp.gnu.org/gnu/ncurses/ +# +# Patches for ncurses 6.3 can be found at +# ftp://ftp.invisible-island.net/ncurses/6.3 +# https://invisible-mirror.net/archives/ncurses/6.3 +# +# ------------------------------------------------------------------------------ +# ftp://ftp.invisible-island.net/ncurses/6.3/ncurses-6.3-20211225.patch.gz +# patch by Thomas E. Dickey +# created Sun Dec 26 02:01:14 UTC 2021 +# ------------------------------------------------------------------------------ +# Ada95/gen/Makefile.in | 29 +# NEWS | 6 +# VERSION | 2 +# dist.mk | 5 +# doc/html/ada/funcs/T.htm | 2 +# doc/html/ada/table.html | 25 +# doc/html/man/adacurses6-config.1.html | 6 +# doc/html/man/captoinfo.1m.html | 8 +# doc/html/man/clear.1.html | 26 +# doc/html/man/curs_add_wch.3x.html | 10 +# doc/html/man/curs_add_wchstr.3x.html | 8 +# doc/html/man/curs_addch.3x.html | 16 +# doc/html/man/curs_addchstr.3x.html | 6 +# doc/html/man/curs_addstr.3x.html | 6 +# doc/html/man/curs_addwstr.3x.html | 6 +# doc/html/man/curs_attr.3x.html | 16 +# doc/html/man/curs_beep.3x.html | 6 +# doc/html/man/curs_bkgd.3x.html | 4 +# doc/html/man/curs_bkgrnd.3x.html | 6 +# doc/html/man/curs_border.3x.html | 6 +# doc/html/man/curs_border_set.3x.html | 6 +# doc/html/man/curs_clear.3x.html | 6 +# doc/html/man/curs_color.3x.html | 4 +# doc/html/man/curs_delch.3x.html | 6 +# doc/html/man/curs_deleteln.3x.html | 6 +# doc/html/man/curs_extend.3x.html | 4 +# doc/html/man/curs_get_wch.3x.html | 4 +# doc/html/man/curs_get_wstr.3x.html | 20 +# doc/html/man/curs_getcchar.3x.html | 6 +# doc/html/man/curs_getch.3x.html | 12 +# doc/html/man/curs_getstr.3x.html | 6 +# doc/html/man/curs_getyx.3x.html | 6 +# doc/html/man/curs_in_wch.3x.html | 6 +# doc/html/man/curs_in_wchstr.3x.html | 6 +# doc/html/man/curs_inch.3x.html | 4 +# doc/html/man/curs_inchstr.3x.html | 6 +# doc/html/man/curs_initscr.3x.html | 8 +# doc/html/man/curs_inopts.3x.html | 6 +# doc/html/man/curs_ins_wch.3x.html | 6 +# doc/html/man/curs_ins_wstr.3x.html | 6 +# doc/html/man/curs_insch.3x.html | 6 +# doc/html/man/curs_insstr.3x.html | 4 +# doc/html/man/curs_instr.3x.html | 6 +# doc/html/man/curs_inwstr.3x.html | 6 +# doc/html/man/curs_kernel.3x.html | 6 +# doc/html/man/curs_legacy.3x.html | 2 +# doc/html/man/curs_memleaks.3x.html | 4 +# doc/html/man/curs_mouse.3x.html | 20 +# doc/html/man/curs_move.3x.html | 6 +# doc/html/man/curs_opaque.3x.html | 6 +# doc/html/man/curs_outopts.3x.html | 6 +# doc/html/man/curs_overlay.3x.html | 6 +# doc/html/man/curs_pad.3x.html | 6 +# doc/html/man/curs_print.3x.html | 6 +# doc/html/man/curs_printw.3x.html | 8 +# doc/html/man/curs_refresh.3x.html | 6 +# doc/html/man/curs_scanw.3x.html | 14 +# doc/html/man/curs_scr_dump.3x.html | 12 +# doc/html/man/curs_scroll.3x.html | 6 +# doc/html/man/curs_slk.3x.html | 4 +# doc/html/man/curs_sp_funcs.3x.html | 4 +# doc/html/man/curs_termattrs.3x.html | 10 +# doc/html/man/curs_termcap.3x.html | 14 +# doc/html/man/curs_terminfo.3x.html | 12 +# doc/html/man/curs_threads.3x.html | 16 +# doc/html/man/curs_touch.3x.html | 4 +# doc/html/man/curs_trace.3x.html | 8 +# doc/html/man/curs_util.3x.html | 12 +# doc/html/man/curs_variables.3x.html | 6 +# doc/html/man/curs_window.3x.html | 4 +# doc/html/man/default_colors.3x.html | 8 +# doc/html/man/define_key.3x.html | 6 +# doc/html/man/form.3x.html | 8 +# doc/html/man/form_cursor.3x.html | 6 +# doc/html/man/form_data.3x.html | 6 +# doc/html/man/form_driver.3x.html | 8 +# doc/html/man/form_field.3x.html | 6 +# doc/html/man/form_field_attributes.3x.html | 6 +# doc/html/man/form_field_buffer.3x.html | 6 +# doc/html/man/form_field_info.3x.html | 6 +# doc/html/man/form_field_just.3x.html | 6 +# doc/html/man/form_field_new.3x.html | 6 +# doc/html/man/form_field_opts.3x.html | 6 +# doc/html/man/form_field_userptr.3x.html | 6 +# doc/html/man/form_field_validation.3x.html | 6 +# doc/html/man/form_fieldtype.3x.html | 6 +# doc/html/man/form_hook.3x.html | 6 +# doc/html/man/form_new.3x.html | 6 +# doc/html/man/form_new_page.3x.html | 6 +# doc/html/man/form_opts.3x.html | 6 +# doc/html/man/form_page.3x.html | 6 +# doc/html/man/form_post.3x.html | 6 +# doc/html/man/form_requestname.3x.html | 6 +# doc/html/man/form_userptr.3x.html | 6 +# doc/html/man/form_variables.3x.html | 6 +# doc/html/man/form_win.3x.html | 6 +# doc/html/man/infocmp.1m.html | 6 +# doc/html/man/infotocap.1m.html | 8 +# doc/html/man/key_defined.3x.html | 6 +# doc/html/man/keybound.3x.html | 6 +# doc/html/man/keyok.3x.html | 8 +# doc/html/man/legacy_coding.3x.html | 4 +# doc/html/man/menu.3x.html | 8 +# doc/html/man/menu_attributes.3x.html | 6 +# doc/html/man/menu_cursor.3x.html | 6 +# doc/html/man/menu_driver.3x.html | 6 +# doc/html/man/menu_format.3x.html | 6 +# doc/html/man/menu_hook.3x.html | 6 +# doc/html/man/menu_items.3x.html | 6 +# doc/html/man/menu_mark.3x.html | 6 +# doc/html/man/menu_new.3x.html | 6 +# doc/html/man/menu_opts.3x.html | 6 +# doc/html/man/menu_pattern.3x.html | 6 +# doc/html/man/menu_post.3x.html | 6 +# doc/html/man/menu_requestname.3x.html | 6 +# doc/html/man/menu_spacing.3x.html | 6 +# doc/html/man/menu_userptr.3x.html | 6 +# doc/html/man/menu_win.3x.html | 6 +# doc/html/man/mitem_current.3x.html | 6 +# doc/html/man/mitem_name.3x.html | 6 +# doc/html/man/mitem_new.3x.html | 6 +# doc/html/man/mitem_opts.3x.html | 6 +# doc/html/man/mitem_userptr.3x.html | 6 +# doc/html/man/mitem_value.3x.html | 6 +# doc/html/man/mitem_visible.3x.html | 6 +# doc/html/man/ncurses.3x.html | 30 +# doc/html/man/ncurses6-config.1.html | 6 +# doc/html/man/new_pair.3x.html | 6 +# doc/html/man/panel.3x.html | 10 +# doc/html/man/resizeterm.3x.html | 6 +# doc/html/man/scr_dump.5.html | 12 +# doc/html/man/tabs.1.html | 8 +# doc/html/man/term.5.html | 16 +# doc/html/man/term.7.html | 4 +# doc/html/man/term_variables.3x.html | 10 +# doc/html/man/terminfo.5.html | 10 +# doc/html/man/tic.1m.html | 6 +# doc/html/man/toe.1m.html | 6 +# doc/html/man/tput.1.html | 20 +# doc/html/man/tset.1.html | 164 +-- +# doc/html/man/user_caps.5.html | 26 +# doc/html/man/wresize.3x.html | 6 +# man/MKada_config.in | 20 +# man/MKncu_config.in | 40 +# man/captoinfo.1m | 64 - +# man/clear.1 | 34 +# man/curs_add_wch.3x | 44 +# man/curs_add_wchstr.3x | 62 - +# man/curs_addch.3x | 118 +- +# man/curs_addchstr.3x | 60 - +# man/curs_addstr.3x | 58 - +# man/curs_addwstr.3x | 62 - +# man/curs_attr.3x | 252 ++--- +# man/curs_beep.3x | 28 +# man/curs_bkgd.3x | 48 - +# man/curs_bkgrnd.3x | 56 - +# man/curs_border.3x | 122 +- +# man/curs_border_set.3x | 220 ++-- +# man/curs_clear.3x | 74 - +# man/curs_color.3x | 190 ++-- +# man/curs_delch.3x | 34 +# man/curs_deleteln.3x | 56 - +# man/curs_extend.3x | 22 +# man/curs_get_wch.3x | 114 +- +# man/curs_get_wstr.3x | 140 +-- +# man/curs_getcchar.3x | 12 +# man/curs_getch.3x | 146 +-- +# man/curs_getstr.3x | 72 - +# man/curs_getyx.3x | 66 - +# man/curs_in_wch.3x | 30 +# man/curs_in_wchstr.3x | 86 - +# man/curs_inch.3x | 38 +# man/curs_inchstr.3x | 60 - +# man/curs_initscr.3x | 120 +- +# man/curs_inopts.3x | 268 ++--- +# man/curs_ins_wch.3x | 26 +# man/curs_ins_wstr.3x | 66 - +# man/curs_insch.3x | 34 +# man/curs_insstr.3x | 58 - +# man/curs_instr.3x | 52 - +# man/curs_inwstr.3x | 64 - +# man/curs_kernel.3x | 194 ++-- +# man/curs_memleaks.3x | 20 +# man/curs_mouse.3x | 164 +-- +# man/curs_move.3x | 28 +# man/curs_opaque.3x | 126 +- +# man/curs_outopts.3x | 136 +- +# man/curs_overlay.3x | 56 - +# man/curs_pad.3x | 110 +- +# man/curs_print.3x | 24 +# man/curs_printw.3x | 76 - +# man/curs_refresh.3x | 94 +- +# man/curs_scanw.3x | 82 - +# man/curs_scr_dump.3x | 74 - +# man/curs_scroll.3x | 36 +# man/curs_slk.3x | 162 +-- +# man/curs_sp_funcs.3x | 286 +++--- +# man/curs_termattrs.3x | 112 +- +# man/curs_termcap.3x | 152 +-- +# man/curs_terminfo.3x | 340 +++---- +# man/curs_threads.3x | 38 +# man/curs_touch.3x | 68 - +# man/curs_trace.3x | 82 - +# man/curs_util.3x | 172 +-- +# man/curs_variables.3x | 72 - +# man/curs_window.3x | 148 +-- +# man/default_colors.3x | 14 +# man/define_key.3x | 8 +# man/form.3x | 192 ++-- +# man/form_cursor.3x | 20 +# man/form_data.3x | 18 +# man/form_driver.3x | 46 - +# man/form_field.3x | 36 +# man/form_field_attributes.3x | 36 +# man/form_field_buffer.3x | 34 +# man/form_field_info.3x | 22 +# man/form_field_just.3x | 24 +# man/form_field_new.3x | 36 +# man/form_field_opts.3x | 28 +# man/form_field_userptr.3x | 20 +# man/form_field_validation.3x | 64 - +# man/form_fieldtype.3x | 48 - +# man/form_hook.3x | 44 +# man/form_new.3x | 24 +# man/form_new_page.3x | 24 +# man/form_opts.3x | 30 +# man/form_page.3x | 36 +# man/form_post.3x | 26 +# man/form_requestname.3x | 24 +# man/form_userptr.3x | 18 +# man/form_variables.3x | 36 +# man/form_win.3x | 34 +# man/infocmp.1m | 314 +++--- +# man/infotocap.1m | 42 +# man/key_defined.3x | 6 +# man/keybound.3x | 8 +# man/keyok.3x | 8 +# man/legacy_coding.3x | 6 +# man/make_sed.sh | 10 +# man/manhtml.externs | 12 +# man/menu.3x | 170 +-- +# man/menu_attributes.3x | 56 - +# man/menu_cursor.3x | 20 +# man/menu_driver.3x | 38 +# man/menu_format.3x | 26 +# man/menu_hook.3x | 42 +# man/menu_items.3x | 36 +# man/menu_mark.3x | 30 +# man/menu_new.3x | 26 +# man/menu_opts.3x | 26 +# man/menu_pattern.3x | 30 +# man/menu_post.3x | 30 +# man/menu_requestname.3x | 24 +# man/menu_spacing.3x | 36 +# man/menu_userptr.3x | 16 +# man/menu_win.3x | 34 +# man/mitem_current.3x | 38 +# man/mitem_name.3x | 22 +# man/mitem_new.3x | 26 +# man/mitem_opts.3x | 28 +# man/mitem_userptr.3x | 16 +# man/mitem_value.3x | 26 +# man/mitem_visible.3x | 14 +# man/ncurses.3x | 1240 +++++++++++++-------------- +# man/new_pair.3x | 6 +# man/panel.3x | 126 +- +# man/resizeterm.3x | 56 - +# man/scr_dump.5 | 14 +# man/tabs.1 | 32 +# man/term.5 | 10 +# man/term.7 | 52 - +# man/term_variables.3x | 52 - +# man/terminfo.head | 24 +# man/terminfo.tail | 400 ++++---- +# man/tic.1m | 258 ++--- +# man/toe.1m | 50 - +# man/tput.1 | 276 +++--- +# man/tset.1 | 128 +- +# man/user_caps.5 | 22 +# man/wresize.3x | 22 +# package/debian-mingw/changelog | 4 +# package/debian-mingw64/changelog | 4 +# package/debian/changelog | 4 +# package/mingw-ncurses.nsi | 4 +# package/mingw-ncurses.spec | 2 +# package/ncurses.spec | 2 +# package/ncursest.spec | 2 +# 287 files changed, 6089 insertions(+), 6076 deletions(-) +# ------------------------------------------------------------------------------ +Index: Ada95/gen/Makefile.in +Prereq: 1.97 +--- ncurses-6.3-20211219+/Ada95/gen/Makefile.in 2021-07-03 15:45:33.000000000 +0000 ++++ ncurses-6.3-20211225/Ada95/gen/Makefile.in 2021-12-25 22:34:44.000000000 +0000 +@@ -30,7 +30,7 @@ + # Author: Juergen Pfeifer, 1996 + # and: Thomas E. Dickey, 1997 + # +-# $Id: Makefile.in,v 1.97 2021/07/03 15:45:33 tom Exp $ ++# $Id: Makefile.in,v 1.98 2021/12/25 22:34:44 tom Exp $ + # + .SUFFIXES: + +@@ -301,23 +301,24 @@ + $(M4) $(M4FLAGS) -DM4MACRO=table.m4 $$f | $(DEL_ADAMODE) >> $@ ;\ + done; + ++TABLE_TITLE=Correspondence between ncurses C and Ada functions ++ + $(HTML_DIR)/table.html : instab.tmp + @-touch $@ + @-chmod +w $@ +- @echo ' $@ +- @echo 'PUBLIC "-//IETF//DTD HTML 3.0//EN">' >> $@ +- @echo '' >> $@ +- @echo '' >> $@ +- @echo 'Correspondence between ncurses C and Ada functions' >>$@ +- @echo '' >> $@ +- @echo '' >> $@ +- @echo '

Correspondence between ncurses C and Ada functions

' >>$@ +- @echo '

Sorted by C function name

' >>$@ +- @echo '' >>$@ +- @echo '' >>$@ +- @echo '' >>$@ ++ @echo '' > $@ ++ @echo '' >> $@ ++ @echo '' >> $@ ++ @echo '$(TABLE_TITLE)' >>$@ ++ @echo '' >> $@ ++ @echo '' >> $@ ++ @echo '

$(TABLE_TITLE)

' >>$@ ++ @echo '

Sorted by C function name

' >>$@ ++ @echo '
C nameAda nameman page
' >>$@ ++ @echo '' >>$@ ++ @echo '' >>$@ + @sort < instab.tmp >> $@ +- @echo '
C nameAda nameman page
' >>$@ ++ @echo '' >>$@ + @rm -f instab.tmp + + adahtml: +Index: NEWS +Prereq: 1.3759 +--- ncurses-6.3-20211219+/NEWS 2021-12-19 11:24:57.000000000 +0000 ++++ ncurses-6.3-20211225/NEWS 2021-12-26 00:29:27.000000000 +0000 +@@ -26,7 +26,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: NEWS,v 1.3759 2021/12/19 11:24:57 tom Exp $ ++-- $Id: NEWS,v 1.3761 2021/12/26 00:29:27 tom Exp $ + ------------------------------------------------------------------------------- + + This is a log of changes that ncurses has gone through since Zeyd started +@@ -46,6 +46,10 @@ + Changes through 1.9.9e did not credit all contributions; + it is not possible to add this information. + ++20211225 ++ + improve markup, e.g., for external manpage links in the manpages ++ (prompted by report by Helge Kreutzmann). ++ + 20211219 + + install ncurses-examples programs in libexecdir, adding a wrapper + script to invoke those. +Index: VERSION +--- ncurses-6.3-20211219+/VERSION 2021-12-19 11:24:57.000000000 +0000 ++++ ncurses-6.3-20211225/VERSION 2021-12-24 20:26:19.000000000 +0000 +@@ -1 +1 @@ +-5:0:10 6.3 20211219 ++5:0:10 6.3 20211225 +Index: dist.mk +Prereq: 1.1456 +--- ncurses-6.3-20211219+/dist.mk 2021-12-19 11:24:57.000000000 +0000 ++++ ncurses-6.3-20211225/dist.mk 2021-12-25 22:11:07.000000000 +0000 +@@ -26,7 +26,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: dist.mk,v 1.1456 2021/12/19 11:24:57 tom Exp $ ++# $Id: dist.mk,v 1.1458 2021/12/25 22:11:07 tom Exp $ + # Makefile for creating ncurses distributions. + # + # This only needs to be used directly as a makefile by developers, but +@@ -38,7 +38,7 @@ + # These define the major/minor/patch versions of ncurses. + NCURSES_MAJOR = 6 + NCURSES_MINOR = 3 +-NCURSES_PATCH = 20211219 ++NCURSES_PATCH = 20211225 + + # We don't append the patch to the version, since this only applies to releases + VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) +@@ -126,7 +126,6 @@ + @misc/csort < subst.tmp | uniq > subst.sed + @echo '/<\/TITLE>/a\' >> subst.sed + @echo '\' >> subst.sed +- @echo '' >> subst.sed + @rm -f subst.tmp + @for f in man/*.[0-9]* ; do \ + m=`basename $$f` ;\ +Index: doc/html/ada/funcs/T.htm +--- ncurses-6.3-20211219+/doc/html/ada/funcs/T.htm 2020-02-15 21:18:26.000000000 +0000 ++++ ncurses-6.3-20211225/doc/html/ada/funcs/T.htm 2021-12-26 00:04:57.000000000 +0000 +@@ -20,8 +20,8 @@ +
  • tgetnum +
  • tgetstr - terminal_interface-curses-termcap.adb:109 +
  • tgetstr - terminal_interface-curses-termcap.adb:130 +-
  • TGoto +
  • tgoto ++
  • TGoto +
  • tigetflag +
  • tigetstr - terminal_interface-curses-terminfo.adb:88 +
  • tigetstr - terminal_interface-curses-terminfo.adb:109 +Index: doc/html/ada/table.html +--- ncurses-6.3-20211219+/doc/html/ada/table.html 2017-04-22 18:35:30.000000000 +0000 ++++ ncurses-6.3-20211225/doc/html/ada/table.html 2021-12-25 22:36:45.000000000 +0000 +@@ -1,15 +1,14 @@ +- +- +- +-Correspondence between ncurses C and Ada functions +- +- +-

    Correspondence between ncurses C and Ada functions

    +-

    Sorted by C function name

    +- +- +- ++ ++ ++ ++Correspondence between ncurses C and Ada functions ++ ++ ++

    Correspondence between ncurses C and Ada functions

    ++

    Sorted by C function name

    ++
    C nameAda nameman page
    ++ ++ + + + +@@ -338,4 +337,4 @@ + + + +-
    C nameAda nameman page
    assume_default_colors()Assume_Default_Colorsdefault_colors.3x
    baudrate()Baudratecurs_termattrs.3x
    beep()Beepcurs_beep.3x
    wtimeout()Set_Timeout_Modecurs_inopts.3x
    wtouchln()Change_Line_Statuscurs_touch.3x
    wvline()Vertical_Linecurs_border.3x
    ++ +Index: doc/html/man/adacurses6-config.1.html +--- ncurses-6.3-20211219+/doc/html/man/adacurses6-config.1.html 2021-10-20 23:22:39.000000000 +0000 ++++ ncurses-6.3-20211225/doc/html/man/adacurses6-config.1.html 2021-12-25 22:12:43.000000000 +0000 +@@ -27,7 +27,7 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: MKada_config.in,v 1.13 2021/06/17 21:26:02 tom Exp @ ++ * @Id: MKada_config.in,v 1.14 2021/12/25 17:39:16 tom Exp @ + --> + + +@@ -36,7 +36,7 @@ + + ADACURSES 1 User Commands + +- ++ + + +

    ADACURSES 1 User Commands

    +@@ -126,7 +126,7 @@ +

    SEE ALSO

    +        curses(3x)
+ 
+-       This describes ncurses version 6.3 (patch 20211021).
++       This describes ncurses version 6.3 (patch 20211225).
+ 
+ 
+ 
+Index: doc/html/man/captoinfo.1m.html
+--- ncurses-6.3-20211219+/doc/html/man/captoinfo.1m.html	2021-10-20 23:22:39.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/captoinfo.1m.html	2021-12-25 22:12:43.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ captoinfo 1m
+ 
+-
++
+ 
+ 
+ 
    captoinfo 1m
    
+@@ -199,7 +199,7 @@
+

    SEE ALSO

    +        infocmp(1m), curses(3x), terminfo(5)
+ 
+-       This describes ncurses version 6.3 (patch 20211021).
++       This describes ncurses version 6.3 (patch 20211225).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/clear.1.html
+--- ncurses-6.3-20211219+/doc/html/man/clear.1.html	2021-10-20 23:22:39.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/clear.1.html	2021-12-26 00:19:27.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+@@ -38,7 +38,7 @@
+ 
+ clear 1
+ 
+-
++
+ 
+ 
+ 
    clear 1
    
+@@ -57,11 +57,11 @@
+ 
+ 
+

    DESCRIPTION

    +-       clear  clears your screen if this is possible, including its scrollback
+-       buffer (if the extended "E3" capability is defined).   clear  looks  in
+-       the environment for the terminal type given by the environment variable
+-       TERM, and then in the terminfo database to determine how to  clear  the
+-       screen.
++       clear  clears your terminal's screen if this is possible, including the
++       terminal's scrollback  buffer  (if  the  extended  "E3"  capability  is
++       defined).   clear  looks in the environment for the terminal type given
++       by the environment variable TERM, and then in the terminfo database  to
++       determine how to clear the screen.
+ 
+        clear  writes  to  the  standard output.  You can redirect the standard
+        output to a file (which  prevents  clear  from  actually  clearing  the
+@@ -107,7 +107,7 @@
+ 
+        The E3 extension came later:
+ 
+-       o   In  June  1999, xterm provided an extension to the standard control
++       o   In  June  1999, xterm provided an extension to the standard control
+            sequence for clearing the screen.  Rather than  clearing  just  the
+            visible part of the screen using
+ 
+@@ -118,14 +118,14 @@
+                printf '\033[3J'
+ 
+            This  is  documented  in  XTerm  Control  Sequences  as  a  feature
+-           originating with xterm.
++           originating with xterm.
+ 
+        o   A few other terminal developers adopted the feature, e.g., PuTTY in
+            2006.
+ 
+        o   In  April  2011, a Red Hat developer submitted a patch to the Linux
+            kernel, modifying its console driver to do  the  same  thing.   The
+-           Linux  change,  part  of  the  3.0  release, did not mention xterm,
++           Linux  change,  part  of  the  3.0  release, did not mention xterm,
+            although it was cited in the Red Hat bug report (#683733) which led
+            to the change.
+ 
+@@ -148,9 +148,9 @@
+ 
+ 
+

    SEE ALSO

    +-       tput(1), terminfo(5)
++       tput(1), terminfo(5), xterm(1).
+ 
+-       This describes ncurses version 6.3 (patch 20211021).
++       This describes ncurses version 6.3 (patch 20211225).
+ 
+ 
+ 
+Index: doc/html/man/curs_add_wch.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_add_wch.3x.html	2021-06-26 13:11:24.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_add_wch.3x.html	2021-12-25 22:12:43.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_add_wch 3x
+ 
+-
++
+ 
+ 
+ 
    curs_add_wch 3x
    
+@@ -226,8 +226,8 @@
+ 
+        o   NetBSD curses defines the symbols as a wchar_t within a cchar_t.
+ 
+-       o   HPUX curses equates some of the ACS_ symbols to the analogous WACS_
+-           symbols  as  if  the  ACS_  symbols  were  wide  characters.    The
++       o   HPUX curses equates some of the ACS_ symbols to the analogous WACS_
++           symbols  as  if  the  ACS_  symbols  were  wide  characters.    The
+            misdefined  symbols  are the arrows and other symbols which are not
+            used for line-drawing.
+ 
+Index: doc/html/man/curs_add_wchstr.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_add_wchstr.3x.html	2021-06-26 13:11:24.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_add_wchstr.3x.html	2021-12-25 22:12:43.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_add_wchstr 3x
+ 
+-
++
+ 
+ 
+ 
    curs_add_wchstr 3x
    
+@@ -87,7 +87,7 @@
+        o   they truncate the string if it crosses  the  right  margin,  rather
+            than wrapping it around to the new line.
+ 
+-       These  functions  end  successfully  on encountering a null cchar_t, or
++       These  functions  end  successfully  on encountering a null cchar_t, or
+        when they have filled the current line.  If a complex character  cannot
+        completely  fit  at  the end of the current line, the remaining columns
+        are filled with the background character and rendition.
+Index: doc/html/man/curs_addch.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_addch.3x.html	2021-06-26 13:11:24.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_addch.3x.html	2021-12-25 22:12:43.000000000 +0000
+@@ -28,7 +28,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_addch.3x,v 1.56 2021/06/17 21:30:22 tom Exp @
++  * @Id: curs_addch.3x,v 1.58 2021/12/25 20:18:06 tom Exp @
+ -->
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ curs_addch 3x
+ 
+-
++
+ 
+ 
+ 
    curs_addch 3x
    
+@@ -198,9 +198,9 @@
+ 
+ 
+

    ACS Symbols

    +-       X/Open Curses states that the ACS_ definitions are char constants.  For
++       X/Open Curses states that the ACS_ definitions are char constants.  For
+        the  wide-character  implementation  (see  curs_add_wch),   there   are
+-       analogous   WACS_   definitions  which  are  cchar_t  constants.   Some
++       analogous   WACS_   definitions  which  are  cchar_t  constants.   Some
+        implementations are problematic:
+ 
+        o   Some implementations define the ACS symbols to a constant (such  as
+@@ -210,8 +210,8 @@
+            NetBSD also uses an array, actually named _acs_char, with a #define
+            for compatibility.
+ 
+-       o   HPUX curses equates some of the ACS_ symbols to the analogous WACS_
+-           symbols  as  if  the  ACS_  symbols  were  wide  characters.    The
++       o   HPUX curses equates some of the ACS_ symbols to the analogous WACS_
++           symbols  as  if  the  ACS_  symbols  were  wide  characters.    The
+            misdefined  symbols  are the arrows and other symbols which are not
+            used for line-drawing.
+ 
+@@ -221,7 +221,7 @@
+            implementations use i (lowercase).
+ 
+            None  of the terminal descriptions on Unix platforms use uppercase-
+-           I,  except  for  Solaris  (i.e.,  screen's  terminal   description,
++           I,  except  for  Solaris  (i.e.,  screen's  terminal   description,
+            apparently  based on the X/Open documentation around 1995).  On the
+            other hand, the terminal description gs6300 (AT&T PC6300 with EMOTS
+            Terminal Emulator) uses lowercase-i.
+@@ -233,7 +233,7 @@
+        second-hand  list  of  their  character descriptions has come to light.
+        The ACS-prefixed names for them were invented for ncurses(3x).
+ 
+-       The displayed values for the ACS_ and WACS_ constants depend on
++       The displayed values for the ACS_ and WACS_ constants depend on
+ 
+        o   the library configuration, i.e., ncurses versus ncursesw, where the
+            latter  is  capable  of displaying Unicode while the former is not,
+Index: doc/html/man/curs_addchstr.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_addchstr.3x.html	2021-06-26 13:11:24.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_addchstr.3x.html	2021-12-25 22:12:43.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_addchstr 3x
+ 
+-
++
+ 
+ 
+ 
    curs_addchstr 3x
    
+Index: doc/html/man/curs_addstr.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_addstr.3x.html	2021-06-26 13:11:24.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_addstr.3x.html	2021-12-25 22:12:43.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_addstr 3x
+ 
+-
++
+ 
+ 
+ 
    curs_addstr 3x
    
+Index: doc/html/man/curs_addwstr.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_addwstr.3x.html	2021-06-26 13:11:24.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_addwstr.3x.html	2021-12-25 22:12:43.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_addwstr 3x
+ 
+-
++
+ 
+ 
+ 
    curs_addwstr 3x
    
+Index: doc/html/man/curs_attr.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_attr.3x.html	2021-06-26 13:11:24.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_attr.3x.html	2021-12-25 22:12:43.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_beep 3x
+ 
+-
++
+ 
+ 
+ 
    curs_beep 3x
    
+Index: doc/html/man/curs_bkgd.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_bkgd.3x.html	2021-06-26 13:11:24.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_bkgd.3x.html	2021-12-25 22:12:43.000000000 +0000
+@@ -27,7 +27,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_bkgd.3x,v 1.32 2021/06/17 21:30:22 tom Exp @
++  * @Id: curs_bkgd.3x,v 1.33 2021/12/25 17:39:16 tom Exp @
+ -->
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_bkgd 3x
+ 
+-
++
+ 
+ 
+ 
    curs_bkgd 3x
    
+Index: doc/html/man/curs_bkgrnd.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_bkgrnd.3x.html	2021-06-26 13:11:24.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_bkgrnd.3x.html	2021-12-25 22:12:43.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_bkgrnd 3x
+ 
+-
++
+ 
+ 
+ 
    curs_bkgrnd 3x
    
+Index: doc/html/man/curs_border.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_border.3x.html	2021-06-26 13:11:25.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_border.3x.html	2021-12-25 22:12:43.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_border 3x
+ 
+-
++
+ 
+ 
+ 
    curs_border 3x
    
+Index: doc/html/man/curs_border_set.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_border_set.3x.html	2021-06-26 13:11:25.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_border_set.3x.html	2021-12-25 22:12:43.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_border_set 3x
+ 
+-
++
+ 
+ 
+ 
    curs_border_set 3x
    
+Index: doc/html/man/curs_clear.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_clear.3x.html	2021-06-26 13:11:25.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_clear.3x.html	2021-12-25 22:12:43.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_clear 3x
+ 
+-
++
+ 
+ 
+ 
    curs_clear 3x
    
+Index: doc/html/man/curs_color.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_color.3x.html	2021-09-04 20:05:41.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_color.3x.html	2021-12-25 22:12:43.000000000 +0000
+@@ -27,7 +27,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_color.3x,v 1.66 2021/09/04 19:42:20 tom Exp @
++  * @Id: curs_color.3x,v 1.67 2021/12/25 17:39:16 tom Exp @
+ -->
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_color 3x
+ 
+-
++
+ 
+ 
+ 
    curs_color 3x
    
+Index: doc/html/man/curs_delch.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_delch.3x.html	2021-06-26 13:11:25.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_delch.3x.html	2021-12-25 22:12:43.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_delch 3x
+ 
+-
++
+ 
+ 
+ 
    curs_delch 3x
    
+Index: doc/html/man/curs_deleteln.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_deleteln.3x.html	2021-06-26 13:11:25.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_deleteln.3x.html	2021-12-25 22:12:44.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_deleteln 3x
+ 
+-
++
+ 
+ 
+ 
    curs_deleteln 3x
    
+Index: doc/html/man/curs_extend.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_extend.3x.html	2021-06-26 13:11:25.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_extend.3x.html	2021-12-25 22:12:44.000000000 +0000
+@@ -28,7 +28,7 @@
+   * authorization.                                                           *
+   ****************************************************************************
+   * Author: Thomas E. Dickey 1999-on
+-  * @Id: curs_extend.3x,v 1.26 2021/03/13 13:43:05 tom Exp @
++  * @Id: curs_extend.3x,v 1.27 2021/12/25 17:39:16 tom Exp @
+ -->
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ curs_extend 3x
+ 
+-
++
+ 
+ 
+ 
    curs_extend 3x
    
+Index: doc/html/man/curs_get_wch.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_get_wch.3x.html	2021-06-26 13:11:25.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_get_wch.3x.html	2021-12-25 22:12:44.000000000 +0000
+@@ -27,7 +27,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_get_wch.3x,v 1.15 2021/05/22 22:33:19 tom Exp @
++  * @Id: curs_get_wch.3x,v 1.16 2021/12/25 17:39:16 tom Exp @
+ -->
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_get_wch 3x
+ 
+-
++
+ 
+ 
+ 
    curs_get_wch 3x
    
+Index: doc/html/man/curs_get_wstr.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_get_wstr.3x.html	2021-06-26 13:11:25.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_get_wstr.3x.html	2021-12-25 22:12:44.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_get_wstr 3x
+ 
+-
++
+ 
+ 
+ 
    curs_get_wstr 3x
    
+@@ -135,13 +135,13 @@
+        X/Open curses documented these functions to pass an array of wchar_t in
+        1997, but that was an error because of this part of the description:
+ 
+-              The effect of get_wstr() is as  though  a  series  of  calls  to
+-              get_wch()  were  made,  until  a  newline character, end-of-line
+-              character, or end-of-file character is processed.
+-
+-       The latter function  get_wch()  can  return  a  negative  value,  while
+-       wchar_t  is  a  unsigned type.  All of the vendors implement this using
+-       wint_t, following the standard.
++              The effect of get_wstr is as though a series of calls to get_wch
++              were  made, until a newline character, end-of-line character, or
++              end-of-file character is processed.
++
++       The latter function get_wch can return a negative value, while  wchar_t
++       is  a  unsigned  type.  All of the vendors implement this using wint_t,
++       following the standard.
+ 
+        X/Open Curses, Issue 7 (2009) is unclear regarding whether  the  termi-
+        nating null wchar_t value is counted in the length parameter n.  X/Open
+Index: doc/html/man/curs_getcchar.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_getcchar.3x.html	2021-06-26 13:11:25.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_getcchar.3x.html	2021-12-25 22:12:44.000000000 +0000
+@@ -27,7 +27,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_getcchar.3x,v 1.25 2021/06/17 21:26:02 tom Exp @
++  * @Id: curs_getcchar.3x,v 1.27 2021/12/25 20:35:03 tom Exp @
+ -->
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_getcchar 3x
+ 
+-
++
+ 
+ 
+ 
    curs_getcchar 3x
    
+@@ -174,7 +174,7 @@
+        o   HP-UX 10  uses  an  opaque  structure with 28 bytes, which is large
+            enough for the 6 wchar_t values.
+ 
+-       o   Solaris xpg4 curses uses a single array of 6 wchar_t values.
++       o   Solaris xpg4 curses uses a single array of 6 wchar_t values.
+ 
+        This implementation's cchar_t was defined in 1995 using 5 for the total
+        of  spacing and non-spacing characters (CCHARW_MAX).  That was probably
+Index: doc/html/man/curs_getch.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_getch.3x.html	2021-06-26 13:11:25.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_getch.3x.html	2021-12-26 00:04:52.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ curs_getch 3x
+ 
+-
++
+ 
+ 
+ 
    curs_getch 3x
    
+@@ -150,7 +150,7 @@
+            the  long  terminfo capability names for the keys, and were defined
+            long ago, in the 1980s.
+ 
+-                  Name            Key name
++                  Name            Key name
+                   -------------------------------------------------
+                   KEY_BREAK       Break key
+                   KEY_DOWN        The four arrow keys ...
+@@ -264,8 +264,8 @@
+ 
+        o   KEY_MOUSE  is returned for mouse-events (see curs_mouse(3x)).  This
+            code relies upon whether or not keypad(3x) has  been  enabled,  be-
+-           cause  (e.g., with xterm mouse prototocol) ncurses must read escape
+-           sequences, just like a function key.
++           cause  (e.g., with xterm(1) mouse prototocol) ncurses must read es-
++           cape sequences, just like a function key.
+ 
+ 
+

    Testing key-codes

    +Index: doc/html/man/curs_getstr.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_getstr.3x.html	2021-06-26 13:11:25.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_getstr.3x.html	2021-12-25 22:12:44.000000000 +0000
+@@ -27,7 +27,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_getstr.3x,v 1.33 2021/05/22 21:36:35 tom Exp @
++  * @Id: curs_getstr.3x,v 1.35 2021/12/25 20:14:56 tom Exp @
+   * X/Open says also until EOf
+   * X/Open says then an EOS is added to the result
+   * X/Open doesn't mention n<0
+@@ -39,7 +39,7 @@
+ 
+ curs_getstr 3x
+ 
+-
++
+ 
+ 
+ 
    curs_getstr 3x
    
+@@ -200,7 +200,7 @@
+            into account when deciding whether to handle echoing within getnstr
+            or as a side-effect of the getch calls.
+ 
+-       o   The original ncurses (as pcurses in 1986) set noraw and cbreak when
++       o   The original ncurses (as pcurses in 1986) set noraw and cbreak when
+            accepting input for getnstr.  That may have been done to make func-
+            tion- and cursor-keys work; it is not necessary with ncurses.
+ 
+Index: doc/html/man/curs_getyx.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_getyx.3x.html	2021-06-26 13:11:25.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_getyx.3x.html	2021-12-25 22:12:44.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_getyx 3x
+ 
+-
++
+ 
+ 
+ 
    curs_getyx 3x
    
+Index: doc/html/man/curs_in_wch.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_in_wch.3x.html	2021-06-26 13:11:25.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_in_wch.3x.html	2021-12-25 22:12:44.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_in_wch 3x
+ 
+-
++
+ 
+ 
+ 
    curs_in_wch 3x
    
+Index: doc/html/man/curs_in_wchstr.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_in_wchstr.3x.html	2021-06-26 13:11:25.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_in_wchstr.3x.html	2021-12-25 22:12:44.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_in_wchstr 3x
+ 
+-
++
+ 
+ 
+ 
    curs_in_wchstr 3x
    
+Index: doc/html/man/curs_inch.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_inch.3x.html	2021-06-26 13:11:25.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_inch.3x.html	2021-12-25 22:12:44.000000000 +0000
+@@ -28,7 +28,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_inch.3x,v 1.26 2021/06/17 21:30:22 tom Exp @
++  * @Id: curs_inch.3x,v 1.27 2021/12/25 17:39:16 tom Exp @
+ -->
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ curs_inch 3x
+ 
+-
++
+ 
+ 
+ 
    curs_inch 3x
    
+Index: doc/html/man/curs_inchstr.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_inchstr.3x.html	2021-06-26 13:11:25.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_inchstr.3x.html	2021-12-25 22:12:44.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_inchstr 3x
+ 
+-
++
+ 
+ 
+ 
    curs_inchstr 3x
    
+Index: doc/html/man/curs_initscr.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_initscr.3x.html	2021-06-26 13:11:25.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_initscr.3x.html	2021-12-25 22:12:44.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_initscr 3x
+ 
+-
++
+ 
+ 
+ 
    curs_initscr 3x
    
+@@ -131,7 +131,7 @@
+ 
+

    set_term

    +        The  set_term  routine  is  used to switch between different terminals.
+-       The screen reference new becomes the new current terminal.  The  previ-
++       The screen reference new becomes the new current terminal.  The  previ-
+        ous  terminal  is  returned  by  the routine.  This is the only routine
+        which manipulates SCREEN pointers; all other routines affect  only  the
+        current terminal.
+Index: doc/html/man/curs_inopts.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_inopts.3x.html	2021-06-26 13:11:25.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_inopts.3x.html	2021-12-25 22:12:44.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_inopts 3x
+ 
+-
++
+ 
+ 
+ 
    curs_inopts 3x
    
+Index: doc/html/man/curs_ins_wch.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_ins_wch.3x.html	2021-06-26 13:11:25.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_ins_wch.3x.html	2021-12-25 22:12:44.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_ins_wch 3x
+ 
+-
++
+ 
+ 
+ 
    curs_ins_wch 3x
    
+Index: doc/html/man/curs_ins_wstr.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_ins_wstr.3x.html	2021-06-26 13:11:25.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_ins_wstr.3x.html	2021-12-25 22:12:44.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_ins_wstr 3x
+ 
+-
++
+ 
+ 
+ 
    curs_ins_wstr 3x
    
+Index: doc/html/man/curs_insch.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_insch.3x.html	2021-06-26 13:11:25.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_insch.3x.html	2021-12-25 22:12:44.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_insch 3x
+ 
+-
++
+ 
+ 
+ 
    curs_insch 3x
    
+Index: doc/html/man/curs_insstr.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_insstr.3x.html	2021-06-26 13:11:25.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_insstr.3x.html	2021-12-25 22:12:44.000000000 +0000
+@@ -27,7 +27,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_insstr.3x,v 1.27 2021/06/17 21:26:02 tom Exp @
++  * @Id: curs_insstr.3x,v 1.28 2021/12/25 17:39:16 tom Exp @
+ -->
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_insstr 3x
+ 
+-
++
+ 
+ 
+ 
    curs_insstr 3x
    
+Index: doc/html/man/curs_instr.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_instr.3x.html	2021-06-26 13:11:25.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_instr.3x.html	2021-12-25 22:12:44.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_instr 3x
+ 
+-
++
+ 
+ 
+ 
    curs_instr 3x
    
+Index: doc/html/man/curs_inwstr.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_inwstr.3x.html	2021-06-26 13:11:25.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_inwstr.3x.html	2021-12-25 22:12:44.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_inwstr 3x
+ 
+-
++
+ 
+ 
+ 
    curs_inwstr 3x
    
+Index: doc/html/man/curs_kernel.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_kernel.3x.html	2021-06-26 13:11:25.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_kernel.3x.html	2021-12-25 22:12:44.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_kernel 3x
+ 
+-
++
+ 
+ 
+ 
    curs_kernel 3x
    
+Index: doc/html/man/curs_legacy.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_legacy.3x.html	2021-06-26 13:11:25.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_legacy.3x.html	2021-12-25 22:12:44.000000000 +0000
+@@ -36,7 +36,7 @@
+ 
+ curs_legacy 3x
+ 
+-
++
+ 
+ 
+ 
    curs_legacy 3x
    
+Index: doc/html/man/curs_memleaks.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_memleaks.3x.html	2021-06-26 13:11:26.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_memleaks.3x.html	2021-12-25 22:12:44.000000000 +0000
+@@ -27,7 +27,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_memleaks.3x,v 1.11 2021/01/02 23:47:51 tom Exp @
++  * @Id: curs_memleaks.3x,v 1.12 2021/12/25 17:39:16 tom Exp @
+ -->
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_memleaks 3x
+ 
+-
++
+ 
+ 
+ 
    curs_memleaks 3x
    
+Index: doc/html/man/curs_mouse.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_mouse.3x.html	2021-06-26 13:11:26.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_mouse.3x.html	2021-12-26 00:04:53.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ curs_mouse 3x
+ 
+-
++
+ 
+ 
+ 
    curs_mouse 3x
    
+@@ -101,7 +101,7 @@
+

    Mouse events

    +        Here are the mouse event type masks which may be defined:
+ 
+-       Name                     Description
++       Name                     Description
+        ---------------------------------------------------------------------
+        BUTTON1_PRESSED          mouse button 1 down
+        BUTTON1_RELEASED         mouse button 1 up
+@@ -177,8 +177,8 @@
+        reserve lines on top or bottom of the screen for  other  purposes  (see
+        the ripoffline and slk_init(3x) calls, for example).
+ 
+-       o   If the parameter to_screen is TRUE, the pointers pY, pX must refer-
+-           ence the coordinates of a location inside the window win.  They are
++       o   If the parameter to_screen is TRUE, the pointers pY, pX must refer-
++           ence the coordinates of a location inside the window win.  They are
+            converted  to  window-relative coordinates and returned through the
+            pointers.  If the conversion was successful, the  function  returns
+            TRUE.
+@@ -186,9 +186,9 @@
+        o   If one of the parameters was NULL or the location is not inside the
+            window, FALSE is returned.
+ 
+-       o   If to_screen is FALSE, the pointers pY, pX must  reference  window-
++       o   If to_screen is FALSE, the pointers pY, pX must  reference  window-
+            relative  coordinates.  They are converted to stdscr-relative coor-
+-           dinates if the window win encloses this point.  In  this  case  the
++           dinates if the window win encloses this point.  In  this  case  the
+            function returns TRUE.
+ 
+        o   If  one  of  the  parameters is NULL or the point is not inside the
+@@ -199,7 +199,7 @@
+ 
+

    mouse_trafo

    +        The mouse_trafo function performs the same translation as wmouse_trafo,
+-       using stdscr for win.
++       using stdscr for win.
+ 
+ 
+

    mouseinterval

    +@@ -250,7 +250,7 @@
+        These  calls  were  designed for ncurses(3x), and are not found in SVr4
+        curses, 4.4BSD curses, or any other previous version of curses.
+ 
+-       SVr4 curses had support for the mouse in a variant  of  xterm.   It  is
++       SVr4 curses had support for the mouse in a variant of xterm(1).  It  is
+        mentioned in a few places, but with no supporting documentation:
+ 
+        o   the  "libcurses" manual page lists functions for this feature which
+Index: doc/html/man/curs_move.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_move.3x.html	2021-06-26 13:11:26.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_move.3x.html	2021-12-25 22:12:45.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_move 3x
+ 
+-
++
+ 
+ 
+ 
    curs_move 3x
    
+Index: doc/html/man/curs_opaque.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_opaque.3x.html	2021-06-26 13:11:26.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_opaque.3x.html	2021-12-25 22:12:45.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_opaque 3x
+ 
+-
++
+ 
+ 
+ 
    curs_opaque 3x
    
+Index: doc/html/man/curs_outopts.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_outopts.3x.html	2021-06-26 13:11:26.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_outopts.3x.html	2021-12-25 22:12:45.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_outopts 3x
+ 
+-
++
+ 
+ 
+ 
    curs_outopts 3x
    
+Index: doc/html/man/curs_overlay.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_overlay.3x.html	2021-06-26 13:11:26.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_overlay.3x.html	2021-12-25 22:12:45.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_overlay 3x
+ 
+-
++
+ 
+ 
+ 
    curs_overlay 3x
    
+Index: doc/html/man/curs_pad.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_pad.3x.html	2021-06-26 13:11:26.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_pad.3x.html	2021-12-25 22:12:45.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_pad 3x
+ 
+-
++
+ 
+ 
+ 
    curs_pad 3x
    
+Index: doc/html/man/curs_print.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_print.3x.html	2021-06-26 13:11:26.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_print.3x.html	2021-12-25 22:12:45.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_print 3x
+ 
+-
++
+ 
+ 
+ 
    curs_print 3x
    
+Index: doc/html/man/curs_printw.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_printw.3x.html	2021-06-26 13:11:26.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_printw.3x.html	2021-12-25 22:12:45.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_printw 3x
+ 
+-
++
+ 
+ 
+ 
    curs_printw 3x
    
+@@ -109,7 +109,7 @@
+        would be output from printf(3) would instead be output using waddstr on
+        the given window.  SVr3 also added vwprintw, saying that the third  pa-
+        rameter  is a va_list, defined in <varargs.h>, and referring the reader
+-       to the manual pages for varargs and vprintf for detailed descriptions.
++       to the manual pages for varargs and vprintf for detailed descriptions.
+ 
+        SVr4 added  no  new  variations  of  printw,  but  provided  for  using
+        <varargs.h> or <stdarg.h> to define the va_list type.
+Index: doc/html/man/curs_refresh.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_refresh.3x.html	2021-06-26 13:11:26.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_refresh.3x.html	2021-12-25 22:12:45.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_refresh 3x
+ 
+-
++
+ 
+ 
+ 
    curs_refresh 3x
    
+Index: doc/html/man/curs_scanw.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_scanw.3x.html	2021-06-26 13:11:26.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_scanw.3x.html	2021-12-25 22:12:45.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_scanw 3x
+ 
+-
++
+ 
+ 
+ 
    curs_scanw 3x
    
+@@ -74,7 +74,7 @@
+ 
+        The vwscanw and vw_scanw routines are  analogous  to  vscanf(3).   They
+        perform a wscanw using a variable argument list.  The third argument is
+-       a va_list, a pointer to a list of arguments, as defined in <stdarg.h>.
++       a va_list, a pointer to a list of arguments, as defined in <stdarg.h>.
+ 
+ 
+

    RETURN VALUE

    +@@ -108,9 +108,9 @@
+        be  output  from  scanf(3) would instead be output using waddstr on the
+        given window.  SVr3 also added vwscanw, saying that the third parameter
+        is  a  va_list, defined in <varargs.h>, and referring the reader to the
+-       manual  pages  for  varargs  and  vprintf  for  detailed  descriptions.
+-       (Because the SVr3 documentation does not mention vscanf, that reference
+-       to vprintf may not be an error).
++       manual  pages  for  varargs  and  vprintf  for  detailed  descriptions.
++       (Because the SVr3 documentation does not mention vscanf, that reference
++       to vprintf may not be an error).
+ 
+        SVr4  added  no  new  variations  of  scanw,  but  provided  for  using
+        <varargs.h> or <stdarg.h> to define the va_list type.
+Index: doc/html/man/curs_scr_dump.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_scr_dump.3x.html	2021-10-20 23:22:41.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_scr_dump.3x.html	2021-12-25 22:12:45.000000000 +0000
+@@ -27,7 +27,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_scr_dump.3x,v 1.17 2021/10/20 22:37:48 tom Exp @
++  * @Id: curs_scr_dump.3x,v 1.19 2021/12/25 21:12:41 tom Exp @
+ -->
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_scr_dump 3x
+ 
+-
++
+ 
+ 
+ 
    curs_scr_dump 3x
    
+@@ -79,10 +79,10 @@
+        initialize the curses data structures about what the terminal currently
+        has on its screen.  If the data is determined to be valid, curses bases
+        its  next update of the screen on this information rather than clearing
+-       the screen and starting from scratch.  scr_init is used  after  initscr
+-       or  a  system  call  to share the screen with another process which has
+-       done a scr_dump after its endwin(3x) call.  The data  is  declared  in-
+-       valid
++       the  screen  and  starting  from  scratch.   scr_init  is  used   after
++       initscr(3x)  or  a  system(3)  call  to  share  the screen with another
++       process which has done a scr_dump after its endwin(3x) call.  The  data
++       is declared invalid
+ 
+        o   if the terminfo capabilities rmcup and nrrmc exist, also
+ 
+Index: doc/html/man/curs_scroll.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_scroll.3x.html	2021-06-26 13:11:26.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_scroll.3x.html	2021-12-25 22:12:45.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_scroll 3x
+ 
+-
++
+ 
+ 
+ 
    curs_scroll 3x
    
+Index: doc/html/man/curs_slk.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_slk.3x.html	2021-06-26 13:11:26.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_slk.3x.html	2021-12-25 22:12:45.000000000 +0000
+@@ -27,7 +27,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_slk.3x,v 1.38 2021/06/17 21:26:02 tom Exp @
++  * @Id: curs_slk.3x,v 1.39 2021/12/25 17:39:16 tom Exp @
+ -->
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_slk 3x
+ 
+-
++
+ 
+ 
+ 
    curs_slk 3x
    
+Index: doc/html/man/curs_sp_funcs.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_sp_funcs.3x.html	2021-06-26 13:11:26.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_sp_funcs.3x.html	2021-12-25 22:12:45.000000000 +0000
+@@ -27,7 +27,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_sp_funcs.3x,v 1.25 2021/05/22 22:12:46 tom Exp @
++  * @Id: curs_sp_funcs.3x,v 1.26 2021/12/25 17:54:00 tom Exp @
+   * ***************************************************************************
+   * ***************************************************************************
+   * ***************************************************************************
+@@ -39,7 +39,7 @@
+ 
+ curs_sp_funcs 3x
+ 
+-
++
+ 
+ 
+ 
    curs_sp_funcs 3x
    
+Index: doc/html/man/curs_termattrs.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_termattrs.3x.html	2021-06-26 13:11:26.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_termattrs.3x.html	2021-12-25 22:12:45.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_termattrs 3x
+ 
+-
++
+ 
+ 
+ 
    curs_termattrs 3x
    
+@@ -116,8 +116,8 @@
+        If  a  given  terminal  does  not  support  a  video  attribute that an
+        application program is trying to use, curses may substitute a different
+        video  attribute for it.  The termattrs and term_attrs functions return
+-       a logical OR of all video attributes supported by the terminal using A_
+-       and  WA_  constants  respectively.   This  information is useful when a
++       a logical OR of all video attributes supported by the terminal using A_
++       and  WA_  constants  respectively.   This  information is useful when a
+        curses program needs  complete  control  over  the  appearance  of  the
+        screen.
+ 
+Index: doc/html/man/curs_termcap.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_termcap.3x.html	2021-06-26 13:11:26.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_termcap.3x.html	2021-12-26 00:04:53.000000000 +0000
+@@ -27,7 +27,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_termcap.3x,v 1.49 2021/04/03 21:17:09 tom Exp @
++  * @Id: curs_termcap.3x,v 1.52 2021/12/25 21:31:00 tom Exp @
+ -->
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_termcap 3x
+ 
+-
++
+ 
+ 
+ 
    curs_termcap 3x
    
+@@ -134,7 +134,7 @@
+ 
+        o   Because  the  capability may have padding characters, the output of
+            tgoto should be passed to tputs rather than some other output func-
+-           tion such as printf.
++           tion such as printf(3).
+ 
+        o   While  tgoto is assumed to be used for the two-parameter cursor po-
+            sitioning capability, termcap applications also use it for  single-
+@@ -268,7 +268,7 @@
+        was written several years before C was  standardized.   However,  there
+        were two different termcap.h header files in the BSD sources:
+ 
+-       o   One  was used internally by the jove editor in 2BSD through 4.4BSD.
++       o   One  was used internally by the jove editor in 2BSD through 4.4BSD.
+            It defined global symbols for the termcap variables which it used.
+ 
+        o   The other appeared in 4.4BSD Lite Release 2 (mid-1993) as  part  of
+@@ -290,12 +290,12 @@
+        that instance, it was libedit which differed from BSD termcap.
+ 
+        A copy of GNU termcap 1.3 was bundled with bash in mid-1993, to support
+-       the readline library.
++       the readline(3) library.
+ 
+        A  termcap.h  file was provided in ncurses 1.8.1 (November 1993).  That
+-       reflected influence by emacs (rather than jove) and GNU termcap:
++       reflected influence by emacs(1) (rather than jove(1)) and GNU termcap:
+ 
+-       o   it provided declarations for a few global symbols used by emacs
++       o   it provided declarations for a few global symbols used by emacs
+ 
+        o   it provided function prototypes (using const).
+ 
+Index: doc/html/man/curs_terminfo.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_terminfo.3x.html	2021-09-04 20:05:42.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_terminfo.3x.html	2021-12-26 00:04:53.000000000 +0000
+@@ -27,7 +27,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_terminfo.3x,v 1.76 2021/09/04 19:58:03 tom Exp @
++  * @Id: curs_terminfo.3x,v 1.79 2021/12/25 21:34:58 tom Exp @
+   * ***************************************************************************
+   * ***************************************************************************
+   * ***************************************************************************
+@@ -43,7 +43,7 @@
+ 
+ curs_terminfo 3x
+ 
+-
++
+ 
+ 
+ 
    curs_terminfo 3x
    
+@@ -289,7 +289,7 @@
+        o   pair of type short for the color-pair number.
+ 
+        The vid_attr and vid_puts routines are designed to  use  the  attribute
+-       constants with the WA_ prefix.
++       constants with the WA_ prefix.
+ 
+        X/Open  Curses  reserves  the opts argument for future use, saying that
+        applications must provide a null pointer for that argument.  As an  ex-
+@@ -301,7 +301,7 @@
+ 
+        While putp and mvcur are low-level functions which do not use the high-
+        level curses state, they are declared in <curses.h> because SystemV did
+-       this (see HISTORY).
++       this (see HISTORY).
+ 
+ 
+

    Terminal Capability Functions

    +@@ -379,7 +379,7 @@
+ 
+

    Compatibility macros

    +        This  implementation  provides a few macros for compatibility with sys-
+-       tems  before  SVr4  (see  HISTORY).   Those  include  crmode,  fixterm,
++       tems  before  SVr4  (see  HISTORY).   Those  include  crmode,  fixterm,
+        gettmode, nocrmode, resetterm, saveterm, and setterm.
+ 
+        In  SVr4,  those  are  found in <curses.h>, but except for setterm, are
+@@ -475,7 +475,7 @@
+ 
+        There are other low-level functions declared in the curses header files
+        on Unix systems, but none were documented.  The functions marked "obso-
+-       lete" remained in use by the Unix vi editor.
++       lete" remained in use by the Unix vi(1) editor.
+ 
+ 
+

    PORTABILITY

    +Index: doc/html/man/curs_threads.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_threads.3x.html	2021-06-26 13:11:26.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_threads.3x.html	2021-12-25 22:12:45.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+@@ -38,7 +38,7 @@
+ 
+ curs_threads 3x
+ 
+-
++
+ 
+ 
+ 
    curs_threads 3x
    
+@@ -69,7 +69,7 @@
+

    DESCRIPTION

    +        This  implementation  can  be configured to provide rudimentary support
+        for multi-threaded applications.  This makes a  different  set  of  li-
+-       braries, e.g., libncursest since the binary interfaces are different.
++       braries, e.g., libncursest since the binary interfaces are different.
+ 
+        Rather  than  modify  the interfaces to pass a thread specifier to each
+        function, it adds a few functions which can be used in  any  configura-
+@@ -109,12 +109,12 @@
+           o   global data, e.g., used in the low-level terminfo or termcap in-
+               terfaces.
+ 
+-          o   terminal data, e.g., associated with a call to set_curterm.  The
++          o   terminal data, e.g., associated with a call to set_curterm.  The
+               terminal data are initialized when screens are created.
+ 
+-          o   screen data, e.g., associated with a call to newterm or initscr.
++          o   screen data, e.g., associated with a call to newterm or initscr.
+ 
+-          o   window data, e.g., associated with a call to newwin  or  subwin.
++          o   window data, e.g., associated with a call to newwin  or  subwin.
+               Windows  are  associated with screens.  Pads are not necessarily
+               associated with a particular screen.
+ 
+@@ -133,7 +133,7 @@
+             COLOR_PAIR              reentrant
+             COLOR_PAIRS             screen (readonly)
+             COLS                    screen (readonly)
+-            ESCDELAY                screen (readonly, see set_escdelay)
++            ESCDELAY                screen (readonly, see set_escdelay)
+             LINES                   screen (readonly)
+             PAIR_NUMBER             reentrant
+             PC                      global
+Index: doc/html/man/curs_touch.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_touch.3x.html	2021-06-26 13:11:26.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_touch.3x.html	2021-12-25 22:12:45.000000000 +0000
+@@ -27,7 +27,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_touch.3x,v 1.24 2021/06/17 21:26:02 tom Exp @
++  * @Id: curs_touch.3x,v 1.25 2021/12/25 17:39:16 tom Exp @
+ -->
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_touch 3x
+ 
+-
++
+ 
+ 
+ 
    curs_touch 3x
    
+Index: doc/html/man/curs_trace.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_trace.3x.html	2021-06-26 13:11:26.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_trace.3x.html	2021-12-25 22:12:45.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_trace 3x
+ 
+-
++
+ 
+ 
+ 
    curs_trace 3x
    
+@@ -81,7 +81,7 @@
+        tions apply:
+ 
+        o   Aside from curses_trace, the other functions are normally available
+-           only with the debugging library e.g., libncurses_g.a.
++           only with the debugging library e.g., libncurses_g.a.
+ 
+            All of the trace functions may be compiled into any model  (shared,
+            static, profile) by defining the symbol TRACE.
+Index: doc/html/man/curs_util.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_util.3x.html	2021-06-26 13:11:26.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_util.3x.html	2021-12-25 22:12:45.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ curs_util 3x
+ 
+-
++
+ 
+ 
+ 
    curs_util 3x
    
+@@ -175,7 +175,7 @@
+ 
+        The use_env and use_tioctl routines combine as summarized here:
+ 
+-           use_env   use_tioctl   Summary
++           use_env   use_tioctl   Summary
+            ----------------------------------------------------------------
+            TRUE      FALSE        This is the default  behavior.   ncurses
+                                   uses operating system calls unless over-
+@@ -271,7 +271,7 @@
+        tioned using NCURSES_VERSION.
+ 
+ 
+-

    putwin/getwin

    ++

    putwin/getwin file-format

    +        The putwin and getwin functions have several issues with portability:
+ 
+        o   The  files  written  and read by these functions use an implementa-
+@@ -381,7 +381,7 @@
+ 
  • filter
    • 
+ 
  • keyname
    • 
+ 
  • nofilter/use_tioctl
    • 
+-
  • putwin/getwin
    • 
++
  • putwin/getwin file-format
    • 
+ 
  • unctrl/wunctrl
    • 
+ 
  • use_env/use_tioctl
    • 
+ 
+Index: doc/html/man/curs_variables.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_variables.3x.html	2021-06-26 13:11:26.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_variables.3x.html	2021-12-25 22:12:45.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_variables 3x
+ 
+-
++
+ 
+ 
+ 
    curs_variables 3x
    
+Index: doc/html/man/curs_window.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/curs_window.3x.html	2021-06-26 13:11:27.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/curs_window.3x.html	2021-12-25 22:12:46.000000000 +0000
+@@ -27,7 +27,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: curs_window.3x,v 1.23 2021/06/17 21:11:08 tom Exp @
++  * @Id: curs_window.3x,v 1.24 2021/12/25 17:39:16 tom Exp @
+ -->
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ curs_window 3x
+ 
+-
++
+ 
+ 
+ 
    curs_window 3x
    
+Index: doc/html/man/default_colors.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/default_colors.3x.html	2021-06-26 13:11:27.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/default_colors.3x.html	2021-12-25 22:12:46.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ default_colors 3x
+ 
+-
++
+ 
+ 
+ 
    default_colors 3x
    
+@@ -113,7 +113,7 @@
+        Associated with this extension, the init_pair function accepts negative
+        arguments to specify default foreground or background colors.
+ 
+-       The  use_default_colors  function  was added to support ded.  This is a
++       The  use_default_colors  function  was added to support ded.  This is a
+        full-screen application which uses curses to manage only  part  of  the
+        screen.  The bottom portion of the screen, which is of adjustable size,
+        is left uncolored to display the results from shell commands.  The  top
+Index: doc/html/man/define_key.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/define_key.3x.html	2021-06-26 13:11:27.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/define_key.3x.html	2021-12-25 22:12:46.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ define_key 3x
+ 
+-
++
+ 
+ 
+ 
    define_key 3x
    
+Index: doc/html/man/form.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/form.3x.html	2021-10-20 23:22:41.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/form.3x.html	2021-12-25 22:12:46.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ form 3x
+ 
+-
++
+ 
+ 
+ 
    form 3x
    
+@@ -248,7 +248,7 @@
+        curses(3x) and related pages whose names  begin  "form_"  for  detailed
+        descriptions of the entry points.
+ 
+-       This describes ncurses version 6.3 (patch 20211021).
++       This describes ncurses version 6.3 (patch 20211225).
+ 
+ 
+ 
+Index: doc/html/man/form_cursor.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/form_cursor.3x.html	2021-06-26 13:11:27.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/form_cursor.3x.html	2021-12-25 22:12:46.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ form_cursor 3x
+ 
+-
++
+ 
+ 
+ 
    form_cursor 3x
    
+Index: doc/html/man/form_data.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/form_data.3x.html	2021-06-26 13:11:27.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/form_data.3x.html	2021-12-25 22:12:46.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ form_data 3x
+ 
+-
++
+ 
+ 
+ 
    form_data 3x
    
+Index: doc/html/man/form_driver.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/form_driver.3x.html	2021-06-26 13:11:27.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/form_driver.3x.html	2021-12-25 22:12:46.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ form_driver 3x
+ 
+-
++
+ 
+ 
+ 
    form_driver 3x
    
+@@ -86,7 +86,7 @@
+

    Form-driver requests

    +        The form driver requests are as follows:
+ 
+-       Name               Description
++       Name               Description
+        ---------------------------------------------------------------------
+        REQ_BEG_FIELD      Move to the beginning of the field.
+        REQ_BEG_LINE       Move to the beginning of the line.
+Index: doc/html/man/form_field.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/form_field.3x.html	2021-06-26 13:11:27.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/form_field.3x.html	2021-12-25 22:12:46.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ form_field 3x
+ 
+-
++
+ 
+ 
+ 
    form_field 3x
    
+Index: doc/html/man/form_field_attributes.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/form_field_attributes.3x.html	2021-06-26 13:11:27.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/form_field_attributes.3x.html	2021-12-25 22:12:46.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ form_field_attributes 3x
+ 
+-
++
+ 
+ 
+ 
    form_field_attributes 3x
    
+Index: doc/html/man/form_field_buffer.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/form_field_buffer.3x.html	2021-06-26 13:11:27.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/form_field_buffer.3x.html	2021-12-25 22:12:46.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ form_field_buffer 3x
+ 
+-
++
+ 
+ 
+ 
    form_field_buffer 3x
    
+Index: doc/html/man/form_field_info.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/form_field_info.3x.html	2021-06-26 13:11:27.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/form_field_info.3x.html	2021-12-25 22:12:46.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ form_field_info 3x
+ 
+-
++
+ 
+ 
+ 
    form_field_info 3x
    
+Index: doc/html/man/form_field_just.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/form_field_just.3x.html	2021-06-26 13:11:27.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/form_field_just.3x.html	2021-12-25 22:12:46.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ form_field_just 3x
+ 
+-
++
+ 
+ 
+ 
    form_field_just 3x
    
+Index: doc/html/man/form_field_new.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/form_field_new.3x.html	2021-06-26 13:11:27.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/form_field_new.3x.html	2021-12-25 22:12:46.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ form_field_new 3x
+ 
+-
++
+ 
+ 
+ 
    form_field_new 3x
    
+Index: doc/html/man/form_field_opts.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/form_field_opts.3x.html	2021-06-26 13:11:27.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/form_field_opts.3x.html	2021-12-25 22:12:46.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ form_field_opts 3x
+ 
+-
++
+ 
+ 
+ 
    form_field_opts 3x
    
+Index: doc/html/man/form_field_userptr.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/form_field_userptr.3x.html	2021-06-26 13:11:27.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/form_field_userptr.3x.html	2021-12-25 22:12:46.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ form_field_userptr 3x
+ 
+-
++
+ 
+ 
+ 
    form_field_userptr 3x
    
+Index: doc/html/man/form_field_validation.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/form_field_validation.3x.html	2021-06-26 13:11:27.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/form_field_validation.3x.html	2021-12-25 22:12:46.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ form_field_validation 3x
+ 
+-
++
+ 
+ 
+ 
    form_field_validation 3x
    
+Index: doc/html/man/form_fieldtype.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/form_fieldtype.3x.html	2021-06-26 13:11:27.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/form_fieldtype.3x.html	2021-12-25 22:12:46.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ form_fieldtype 3x
+ 
+-
++
+ 
+ 
+ 
    form_fieldtype 3x
    
+Index: doc/html/man/form_hook.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/form_hook.3x.html	2021-06-26 13:11:27.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/form_hook.3x.html	2021-12-25 22:12:46.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ form_hook 3x
+ 
+-
++
+ 
+ 
+ 
    form_hook 3x
    
+Index: doc/html/man/form_new.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/form_new.3x.html	2021-06-26 13:11:27.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/form_new.3x.html	2021-12-25 22:12:46.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ form_new 3x
+ 
+-
++
+ 
+ 
+ 
    form_new 3x
    
+Index: doc/html/man/form_new_page.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/form_new_page.3x.html	2021-06-26 13:11:27.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/form_new_page.3x.html	2021-12-25 22:12:46.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ form_new_page 3x
+ 
+-
++
+ 
+ 
+ 
    form_new_page 3x
    
+Index: doc/html/man/form_opts.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/form_opts.3x.html	2021-06-26 13:11:27.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/form_opts.3x.html	2021-12-25 22:12:46.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ form_opts 3x
+ 
+-
++
+ 
+ 
+ 
    form_opts 3x
    
+Index: doc/html/man/form_page.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/form_page.3x.html	2021-06-26 13:11:27.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/form_page.3x.html	2021-12-25 22:12:46.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ form_page 3x
+ 
+-
++
+ 
+ 
+ 
    form_page 3x
    
+Index: doc/html/man/form_post.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/form_post.3x.html	2021-06-26 13:11:27.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/form_post.3x.html	2021-12-25 22:12:46.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ form_post 3x
+ 
+-
++
+ 
+ 
+ 
    form_post 3x
    
+Index: doc/html/man/form_requestname.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/form_requestname.3x.html	2021-06-26 13:11:27.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/form_requestname.3x.html	2021-12-25 22:12:46.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ form_requestname 3x
+ 
+-
++
+ 
+ 
+ 
    form_requestname 3x
    
+Index: doc/html/man/form_userptr.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/form_userptr.3x.html	2021-06-26 13:11:27.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/form_userptr.3x.html	2021-12-25 22:12:46.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ form_userptr 3x
+ 
+-
++
+ 
+ 
+ 
    form_userptr 3x
    
+Index: doc/html/man/form_variables.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/form_variables.3x.html	2021-06-26 13:11:27.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/form_variables.3x.html	2021-12-25 22:12:46.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ form_variables 3x
+ 
+-
++
+ 
+ 
+ 
    form_variables 3x
    
+Index: doc/html/man/form_win.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/form_win.3x.html	2021-06-26 13:11:28.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/form_win.3x.html	2021-12-25 22:12:47.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ form_win 3x
+ 
+-
++
+ 
+ 
+ 
    form_win 3x
    
+Index: doc/html/man/infocmp.1m.html
+--- ncurses-6.3-20211219+/doc/html/man/infocmp.1m.html	2021-10-20 23:22:42.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/infocmp.1m.html	2021-12-25 22:12:47.000000000 +0000
+@@ -28,7 +28,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: infocmp.1m,v 1.79 2021/08/15 20:01:31 tom Exp @
++  * @Id: infocmp.1m,v 1.80 2021/12/25 18:55:27 tom Exp @
+ -->
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ infocmp 1m
+ 
+-
++
+ 
+ 
+ 
    infocmp 1m
    
+@@ -514,7 +514,7 @@
+ 
+        https://invisible-island.net/ncurses/tctest.html
+ 
+-       This describes ncurses version 6.3 (patch 20211021).
++       This describes ncurses version 6.3 (patch 20211225).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/infotocap.1m.html
+--- ncurses-6.3-20211219+/doc/html/man/infotocap.1m.html	2021-10-20 23:22:42.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/infotocap.1m.html	2021-12-25 22:12:47.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ infotocap 1m
+ 
+-
++
+ 
+ 
+ 
    infotocap 1m
    
+@@ -91,7 +91,7 @@
+

    SEE ALSO

    +        infocmp(1m), tic(1m), curses(3x), terminfo(5)
+ 
+-       This describes ncurses version 6.3 (patch 20211021).
++       This describes ncurses version 6.3 (patch 20211225).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/key_defined.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/key_defined.3x.html	2021-06-26 13:11:28.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/key_defined.3x.html	2021-12-25 22:12:47.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ key_defined 3x
+ 
+-
++
+ 
+ 
+ 
    key_defined 3x
    
+Index: doc/html/man/keybound.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/keybound.3x.html	2021-06-26 13:11:28.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/keybound.3x.html	2021-12-25 22:12:47.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ keybound 3x
+ 
+-
++
+ 
+ 
+ 
    keybound 3x
    
+Index: doc/html/man/keyok.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/keyok.3x.html	2021-06-26 13:11:28.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/keyok.3x.html	2021-12-25 22:12:47.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ keyok 3x
+ 
+-
++
+ 
+ 
+ 
    keyok 3x
    
+@@ -59,7 +59,7 @@
+ 
+

    DESCRIPTION

    +        This  is an extension to the curses library.  It permits an application
+-       to disable specific keycodes, rather than use the  keypad  function  to
++       to disable specific keycodes, rather than use the  keypad  function  to
+        disable all keycodes.  Keys that have been disabled can be re-enabled.
+ 
+ 
+Index: doc/html/man/legacy_coding.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/legacy_coding.3x.html	2021-08-21 23:11:21.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/legacy_coding.3x.html	2021-12-25 22:12:47.000000000 +0000
+@@ -28,7 +28,7 @@
+   * authorization.                                                           *
+   ****************************************************************************
+   * Author: Thomas E. Dickey
+-  * @Id: legacy_coding.3x,v 1.9 2021/08/15 19:32:05 tom Exp @
++  * @Id: legacy_coding.3x,v 1.10 2021/12/25 17:39:16 tom Exp @
+ -->
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ legacy_coding 3x
+ 
+-
++
+ 
+ 
+ 
    legacy_coding 3x
    
+Index: doc/html/man/menu.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/menu.3x.html	2021-10-20 23:22:42.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/menu.3x.html	2021-12-25 22:12:47.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ menu 3x
+ 
+-
++
+ 
+ 
+ 
    menu 3x
    
+@@ -223,7 +223,7 @@
+        curses(3x) and related pages whose names  begin  "menu_"  for  detailed
+        descriptions of the entry points.
+ 
+-       This describes ncurses version 6.3 (patch 20211021).
++       This describes ncurses version 6.3 (patch 20211225).
+ 
+ 
+ 
+Index: doc/html/man/menu_attributes.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/menu_attributes.3x.html	2021-06-26 13:11:28.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/menu_attributes.3x.html	2021-12-25 22:12:47.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ menu_attributes 3x
+ 
+-
++
+ 
+ 
+ 
    menu_attributes 3x
    
+Index: doc/html/man/menu_cursor.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/menu_cursor.3x.html	2021-06-26 13:11:28.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/menu_cursor.3x.html	2021-12-25 22:12:47.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ menu_cursor 3x
+ 
+-
++
+ 
+ 
+ 
    menu_cursor 3x
    
+Index: doc/html/man/menu_driver.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/menu_driver.3x.html	2021-06-26 13:11:28.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/menu_driver.3x.html	2021-12-25 22:12:47.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ menu_driver 3x
+ 
+-
++
+ 
+ 
+ 
    menu_driver 3x
    
+Index: doc/html/man/menu_format.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/menu_format.3x.html	2021-06-26 13:11:28.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/menu_format.3x.html	2021-12-25 22:12:47.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ menu_format 3x
+ 
+-
++
+ 
+ 
+ 
    menu_format 3x
    
+Index: doc/html/man/menu_hook.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/menu_hook.3x.html	2021-06-26 13:11:28.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/menu_hook.3x.html	2021-12-25 22:12:47.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ menu_hook 3x
+ 
+-
++
+ 
+ 
+ 
    menu_hook 3x
    
+Index: doc/html/man/menu_items.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/menu_items.3x.html	2021-06-26 13:11:28.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/menu_items.3x.html	2021-12-25 22:12:47.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ menu_items 3x
+ 
+-
++
+ 
+ 
+ 
    menu_items 3x
    
+Index: doc/html/man/menu_mark.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/menu_mark.3x.html	2021-06-26 13:11:28.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/menu_mark.3x.html	2021-12-25 22:12:47.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ menu_mark 3x
+ 
+-
++
+ 
+ 
+ 
    menu_mark 3x
    
+Index: doc/html/man/menu_new.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/menu_new.3x.html	2021-06-26 13:11:28.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/menu_new.3x.html	2021-12-25 22:12:47.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ menu_new 3x
+ 
+-
++
+ 
+ 
+ 
    menu_new 3x
    
+Index: doc/html/man/menu_opts.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/menu_opts.3x.html	2021-06-26 13:11:28.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/menu_opts.3x.html	2021-12-25 22:12:47.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ menu_opts 3x
+ 
+-
++
+ 
+ 
+ 
    menu_opts 3x
    
+Index: doc/html/man/menu_pattern.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/menu_pattern.3x.html	2021-06-26 13:11:28.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/menu_pattern.3x.html	2021-12-25 22:12:47.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ menu_pattern 3x
+ 
+-
++
+ 
+ 
+ 
    menu_pattern 3x
    
+Index: doc/html/man/menu_post.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/menu_post.3x.html	2021-06-26 13:11:28.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/menu_post.3x.html	2021-12-25 22:12:47.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ menu_post 3x
+ 
+-
++
+ 
+ 
+ 
    menu_post 3x
    
+Index: doc/html/man/menu_requestname.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/menu_requestname.3x.html	2021-06-26 13:11:28.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/menu_requestname.3x.html	2021-12-25 22:12:48.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ menu_requestname 3x
+ 
+-
++
+ 
+ 
+ 
    menu_requestname 3x
    
+Index: doc/html/man/menu_spacing.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/menu_spacing.3x.html	2021-06-26 13:11:28.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/menu_spacing.3x.html	2021-12-25 22:12:48.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ menu_spacing 3x
+ 
+-
++
+ 
+ 
+ 
    menu_spacing 3x
    
+Index: doc/html/man/menu_userptr.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/menu_userptr.3x.html	2021-06-26 13:11:28.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/menu_userptr.3x.html	2021-12-25 22:12:48.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ menu_userptr 3x
+ 
+-
++
+ 
+ 
+ 
    menu_userptr 3x
    
+Index: doc/html/man/menu_win.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/menu_win.3x.html	2021-06-26 13:11:28.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/menu_win.3x.html	2021-12-25 22:12:48.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ menu_win 3x
+ 
+-
++
+ 
+ 
+ 
    menu_win 3x
    
+Index: doc/html/man/mitem_current.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/mitem_current.3x.html	2021-06-26 13:11:28.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/mitem_current.3x.html	2021-12-25 22:12:48.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ mitem_current 3x
+ 
+-
++
+ 
+ 
+ 
    mitem_current 3x
    
+Index: doc/html/man/mitem_name.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/mitem_name.3x.html	2021-06-26 13:11:28.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/mitem_name.3x.html	2021-12-25 22:12:48.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ mitem_name 3x
+ 
+-
++
+ 
+ 
+ 
    mitem_name 3x
    
+Index: doc/html/man/mitem_new.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/mitem_new.3x.html	2021-06-26 13:11:28.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/mitem_new.3x.html	2021-12-25 22:12:48.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ mitem_new 3x
+ 
+-
++
+ 
+ 
+ 
    mitem_new 3x
    
+Index: doc/html/man/mitem_opts.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/mitem_opts.3x.html	2021-06-26 13:11:29.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/mitem_opts.3x.html	2021-12-25 22:12:48.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ mitem_opts 3x
+ 
+-
++
+ 
+ 
+ 
    mitem_opts 3x
    
+Index: doc/html/man/mitem_userptr.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/mitem_userptr.3x.html	2021-06-26 13:11:29.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/mitem_userptr.3x.html	2021-12-25 22:12:48.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ mitem_userptr 3x
+ 
+-
++
+ 
+ 
+ 
    mitem_userptr 3x
    
+Index: doc/html/man/mitem_value.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/mitem_value.3x.html	2021-06-26 13:11:29.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/mitem_value.3x.html	2021-12-25 22:12:48.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ mitem_value 3x
+ 
+-
++
+ 
+ 
+ 
    mitem_value 3x
    
+Index: doc/html/man/mitem_visible.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/mitem_visible.3x.html	2021-06-26 13:11:29.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/mitem_visible.3x.html	2021-12-25 22:12:48.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ mitem_visible 3x
+ 
+-
++
+ 
+ 
+ 
    mitem_visible 3x
    
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/ncurses.3x.html	2021-10-20 23:22:43.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/ncurses.3x.html	2021-12-26 00:04:56.000000000 +0000
+@@ -28,7 +28,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: ncurses.3x,v 1.153 2021/08/22 17:17:16 tom Exp @
++  * @Id: ncurses.3x,v 1.156 2021/12/25 21:19:26 tom Exp @
+ -->
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ ncurses 3x
+ 
+-
++
+ 
+ 
+ 
    ncurses 3x
    
+@@ -60,15 +60,15 @@
+        method of updating  character  screens  with  reasonable  optimization.
+        This  implementation  is  "new  curses"  (ncurses)  and is the approved
+        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
+-       This describes ncurses version 6.3 (patch 20211021).
++       This describes ncurses version 6.3 (patch 20211225).
+ 
+        The  ncurses  library emulates the curses library of System V Release 4
+        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
+        curses).   XSI  stands  for  X/Open  System  Interfaces Extension.  The
+        ncurses library is freely redistributable in source form.   Differences
+-       from   the   SVr4  curses  are  summarized  under  the  EXTENSIONS  and
+-       PORTABILITY sections below and described in detail  in  the  respective
+-       EXTENSIONS, PORTABILITY and BUGS sections of individual man pages.
++       from   the   SVr4  curses  are  summarized  under  the  EXTENSIONS  and
++       PORTABILITY sections below and described in detail  in  the  respective
++       EXTENSIONS, PORTABILITY and BUGS sections of individual man pages.
+ 
+        The  ncurses  library  also  provides  many  useful  extensions,  i.e.,
+        features which cannot be implemented by a  simple  add-on  library  but
+@@ -91,7 +91,7 @@
+ 
+

    Initialization

    +        The  library uses the locale which the calling program has initialized.
+-       That is normally done with setlocale:
++       That is normally done with setlocale(3):
+ 
+            setlocale(LC_ALL, "");
+ 
+@@ -204,7 +204,7 @@
+ 
+

    Routine and Argument Names

    +        Many  curses routines have two or more versions.  The routines prefixed
+-       with w require a window argument.  The routines prefixed with p require
++       with w require a window argument.  The routines prefixed with p require
+        a pad argument.  Those without a prefix generally use stdscr.
+ 
+        The  routines  prefixed with mv require a y and x coordinate to move to
+@@ -912,7 +912,7 @@
+        Ncurses may use tabs as part of the cursor movement  optimization.   In
+        some  cases,  your  terminal driver may not handle these properly.  Set
+        this environment variable to disable the feature.  You can also  adjust
+-       your stty settings to avoid the problem.
++       your stty(1) settings to avoid the problem.
+ 
+ 
+

    NCURSES_NO_MAGIC_COOKIE

    +@@ -942,7 +942,7 @@
+ 
+        Set  the  NCURSES_NO_PADDING  environment  variable  to disable all but
+        mandatory padding.  Mandatory padding is used  as  a  part  of  special
+-       control sequences such as flash.
++       control sequences such as flash.
+ 
+ 
+

    NCURSES_NO_SETBUF

    +@@ -1030,10 +1030,10 @@
+ 
+        If you set TERM in your environment, it has no effect on the  operation
+        of  the  terminal  emulator.  It only affects the way applications work
+-       within the terminal.  Likewise, as a general rule (xterm being  a  rare
+-       exception),  terminal  emulators  which  allow you to specify TERM as a
+-       parameter or configuration value do not change their behavior to  match
+-       that setting.
++       within the terminal.  Likewise, as a general  rule  (xterm(1)  being  a
++       rare  exception), terminal emulators which allow you to specify TERM as
++       a parameter or configuration value do  not  change  their  behavior  to
++       match that setting.
+ 
+ 
+

    TERMCAP

    +@@ -1471,7 +1471,7 @@
+ 
+ 
+

    AUTHORS

    +-       Zeyd M. Ben-Halim, Eric S. Raymond, Thomas E. Dickey.  Based on pcurses
++       Zeyd M. Ben-Halim, Eric S. Raymond, Thomas E. Dickey.  Based on pcurses
+        by Pavel Curtis.
+ 
+ 
+Index: doc/html/man/ncurses6-config.1.html
+--- ncurses-6.3-20211219+/doc/html/man/ncurses6-config.1.html	2021-10-20 23:22:43.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/ncurses6-config.1.html	2021-12-25 22:12:48.000000000 +0000
+@@ -27,7 +27,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: MKncu_config.in,v 1.5 2021/06/17 21:20:30 tom Exp @
++  * @Id: MKncu_config.in,v 1.6 2021/12/25 17:39:16 tom Exp @
+ -->
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ ncurses6-config 1
+ 
+-
++
+ 
+ 
+ 
    ncurses6-config 1
    
+@@ -113,7 +113,7 @@
+

    SEE ALSO

    +        curses(3x)
+ 
+-       This describes ncurses version 6.3 (patch 20211021).
++       This describes ncurses version 6.3 (patch 20211225).
+ 
+ 
+ 
+Index: doc/html/man/new_pair.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/new_pair.3x.html	2021-06-26 13:11:29.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/new_pair.3x.html	2021-12-25 22:12:48.000000000 +0000
+@@ -28,7 +28,7 @@
+   * authorization.                                                           *
+   ****************************************************************************
+   * Author: Thomas E. Dickey
+-  * @Id: new_pair.3x,v 1.16 2021/06/17 21:26:02 tom Exp @
++  * @Id: new_pair.3x,v 1.18 2021/12/25 20:10:40 tom Exp @
+ -->
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ new_pair 3x
+ 
+-
++
+ 
+ 
+ 
    new_pair 3x
    
+@@ -119,7 +119,7 @@
+            allocated entry using free_pair and allocates a new color pair.
+ 
+        All  of  the  color  pairs are allocated from a table of possible color
+-       pairs.  The size of the table  is  determined  by  the  terminfo  pairs
++       pairs.  The size of the table  is  determined  by  the  terminfo  pairs
+        capability.   The  table  is  shared with init_pair; in fact alloc_pair
+        calls init_pair after updating the ncurses library's fast index to  the
+        colors versus color pairs.
+Index: doc/html/man/panel.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/panel.3x.html	2021-10-20 23:22:43.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/panel.3x.html	2021-12-25 22:12:48.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ resizeterm 3x
+ 
+-
++
+ 
+ 
+ 
    resizeterm 3x
    
+Index: doc/html/man/scr_dump.5.html
+--- ncurses-6.3-20211219+/doc/html/man/scr_dump.5.html	2021-06-26 13:11:29.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/scr_dump.5.html	2021-12-25 22:12:48.000000000 +0000
+@@ -27,7 +27,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: scr_dump.5,v 1.17 2021/06/17 21:26:02 tom Exp @
++  * @Id: scr_dump.5,v 1.20 2021/12/25 21:13:38 tom Exp @
+ -->
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ scr_dump 5
+ 
+-
++
+ 
+ 
+ 
    scr_dump 5
    
+@@ -138,13 +138,13 @@
+ 
+        X/Open's documentation for enhanced curses says only:
+ 
+-          The getwin( ) function reads window-related data stored in the  file
++          The getwin( ) function reads window-related data stored in the  file
+           by  putwin( ).   The  function  then  creates  and initializes a new
+           window using that data.
+ 
+-          The putwin( ) function writes all data associated with win into  the
+-          stdio  stream  to  which  filep points, using an unspecified format.
+-          This information can be retrieved later using getwin( ).
++          The putwin( ) function writes all data associated with win into  the
++          stdio(3)  stream to which filep points, using an unspecified format.
++          This information can be retrieved later using getwin( ).
+ 
+        In the mid-1990s when the X/Open Curses  document  was  written,  there
+        were  still  systems  using older, less capable curses libraries (aside
+Index: doc/html/man/tabs.1.html
+--- ncurses-6.3-20211219+/doc/html/man/tabs.1.html	2021-10-20 23:22:43.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/tabs.1.html	2021-12-25 22:12:48.000000000 +0000
+@@ -27,7 +27,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: tabs.1,v 1.32 2021/10/16 13:37:43 tom Exp @
++  * @Id: tabs.1,v 1.35 2021/12/25 19:04:39 tom Exp @
+ -->
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ tabs 1
+ 
+-
++
+ 
+ 
+ 
    tabs 1
    
+@@ -56,7 +56,7 @@
+ 
+

    DESCRIPTION

    +        The  tabs program clears and sets tab-stops on the terminal.  This uses
+-       the terminfo clear_all_tabs and set_tab  capabilities.   If  either  is
++       the terminfo clear_all_tabs and set_tab  capabilities.   If  either  is
+        absent,  tabs is unable to clear/set tab-stops.  The terminal should be
+        configured to use hard tabs, e.g.,
+ 
+@@ -252,7 +252,7 @@
+

    SEE ALSO

    +        infocmp(1m), tset(1), curses(3x), terminfo(5).
+ 
+-       This describes ncurses version 6.3 (patch 20211021).
++       This describes ncurses version 6.3 (patch 20211225).
+ 
+ 
+ 
+Index: doc/html/man/term.5.html
+--- ncurses-6.3-20211219+/doc/html/man/term.5.html	2021-08-21 23:11:22.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/term.5.html	2021-12-25 22:12:48.000000000 +0000
+@@ -27,7 +27,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: term.5,v 1.40 2021/08/15 19:38:47 tom Exp @
++  * @Id: term.5,v 1.43 2021/12/25 21:28:59 tom Exp @
+ -->
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ term 5
+ 
+-
++
+ 
+ 
+ 
    term 5
    
+@@ -283,11 +283,11 @@
+

    Magic codes

    +        The  magic  number  in a binary terminfo file is the first 16-bits (two
+        bytes).  Besides making it more reliable for the library to check  that
+-       a  file  is terminfo, utilities such as file also use that to tell what
+-       the file-format is.  System V defined more than one magic number,  with
+-       0433, 0435 as screen-dumps (see scr_dump(5)).  This implementation uses
+-       01036 as a continuation of that sequence, but with  a  different  high-
+-       order byte to avoid confusion.
++       a  file  is  terminfo,  utilities such as file(1) also use that to tell
++       what the file-format is.  System V defined more than one magic  number,
++       with 0433, 0435 as screen-dumps (see scr_dump(5)).  This implementation
++       uses 01036 as a continuation of that sequence,  but  with  a  different
++       high-order byte to avoid confusion.
+ 
+ 
+

    The TERMTYPE structure

    +@@ -376,7 +376,7 @@
+        extended number support for ncurses 6.1
+ 
+        Eric S. Raymond
+-       documented legacy terminfo format, e.g., from pcurses.
++       documented legacy terminfo format, e.g., from pcurses.
+ 
+ 
+ 
+Index: doc/html/man/term.7.html
+--- ncurses-6.3-20211219+/doc/html/man/term.7.html	2021-08-21 23:11:22.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/term.7.html	2021-12-25 22:12:49.000000000 +0000
+@@ -27,7 +27,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: term.7,v 1.30 2021/08/15 19:39:57 tom Exp @
++  * @Id: term.7,v 1.31 2021/12/25 17:39:16 tom Exp @
+ -->
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ term 7
+ 
+-
++
+ 
+ 
+ 
    term 7
    
+Index: doc/html/man/term_variables.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/term_variables.3x.html	2021-06-26 13:11:29.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/term_variables.3x.html	2021-12-25 22:12:49.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ term_variables 3x
+ 
+-
++
+ 
+ 
+ 
    term_variables 3x
    
+@@ -112,7 +112,7 @@
+        set_term.
+ 
+ 
+-

    Terminfo Names

    ++

    Terminfo Lookup Tables

    +        The tic(1) and infocmp(1) programs use lookup tables for the  long  and
+        short  names  of  terminfo  capabilities,  as well as the corresponding
+        names for termcap capabilities.  These are available to other  applica-
+@@ -186,7 +186,7 @@
+ 
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.3-20211219+/doc/html/man/terminfo.5.html	2021-10-20 23:22:43.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/terminfo.5.html	2021-12-25 22:12:49.000000000 +0000
+@@ -32,7 +32,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: terminfo.head,v 1.41 2021/08/15 19:32:53 tom Exp @
++  * @Id: terminfo.head,v 1.42 2021/12/25 17:39:16 tom Exp @
+   * Head of terminfo man page ends here
+   ****************************************************************************
+   * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+@@ -62,7 +62,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: terminfo.tail,v 1.108 2021/10/09 23:13:23 tom Exp @
++  * @Id: terminfo.tail,v 1.110 2021/12/25 20:14:56 tom Exp @
+   *.in -2
+   *.in +2
+   *.in -2
+@@ -76,7 +76,7 @@
+ 
+ terminfo 5   File Formats
+ 
+-
++
+ 
+ 
+ 
    terminfo 5   File Formats
    
+@@ -106,7 +106,7 @@
+        have, by specifying how to perform screen operations, and by specifying
+        padding requirements and initialization sequences.
+ 
+-       This manual describes ncurses version 6.3 (patch 20211021).
++       This manual describes ncurses version 6.3 (patch 20211225).
+ 
+ 
+

    Terminfo Entry Syntax

    +@@ -2647,7 +2647,7 @@
+ 
+ 
+

    AUTHORS

    +-       Zeyd M. Ben-Halim, Eric S. Raymond, Thomas E. Dickey.  Based on pcurses
++       Zeyd M. Ben-Halim, Eric S. Raymond, Thomas E. Dickey.  Based on pcurses
+        by Pavel Curtis.
+ 
+ 
+Index: doc/html/man/tic.1m.html
+--- ncurses-6.3-20211219+/doc/html/man/tic.1m.html	2021-10-20 23:22:43.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/tic.1m.html	2021-12-25 22:12:50.000000000 +0000
+@@ -27,7 +27,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: tic.1m,v 1.80 2021/08/15 20:01:19 tom Exp @
++  * @Id: tic.1m,v 1.81 2021/12/25 17:39:16 tom Exp @
+ -->
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ tic 1m
+ 
+-
++
+ 
+ 
+ 
    tic 1m
    
+@@ -461,7 +461,7 @@
+        captoinfo(1m),   infocmp(1m),   infotocap(1m),   toe(1m),   curses(3x),
+        term(5).  terminfo(5).  user_caps(5).
+ 
+-       This describes ncurses version 6.3 (patch 20211021).
++       This describes ncurses version 6.3 (patch 20211225).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/toe.1m.html
+--- ncurses-6.3-20211219+/doc/html/man/toe.1m.html	2021-10-20 23:22:43.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/toe.1m.html	2021-12-25 22:12:50.000000000 +0000
+@@ -27,7 +27,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: toe.1m,v 1.34 2021/06/17 21:26:02 tom Exp @
++  * @Id: toe.1m,v 1.35 2021/12/25 17:39:16 tom Exp @
+ -->
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ toe 1m
+ 
+-
++
+ 
+ 
+ 
    toe 1m
    
+@@ -171,7 +171,7 @@
+        captoinfo(1m),   infocmp(1m),   infotocap(1m),   tic(1m),   curses(3x),
+        terminfo(5).
+ 
+-       This describes ncurses version 6.3 (patch 20211021).
++       This describes ncurses version 6.3 (patch 20211225).
+ 
+ 
+ 
+Index: doc/html/man/tput.1.html
+--- ncurses-6.3-20211219+/doc/html/man/tput.1.html	2021-10-20 23:22:43.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/tput.1.html	2021-12-26 00:04:56.000000000 +0000
+@@ -28,7 +28,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: tput.1,v 1.72 2021/10/02 21:41:00 tom Exp @
++  * @Id: tput.1,v 1.75 2021/12/25 21:31:59 tom Exp @
+ -->
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ tput 1
+ 
+-
++
+ 
+ 
+ 
    tput 1
    
+@@ -399,14 +399,14 @@
+            incorporated  from  the  reset  feature of BSD tset written by Eric
+            Allman.
+ 
+-       o   SVr4  added  color  initialization  using   the   orig_colors   and
+-           orig_pairs capabilities in the init subcommand.
++       o   SVr4 added color initialization using the orig_colors and orig_pair
++           capabilities in the init subcommand.
+ 
+        Keith  Bostic  replaced  the  BSD  tput  command  in  1989  with  a new
+        implementation based on the AT&T System V program tput.  Like the  AT&T
+        program,  Bostic's  version accepted some parameters named for terminfo
+-       capabilities (clear, init, longname and reset).   However  (because  he
+-       had  only  termcap  available),  it  accepted  termcap  names for other
++       capabilities (clear, init, longname and reset).   However  (because  he
++       had  only  termcap  available),  it  accepted  termcap  names for other
+        capabilities.  Also, Bostic's BSD tput did not modify the terminal  I/O
+        modes as the earlier BSD tset had done.
+ 
+@@ -443,14 +443,14 @@
+            Until  changes made after ncurses 6.0, tput did not modify terminal
+            modes.  tput now uses a similar scheme, using functions shared with
+            tset  (and ultimately based on the 4.4BSD tset).  If it is not able
+-           to open a terminal, e.g., when running in cron, tput will return an
+-           error.
++           to open a terminal, e.g., when running in cron(1), tput will return
++           an error.
+ 
+        o   AT&T tput guesses the type of its capname operands by seeing if all
+            of the characters are numeric, or not.
+ 
+            Most implementations which provide support for capname operands use
+-           the  tparm  function  to  expand  parameters  in it.  That function
++           the  tparm  function  to  expand  parameters  in it.  That function
+            expects a mixture of numeric and string parameters, requiring  tput
+            to know which type to use.
+ 
+@@ -545,7 +545,7 @@
+

    SEE ALSO

    +        clear(1), stty(1), tabs(1), tset(1), curs_termcap(3x), terminfo(5).
+ 
+-       This describes ncurses version 6.3 (patch 20211021).
++       This describes ncurses version 6.3 (patch 20211225).
+ 
+ 
+ 
+Index: doc/html/man/tset.1.html
+--- ncurses-6.3-20211219+/doc/html/man/tset.1.html	2021-10-20 23:22:44.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/tset.1.html	2021-12-26 00:04:57.000000000 +0000
+@@ -27,7 +27,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: tset.1,v 1.58 2021/09/18 21:21:55 tom Exp @
++  * @Id: tset.1,v 1.61 2021/12/25 21:27:03 tom Exp @
+ -->
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ tset 1
+ 
+-
++
+ 
+ 
+ 
    tset 1
    
+@@ -83,8 +83,8 @@
+ 
+        3. (BSD systems only.) The terminal type associated with  the  standard
+        error  output  device  in the /etc/ttys file.  (On System-V-like UNIXes
+-       and systems using that convention, getty does this job by setting  TERM
+-       according to the type passed to it by /etc/inittab.)
++       and systems using that convention, getty(1) does this  job  by  setting
++       TERM according to the type passed to it by /etc/inittab.)
+ 
+        4. The default terminal type, "unknown".
+ 
+@@ -206,165 +206,167 @@
+        When the -s option is specified, the commands to enter the  information
+        into  the  shell's  environment are written to the standard output.  If
+        the SHELL environmental variable ends in "csh", the  commands  are  for
+-       csh,  otherwise, they are for sh.  Note, the csh commands set and unset
+-       the shell variable noglob, leaving it unset.  The following line in the
+-       .login or .profile files will initialize the environment correctly:
++       csh,  otherwise,  they  are  for sh(1).  Note, the csh commands set and
++       unset the shell variable noglob, leaving it unset.  The following  line
++       in  the  .login  or  .profile  files  will  initialize  the environment
++       correctly:
+ 
+            eval `tset -s options ... `
+ 
+ 
+

    TERMINAL TYPE MAPPING

    +-       When  the  terminal  is  not  hardwired into the system (or the current
+-       system information is incorrect) the terminal  type  derived  from  the
+-       /etc/ttys  file  or  the TERM environmental variable is often something
+-       generic like network, dialup, or unknown.   When  tset  is  used  in  a
+-       startup  script  it is often desirable to provide information about the
++       When the terminal is not hardwired into  the  system  (or  the  current
++       system  information  is  incorrect)  the terminal type derived from the
++       /etc/ttys file or the TERM environmental variable  is  often  something
++       generic  like  network,  dialup,  or  unknown.   When tset is used in a
++       startup script it is often desirable to provide information  about  the
+        type of terminal used on such ports.
+ 
+-       The -m options maps from some set of conditions  to  a  terminal  type,
++       The  -m  options  maps  from some set of conditions to a terminal type,
+        that is, to tell tset "If I'm on this port at a particular speed, guess
+        that I'm on that kind of terminal".
+ 
+-       The argument to the -m option consists of an  optional  port  type,  an
+-       optional  operator,  an  optional  baud rate specification, an optional
+-       colon (":") character and a terminal type.  The port type is  a  string
+-       (delimited  by  either  the  operator  or  the  colon  character).  The
+-       operator may be any combination of ">", "<", "@", and  "!";  ">"  means
+-       greater  than,  "<" means less than, "@" means equal to and "!" inverts
+-       the sense of the test.  The baud rate is specified as a number  and  is
+-       compared  with  the speed of the standard error output (which should be
++       The  argument  to  the  -m option consists of an optional port type, an
++       optional operator, an optional baud  rate  specification,  an  optional
++       colon  (":")  character and a terminal type.  The port type is a string
++       (delimited by  either  the  operator  or  the  colon  character).   The
++       operator  may  be  any combination of ">", "<", "@", and "!"; ">" means
++       greater than, "<" means less than, "@" means equal to and  "!"  inverts
++       the  sense  of the test.  The baud rate is specified as a number and is
++       compared with the speed of the standard error output (which  should  be
+        the control terminal).  The terminal type is a string.
+ 
+-       If the terminal type is not specified  on  the  command  line,  the  -m
+-       mappings  are  applied to the terminal type.  If the port type and baud
+-       rate match the mapping, the terminal  type  specified  in  the  mapping
+-       replaces  the current type.  If more than one mapping is specified, the
++       If  the  terminal  type  is  not  specified on the command line, the -m
++       mappings are applied to the terminal type.  If the port type  and  baud
++       rate  match  the  mapping,  the  terminal type specified in the mapping
++       replaces the current type.  If more than one mapping is specified,  the
+        first applicable mapping is used.
+ 
+-       For example, consider the following  mapping:  dialup>9600:vt100.   The
++       For  example,  consider  the following mapping: dialup>9600:vt100.  The
+        port type is dialup , the operator is >, the baud rate specification is
+        9600, and the terminal type is vt100.  The result of this mapping is to
+-       specify  that  if  the  terminal  type  is dialup, and the baud rate is
++       specify that if the terminal type is  dialup,  and  the  baud  rate  is
+        greater than 9600 baud, a terminal type of vt100 will be used.
+ 
+-       If no baud rate is specified, the terminal type  will  match  any  baud
+-       rate.   If  no port type is specified, the terminal type will match any
+-       port type.  For example, -m dialup:vt100  -m  :?xterm  will  cause  any
++       If  no  baud  rate  is specified, the terminal type will match any baud
++       rate.  If no port type is specified, the terminal type will  match  any
++       port  type.   For  example,  -m  dialup:vt100 -m :?xterm will cause any
+        dialup port, regardless of baud rate, to match the terminal type vt100,
+-       and any non-dialup port type to match the terminal type ?xterm.   Note,
+-       because  of  the  leading  question mark, the user will be queried on a
++       and  any non-dialup port type to match the terminal type ?xterm.  Note,
++       because of the leading question mark, the user will  be  queried  on  a
+        default port as to whether they are actually using an xterm terminal.
+ 
+-       No whitespace characters are  permitted  in  the  -m  option  argument.
+-       Also,  to avoid problems with meta-characters, it is suggested that the
++       No  whitespace  characters  are  permitted  in  the -m option argument.
++       Also, to avoid problems with meta-characters, it is suggested that  the
+        entire -m option argument be placed within single quote characters, and
+-       that   csh   users  insert  a  backslash  character  ("\")  before  any
++       that  csh  users  insert  a  backslash  character  ("\")   before   any
+        exclamation marks ("!").
+ 
+ 
+

    HISTORY

    +-       A reset command appeared in 1BSD (March 1978), written by Kurt  Shoens.
+-       This  program set the erase and kill characters to ^H (backspace) and @
++       A  reset command appeared in 1BSD (March 1978), written by Kurt Shoens.
++       This program set the erase and kill characters to ^H (backspace) and  @
+        respectively.  Mark Horton improved that in 3BSD (October 1979), adding
+-       intr,  quit,  start/stop  and  eof  characters  as well as changing the
+-       program to avoid modifying any user settings.  That  version  of  reset
++       intr, quit, start/stop and eof  characters  as  well  as  changing  the
++       program  to  avoid  modifying any user settings.  That version of reset
+        did not use the termcap database.
+ 
+-       A  separate tset command was provided in 1BSD by Eric Allman, using the
+-       termcap database.  Allman's comments in the source code  indicate  that
++       A separate tset command was provided in 1BSD by Eric Allman, using  the
++       termcap  database.   Allman's comments in the source code indicate that
+        he began work in October 1977, continuing development over the next few
+        years.
+ 
+        According to comments in the source code, the tset program was modified
+-       in  September  1980,  to use logic copied from the 3BSD "reset" when it
++       in September 1980, to use logic copied from the 3BSD  "reset"  when  it
+        was invoked as reset.  This version appeared in 4.1cBSD, late in 1982.
+ 
+        Other developers (e.g., Keith Bostic and Jim Bloom) continued to modify
+        tset until 4.4BSD was released in 1993.
+ 
+-       The  ncurses implementation was lightly adapted from the 4.4BSD sources
++       The ncurses implementation was lightly adapted from the 4.4BSD  sources
+        for a terminfo environment by Eric S. Raymond <esr@snark.thyrsus.com>.
+ 
+ 
+

    COMPATIBILITY

    +-       Neither IEEE Std 1003.1/The Open  Group  Base  Specifications  Issue  7
++       Neither  IEEE  Std  1003.1/The  Open  Group Base Specifications Issue 7
+        (POSIX.1-2008) nor X/Open Curses Issue 7 documents tset or reset.
+ 
+-       The  AT&T  tput utility (AIX, HPUX, Solaris) incorporated the terminal-
+-       mode manipulation as well as termcap-based features such  as  resetting
+-       tabstops  from  tset  in  BSD  (4.1c), presumably with the intention of
+-       making tset obsolete.  However, each of those  systems  still  provides
+-       tset.   In fact, the commonly-used reset utility is always an alias for
++       The AT&T tput utility (AIX, HPUX, Solaris) incorporated  the  terminal-
++       mode  manipulation  as well as termcap-based features such as resetting
++       tabstops from tset in BSD (4.1c),  presumably  with  the  intention  of
++       making  tset  obsolete.   However, each of those systems still provides
++       tset.  In fact, the commonly-used reset utility is always an alias  for
+        tset.
+ 
+-       The  tset  utility  provides  for   backward-compatibility   with   BSD
+-       environments  (under  most modern UNIXes, /etc/inittab and getty(1) can
+-       set TERM appropriately for each dial-up line; this  obviates  what  was
+-       tset's  most  important  use).  This implementation behaves like 4.4BSD
++       The   tset   utility   provides  for  backward-compatibility  with  BSD
++       environments (under most modern UNIXes, /etc/inittab and  getty(1)  can
++       set  TERM  appropriately  for each dial-up line; this obviates what was
++       tset's most important use).  This implementation  behaves  like  4.4BSD
+        tset, with a few exceptions specified here.
+ 
+-       A few options are different because the TERMCAP variable is  no  longer
++       A  few  options are different because the TERMCAP variable is no longer
+        supported under terminfo-based ncurses:
+ 
+-       o   The  -S  option  of  BSD  tset  no longer works; it prints an error
++       o   The -S option of BSD tset no  longer  works;  it  prints  an  error
+            message to the standard error and dies.
+ 
+        o   The -s option only sets TERM, not TERMCAP.
+ 
+-       There was an undocumented 4.4BSD feature that invoking tset via a  link
+-       named  "TSET"  (or  via  any  other  name  beginning with an upper-case
++       There  was an undocumented 4.4BSD feature that invoking tset via a link
++       named "TSET" (or via  any  other  name  beginning  with  an  upper-case
+        letter) set the terminal to use upper-case only.  This feature has been
+        omitted.
+ 
+        The -A, -E, -h, -u and -v options were deleted from the tset utility in
+-       4.4BSD.  None of them were documented in 4.3BSD and all are of  limited
+-       utility  at  best.   The  -a,  -d,  and  -p  options  are similarly not
+-       documented or useful, but  were  retained  as  they  appear  to  be  in
+-       widespread  use.   It  is  strongly recommended that any usage of these
++       4.4BSD.   None of them were documented in 4.3BSD and all are of limited
++       utility at best.   The  -a,  -d,  and  -p  options  are  similarly  not
++       documented  or  useful,  but  were  retained  as  they  appear to be in
++       widespread use.  It is strongly recommended that  any  usage  of  these
+        three options be changed to use the -m option instead.  The -a, -d, and
+        -p options are therefore omitted from the usage summary above.
+ 
+-       Very  old  systems,  e.g., 3BSD, used a different terminal driver which
+-       was replaced in 4BSD in the early 1980s.  To  accommodate  these  older
+-       systems,  the  4BSD  tset  provided a -n option to specify that the new
+-       terminal driver should be used.  This implementation does  not  provide
++       Very old systems, e.g., 3BSD, used a different  terminal  driver  which
++       was  replaced  in  4BSD in the early 1980s.  To accommodate these older
++       systems, the 4BSD tset provided a -n option to  specify  that  the  new
++       terminal  driver  should be used.  This implementation does not provide
+        that choice.
+ 
+-       It  is  still permissible to specify the -e, -i, and -k options without
++       It is still permissible to specify the -e, -i, and -k  options  without
+        arguments, although it is strongly recommended that such usage be fixed
+        to explicitly specify the character.
+ 
+-       As  of 4.4BSD, executing tset as reset no longer implies the -Q option.
++       As of 4.4BSD, executing tset as reset no longer implies the -Q  option.
+        Also, the interaction between the - option and the terminal argument in
+        some historic implementations of tset has been removed.
+ 
+-       The  -c  and  -w  options  are  not  found  in earlier implementations.
++       The -c and  -w  options  are  not  found  in  earlier  implementations.
+        However, a different window size-change feature was provided in 4.4BSD.
+ 
+-       o   In 4.4BSD, tset uses the window size from the  termcap  description
+-           to  set  the  window  size if tset is not able to obtain the window
++       o   In  4.4BSD,  tset uses the window size from the termcap description
++           to set the window size if tset is not able  to  obtain  the  window
+            size from the operating system.
+ 
+        o   In ncurses, tset obtains the window size using setupterm, which may
+-           be  from  the  operating  system, the LINES and COLUMNS environment
++           be from the operating system, the  LINES  and  COLUMNS  environment
+            variables or the terminal description.
+ 
+-       Obtaining the window size from the terminal description  is  common  to
+-       both  implementations,  but considered obsolescent.  Its only practical
++       Obtaining  the  window  size from the terminal description is common to
++       both implementations, but considered obsolescent.  Its  only  practical
+        use is for hardware terminals.  Generally speaking, a window size would
+-       be  unset  only if there were some problem obtaining the value from the
+-       operating system (and setupterm would still fail).   For  that  reason,
+-       the  LINES  and COLUMNS environment variables may be useful for working
+-       around window-size problems.  Those  have  the  drawback  that  if  the
+-       window  is  resized, those variables must be recomputed and reassigned.
+-       To do this more easily, use the resize(1) program.
++       be unset only if there were some problem obtaining the value  from  the
++       operating  system  (and  setupterm would still fail).  For that reason,
++       the LINES and COLUMNS environment variables may be useful  for  working
++       around  window-size  problems.   Those  have  the  drawback that if the
++       window is resized, those variables must be recomputed  and  reassigned.
++       To do this more easily, use the resize(1) program.
+ 
+ 
+

    ENVIRONMENT

    +        The tset command uses these environment variables:
+ 
+        SHELL
+-            tells tset whether to initialize TERM using sh or csh syntax.
++            tells  tset  whether  to  initialize  TERM  using  sh(1) or csh(1)
++            syntax.
+ 
+        TERM Denotes your terminal  type.   Each  terminal  type  is  distinct,
+             though many are similar.
+@@ -389,7 +391,7 @@
+        csh(1),   sh(1),   stty(1),   curs_terminfo(3x),  tty(4),  terminfo(5),
+        ttys(5), environ(7)
+ 
+-       This describes ncurses version 6.3 (patch 20211021).
++       This describes ncurses version 6.3 (patch 20211225).
+ 
+ 
+ 
+Index: doc/html/man/user_caps.5.html
+--- ncurses-6.3-20211219+/doc/html/man/user_caps.5.html	2021-06-26 13:11:29.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/user_caps.5.html	2021-12-26 00:04:57.000000000 +0000
+@@ -27,7 +27,7 @@
+   * sale, use or other dealings in this Software without prior written       *
+   * authorization.                                                           *
+   ****************************************************************************
+-  * @Id: user_caps.5,v 1.17 2021/06/17 21:30:22 tom Exp @
++  * @Id: user_caps.5,v 1.20 2021/12/25 21:09:22 tom Exp @
+ -->
+ 
+ 
+@@ -36,7 +36,7 @@
+ 
+ user_caps 5
+ 
+-
++
+ 
+ 
+ 
    user_caps 5
    
+@@ -115,7 +115,7 @@
+                     (box1) box characters primary set
+ 
+            The memory lock/unlock capabilities were included because they were
+-           used in  the  X11R6  terminal  description  for  xterm.   The  box1
++           used in the X11R6 terminal  description  for  xterm(1).   The  box1
+            capability  is  used  in  tic  to  help  with terminal descriptions
+            written for AIX.
+ 
+@@ -168,7 +168,7 @@
+            predefined function-key names, to which a series  of  keys  can  be
+            assigned,   that  is  insufficient  for  more  than  a  dozen  keys
+            multiplied by more than a couple  of  modifier  combinations.   The
+-           ncurses  database  uses  a  convention  based  on  xterm to provide
++           ncurses  database  uses  a  convention based on xterm(1) to provide
+            extended special-key names.
+ 
+            Fitting that into termcap's limitation of 2-character  names  would
+@@ -236,7 +236,7 @@
+              Set this capability to a nonzero value to enable it.
+ 
+           XM string, override ncurses's built-in string which enables/disables
+-             xterm mouse mode.
++             xterm(1) mouse mode.
+ 
+              ncurses  sends a character sequence to the terminal to initialize
+              mouse mode, and when the user clicks the  mouse  buttons  or  (in
+@@ -310,17 +310,17 @@
+        combinations of modified special keys.  There is no standard  for  what
+        those keys can send.
+ 
+-       Since 1999, xterm has supported shift, control, alt, and meta modifiers
+-       which produce distinct special-key strings.  In a terminal description,
+-       ncurses  has  no special knowledge of the modifiers used.  Applications
+-       can use the naming convention  established  for  xterm  to  find  these
+-       special keys in the terminal description.
++       Since  1999,  xterm(1)  has  supported  shift,  control,  alt, and meta
++       modifiers which produce distinct special-key strings.   In  a  terminal
++       description,  ncurses  has  no special knowledge of the modifiers used.
++       Applications can use the naming convention  established  for  xterm  to
++       find these special keys in the terminal description.
+ 
+        Starting  with  the curses convention that key names begin with "k" and
+        that shifted special keys are  an  uppercase  name,  ncurses'  terminal
+        database defines these names to which a suffix is added:
+ 
+-            Name   Description
++            Name   Description
+             ---------------------------------------------------------------
+             kDC    special form of kdch1 (delete character)
+             kDN    special form of kcud1 (cursor down)
+@@ -334,7 +334,7 @@
+ 
+        These are the suffixes used to denote the modifiers:
+ 
+-            Value   Description
++            Value   Description
+             ----------------------------------
+             2       Shift
+             3       Alt
+@@ -377,7 +377,7 @@
+        the  terminal  descriptions.   Some  of those features are mentioned in
+        screen(1) or tmux(1).
+ 
+-       XTerm Control Sequences  provides  further  information  on  the  xterm
++       XTerm Control Sequences provides further information  on  the  xterm(1)
+        features which are used in these extended capabilities.
+ 
+ 
+Index: doc/html/man/wresize.3x.html
+--- ncurses-6.3-20211219+/doc/html/man/wresize.3x.html	2021-06-26 13:11:29.000000000 +0000
++++ ncurses-6.3-20211225/doc/html/man/wresize.3x.html	2021-12-25 22:12:51.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -37,7 +37,7 @@
+ 
+ wresize 3x
+ 
+-
++
+ 
+ 
+ 
    wresize 3x
    
+Index: man/MKada_config.in
+Prereq:  1.13 
+--- ncurses-6.3-20211219+/man/MKada_config.in	2021-06-17 21:26:02.000000000 +0000
++++ ncurses-6.3-20211225/man/MKada_config.in	2021-12-25 17:39:16.000000000 +0000
+@@ -27,36 +27,36 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: MKada_config.in,v 1.13 2021/06/17 21:26:02 tom Exp $
++.\" $Id: MKada_config.in,v 1.14 2021/12/25 17:39:16 tom Exp $
+ .ds C adacurses@USE_CFG_SUFFIX@\-config
+ .TH ADACURSES "1" "" "" "User Commands"
+ .SH NAME
+ adacurses@USE_CFG_SUFFIX@\-config \- helper script for @ADA_LIBNAME@ libraries
+ .SH SYNOPSIS
+ .B \*C
+-[\fIoptions\fR]
++[\fIoptions\fP]
+ .SH DESCRIPTION
+ This is a shell script which simplifies configuring an application to use
+ the @ADA_LIBNAME@ library binding to ncurses.
+ .SH OPTIONS
+ .TP
+-\fB\-\-cflags\fR
++\fB\-\-cflags\fP
+ echos the gnat (Ada compiler) flags needed to compile with @ADA_LIBNAME@.
+ .TP
+-\fB\-\-libs\fR
++\fB\-\-libs\fP
+ echos the gnat libraries needed to link with @ADA_LIBNAME@.
+ .TP
+-\fB\-\-version\fR
++\fB\-\-version\fP
+ echos the release+patchdate version of the ncurses libraries used
+ to configure and build @ADA_LIBNAME@.
+ .TP
+-\fB\-\-help\fR
++\fB\-\-help\fP
+ prints a list of the \fB\*C\fP script's options.
+ .PP
+ If no options are given, \fB\*C\fP prints the combination
+ of
+-\fB\-\-cflags\fR and
+-\fB\-\-libs\fR
++\fB\-\-cflags\fP and
++\fB\-\-libs\fP
+ that \fBgnatmake\fP expects (see example).
+ .SH EXAMPLE
+ .PP
+@@ -118,7 +118,7 @@
+ .PP
+ you will compile and link the program.
+ .SH "SEE ALSO"
+-\fBcurses\fR(3X)
++\fBcurses\fP(3X)
+ .PP
+-This describes \fBncurses\fR
++This describes \fBncurses\fP
+ version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
+Index: man/MKncu_config.in
+Prereq:  1.5 
+--- ncurses-6.3-20211219+/man/MKncu_config.in	2021-06-17 21:20:30.000000000 +0000
++++ ncurses-6.3-20211225/man/MKncu_config.in	2021-12-25 17:39:16.000000000 +0000
+@@ -27,73 +27,73 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: MKncu_config.in,v 1.5 2021/06/17 21:20:30 tom Exp $
++.\" $Id: MKncu_config.in,v 1.6 2021/12/25 17:39:16 tom Exp $
+ .TH @LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config 1 ""
+ .SH NAME
+ @LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config \- helper script for ncurses libraries
+ .SH SYNOPSIS
+ .B @LIB_NAME@@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config
+-[\fIoptions\fR]
++[\fIoptions\fP]
+ .SH DESCRIPTION
+ This is a shell script which simplifies configuring applications against
+ a particular set of ncurses libraries.
+ .SH OPTIONS
+ .TP
+-\fB\-\-prefix\fR
++\fB\-\-prefix\fP
+ echos the package\-prefix of ncurses
+ .TP
+-\fB\-\-exec\-prefix\fR
++\fB\-\-exec\-prefix\fP
+ echos the executable\-prefix of ncurses
+ .TP
+-\fB\-\-cflags\fR
++\fB\-\-cflags\fP
+ echos the C compiler flags needed to compile with ncurses
+ .TP
+-\fB\-\-libs\fR
++\fB\-\-libs\fP
+ echos the libraries needed to link with ncurses
+ .TP
+-\fB\-\-version\fR
++\fB\-\-version\fP
+ echos the release+patchdate version of ncurses
+ .TP
+-\fB\-\-abi\-version\fR
++\fB\-\-abi\-version\fP
+ echos the ABI version of ncurses
+ .TP
+-\fB\-\-mouse\-version\fR
++\fB\-\-mouse\-version\fP
+ echos the mouse\-interface version of ncurses
+ .TP
+-\fB\-\-bindir\fR
++\fB\-\-bindir\fP
+ echos the directory containing ncurses programs
+ .TP
+-\fB\-\-datadir\fR
++\fB\-\-datadir\fP
+ echos the directory containing ncurses data
+ .TP
+-\fB\-\-includedir\fR
++\fB\-\-includedir\fP
+ echos the directory containing ncurses header files
+ .TP
+-\fB\-\-libdir\fR
++\fB\-\-libdir\fP
+ echos the directory containing ncurses libraries
+ .TP
+-\fB\-\-mandir\fR
++\fB\-\-mandir\fP
+ echos the directory containing ncurses manpages
+ .TP
+-\fB\-\-terminfo\fR
++\fB\-\-terminfo\fP
+ echos the $TERMINFO terminfo database path, e.g.,
+ .RS
+ @TERMINFO@
+ .RE
+ .TP
+-\fB\-\-terminfo\-dirs\fR
++\fB\-\-terminfo\-dirs\fP
+ echos the $TERMINFO_DIRS directory list, e.g.,
+ .RS
+ @TERMINFO_DIRS@
+ .RE
+ .TP
+-\fB\-\-termpath\fR
++\fB\-\-termpath\fP
+ echos the $TERMPATH termcap list, if support for termcap is configured.
+ .TP
+-\fB\-\-help\fR
++\fB\-\-help\fP
+ prints this message
+ .SH "SEE ALSO"
+-\fBcurses\fR(3X)
++\fBcurses\fP(3X)
+ .PP
+-This describes \fBncurses\fR
++This describes \fBncurses\fP
+ version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
+Index: man/captoinfo.1m
+Prereq:  1.30 
+--- ncurses-6.3-20211219+/man/captoinfo.1m	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.3-20211225/man/captoinfo.1m	2021-12-25 21:37:49.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2016 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,45 +28,45 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: captoinfo.1m,v 1.30 2020/02/02 23:34:34 tom Exp $
++.\" $Id: captoinfo.1m,v 1.32 2021/12/25 21:37:49 tom Exp $
+ .TH @CAPTOINFO@ 1M ""
+ .ds n 5
+ .ds d @TERMINFO@
+ .SH NAME
+-\fB@CAPTOINFO@\fR \- convert a \fItermcap\fR description into a \fIterminfo\fR description
++\fB@CAPTOINFO@\fP \- convert a \fItermcap\fP description into a \fIterminfo\fP description
+ .SH SYNOPSIS
+-\fB@CAPTOINFO@\fR [\fB\-v\fR\fIn\fR \fIwidth\fR]  [\fB\-V\fR] [\fB\-1\fR] [\fB\-w\fR \fIwidth\fR] \fIfile\fR ...
++\fB@CAPTOINFO@\fP [\fB\-v\fP\fIn\fP \fIwidth\fP]  [\fB\-V\fP] [\fB\-1\fP] [\fB\-w\fP \fIwidth\fP] \fIfile\fP ...
+ .SH DESCRIPTION
+-\fB@CAPTOINFO@\fR looks in each given text
+-\fIfile\fR for \fBtermcap\fR descriptions.
++\fB@CAPTOINFO@\fP looks in each given text
++\fIfile\fP for \fBtermcap\fP descriptions.
+ For each
+-one found, an equivalent \fBterminfo\fR description is written to standard
++one found, an equivalent \fBterminfo\fP description is written to standard
+ output.
+-Termcap \fBtc\fR capabilities are translated directly to terminfo
+-\fBuse\fR capabilities.
++Termcap \fBtc\fP capabilities are translated directly to terminfo
++\fBuse\fP capabilities.
+ .PP
+-If no \fIfile\fR is given, then the environment variable \fBTERMCAP\fR is used
++If no \fIfile\fP is given, then the environment variable \fBTERMCAP\fP is used
+ for the filename or entry.
+-If \fBTERMCAP\fR is a full pathname to a file, only
+-the terminal whose name is specified in the environment variable \fBTERM\fR is
++If \fBTERMCAP\fP is a full pathname to a file, only
++the terminal whose name is specified in the environment variable \fBTERM\fP is
+ extracted from that file.
+-If the environment variable \fBTERMCAP\fR is not
+-set, then the file \fB\*d\fR is read.
++If the environment variable \fBTERMCAP\fP is not
++set, then the file \fB\*d\fP is read.
+ .TP 5
+-\fB\-v\fR
++\fB\-v\fP
+ print out tracing information on standard error as the program runs.
+ .TP 5
+-\fB\-V\fR
++\fB\-V\fP
+ print out the version of the program in use on standard error and exit.
+ .TP 5
+-\fB\-1\fR
++\fB\-1\fP
+ cause the fields to print out one to a line.
+ Otherwise, the fields
+ will be printed several to a line to a maximum width of 60
+ characters.
+ .TP 5
+-\fB\-w\fR
+-change the output to \fIwidth\fR characters.
++\fB\-w\fP
++change the output to \fIwidth\fP characters.
+ .SH FILES
+ .TP 20
+ \*d
+@@ -74,7 +74,7 @@
+ .SH TRANSLATIONS FROM NONSTANDARD CAPABILITIES
+ .PP
+ Some obsolete nonstandard capabilities will automatically be translated
+-into standard (SVr4/XSI Curses) terminfo capabilities by \fB@CAPTOINFO@\fR.
++into standard (SVr4/XSI Curses) terminfo capabilities by \fB@CAPTOINFO@\fP.
+ Whenever one of these automatic translations is done, the program
+ will issue an notification to stderr, inviting the user to check that
+ it has not mistakenly translated a completely unknown and random
+@@ -153,9 +153,9 @@
+ .TE
+ .PP
+ If the single-line capabilities occur in an entry, they will automatically
+-be composed into an \fBacsc\fR string.
++be composed into an \fBacsc\fP string.
+ The double-line capabilities and
+-\fBGG\fR are discarded with a warning message.
++\fBGG\fP are discarded with a warning message.
+ .PP
+ IBM's AIX has a terminfo facility descended from SVr1 terminfo but incompatible
+ with the SVr4 format.
+@@ -174,19 +174,19 @@
+ font3	s3ds
+ .TE
+ .PP
+-Additionally, the AIX \fIbox1\fR capability will be automatically translated to
+-an \fBacsc\fR string.
++Additionally, the AIX \fIbox1\fP capability will be automatically translated to
++an \fBacsc\fP string.
+ .PP
+ Hewlett-Packard's terminfo library supports two nonstandard terminfo
+-capabilities \fBmeml\fR (memory lock) and \fBmemu\fR (memory unlock).
++capabilities \fBmeml\fP (memory lock) and \fBmemu\fP (memory unlock).
+ These will be discarded with a warning message.
+ .SH NOTES
+-This utility is actually a link to \fB@TIC@\fR(1M), running in \fI\-I\fR mode.
+-You can use other \fB@TIC@\fR options such as \fB\-f\fR and  \fB\-x\fR.
++This utility is actually a link to \fB@TIC@\fP(1M), running in \fI\-I\fP mode.
++You can use other \fB@TIC@\fP options such as \fB\-f\fP and  \fB\-x\fP.
+ .PP
+ The verbose option is not identical to SVr4's.
+ Under SVr4, instead of following
+-the \fB\-v\fR with a trace level n, you repeat it n times.
++the \fB\-v\fP with a trace level n, you repeat it n times.
+ .SH PORTABILITY
+ X/Open Curses, Issue 7 (2009) describes \fBtic\fP briefly,
+ but omits this program.
+@@ -194,11 +194,11 @@
+ .PP
+ NetBSD does not provide this application.
+ .SH SEE ALSO
+-\fB@INFOCMP@\fR(1M),
+-\fBcurses\fR(3X),
+-\fBterminfo\fR(\*n)
++\fB@INFOCMP@\fP(1M),
++\fBcurses\fP(3X),
++\fBterminfo\fP(\*n)
+ .PP
+-This describes \fBncurses\fR
++This describes \fBncurses\fP
+ version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
+ .SH AUTHOR
+ Eric S. Raymond 
+Index: man/clear.1
+Prereq:  1.24 
+--- ncurses-6.3-20211219+/man/clear.1	2021-11-14 00:33:00.000000000 +0000
++++ ncurses-6.3-20211225/man/clear.1	2021-12-26 00:13:25.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: clear.1,v 1.24 2021/11/14 00:33:00 tom Exp $
++.\" $Id: clear.1,v 1.26 2021/12/26 00:13:25 tom Exp $
+ .TH @CLEAR@ 1 ""
+ .\" these would be fallbacks for DS/DE,
+ .\" but groff changed the meaning of the macros.
+@@ -55,33 +55,33 @@
+ ..
+ .ds n 5
+ .SH NAME
+-\fB@CLEAR@\fR \- clear the terminal screen
++\fB@CLEAR@\fP \- clear the terminal screen
+ .SH SYNOPSIS
+-\fB@CLEAR@\fR [\fB\-T\fR\fItype\fR] [\fB\-V\fP] [\fB\-x\fP]
++\fB@CLEAR@\fP [\fB\-T\fP\fItype\fP] [\fB\-V\fP] [\fB\-x\fP]
+ .br
+ .SH DESCRIPTION
+-\fB@CLEAR@\fR clears your terminal's screen if this is possible,
++\fB@CLEAR@\fP clears your terminal's screen if this is possible,
+ including the terminal's scrollback buffer
+ (if the extended \*(``E3\*('' capability is defined).
+-\fB@CLEAR@\fR looks in the environment for the terminal type
++\fB@CLEAR@\fP looks in the environment for the terminal type
+ given by the environment variable \fBTERM\fP,
+ and then in the
+-\fBterminfo\fR database to determine how to clear the screen.
++\fBterminfo\fP database to determine how to clear the screen.
+ .PP
+-\fB@CLEAR@\fR writes to the standard output.
++\fB@CLEAR@\fP writes to the standard output.
+ You can redirect the standard output to a file (which prevents
+-\fB@CLEAR@\fR from actually clearing the screen),
++\fB@CLEAR@\fP from actually clearing the screen),
+ and later \fBcat\fP the file to the screen, clearing it at that point.
+ .SH OPTIONS
+ .PP
+ .TP 5
+ .B \-T \fItype\fP
+-indicates the \fItype\fR of terminal.
++indicates the \fItype\fP of terminal.
+ Normally this option is
+ unnecessary, because the default is taken from the environment
+-variable \fBTERM\fR.
+-If \fB\-T\fR is specified, then the shell
+-variables \fBLINES\fR and \fBCOLUMNS\fR will also be ignored.
++variable \fBTERM\fP.
++If \fB\-T\fP is specified, then the shell
++variables \fBLINES\fP and \fBCOLUMNS\fP will also be ignored.
+ .TP
+ .B \-V
+ reports the version of ncurses which was used in this program, and exits.
+@@ -117,7 +117,7 @@
+ .PP
+ The \fBE3\fP extension came later:
+ .bP
+-In June 1999, xterm provided an extension to the standard control
++In June 1999, \fBxterm\fP provided an extension to the standard control
+ sequence for clearing the screen.
+ Rather than clearing just the visible part of the screen using
+ .NS
+@@ -130,13 +130,13 @@
+ .NE
+ .IP
+ This is documented in \fIXTerm Control Sequences\fP as a feature originating
+-with xterm.
++with \fBxterm\fP.
+ .bP
+ A few other terminal developers adopted the feature, e.g., PuTTY in 2006.
+ .bP
+ In April 2011, a Red Hat developer submitted a patch to the Linux
+ kernel, modifying its console driver to do the same thing.
+-The Linux change, part of the 3.0 release, did not mention xterm,
++The Linux change, part of the 3.0 release, did not mention \fBxterm\fP,
+ although it was cited in the Red Hat bug report (#683733)
+ which led to the change.
+ .bP
+@@ -157,7 +157,7 @@
+ either via a shell script or by an alias (such as a symbolic link) to
+ run \fB@TPUT@\fP as \fB@CLEAR@\fP.
+ .SH SEE ALSO
+-\fB@TPUT@\fR(1), \fBterminfo\fR(\*n)
++\fB@TPUT@\fP(1), \fBterminfo\fP(\*n), \fBxterm\fP(1).
+ .PP
+-This describes \fBncurses\fR
++This describes \fBncurses\fP
+ version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
+Index: man/curs_add_wch.3x
+Prereq:  1.28 
+--- ncurses-6.3-20211219+/man/curs_add_wch.3x	2020-10-17 23:10:38.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_add_wch.3x	2021-12-25 21:37:49.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2019,2020 Thomas E. Dickey                                     *
++.\" Copyright 2019-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 2001-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_add_wch.3x,v 1.28 2020/10/17 23:10:38 tom Exp $
++.\" $Id: curs_add_wch.3x,v 1.31 2021/12/25 21:37:49 tom Exp $
+ .TH curs_add_wch 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -43,7 +43,7 @@
+ \fBmvadd_wch\fP,
+ \fBmvwadd_wch\fP,
+ \fBecho_wchar\fP,
+-\fBwecho_wchar\fP \- add a complex character and rendition to a \fBcurses\fR window, then advance the cursor
++\fBwecho_wchar\fP \- add a complex character and rendition to a \fBcurses\fP window, then advance the cursor
+ .SH SYNOPSIS
+ .PP
+ \fB#include \fP
+@@ -89,7 +89,7 @@
+ .bP
+ If the character part of \fIwch\fP is
+ a tab, newline, backspace or other control character,
+-the window is updated and the cursor moves as if \fBaddch\fR were called.
++the window is updated and the cursor moves as if \fBaddch\fP were called.
+ .SS echo_wchar
+ .PP
+ The \fBecho_wchar\fP
+@@ -119,8 +119,8 @@
+ l l l l l
+ _ _ _ _ _
+ lw(1.5i) lw5 lw5 lw5 lw20.
+-\fBACS\fR	\fBUnicode\fP	\fBASCII\fR	\fBacsc\fP	\fBGlyph\fR
+-\fBName\fR	\fBDefault\fP	\fBDefault\fR	\fBchar\fP	\fBName\fR
++\fBACS\fP	\fBUnicode\fP	\fBASCII\fP	\fBacsc\fP	\fBGlyph\fP
++\fBName\fP	\fBDefault\fP	\fBDefault\fP	\fBchar\fP	\fBName\fP
+ WACS_BLOCK	0x25ae 	#	0	solid square block
+ WACS_BOARD	0x2592 	#	h	board of squares
+ WACS_BTEE	0x2534 	+	v	bottom tee
+@@ -162,8 +162,8 @@
+ l l l l l
+ _ _ _ _ _
+ lw(1.5i) lw5 lw5 lw5 lw20.
+-\fBACS\fR	\fBUnicode\fP	\fBASCII\fR	\fBacsc\fP	\fBGlyph\fR
+-\fBName\fR	\fBDefault\fP	\fBDefault\fR	\fBchar\fP	\fBName\fR
++\fBACS\fP	\fBUnicode\fP	\fBASCII\fP	\fBacsc\fP	\fBGlyph\fP
++\fBName\fP	\fBDefault\fP	\fBDefault\fP	\fBchar\fP	\fBName\fP
+ WACS_T_BTEE	0x253b	+	V	thick tee pointing up
+ WACS_T_HLINE	0x2501	-	Q	thick horizontal line
+ WACS_T_LLCORNER	0x2517	+	M	thick lower left corner
+@@ -184,8 +184,8 @@
+ l l l l l
+ _ _ _ _ _
+ lw(1.5i) lw5 lw5 lw5 lw20.
+-\fBACS\fR	\fBUnicode\fP	\fBASCII\fR	\fBacsc\fP	\fBGlyph\fR
+-\fBName\fR	\fBDefault\fP	\fBDefault\fR	\fBchar\fP	\fBName\fR
++\fBACS\fP	\fBUnicode\fP	\fBASCII\fP	\fBacsc\fP	\fBGlyph\fP
++\fBName\fP	\fBDefault\fP	\fBDefault\fP	\fBchar\fP	\fBName\fP
+ WACS_D_BTEE	0x2569	+	H	double tee pointing up
+ WACS_D_HLINE	0x2550	-	R	double horizontal line
+ WACS_D_LLCORNER	0x255a	+	D	double lower left corner
+@@ -210,7 +210,7 @@
+ U+2550 BOX DRAWINGS DOUBLE HORIZONTAL
+ .SH RETURN VALUE
+ .PP
+-All routines return the integer \fBERR\fR upon failure and \fBOK\fR on success.
++All routines return the integer \fBERR\fP upon failure and \fBOK\fP on success.
+ .PP
+ X/Open does not define any error conditions.
+ This implementation returns an error
+@@ -221,7 +221,7 @@
+ .PP
+ The latter may be due to different causes:
+ .bP
+-If \fBscrollok\fR is not enabled,
++If \fBscrollok\fP is not enabled,
+ writing a character at the lower right margin succeeds.
+ However, an error is returned because
+ it is not possible to wrap to a new line
+@@ -248,13 +248,13 @@
+ The defaults specified for line-drawing characters apply in the POSIX locale.
+ .PP
+ X/Open Curses makes it clear that the WACS_ symbols should be defined as
+-a pointer to \fBcchar_t\fP data, e.g., in the discussion of \fBborder_set\fR.
++a pointer to \fBcchar_t\fP data, e.g., in the discussion of \fBborder_set\fP.
+ A few implementations are problematic:
+ .bP
+ NetBSD curses defines the symbols as a \fBwchar_t\fP within a \fBcchar_t\fP.
+ .bP
+-HPUX curses equates some of the \fIACS_\fP symbols
+-to the analogous \fIWACS_\fP symbols as if the \fIACS_\fP symbols were
++HPUX curses equates some of the \fBACS_\fP symbols
++to the analogous \fBWACS_\fP symbols as if the \fBACS_\fP symbols were
+ wide characters.
+ The misdefined symbols are the arrows
+ and other symbols which are not used for line-drawing.
+@@ -325,10 +325,10 @@
+ .SH SEE ALSO
+ .na
+ .PP
+-\fBcurses\fR(3X),
+-\fBcurs_addch\fR(3X),
+-\fBcurs_attr\fR(3X),
+-\fBcurs_clear\fR(3X),
+-\fBcurs_outopts\fR(3X),
+-\fBcurs_refresh\fR(3X),
+-\fBputwc\fR(3)
++\fBcurses\fP(3X),
++\fBcurs_addch\fP(3X),
++\fBcurs_attr\fP(3X),
++\fBcurs_clear\fP(3X),
++\fBcurs_outopts\fP(3X),
++\fBcurs_refresh\fP(3X),
++\fBputwc\fP(3)
+Index: man/curs_add_wchstr.3x
+Prereq:  1.15 
+--- ncurses-6.3-20211219+/man/curs_add_wchstr.3x	2020-12-19 21:39:06.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_add_wchstr.3x	2021-12-25 21:41:58.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2019,2020 Thomas E. Dickey                                     *
++.\" Copyright 2019-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_add_wchstr.3x,v 1.15 2020/12/19 21:39:06 tom Exp $
++.\" $Id: curs_add_wchstr.3x,v 1.18 2021/12/25 21:41:58 tom Exp $
+ .TH curs_add_wchstr 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -40,49 +40,49 @@
+ .na
+ .hy 0
+ .SH NAME
+-\fBadd_wchstr\fR,
+-\fBadd_wchnstr\fR,
+-\fBwadd_wchstr\fR,
+-\fBwadd_wchnstr\fR,
+-\fBmvadd_wchstr\fR,
+-\fBmvadd_wchnstr\fR,
+-\fBmvwadd_wchstr\fR,
+-\fBmvwadd_wchnstr\fR \- add an array of complex characters (and attributes) to a curses window
++\fBadd_wchstr\fP,
++\fBadd_wchnstr\fP,
++\fBwadd_wchstr\fP,
++\fBwadd_wchnstr\fP,
++\fBmvadd_wchstr\fP,
++\fBmvadd_wchnstr\fP,
++\fBmvwadd_wchstr\fP,
++\fBmvwadd_wchnstr\fP \- add an array of complex characters (and attributes) to a curses window
+ .ad
+ .hy
+ .SH SYNOPSIS
+ .nf
+-\fB#include \fR
++\fB#include \fP
+ .PP
+-\fBint add_wchstr(const cchar_t *\fR\fIwchstr\fR\fB);\fR
++\fBint add_wchstr(const cchar_t *\fP\fIwchstr\fP\fB);\fP
+ .br
+-\fBint add_wchnstr(const cchar_t *\fR\fIwchstr\fR\fB, int \fR\fIn\fR\fB);\fR
++\fBint add_wchnstr(const cchar_t *\fP\fIwchstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .br
+-\fBint wadd_wchstr(WINDOW *\fR \fIwin\fR\fB, const cchar_t *\fR\fIwchstr\fR\fB);\fR
++\fBint wadd_wchstr(WINDOW *\fP \fIwin\fP\fB, const cchar_t *\fP\fIwchstr\fP\fB);\fP
+ .br
+-\fBint wadd_wchnstr(WINDOW *\fR \fIwin\fR\fB, const cchar_t *\fR\fIwchstr\fR\fB, int \fR\fIn\fR\fB);\fR
++\fBint wadd_wchnstr(WINDOW *\fP \fIwin\fP\fB, const cchar_t *\fP\fIwchstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .sp
+-\fBint mvadd_wchstr(int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, const cchar_t *\fR\fIwchstr\fR\fB);\fR
++\fBint mvadd_wchstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const cchar_t *\fP\fIwchstr\fP\fB);\fP
+ .br
+-\fBint mvadd_wchnstr(int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, const cchar_t *\fR\fIwchstr\fR\fB, int \fR\fIn\fR\fB);\fR
++\fBint mvadd_wchnstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const cchar_t *\fP\fIwchstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .br
+-\fBint mvwadd_wchstr(WINDOW *\fR\fIwin\fR\fB, int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, const cchar_t *\fR\fIwchstr\fR\fB);\fR
++\fBint mvwadd_wchstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const cchar_t *\fP\fIwchstr\fP\fB);\fP
+ .br
+-\fBint mvwadd_wchnstr(WINDOW *\fR\fIwin\fR\fB, int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, const cchar_t *\fR\fIwchstr\fR\fB, int \fR\fIn\fR\fB);\fR
++\fBint mvwadd_wchnstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const cchar_t *\fP\fIwchstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .fi
+ .SH DESCRIPTION
+ These functions copy the (null-terminated)
+-array of complex characters \fIwchstr\fR
++array of complex characters \fIwchstr\fP
+ into the window image structure
+ starting at the current cursor position.
+-The four functions with \fIn\fR as the last
+-argument copy at most \fIn\fR elements,
++The four functions with \fIn\fP as the last
++argument copy at most \fIn\fP elements,
+ but no more than will fit on the line.
+-If \fBn\fR=\fB\-1\fR then the whole array is copied,
++If \fBn\fP=\fB\-1\fP then the whole array is copied,
+ to the maximum number of characters that will fit on the line.
+ .PP
+-The window cursor is \fInot\fR advanced.
+-These functions work faster than \fBwaddnstr\fR.
++The window cursor is \fInot\fP advanced.
++These functions work faster than \fBwaddnstr\fP.
+ On the other hand:
+ .bP
+ they do not perform checking
+@@ -96,12 +96,12 @@
+ rather than wrapping it around to the new line.
+ .PP
+ These functions end successfully
+-on encountering a null \fIcchar_t\fR, or
++on encountering a null \fBcchar_t\fP, or
+ when they have filled the current line.
+ If a complex character cannot completely fit at the end of the current line,
+ the remaining columns are filled with the background character and rendition.
+ .SH RETURN VALUE
+-All functions return the integer \fBERR\fR upon failure and \fBOK\fR on success.
++All functions return the integer \fBERR\fP upon failure and \fBOK\fP on success.
+ .PP
+ X/Open does not define any error conditions.
+ This implementation returns an error
+@@ -111,13 +111,13 @@
+ \fBwmove\fP, and return an error if the position is outside the window,
+ or if the window pointer is null.
+ .SH NOTES
+-All functions except \fBwadd_wchnstr\fR may be macros.
++All functions except \fBwadd_wchnstr\fP may be macros.
+ .SH PORTABILITY
+ These entry points are described in the XSI Curses standard, Issue 4.
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBcurs_addwstr\fR(3X).
++\fBcurses\fP(3X),
++\fBcurs_addwstr\fP(3X).
+ .PP
+ Comparable functions in the narrow-character (ncurses) library are
+ described in
+-\fBcurs_addchstr\fR(3X).
++\fBcurs_addchstr\fP(3X).
+Index: man/curs_addch.3x
+Prereq:  1.56 
+--- ncurses-6.3-20211219+/man/curs_addch.3x	2021-06-17 21:30:22.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_addch.3x	2021-12-25 20:18:06.000000000 +0000
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addch.3x,v 1.56 2021/06/17 21:30:22 tom Exp $
++.\" $Id: curs_addch.3x,v 1.58 2021/12/25 20:18:06 tom Exp $
+ .TH curs_addch 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -39,47 +39,47 @@
+ .el    .IP \(bu 2
+ ..
+ .SH NAME
+-\fBaddch\fR,
+-\fBwaddch\fR,
+-\fBmvaddch\fR,
+-\fBmvwaddch\fR,
+-\fBechochar\fR,
+-\fBwechochar\fR \- add a character (with attributes) to a \fBcurses\fR window, then advance the cursor
++\fBaddch\fP,
++\fBwaddch\fP,
++\fBmvaddch\fP,
++\fBmvwaddch\fP,
++\fBechochar\fP,
++\fBwechochar\fP \- add a character (with attributes) to a \fBcurses\fP window, then advance the cursor
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .PP
+-\fBint addch(const chtype \fP\fIch\fP\fB);\fR
++\fBint addch(const chtype \fP\fIch\fP\fB);\fP
+ .br
+-\fBint waddch(WINDOW *\fP\fIwin\fP\fB, const chtype \fP\fIch\fP\fB);\fR
++\fBint waddch(WINDOW *\fP\fIwin\fP\fB, const chtype \fP\fIch\fP\fB);\fP
+ .br
+-\fBint mvaddch(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const chtype \fP\fIch\fP\fB);\fR
++\fBint mvaddch(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const chtype \fP\fIch\fP\fB);\fP
+ .br
+-\fBint mvwaddch(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const chtype \fP\fIch\fP\fB);\fR
++\fBint mvwaddch(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const chtype \fP\fIch\fP\fB);\fP
+ .sp
+-\fBint echochar(const chtype \fP\fIch\fP\fB);\fR
++\fBint echochar(const chtype \fP\fIch\fP\fB);\fP
+ .br
+-\fBint wechochar(WINDOW *\fP\fIwin\fP\fB, const chtype \fP\fIch\fP\fB);\fR
++\fBint wechochar(WINDOW *\fP\fIwin\fP\fB, const chtype \fP\fIch\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+ .SS Adding characters
+-The \fBaddch\fR, \fBwaddch\fR, \fBmvaddch\fR and \fBmvwaddch\fR routines put
+-the character \fIch\fR into the given window at its current window position,
++The \fBaddch\fP, \fBwaddch\fP, \fBmvaddch\fP and \fBmvwaddch\fP routines put
++the character \fIch\fP into the given window at its current window position,
+ which is then advanced.
+-They are analogous to \fBputchar\fR(3) in \fBstdio\fR(3).
++They are analogous to \fBputchar\fP(3) in \fBstdio\fP(3).
+ If the advance is at the right margin:
+ .bP
+ The cursor automatically wraps to the beginning of the next line.
+ .bP
+ At the bottom of the current scrolling region,
+-and if \fBscrollok\fR is enabled,
++and if \fBscrollok\fP is enabled,
+ the scrolling region is scrolled up one line.
+ .bP
+-If \fBscrollok\fR is not enabled,
++If \fBscrollok\fP is not enabled,
+ writing a character at the lower right margin succeeds.
+ However, an error is returned because
+ it is not possible to wrap to a new line
+ .PP
+-If \fIch\fR is a tab, newline, carriage return or backspace,
++If \fIch\fP is a tab, newline, carriage return or backspace,
+ the cursor is moved appropriately within the window:
+ .bP
+ Backspace moves the cursor one character left; at the left
+@@ -87,40 +87,40 @@
+ .bP
+ Carriage return moves the cursor to the window left margin on the current line.
+ .bP
+-Newline does a \fBclrtoeol\fR,
++Newline does a \fBclrtoeol\fP,
+ then moves the cursor to the window left margin on the next line,
+ scrolling the window if on the last line.
+ .bP
+ Tabs are considered to be at every eighth column.
+-The tab interval may be altered by setting the \fBTABSIZE\fR variable.
++The tab interval may be altered by setting the \fBTABSIZE\fP variable.
+ .PP
+-If \fIch\fR is any other nonprintable character,
++If \fIch\fP is any other nonprintable character,
+ it is drawn in printable form,
+-i.e., the \fB^\fR\fIX\fR notation used by \fBunctrl\fR(3X).
+-Calling \fBwinch\fR after adding a
++i.e., the \fB^\fP\fIX\fP notation used by \fBunctrl\fP(3X).
++Calling \fBwinch\fP after adding a
+ nonprintable character does not return the character itself,
+ but instead returns the printable representation of the character.
+ .PP
+ Video attributes can be combined with a character argument passed to
+-\fBaddch\fR or related functions by logical-ORing them into the character.
++\fBaddch\fP or related functions by logical-ORing them into the character.
+ (Thus, text, including attributes, can be copied from one place to another
+-using \fBinch\fR(3X) and \fBaddch\fR.)  See the \fBcurs_attr\fR(3X) page for
++using \fBinch\fP(3X) and \fBaddch\fP.)  See the \fBcurs_attr\fP(3X) page for
+ values of predefined video attribute constants that can be usefully OR'ed
+ into characters.
+ .SS Echoing characters
+ .PP
+-The \fBechochar\fR and \fBwechochar\fR routines are equivalent to a call to
+-\fBaddch\fR followed by a call to \fBrefresh\fR(3X), or a call to \fBwaddch\fR
+-followed by a call to \fBwrefresh\fR.
++The \fBechochar\fP and \fBwechochar\fP routines are equivalent to a call to
++\fBaddch\fP followed by a call to \fBrefresh\fP(3X), or a call to \fBwaddch\fP
++followed by a call to \fBwrefresh\fP.
+ The knowledge that only a single
+ character is being output is used and, for non-control characters, a
+ considerable performance gain may be seen by using these routines instead of
+ their equivalents.
+ .SS Line Graphics
+ The following variables may be used to add line drawing characters to the
+-screen with routines of the \fBaddch\fR family.
++screen with routines of the \fBaddch\fP family.
+ The default character listed
+-below is used if the \fBacsc\fR capability does not define a terminal-specific
++below is used if the \fBacsc\fP capability does not define a terminal-specific
+ replacement for it,
+ or if the terminal and locale configuration requires Unicode but the
+ library is unable to use Unicode.
+@@ -132,8 +132,8 @@
+ l l l l
+ _ _ _ _
+ l l l l.
+-\fBACS\fR	\fBACS\fR	\fBacsc\fP	\fBGlyph\fR
+-\fBName\fR	\fBDefault\fR	\fBchar\fP	\fBName\fR
++\fBACS\fP	\fBACS\fP	\fBacsc\fP	\fBGlyph\fP
++\fBName\fP	\fBDefault\fP	\fBchar\fP	\fBName\fP
+ ACS_BLOCK	#	0	solid square block
+ ACS_BOARD	#	h	board of squares
+ ACS_BTEE	+	v	bottom tee
+@@ -168,9 +168,9 @@
+ ACS_VLINE	|	x	vertical line
+ .TE
+ .SH RETURN VALUE
+-All routines return the integer \fBERR\fR upon failure and \fBOK\fR on success
++All routines return the integer \fBERR\fP upon failure and \fBOK\fP on success
+ (the SVr4 manuals specify only
+-\*(``an integer value other than \fBERR\fR\*('') upon successful completion,
++\*(``an integer value other than \fBERR\fP\*('') upon successful completion,
+ unless otherwise noted in the preceding routine descriptions.
+ .PP
+ Functions with a \*(``mv\*('' prefix first perform a cursor movement using
+@@ -180,7 +180,7 @@
+ If it is not possible to add a complete character,
+ an error is returned:
+ .bP
+-If \fBscrollok\fR is not enabled,
++If \fBscrollok\fP is not enabled,
+ writing a character at the lower right margin succeeds.
+ However, an error is returned because
+ it is not possible to wrap to a new line
+@@ -190,16 +190,16 @@
+ or if it is not possible to add all of the resulting bytes in the window,
+ an error is returned.
+ .SH NOTES
+-Note that \fBaddch\fR, \fBmvaddch\fR, \fBmvwaddch\fR, and
+-\fBechochar\fR may be macros.
++Note that \fBaddch\fP, \fBmvaddch\fP, \fBmvwaddch\fP, and
++\fBechochar\fP may be macros.
+ .SH PORTABILITY
+ All these functions are described in the XSI Curses standard, Issue 4.
+ The defaults specified for forms-drawing characters apply in the POSIX locale.
+ .SS ACS Symbols
+ .LP
+-X/Open Curses states that the \fIACS_\fP definitions are \fBchar\fP constants.
++X/Open Curses states that the \fBACS_\fP definitions are \fBchar\fP constants.
+ For the wide-character implementation (see \fBcurs_add_wch\fP),
+-there are analogous \fIWACS_\fP definitions which are \fBcchar_t\fP constants.
++there are analogous \fBWACS_\fP definitions which are \fBcchar_t\fP constants.
+ Some implementations are problematic:
+ .bP
+ Some implementations define the ACS symbols to a constant
+@@ -209,8 +209,8 @@
+ NetBSD also uses an array, actually named \fB_acs_char\fP, with a \fB#define\fP
+ for compatibility.
+ .bP
+-HPUX curses equates some of the \fIACS_\fP symbols
+-to the analogous \fIWACS_\fP symbols as if the \fIACS_\fP symbols were
++HPUX curses equates some of the \fBACS_\fP symbols
++to the analogous \fBWACS_\fP symbols as if the \fBACS_\fP symbols were
+ wide characters.
+ The misdefined symbols are the arrows
+ and other symbols which are not used for line-drawing.
+@@ -221,7 +221,7 @@
+ and the various implementations use \fBi\fP (lowercase).
+ .IP
+ None of the terminal descriptions on Unix platforms use uppercase-I,
+-except for Solaris (i.e., \fIscreen\fP's terminal description,
++except for Solaris (i.e., \fBscreen\fP's terminal description,
+ apparently based on the X/Open documentation around 1995).
+ On the other hand, the terminal description \fIgs6300\fP
+ (AT&T PC6300 with EMOTS Terminal Emulator) uses lowercase-i.
+@@ -237,12 +237,12 @@
+ were not documented in
+ any publicly released System V.
+ However, many publicly available terminfos
+-include \fBacsc\fR strings in which their key characters (pryz{|}) are
++include \fBacsc\fP strings in which their key characters (pryz{|}) are
+ embedded, and a second-hand list of their character descriptions has come
+ to light.
+-The ACS-prefixed names for them were invented for \fBncurses\fR(3X).
++The ACS-prefixed names for them were invented for \fBncurses\fP(3X).
+ .LP
+-The \fIdisplayed\fP values for the \fIACS_\fP and \fIWACS_\fP constants
++The \fIdisplayed\fP values for the \fBACS_\fP and \fBWACS_\fP constants
+ depend on
+ .bP
+ the library configuration, i.e., \fBncurses\fP versus \fBncursesw\fP,
+@@ -292,23 +292,23 @@
+ call \fBwadd_wch\fP for characters which cannot be handled by \fBwaddch\fP.
+ .SS TABSIZE
+ .LP
+-The \fBTABSIZE\fR variable is implemented in SVr4 and other versions of curses,
++The \fBTABSIZE\fP variable is implemented in SVr4 and other versions of curses,
+ but is not part of X/Open curses
+-(see \fBcurs_variables\fR(3X) for more details).
++(see \fBcurs_variables\fP(3X) for more details).
+ .LP
+-If \fIch\fR is a carriage return,
++If \fIch\fP is a carriage return,
+ the cursor is moved to the beginning of the current row of the window.
+ This is true of other implementations, but is not documented.
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBcurs_attr\fR(3X),
+-\fBcurs_clear\fR(3X),
+-\fBcurs_inch\fR(3X),
+-\fBcurs_outopts\fR(3X),
+-\fBcurs_refresh\fR(3X),
+-\fBcurs_variables\fR(3X),
+-\fBputc\fR(3).
++\fBcurses\fP(3X),
++\fBcurs_attr\fP(3X),
++\fBcurs_clear\fP(3X),
++\fBcurs_inch\fP(3X),
++\fBcurs_outopts\fP(3X),
++\fBcurs_refresh\fP(3X),
++\fBcurs_variables\fP(3X),
++\fBputc\fP(3).
+ .PP
+ Comparable functions in the wide-character (ncursesw) library are
+ described in
+-\fBcurs_add_wch\fR(3X).
++\fBcurs_add_wch\fP(3X).
+Index: man/curs_addchstr.3x
+Prereq:  1.22 
+--- ncurses-6.3-20211219+/man/curs_addchstr.3x	2020-12-19 21:39:20.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_addchstr.3x	2021-12-25 21:41:58.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2019,2020 Thomas E. Dickey                                     *
++.\" Copyright 2019-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2012,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addchstr.3x,v 1.22 2020/12/19 21:39:20 tom Exp $
++.\" $Id: curs_addchstr.3x,v 1.24 2021/12/25 21:41:58 tom Exp $
+ .TH curs_addchstr 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -40,49 +40,49 @@
+ .na
+ .hy 0
+ .SH NAME
+-\fBaddchstr\fR,
+-\fBaddchnstr\fR,
+-\fBwaddchstr\fR,
+-\fBwaddchnstr\fR,
+-\fBmvaddchstr\fR,
+-\fBmvaddchnstr\fR,
+-\fBmvwaddchstr\fR,
+-\fBmvwaddchnstr\fR \- add a string of characters (and attributes) to a \fBcurses\fR window
++\fBaddchstr\fP,
++\fBaddchnstr\fP,
++\fBwaddchstr\fP,
++\fBwaddchnstr\fP,
++\fBmvaddchstr\fP,
++\fBmvaddchnstr\fP,
++\fBmvwaddchstr\fP,
++\fBmvwaddchnstr\fP \- add a string of characters (and attributes) to a \fBcurses\fP window
+ .ad
+ .hy
+ .SH SYNOPSIS
+ .nf
+-\fB#include \fR
++\fB#include \fP
+ .PP
+-\fBint addchstr(const chtype *\fP\fIchstr\fP\fB);\fR
++\fBint addchstr(const chtype *\fP\fIchstr\fP\fB);\fP
+ .br
+-\fBint addchnstr(const chtype *\fP\fIchstr\fP\fB, int \fP\fIn\fP\fB);\fR
++\fBint addchnstr(const chtype *\fP\fIchstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .br
+-\fBint waddchstr(WINDOW *\fP\fIwin\fP\fB, const chtype *\fP\fIchstr\fP\fB);\fR
++\fBint waddchstr(WINDOW *\fP\fIwin\fP\fB, const chtype *\fP\fIchstr\fP\fB);\fP
+ .br
+-\fBint waddchnstr(WINDOW *\fP\fIwin\fP\fB, const chtype *\fP\fIchstr\fP\fB, int \fP\fIn\fP\fB);\fR
++\fBint waddchnstr(WINDOW *\fP\fIwin\fP\fB, const chtype *\fP\fIchstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .sp
+-\fBint mvaddchstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const chtype *\fP\fIchstr\fP\fB);\fR
++\fBint mvaddchstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const chtype *\fP\fIchstr\fP\fB);\fP
+ .br
+-\fBint mvaddchnstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const chtype *\fP\fIchstr\fP\fB, int \fP\fIn\fP\fB);\fR
++\fBint mvaddchnstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const chtype *\fP\fIchstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .br
+-\fBint mvwaddchstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const chtype *\fP\fIchstr\fP\fB);\fR
++\fBint mvwaddchstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const chtype *\fP\fIchstr\fP\fB);\fP
+ .br
+-\fBint mvwaddchnstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const chtype *\fP\fIchstr\fP\fB, int \fP\fIn\fP\fB);\fR
++\fBint mvwaddchnstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const chtype *\fP\fIchstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .fi
+ .SH DESCRIPTION
+ These functions copy the (null-terminated)
+-\fIchstr\fR array
++\fIchstr\fP array
+ into the window image structure
+ starting at the current cursor position.
+-The four functions with \fIn\fR as the last
+-argument copy at most \fIn\fR elements,
++The four functions with \fIn\fP as the last
++argument copy at most \fIn\fP elements,
+ but no more than will fit on the line.
+-If \fBn\fR=\fB\-1\fR then the whole array is copied,
++If \fBn\fP=\fB\-1\fP then the whole array is copied,
+ to the maximum number of characters that will fit on the line.
+ .PP
+-The window cursor is \fInot\fR advanced.
+-These functions work faster than \fBwaddnstr\fR.
++The window cursor is \fInot\fP advanced.
++These functions work faster than \fBwaddnstr\fP.
+ On the other hand:
+ .bP
+ they do not perform checking
+@@ -95,7 +95,7 @@
+ they truncate the string if it crosses the right margin,
+ rather than wrapping it around to the new line.
+ .SH RETURN VALUE
+-All functions return the integer \fBERR\fR upon failure and \fBOK\fR on success.
++All functions return the integer \fBERR\fP upon failure and \fBOK\fP on success.
+ .PP
+ X/Open does not define any error conditions.
+ This implementation returns an error
+@@ -105,13 +105,13 @@
+ \fBwmove\fP, and return an error if the position is outside the window,
+ or if the window pointer is null.
+ .SH NOTES
+-All functions except \fBwaddchnstr\fR may be macros.
++All functions except \fBwaddchnstr\fP may be macros.
+ .SH PORTABILITY
+ These entry points are described in the XSI Curses standard, Issue 4.
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBcurs_addstr\fR(3X).
++\fBcurses\fP(3X),
++\fBcurs_addstr\fP(3X).
+ .PP
+ Comparable functions in the wide-character (ncursesw) library are
+ described in
+-\fBcurs_add_wchstr\fR(3X).
++\fBcurs_add_wchstr\fP(3X).
+Index: man/curs_addstr.3x
+Prereq:  1.23 
+--- ncurses-6.3-20211219+/man/curs_addstr.3x	2020-10-17 23:11:02.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_addstr.3x	2021-12-25 21:41:58.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2019,2020 Thomas E. Dickey                                     *
++.\" Copyright 2019-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2012,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addstr.3x,v 1.23 2020/10/17 23:11:02 tom Exp $
++.\" $Id: curs_addstr.3x,v 1.25 2021/12/25 21:41:58 tom Exp $
+ .TH curs_addstr 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -40,51 +40,51 @@
+ .na
+ .hy 0
+ .SH NAME
+-\fBaddstr\fR,
+-\fBaddnstr\fR,
+-\fBwaddstr\fR,
+-\fBwaddnstr\fR,
+-\fBmvaddstr\fR,
+-\fBmvaddnstr\fR,
+-\fBmvwaddstr\fR,
+-\fBmvwaddnstr\fR \- add a string of characters to a \fBcurses\fR window and advance cursor
++\fBaddstr\fP,
++\fBaddnstr\fP,
++\fBwaddstr\fP,
++\fBwaddnstr\fP,
++\fBmvaddstr\fP,
++\fBmvaddnstr\fP,
++\fBmvwaddstr\fP,
++\fBmvwaddnstr\fP \- add a string of characters to a \fBcurses\fP window and advance cursor
+ .ad
+ .hy
+ .SH SYNOPSIS
+ .nf
+-\fB#include \fR
++\fB#include \fP
+ .PP
+-\fBint addstr(const char *\fR\fIstr\fR\fB);\fR
++\fBint addstr(const char *\fP\fIstr\fP\fB);\fP
+ .br
+-\fBint addnstr(const char *\fR\fIstr\fR\fB, int \fR\fIn\fR\fB);\fR
++\fBint addnstr(const char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .br
+-\fBint waddstr(WINDOW *\fR\fIwin\fR\fB, const char *\fR\fIstr\fR\fB);\fR
++\fBint waddstr(WINDOW *\fP\fIwin\fP\fB, const char *\fP\fIstr\fP\fB);\fP
+ .br
+-\fBint waddnstr(WINDOW *\fR\fIwin\fR\fB, const char *\fR\fIstr\fR\fB, int \fR\fIn\fR\fB);\fR
++\fBint waddnstr(WINDOW *\fP\fIwin\fP\fB, const char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .sp
+-\fBint mvaddstr(int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, const char *\fR\fIstr\fR\fB);\fR
++\fBint mvaddstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const char *\fP\fIstr\fP\fB);\fP
+ .br
+-\fBint mvaddnstr(int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, const char *\fR\fIstr\fR\fB, int \fR\fIn\fR\fB);\fR
++\fBint mvaddnstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .br
+-\fBint mvwaddstr(WINDOW *\fR\fIwin\fR\fB, int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, const char *\fR\fIstr\fR\fB);\fR
++\fBint mvwaddstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const char *\fP\fIstr\fP\fB);\fP
+ .br
+-\fBint mvwaddnstr(WINDOW *\fR\fIwin\fR\fB, int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, const char *\fR\fIstr, int \fR\fIn\fR\fB);\fR
++\fBint mvwaddnstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const char *\fP\fIstr, int \fP\fIn\fP\fB);\fP
+ .fi
+ .SH DESCRIPTION
+ These functions write the (null-terminated) character string
+-\fIstr\fR on the given window.
+-It is similar to calling \fBwaddch\fR once for each byte in the string.
++\fIstr\fP on the given window.
++It is similar to calling \fBwaddch\fP once for each byte in the string.
+ .PP
+-The \fImv\fR functions perform cursor movement once, before writing any
++The \fImv\fP functions perform cursor movement once, before writing any
+ characters.
+ Thereafter, the cursor is advanced as a side-effect of writing to the window.
+ .PP
+-The four functions with \fIn\fR as the last argument
+-write at most \fIn\fR bytes,
++The four functions with \fIn\fP as the last argument
++write at most \fIn\fP bytes,
+ or until a terminating null is reached.
+-If \fIn\fR is \-1, then the entire string will be added.
++If \fIn\fP is \-1, then the entire string will be added.
+ .SH RETURN VALUE
+-All functions return the integer \fBERR\fR upon failure and \fBOK\fR on success.
++All functions return the integer \fBERR\fP upon failure and \fBOK\fP on success.
+ .PP
+ X/Open does not define any error conditions.
+ This implementation returns an error
+@@ -111,9 +111,9 @@
+ returned after successfully writing a character to the lower-right corner
+ of a window when \fBscrollok\fP is disabled.
+ .SH NOTES
+-All of these functions except \fBwaddnstr\fR may be macros.
++All of these functions except \fBwaddnstr\fP may be macros.
+ .SH PORTABILITY
+ These functions are described in the XSI Curses standard, Issue 4.
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBcurs_addch\fR(3X).
++\fBcurses\fP(3X),
++\fBcurs_addch\fP(3X).
+Index: man/curs_addwstr.3x
+Prereq:  1.15 
+--- ncurses-6.3-20211219+/man/curs_addwstr.3x	2020-10-17 23:12:22.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_addwstr.3x	2021-12-25 21:41:58.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2019,2020 Thomas E. Dickey                                     *
++.\" Copyright 2019-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addwstr.3x,v 1.15 2020/10/17 23:12:22 tom Exp $
++.\" $Id: curs_addwstr.3x,v 1.17 2021/12/25 21:41:58 tom Exp $
+ .TH curs_addwstr 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -40,53 +40,53 @@
+ .na
+ .hy 0
+ .SH NAME
+-\fBaddwstr\fR,
+-\fBaddnwstr\fR,
+-\fBwaddwstr\fR,
+-\fBwaddnwstr\fR,
+-\fBmvaddwstr\fR,
+-\fBmvaddnwstr\fR,
+-\fBmvwaddwstr\fR,
+-\fBmvwaddnwstr\fR \- add a string of wide characters to a \fBcurses\fR window and advance cursor
++\fBaddwstr\fP,
++\fBaddnwstr\fP,
++\fBwaddwstr\fP,
++\fBwaddnwstr\fP,
++\fBmvaddwstr\fP,
++\fBmvaddnwstr\fP,
++\fBmvwaddwstr\fP,
++\fBmvwaddnwstr\fP \- add a string of wide characters to a \fBcurses\fP window and advance cursor
+ .ad
+ .hy
+ .SH SYNOPSIS
+ .nf
+-\fB#include \fR
++\fB#include \fP
+ .PP
+-\fBint addwstr(const wchar_t *\fR\fIwstr\fR\fB);\fR
++\fBint addwstr(const wchar_t *\fP\fIwstr\fP\fB);\fP
+ .br
+-\fBint addnwstr(const wchar_t *\fR\fIwstr\fR\fB, int \fR\fIn\fR\fB);\fR
++\fBint addnwstr(const wchar_t *\fP\fIwstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .br
+-\fBint waddwstr(WINDOW *\fR\fIwin\fR\fB, const wchar_t *\fR\fIwstr\fR\fB);\fR
++\fBint waddwstr(WINDOW *\fP\fIwin\fP\fB, const wchar_t *\fP\fIwstr\fP\fB);\fP
+ .br
+-\fBint waddnwstr(WINDOW *\fR\fIwin\fR\fB, const wchar_t *\fR\fIwstr\fR\fB, int \fR\fIn\fR\fB);\fR
++\fBint waddnwstr(WINDOW *\fP\fIwin\fP\fB, const wchar_t *\fP\fIwstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .sp
+-\fBint mvaddwstr(int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, const wchar_t *\fR\fIwstr\fR\fB);\fR
++\fBint mvaddwstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const wchar_t *\fP\fIwstr\fP\fB);\fP
+ .br
+-\fBint mvaddnwstr(int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, const wchar_t *\fR\fIwstr\fR\fB, int \fR\fIn\fR\fB);\fR
++\fBint mvaddnwstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const wchar_t *\fP\fIwstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .br
+-\fBint mvwaddwstr(WINDOW *\fR\fIwin\fR\fB, int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, const wchar_t *\fR\fIwstr\fR\fB);\fR
++\fBint mvwaddwstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const wchar_t *\fP\fIwstr\fP\fB);\fP
+ .br
+-\fBint mvwaddnwstr(WINDOW *\fR\fIwin\fR\fB, int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, const wchar_t *\fR\fIwstr\fR\fB, int \fR\fIn\fR\fB);\fR
++\fBint mvwaddnwstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const wchar_t *\fP\fIwstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .fi
+ .SH DESCRIPTION
+ These functions write the characters of the
+-(null-terminated) \fBwchar_t\fR character string
+-\fIwstr\fR on the given window.
+-It is similar to constructing a \fBcchar_t\fR for each wchar_t in the string,
+-then calling \fBwadd_wch\fR for the resulting \fBcchar_t\fR.
++(null-terminated) \fBwchar_t\fP character string
++\fIwstr\fP on the given window.
++It is similar to constructing a \fBcchar_t\fP for each wchar_t in the string,
++then calling \fBwadd_wch\fP for the resulting \fBcchar_t\fP.
+ .PP
+-The \fImv\fR functions perform cursor movement once, before writing any
++The \fImv\fP functions perform cursor movement once, before writing any
+ characters.
+ Thereafter, the cursor is advanced as a side-effect of writing to the window.
+ .PP
+-The four functions with \fIn\fR as the last argument
+-write at most \fIn\fR \fBwchar_t\fR characters,
++The four functions with \fIn\fP as the last argument
++write at most \fIn\fP \fBwchar_t\fP characters,
+ or until a terminating null is reached.
+-If \fIn\fR is \-1, then the entire string will be added.
++If \fIn\fP is \-1, then the entire string will be added.
+ .SH RETURN VALUE
+-All functions return the integer \fBERR\fR upon failure and \fBOK\fR on success.
++All functions return the integer \fBERR\fP upon failure and \fBOK\fP on success.
+ .PP
+ X/Open does not define any error conditions.
+ This implementation returns an error
+@@ -101,9 +101,9 @@
+ \fBwmove\fP, and return an error if the position is outside the window,
+ or if the window pointer is null.
+ .SH NOTES
+-All of these functions except \fBwaddnwstr\fR may be macros.
++All of these functions except \fBwaddnwstr\fP may be macros.
+ .SH PORTABILITY
+ These functions are described in the XSI Curses standard, Issue 4.
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBcurs_add_wch\fR(3X)
++\fBcurses\fP(3X),
++\fBcurs_add_wch\fP(3X)
+Index: man/curs_attr.3x
+Prereq:  1.66 
+--- ncurses-6.3-20211219+/man/curs_attr.3x	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_attr.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_attr.3x,v 1.66 2020/02/02 23:34:34 tom Exp $
++.\" $Id: curs_attr.3x,v 1.70 2021/12/25 21:49:32 tom Exp $
+ .TH curs_attr 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -57,97 +57,97 @@
+ .\" ---------------------------------------------------------------------------
+ .SH NAME
+ .\" attr_get
+-\fBattr_get\fR,
+-\fBwattr_get\fR,
+-\fBattr_set\fR,
+-\fBwattr_set\fR,
++\fBattr_get\fP,
++\fBwattr_get\fP,
++\fBattr_set\fP,
++\fBwattr_set\fP,
+ .\" .br
+-\fBattr_off\fR,
+-\fBwattr_off\fR,
+-\fBattr_on\fR,
+-\fBwattr_on\fR,
++\fBattr_off\fP,
++\fBwattr_off\fP,
++\fBattr_on\fP,
++\fBwattr_on\fP,
+ .\" .br
+-\fBattroff\fR,
+-\fBwattroff\fR,
+-\fBattron\fR,
+-\fBwattron\fR,
+-\fBattrset\fR,
+-\fBwattrset\fR,
++\fBattroff\fP,
++\fBwattroff\fP,
++\fBattron\fP,
++\fBwattron\fP,
++\fBattrset\fP,
++\fBwattrset\fP,
+ .\" .br
+-\fBchgat\fR,
+-\fBwchgat\fR,
+-\fBmvchgat\fR,
+-\fBmvwchgat\fR,
++\fBchgat\fP,
++\fBwchgat\fP,
++\fBmvchgat\fP,
++\fBmvwchgat\fP,
+ .\" .br
+-\fBcolor_set\fR,
+-\fBwcolor_set\fR,
++\fBcolor_set\fP,
++\fBwcolor_set\fP,
+ .\" .br
+-\fBstandend\fR,
+-\fBwstandend\fR,
+-\fBstandout\fR,
+-\fBwstandout\fR \- \fBcurses\fR character and window attribute control routines
++\fBstandend\fP,
++\fBwstandend\fP,
++\fBstandout\fP,
++\fBwstandout\fP \- \fBcurses\fP character and window attribute control routines
+ .ad
+ .hy
+ .\" ---------------------------------------------------------------------------
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBint attr_get(attr_t *\fP\fIattrs\fP\fB, short *\fP\fIpair\fP\fB, void *\fP\fIopts\fP\fB);\fR
++\fBint attr_get(attr_t *\fP\fIattrs\fP\fB, short *\fP\fIpair\fP\fB, void *\fP\fIopts\fP\fB);\fP
+ .br
+-\fBint wattr_get(WINDOW *\fP\fIwin\fP\fB, attr_t *\fP\fIattrs\fP\fB, short *\fP\fIpair\fP\fB,\fR \fBvoid *\fP\fIopts\fP\fB);\fR
++\fBint wattr_get(WINDOW *\fP\fIwin\fP\fB, attr_t *\fP\fIattrs\fP\fB, short *\fP\fIpair\fP\fB,\fP \fBvoid *\fP\fIopts\fP\fB);\fP
+ .br
+-\fBint attr_set(attr_t \fP\fIattrs\fP\fB, short \fP\fIpair\fP\fB, void *\fP\fIopts\fP\fB);\fR
++\fBint attr_set(attr_t \fP\fIattrs\fP\fB, short \fP\fIpair\fP\fB, void *\fP\fIopts\fP\fB);\fP
+ .br
+-\fBint wattr_set(WINDOW *\fP\fIwin\fP\fB, attr_t \fP\fIattrs\fP\fB, short \fP\fIpair\fP\fB, void *\fP\fIopts\fP\fB);\fR
++\fBint wattr_set(WINDOW *\fP\fIwin\fP\fB, attr_t \fP\fIattrs\fP\fB, short \fP\fIpair\fP\fB, void *\fP\fIopts\fP\fB);\fP
+ .sp
+-\fBint attr_off(attr_t \fP\fIattrs\fP\fB, void *\fP\fIopts\fP\fB);\fR
++\fBint attr_off(attr_t \fP\fIattrs\fP\fB, void *\fP\fIopts\fP\fB);\fP
+ .br
+-\fBint wattr_off(WINDOW *\fP\fIwin\fP\fB, attr_t \fP\fIattrs\fP\fB, void *\fP\fIopts\fP\fB);\fR
++\fBint wattr_off(WINDOW *\fP\fIwin\fP\fB, attr_t \fP\fIattrs\fP\fB, void *\fP\fIopts\fP\fB);\fP
+ .br
+-\fBint attr_on(attr_t \fP\fIattrs\fP\fB, void *\fP\fIopts\fP\fB);\fR
++\fBint attr_on(attr_t \fP\fIattrs\fP\fB, void *\fP\fIopts\fP\fB);\fP
+ .br
+-\fBint wattr_on(WINDOW *\fP\fIwin\fP\fB, attr_t \fP\fIattrs\fP\fB, void *\fP\fIopts\fP\fB);\fR
++\fBint wattr_on(WINDOW *\fP\fIwin\fP\fB, attr_t \fP\fIattrs\fP\fB, void *\fP\fIopts\fP\fB);\fP
+ .sp
+-\fBint attroff(int \fP\fIattrs);\fR
++\fBint attroff(int \fP\fIattrs);\fP
+ .br
+-\fBint wattroff(WINDOW *\fP\fIwin\fP\fB, int \fP\fIattrs\fP\fB);\fR
++\fBint wattroff(WINDOW *\fP\fIwin\fP\fB, int \fP\fIattrs\fP\fB);\fP
+ .br
+-\fBint attron(int \fP\fIattrs\fP\fB);\fR
++\fBint attron(int \fP\fIattrs\fP\fB);\fP
+ .br
+-\fBint wattron(WINDOW *\fP\fIwin\fP\fB, int \fP\fIattrs\fP\fB);\fR
++\fBint wattron(WINDOW *\fP\fIwin\fP\fB, int \fP\fIattrs\fP\fB);\fP
+ .br
+-\fBint attrset(int \fP\fIattrs\fP\fB);\fR
++\fBint attrset(int \fP\fIattrs\fP\fB);\fP
+ .br
+-\fBint wattrset(WINDOW *\fP\fIwin\fP\fB, int \fP\fIattrs\fP\fB);\fR
++\fBint wattrset(WINDOW *\fP\fIwin\fP\fB, int \fP\fIattrs\fP\fB);\fP
+ .sp
+-\fBint chgat(int \fP\fIn\fP\fB, attr_t \fP\fIattr\fP\fB, short \fP\fIpair\fP\fB,\fR \fBconst void *\fP\fIopts\fP\fB);\fR
++\fBint chgat(int \fP\fIn\fP\fB, attr_t \fP\fIattr\fP\fB, short \fP\fIpair\fP\fB,\fP \fBconst void *\fP\fIopts\fP\fB);\fP
+ .br
+ \fBint wchgat(WINDOW *\fP\fIwin\fP\fB,\fP
+-      \fBint \fP\fIn\fP\fB, attr_t \fP\fIattr\fP\fB,\fR \fBshort \fP\fIpair\fP\fB, const void *\fP\fIopts\fP\fB);\fR
++      \fBint \fP\fIn\fP\fB, attr_t \fP\fIattr\fP\fB,\fP \fBshort \fP\fIpair\fP\fB, const void *\fP\fIopts\fP\fB);\fP
+ .br
+ \fBint mvchgat(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB,\fP
+-      \fBint \fP\fIn\fP\fB, attr_t \fP\fIattr\fP\fB,\fR \fBshort \fP\fIpair\fP\fB, const void *\fP\fIopts\fP\fB);\fR
++      \fBint \fP\fIn\fP\fB, attr_t \fP\fIattr\fP\fB,\fP \fBshort \fP\fIpair\fP\fB, const void *\fP\fIopts\fP\fB);\fP
+ .br
+ \fBint mvwchgat(WINDOW *\fP\fIwin, int \fP\fIy, int \fP\fIx\fP\fB,\fP
+-      \fBint \fP\fIn,\fR \fBattr_t \fP\fIattr\fP\fB, short \fP\fIpair\fP\fB, const void *\fP\fIopts\fP\fB);\fR
++      \fBint \fP\fIn,\fP \fBattr_t \fP\fIattr\fP\fB, short \fP\fIpair\fP\fB, const void *\fP\fIopts\fP\fB);\fP
+ .sp
+-\fBint color_set(short \fP\fIpair\fP\fB, void* \fP\fIopts\fP\fB);\fR
++\fBint color_set(short \fP\fIpair\fP\fB, void* \fP\fIopts\fP\fB);\fP
+ .br
+-\fBint wcolor_set(WINDOW *\fP\fIwin\fP\fB, short \fP\fIpair\fP\fB,\fR \fBvoid* \fP\fIopts);\fR
++\fBint wcolor_set(WINDOW *\fP\fIwin\fP\fB, short \fP\fIpair\fP\fB,\fP \fBvoid* \fP\fIopts);\fP
+ .sp
+-\fBint standend(void);\fR
++\fBint standend(void);\fP
+ .br
+-\fBint wstandend(WINDOW *\fP\fIwin\fP\fB);\fR
++\fBint wstandend(WINDOW *\fP\fIwin\fP\fB);\fP
+ .br
+-\fBint standout(void);\fR
++\fBint standout(void);\fP
+ .br
+-\fBint wstandout(WINDOW *\fP\fIwin\fP\fB);\fR
++\fBint wstandout(WINDOW *\fP\fIwin\fP\fB);\fP
+ .\" ---------------------------------------------------------------------------
+ .SH DESCRIPTION
+ .PP
+ These routines manipulate the current attributes of the named window,
+ which then apply to all characters that are written into
+-the window with \fBwaddch\fR, \fBwaddstr\fR and \fBwprintw\fR.
++the window with \fBwaddch\fP, \fBwaddstr\fP and \fBwprintw\fP.
+ Attributes are
+ a property of the character, and move with the character through any scrolling
+ and insert/delete line/character operations.
+@@ -157,7 +157,7 @@
+ .PP
+ These routines do not affect the attributes used
+ when erasing portions of the window.
+-See \fBcurs_bkgd\fR(3X) for functions which modify the attributes used for
++See \fBcurs_bkgd\fP(3X) for functions which modify the attributes used for
+ erasing and clearing.
+ .PP
+ Routines which do not have a \fBWINDOW*\fP parameter apply to \fBstdscr\fP.
+@@ -228,39 +228,39 @@
+ but kept in X/Open Curses for the same reason that SVr4 curses kept it:
+ compatibility.
+ .PP
+-The remaining \fBattr\fR* functions operate exactly like the corresponding
+-\fBattr_\fR* functions, except that they take arguments of type \fBint\fR
+-rather than \fBattr_t\fR.
++The remaining \fBattr\fP* functions operate exactly like the corresponding
++\fBattr_\fP* functions, except that they take arguments of type \fBint\fP
++rather than \fBattr_t\fP.
+ .PP
+ There is no corresponding \fBattrget\fP function as such in X/Open Curses,
+ although ncurses provides \fBgetattrs\fP (see curs_legacy(3X)).
+ .\" ---------------------------------------------------------------------------
+ .SS Change character rendition
+ .PP
+-The routine \fBchgat\fR changes the attributes of a given number of characters
+-starting at the current cursor location of \fBstdscr\fR.
++The routine \fBchgat\fP changes the attributes of a given number of characters
++starting at the current cursor location of \fBstdscr\fP.
+ It does not update
+ the cursor and does not perform wrapping.
+ A character count of \-1 or greater
+ than the remaining window width means to change attributes all the way to the
+ end of the current line.
+-The \fBwchgat\fR function generalizes this to any window;
+-the \fBmvwchgat\fR function does a cursor move before acting.
++The \fBwchgat\fP function generalizes this to any window;
++the \fBmvwchgat\fP function does a cursor move before acting.
+ .PP
+ In these functions,
+ the color \fIpair\fP argument is a color-pair index
+-(as in the first argument of \fBinit_pair\fR, see \fBcurs_color\fR(3X)).
++(as in the first argument of \fBinit_pair\fP, see \fBcurs_color\fP(3X)).
+ .\" ---------------------------------------------------------------------------
+ .SS Change window color
+-The routine \fBcolor_set\fR sets the current color of the given window to the
++The routine \fBcolor_set\fP sets the current color of the given window to the
+ foreground/background combination described by the color \fIpair\fP parameter.
+ .\" ---------------------------------------------------------------------------
+ .SS Standout
+ .PP
+-The routine \fBstandout\fR is
+-the same as \fBattron(A_STANDOUT)\fR.
+-The routine \fBstandend\fR is the same
+-as \fBattrset(A_NORMAL)\fR or \fBattrset(0)\fR, that is, it turns off all
++The routine \fBstandout\fP is
++the same as \fBattron(A_STANDOUT)\fP.
++The routine \fBstandend\fP is the same
++as \fBattrset(A_NORMAL)\fP or \fBattrset(0)\fP, that is, it turns off all
+ attributes.
+ .PP
+ X/Open does not mark these \*(``restricted\*('', because
+@@ -271,29 +271,29 @@
+ might be combined with a color pair.
+ .\" ---------------------------------------------------------------------------
+ .SH VIDEO ATTRIBUTES
+-The following video attributes, defined in \fB\fR, can be passed to
+-the routines \fBattron\fR, \fBattroff\fR, and \fBattrset\fR, or OR'd with the
+-characters passed to \fBaddch\fR (see \fBcurs_addch\fR(3X)).
++The following video attributes, defined in \fB\fP, can be passed to
++the routines \fBattron\fP, \fBattroff\fP, and \fBattrset\fP, or OR'd with the
++characters passed to \fBaddch\fP (see \fBcurs_addch\fP(3X)).
+ .PP
+ .RS
+ .TS
+ l l
+ _ _ _
+ l l .
+-\fIName\fR	\fIDescription\fR
+-\fBA_NORMAL\fR	Normal display (no highlight)
+-\fBA_STANDOUT\fR	Best highlighting mode of the terminal.
+-\fBA_UNDERLINE\fR	Underlining
+-\fBA_REVERSE\fR	Reverse video
+-\fBA_BLINK\fR	Blinking
+-\fBA_DIM\fR	Half bright
+-\fBA_BOLD\fR	Extra bright or bold
+-\fBA_PROTECT\fR	Protected mode
+-\fBA_INVIS\fR	Invisible or blank mode
+-\fBA_ALTCHARSET\fR	Alternate character set
+-\fBA_ITALIC\fR	Italics (non-X/Open extension)
+-\fBA_CHARTEXT\fR	Bit-mask to extract a character
+-\fBA_COLOR\fR	Bit-mask to extract a color (legacy routines)
++\fBName\fP	\fBDescription\fP
++\fBA_NORMAL\fP	Normal display (no highlight)
++\fBA_STANDOUT\fP	Best highlighting mode of the terminal.
++\fBA_UNDERLINE\fP	Underlining
++\fBA_REVERSE\fP	Reverse video
++\fBA_BLINK\fP	Blinking
++\fBA_DIM\fP	Half bright
++\fBA_BOLD\fP	Extra bright or bold
++\fBA_PROTECT\fP	Protected mode
++\fBA_INVIS\fP	Invisible or blank mode
++\fBA_ALTCHARSET\fP	Alternate character set
++\fBA_ITALIC\fP	Italics (non-X/Open extension)
++\fBA_CHARTEXT\fP	Bit-mask to extract a character
++\fBA_COLOR\fP	Bit-mask to extract a color (legacy routines)
+ .TE
+ .RE
+ .PP
+@@ -304,26 +304,26 @@
+ l l
+ _ _ _
+ l l .
+-\fIName\fR	\fIDescription\fR
+-\fBWA_HORIZONTAL\fR	Horizontal highlight
+-\fBWA_LEFT\fR	Left highlight
+-\fBWA_LOW\fR	Low highlight
+-\fBWA_RIGHT\fR	Right highlight
+-\fBWA_TOP\fR	Top highlight
+-\fBWA_VERTICAL\fR	Vertical highlight
++\fBName\fP	\fBDescription\fP
++\fBWA_HORIZONTAL\fP	Horizontal highlight
++\fBWA_LEFT\fP	Left highlight
++\fBWA_LOW\fP	Low highlight
++\fBWA_RIGHT\fP	Right highlight
++\fBWA_TOP\fP	Top highlight
++\fBWA_VERTICAL\fP	Vertical highlight
+ .TE
+ .RE
+ .PP
+ The return values of many of these routines are not meaningful (they are
+ implemented as macro-expanded assignments and simply return their argument).
+-The SVr4 manual page claims (falsely) that these routines always return \fB1\fR.
++The SVr4 manual page claims (falsely) that these routines always return \fB1\fP.
+ .\" ---------------------------------------------------------------------------
+ .SH NOTES
+ These functions may be macros:
+ .sp
+ .RS
+-\fBattroff\fR, \fBwattroff\fR, \fBattron\fR, \fBwattron\fR,
+-\fBattrset\fR, \fBwattrset\fR, \fBstandend\fR and \fBstandout\fR.
++\fBattroff\fP, \fBwattroff\fP, \fBattron\fP, \fBwattron\fP,
++\fBattrset\fP, \fBwattrset\fP, \fBstandend\fP and \fBstandout\fP.
+ .RE
+ .PP
+ Color pair values can only be OR'd with attributes if the pair
+@@ -396,7 +396,7 @@
+ l l l l l l
+ _ _ _ _ _ _
+ l l l l l l .
+-\fIYear\fR	\fISystem\fR	\fIArch\fP	\fIColor\fR	\fIChar\fR	\fINotes\fR
++\fBYear\fP	\fBSystem\fP	\fBArch\fP	\fBColor\fP	\fBChar\fP	\fBNotes\fP
+ 1992	Solaris 5.2	32	6	17	SVr4 curses
+ 1992	HPUX 9	32	no	8	SVr2 curses
+ 1992	AIX 3.2	32	no	23	SVr2 curses
+@@ -459,7 +459,7 @@
+ Other interfaces are rarely used now:
+ .bP
+ BSD curses was improved slightly in 1993/1994 using Keith Bostic's
+-modification to make the library 8-bit clean for \fBnvi\fP.
++modification to make the library 8-bit clean for \fBnvi\fP(1).
+ He moved \fIstandout\fP attribute to a structure member.
+ .IP
+ The resulting 4.4BSD curses was replaced by ncurses over the next ten years.
+@@ -503,31 +503,31 @@
+ .SH PORTABILITY
+ These functions are supported in the XSI Curses standard, Issue 4.
+ The standard defined the dedicated type for highlights,
+-\fBattr_t\fR, which was not defined in SVr4 curses.
+-The functions taking \fBattr_t\fR arguments were not supported under SVr4.
++\fBattr_t\fP, which was not defined in SVr4 curses.
++The functions taking \fBattr_t\fP arguments were not supported under SVr4.
+ .PP
+ Very old versions of this library did not force an update of the screen
+ when changing the attributes.
+-Use \fBtouchwin\fR to force the screen to match the updated attributes.
++Use \fBtouchwin\fP to force the screen to match the updated attributes.
+ .PP
+ The XSI Curses standard states that whether the traditional functions
+-\fBattron\fR/\fBattroff\fR/\fBattrset\fR can manipulate attributes other than
+-\fBA_BLINK\fR, \fBA_BOLD\fR, \fBA_DIM\fR, \fBA_REVERSE\fR, \fBA_STANDOUT\fR, or
+-\fBA_UNDERLINE\fR is \*(``unspecified\*(''.
++\fBattron\fP/\fBattroff\fP/\fBattrset\fP can manipulate attributes other than
++\fBA_BLINK\fP, \fBA_BOLD\fP, \fBA_DIM\fP, \fBA_REVERSE\fP, \fBA_STANDOUT\fP, or
++\fBA_UNDERLINE\fP is \*(``unspecified\*(''.
+ Under this implementation as well as
+ SVr4 curses, these functions correctly manipulate all other highlights
+-(specifically, \fBA_ALTCHARSET\fR, \fBA_PROTECT\fR, and \fBA_INVIS\fR).
++(specifically, \fBA_ALTCHARSET\fP, \fBA_PROTECT\fP, and \fBA_INVIS\fP).
+ .PP
+ XSI Curses added these entry points:
+ .sp
+ .RS
+-\fBattr_get\fR, \fBattr_on\fR,
+-\fBattr_off\fR, \fBattr_set\fR, \fBwattr_on\fR, \fBwattr_off\fR,
+-\fBwattr_get\fR, \fBwattr_set\fR
++\fBattr_get\fP, \fBattr_on\fP,
++\fBattr_off\fP, \fBattr_set\fP, \fBwattr_on\fP, \fBwattr_off\fP,
++\fBwattr_get\fP, \fBwattr_set\fP
+ .RE
+ .PP
+ The new functions are intended to work with
+-a new series of highlight macros prefixed with \fBWA_\fR.
++a new series of highlight macros prefixed with \fBWA_\fP.
+ The older macros have direct counterparts in the newer set of names:
+ .PP
+ .RS
+@@ -536,15 +536,15 @@
+ l l
+ _ _ _
+ l l .
+-\fIName\fR	\fIDescription\fR
+-\fBWA_NORMAL\fR	Normal display (no highlight)
+-\fBWA_STANDOUT\fR	Best highlighting mode of the terminal.
+-\fBWA_UNDERLINE\fR	Underlining
+-\fBWA_REVERSE\fR	Reverse video
+-\fBWA_BLINK\fR	Blinking
+-\fBWA_DIM\fR	Half bright
+-\fBWA_BOLD\fR	Extra bright or bold
+-\fBWA_ALTCHARSET\fR	Alternate character set
++\fBName\fP	\fBDescription\fP
++\fBWA_NORMAL\fP	Normal display (no highlight)
++\fBWA_STANDOUT\fP	Best highlighting mode of the terminal.
++\fBWA_UNDERLINE\fP	Underlining
++\fBWA_REVERSE\fP	Reverse video
++\fBWA_BLINK\fP	Blinking
++\fBWA_DIM\fP	Half bright
++\fBWA_BOLD\fP	Extra bright or bold
++\fBWA_ALTCHARSET\fP	Alternate character set
+ .TE
+ .RE
+ .PP
+@@ -552,8 +552,8 @@
+ nor does it state whether or not they are related to the
+ similarly-named A_NORMAL, etc.:
+ .bP
+-The XSI curses standard specifies that each pair of corresponding \fBA_\fR
+-and \fBWA_\fR-using functions operates on the same current-highlight
++The XSI curses standard specifies that each pair of corresponding \fBA_\fP
++and \fBWA_\fP-using functions operates on the same current-highlight
+ information.
+ .bP
+ However, in some implementations, those symbols have unrelated values.
+@@ -570,14 +570,14 @@
+ \fBchtype\fP and \fBcchar_t\fP variables.
+ .PP
+ The XSI standard extended conformance level adds new highlights
+-\fBA_HORIZONTAL\fR, \fBA_LEFT\fR, \fBA_LOW\fR, \fBA_RIGHT\fR, \fBA_TOP\fR,
+-\fBA_VERTICAL\fR (and corresponding \fBWA_\fR macros for each).
++\fBA_HORIZONTAL\fP, \fBA_LEFT\fP, \fBA_LOW\fP, \fBA_RIGHT\fP, \fBA_TOP\fP,
++\fBA_VERTICAL\fP (and corresponding \fBWA_\fP macros for each).
+ As of August 2013,
+ no known terminal provides these highlights
+ (i.e., via the \fBsgr1\fP capability).
+ .\" ---------------------------------------------------------------------------
+ .SH RETURN VALUE
+-All routines return the integer \fBOK\fR on success, or \fBERR\fP on failure.
++All routines return the integer \fBOK\fP on success, or \fBERR\fP on failure.
+ .PP
+ X/Open does not define any error conditions.
+ .PP
+@@ -597,9 +597,9 @@
+ .\" ---------------------------------------------------------------------------
+ .SH SEE ALSO
+ .na
+-\fBcurses\fR(3X),
+-\fBcurs_addch\fR(3X),
+-\fBcurs_addstr\fR(3X),
+-\fBcurs_bkgd\fR(3X),
+-\fBcurs_printw\fR(3X),
+-\fBcurs_variables\fR(3X)
++\fBcurses\fP(3X),
++\fBcurs_addch\fP(3X),
++\fBcurs_addstr\fP(3X),
++\fBcurs_bkgd\fP(3X),
++\fBcurs_printw\fP(3X),
++\fBcurs_variables\fP(3X)
+Index: man/curs_beep.3x
+Prereq:  1.14 
+--- ncurses-6.3-20211219+/man/curs_beep.3x	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_beep.3x	2021-12-25 21:41:58.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018,2020 Thomas E. Dickey                                     *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2005,2010 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,35 +27,35 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_beep.3x,v 1.14 2020/02/02 23:34:34 tom Exp $
++.\" $Id: curs_beep.3x,v 1.16 2021/12/25 21:41:58 tom Exp $
+ .TH curs_beep 3X ""
+ .SH NAME
+-\fBbeep\fR, \fBflash\fR \- \fBcurses\fR bell and screen flash routines
++\fBbeep\fP, \fBflash\fP \- \fBcurses\fP bell and screen flash routines
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .PP
+-\fBint beep(void);\fR
++\fBint beep(void);\fP
+ .br
+-\fBint flash(void);\fR
++\fBint flash(void);\fP
+ .br
+ .SH DESCRIPTION
+-The \fBbeep\fR and \fBflash\fR routines are used to alert the terminal user.
+-The routine \fBbeep\fR sounds an audible alarm on the terminal, if possible;
++The \fBbeep\fP and \fBflash\fP routines are used to alert the terminal user.
++The routine \fBbeep\fP sounds an audible alarm on the terminal, if possible;
+ otherwise it flashes the screen (visible bell).
+-The routine \fBflash\fR
++The routine \fBflash\fP
+ flashes the screen, and if that is not possible, sounds the alert.
+ If neither
+ alert is possible, nothing happens.
+ Nearly all terminals have an audible alert
+ (bell or beep), but only some can flash the screen.
+ .SH RETURN VALUE
+-These routines return \fBOK\fR if they succeed in beeping or flashing,
+-\fBERR\fR otherwise.
++These routines return \fBOK\fP if they succeed in beeping or flashing,
++\fBERR\fP otherwise.
+ .SH EXTENSIONS
+-SVr4's beep and flash routines always returned \fBOK\fR, so it was not
++SVr4's beep and flash routines always returned \fBOK\fP, so it was not
+ possible to tell when the beep or flash failed.
+ .SH PORTABILITY
+ These functions are described in the XSI Curses standard, Issue 4.
+-Like SVr4, it specifies that they always return \fBOK\fR.
++Like SVr4, it specifies that they always return \fBOK\fP.
+ .SH SEE ALSO
+-\fBcurses\fR(3X)
++\fBcurses\fP(3X)
+Index: man/curs_bkgd.3x
+Prereq:  1.32 
+--- ncurses-6.3-20211219+/man/curs_bkgd.3x	2021-06-17 21:30:22.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_bkgd.3x	2021-12-25 17:39:16.000000000 +0000
+@@ -27,37 +27,37 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_bkgd.3x,v 1.32 2021/06/17 21:30:22 tom Exp $
++.\" $Id: curs_bkgd.3x,v 1.33 2021/12/25 17:39:16 tom Exp $
+ .de bP
+ .ie n  .IP \(bu 4
+ .el    .IP \(bu 2
+ ..
+ .TH curs_bkgd 3X ""
+ .SH NAME
+-\fBbkgdset\fR, \fBwbkgdset\fR,
+-\fBbkgd\fR, \fBwbkgd\fR,
+-\fBgetbkgd\fR \- \fBcurses\fR window background manipulation routines
++\fBbkgdset\fP, \fBwbkgdset\fP,
++\fBbkgd\fP, \fBwbkgd\fP,
++\fBgetbkgd\fP \- \fBcurses\fP window background manipulation routines
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .PP
+-\fBvoid bkgdset(chtype \fP\fIch\fP\fB);\fR
++\fBvoid bkgdset(chtype \fP\fIch\fP\fB);\fP
+ .br
+-\fBvoid wbkgdset(WINDOW *\fP\fIwin, chtype \fP\fIch\fP\fB);\fR
++\fBvoid wbkgdset(WINDOW *\fP\fIwin, chtype \fP\fIch\fP\fB);\fP
+ .sp
+-\fBint bkgd(chtype \fP\fIch\fP\fB);\fR
++\fBint bkgd(chtype \fP\fIch\fP\fB);\fP
+ .br
+-\fBint wbkgd(WINDOW *\fP\fIwin\fP\fB, chtype \fP\fIch\fP\fB);\fR
++\fBint wbkgd(WINDOW *\fP\fIwin\fP\fB, chtype \fP\fIch\fP\fB);\fP
+ .sp
+-\fBchtype getbkgd(WINDOW *\fP\fIwin\fP\fB);\fR
++\fBchtype getbkgd(WINDOW *\fP\fIwin\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+ .SS bkgdset
+-The \fBbkgdset\fR and \fBwbkgdset\fR routines manipulate the
++The \fBbkgdset\fP and \fBwbkgdset\fP routines manipulate the
+ background of the named window.
+-The window background is a \fBchtype\fR consisting of
++The window background is a \fBchtype\fP consisting of
+ any combination of attributes (i.e., rendition) and a character.
+ The attribute part of the background is combined (OR'ed) with all non-blank
+-characters that are written into the window with \fBwaddch\fR.
++characters that are written into the window with \fBwaddch\fP.
+ Both the character and attribute parts of the background are combined with
+ the blank characters.
+ The background becomes a property of the
+@@ -69,7 +69,7 @@
+ as the graphic rendition of the character put on the screen.
+ .SS bkgd
+ .PP
+-The \fBbkgd\fR and \fBwbkgd\fR functions
++The \fBbkgd\fP and \fBwbkgd\fP functions
+ set the background property of the current or specified window
+ and then apply this setting to every character position in that window.
+ According to X/Open Curses, it should do this:
+@@ -121,20 +121,20 @@
+ the new background character's color attribute will be ignored.
+ .SS getbkgd
+ .PP
+-The \fBgetbkgd\fR function returns the given window's current background
++The \fBgetbkgd\fP function returns the given window's current background
+ character/attribute pair.
+ .SH RETURN VALUE
+ .PP
+ These functions are described in the XSI Curses standard, Issue 4.
+-It specifies that \fBbkgd\fR and \fBwbkgd\fR return \fBERR\fR on failure,
++It specifies that \fBbkgd\fP and \fBwbkgd\fP return \fBERR\fP on failure,
+ but gives no failure conditions.
+ .PP
+-The routines \fBbkgd\fR and \fBwbkgd\fR return the integer \fBOK\fR,
++The routines \fBbkgd\fP and \fBwbkgd\fP return the integer \fBOK\fP,
+ unless the library has not been initialized.
+ .PP
+ In contrast,
+-the SVr4.0 manual says \fBbkgd\fR and \fBwbkgd\fR may return \fBOK\fP
+-"or a non-negative integer if \fBimmedok\fR is set",
++the SVr4.0 manual says \fBbkgd\fP and \fBwbkgd\fP may return \fBOK\fP
++"or a non-negative integer if \fBimmedok\fP is set",
+ which refers to the return value from \fBwrefresh\fP
+ (used to implement the immediate repainting).
+ The SVr4 curses \fBwrefresh\fP returns the number of characters
+@@ -142,7 +142,7 @@
+ This implementation does not do that.
+ .SH NOTES
+ .PP
+-Note that \fBbkgdset\fR and \fBbkgd\fR may be macros.
++Note that \fBbkgdset\fP and \fBbkgd\fP may be macros.
+ .PP
+ X/Open Curses mentions that the character part of the background must
+ be a single-byte value.
+@@ -155,7 +155,7 @@
+ .SH SEE ALSO
+ .na
+ .PP
+-\fBcurses\fR(3X),
+-\fBcurs_addch\fR(3X),
+-\fBcurs_attr\fR(3X),
+-\fBcurs_outopts\fR(3X)
++\fBcurses\fP(3X),
++\fBcurs_addch\fP(3X),
++\fBcurs_attr\fP(3X),
++\fBcurs_outopts\fP(3X)
+Index: man/curs_bkgrnd.3x
+Prereq:  1.12 
+--- ncurses-6.3-20211219+/man/curs_bkgrnd.3x	2020-10-17 23:13:15.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_bkgrnd.3x	2021-12-25 21:41:58.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018,2020 Thomas E. Dickey                                     *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 2002-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,44 +27,44 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_bkgrnd.3x,v 1.12 2020/10/17 23:13:15 tom Exp $
++.\" $Id: curs_bkgrnd.3x,v 1.14 2021/12/25 21:41:58 tom Exp $
+ .de bP
+ .ie n  .IP \(bu 4
+ .el    .IP \(bu 2
+ ..
+ .TH curs_bkgrnd 3X ""
+ .SH NAME
+-\fBbkgrnd\fR,
+-\fBwbkgrnd\fR,
+-\fBbkgrndset\fR,
+-\fBwbkgrndset\fR,
+-\fBgetbkgrnd\fR,
+-\fBwgetbkgrnd\fR \- \fBcurses\fR window complex background manipulation routines
++\fBbkgrnd\fP,
++\fBwbkgrnd\fP,
++\fBbkgrndset\fP,
++\fBwbkgrndset\fP,
++\fBgetbkgrnd\fP,
++\fBwgetbkgrnd\fP \- \fBcurses\fP window complex background manipulation routines
+ .SH SYNOPSIS
+ .PP
+ .B #include 
+ .sp
+-\fBint bkgrnd(\fR\fB const cchar_t *\fR\fIwch\fR\fB);\fR
++\fBint bkgrnd(\fP\fB const cchar_t *\fP\fIwch\fP\fB);\fP
+ .br
+-\fBint wbkgrnd(\fR\fB WINDOW *\fR\fIwin\fR\fB, const cchar_t *\fR\fIwch\fR\fB);\fR
++\fBint wbkgrnd(\fP\fB WINDOW *\fP\fIwin\fP\fB, const cchar_t *\fP\fIwch\fP\fB);\fP
+ .sp
+-\fBvoid bkgrndset(const cchar_t *\fR\fIwch\fR \fB);\fR
++\fBvoid bkgrndset(const cchar_t *\fP\fIwch\fP \fB);\fP
+ .br
+-\fBvoid wbkgrndset(WINDOW *\fR\fIwin\fR\fB, const cchar_t *\fR\fIwch\fR\fB);\fR
++\fBvoid wbkgrndset(WINDOW *\fP\fIwin\fP\fB, const cchar_t *\fP\fIwch\fP\fB);\fP
+ .sp
+-\fBint getbkgrnd(cchar_t *\fR\fIwch\fR\fB);\fR
++\fBint getbkgrnd(cchar_t *\fP\fIwch\fP\fB);\fP
+ .br
+-\fBint wgetbkgrnd(WINDOW *\fR\fIwin\fR\fB, cchar_t *\fR\fIwch\fR\fB);\fR
++\fBint wgetbkgrnd(WINDOW *\fP\fIwin\fP\fB, cchar_t *\fP\fIwch\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+ .SS bkgrndset
+ .PP
+-The \fBbkgrndset\fR and \fBwbkgrndset\fR routines manipulate the
++The \fBbkgrndset\fP and \fBwbkgrndset\fP routines manipulate the
+ background of the named window.
+-The window background is a \fBcchar_t\fR consisting of
++The window background is a \fBcchar_t\fP consisting of
+ any combination of attributes (i.e., rendition) and a complex character.
+ The attribute part of the background is combined (OR'ed) with all non-blank
+-characters that are written into the window with \fBwaddch\fR.
++characters that are written into the window with \fBwaddch\fP.
+ Both
+ the character and attribute parts of the background are combined with
+ the blank characters.
+@@ -77,7 +77,7 @@
+ as the graphic rendition of the character put on the screen.
+ .SS bkgrnd
+ .PP
+-The \fBbkgrnd\fR and \fBwbkgrnd\fR functions
++The \fBbkgrnd\fP and \fBwbkgrnd\fP functions
+ set the background property of the current or specified window
+ and then apply this setting to every character position in that window:
+ .bP
+@@ -88,15 +88,15 @@
+ appears, it is changed to the new background character.
+ .SS getbkgrnd
+ .PP
+-The \fBgetbkgrnd\fR function returns the given window's current background
+-character/attribute pair via the \fBwch\fR pointer.
++The \fBgetbkgrnd\fP function returns the given window's current background
++character/attribute pair via the \fBwch\fP pointer.
+ If the given window pointer is null,
+ the character is not updated (but no error returned).
+ .SH NOTES
+ Note that
+-\fBbkgrnd\fR,
+-\fBbkgrndset\fR, and
+-\fBgetbkgrnd\fR
++\fBbkgrnd\fP,
++\fBbkgrndset\fP, and
++\fBgetbkgrnd\fP
+ may be macros.
+ .PP
+ X/Open Curses does not provide details on how the rendition is changed.
+@@ -104,10 +104,10 @@
+ which is explained in the manual page for \fBwbkgd\fP.
+ .SH RETURN VALUE
+ .PP
+-The \fBbkgrndset\fR and \fBwbkgrndset\fR routines do not return a value.
++The \fBbkgrndset\fP and \fBwbkgrndset\fP routines do not return a value.
+ .PP
+-Upon successful completion, the other functions return \fBOK\fR.
+-Otherwise, they return \fBERR\fR:
++Upon successful completion, the other functions return \fBOK\fP.
++Otherwise, they return \fBERR\fP:
+ .bP
+ A null window pointer is treated as an error.
+ .bP
+@@ -117,5 +117,5 @@
+ These functions are described in the XSI Curses standard, Issue 4
+ (X/Open Curses).
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBcurs_bkgd\fR(3X)
++\fBcurses\fP(3X),
++\fBcurs_bkgd\fP(3X)
+Index: man/curs_border.3x
+Prereq:  1.27 
+--- ncurses-6.3-20211219+/man/curs_border.3x	2020-10-18 00:33:06.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_border.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_border.3x,v 1.27 2020/10/18 00:33:06 tom Exp $
++.\" $Id: curs_border.3x,v 1.29 2021/12/25 21:49:32 tom Exp $
+ .TH curs_border 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -36,112 +36,112 @@
+ .na
+ .hy 0
+ .SH NAME
+-\fBborder\fR,
+-\fBwborder\fR,
+-\fBbox\fR,
+-\fBhline\fR,
+-\fBwhline\fR,
+-\fBvline\fR,
+-\fBwvline\fR,
+-\fBmvhline\fR,
+-\fBmvwhline\fR,
+-\fBmvvline\fR,
+-\fBmvwvline\fR \- create \fBcurses\fR borders, horizontal and vertical lines
++\fBborder\fP,
++\fBwborder\fP,
++\fBbox\fP,
++\fBhline\fP,
++\fBwhline\fP,
++\fBvline\fP,
++\fBwvline\fP,
++\fBmvhline\fP,
++\fBmvwhline\fP,
++\fBmvvline\fP,
++\fBmvwvline\fP \- create \fBcurses\fP borders, horizontal and vertical lines
+ .ad
+ .hy
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBint border(chtype \fP\fIls\fP\fB, chtype \fP\fIrs\fP\fB, chtype \fP\fIts\fP\fB, chtype \fP\fIbs\fP\fB,\fR
+-           \fBchtype \fP\fItl\fP\fB, chtype \fP\fItr\fP\fB, chtype \fP\fIbl\fP\fB, chtype \fP\fIbr\fP\fB);\fR
++\fBint border(chtype \fP\fIls\fP\fB, chtype \fP\fIrs\fP\fB, chtype \fP\fIts\fP\fB, chtype \fP\fIbs\fP\fB,\fP
++           \fBchtype \fP\fItl\fP\fB, chtype \fP\fItr\fP\fB, chtype \fP\fIbl\fP\fB, chtype \fP\fIbr\fP\fB);\fP
+ .br
+-\fBint wborder(WINDOW *\fP\fIwin\fP\fB, chtype \fP\fIls\fP\fB, chtype \fP\fIrs\fP\fB,\fR
+-            \fBchtype \fP\fIts\fP\fB, chtype \fP\fIbs\fP\fB, chtype \fP\fItl\fP\fB, chtype \fP\fItr\fP\fB,\fR
+-            \fBchtype \fP\fIbl\fP\fB, chtype \fP\fIbr\fP\fB);\fR
++\fBint wborder(WINDOW *\fP\fIwin\fP\fB, chtype \fP\fIls\fP\fB, chtype \fP\fIrs\fP\fB,\fP
++            \fBchtype \fP\fIts\fP\fB, chtype \fP\fIbs\fP\fB, chtype \fP\fItl\fP\fB, chtype \fP\fItr\fP\fB,\fP
++            \fBchtype \fP\fIbl\fP\fB, chtype \fP\fIbr\fP\fB);\fP
+ .sp
+-\fBint box(WINDOW *\fP\fIwin\fP\fB, chtype \fP\fIverch\fP\fB, chtype \fP\fIhorch\fP\fB);\fR
++\fBint box(WINDOW *\fP\fIwin\fP\fB, chtype \fP\fIverch\fP\fB, chtype \fP\fIhorch\fP\fB);\fP
+ .sp
+-\fBint hline(chtype \fP\fIch\fP\fB, int \fP\fIn\fP\fB);\fR
++\fBint hline(chtype \fP\fIch\fP\fB, int \fP\fIn\fP\fB);\fP
+ .br
+-\fBint whline(WINDOW *\fP\fIwin\fP\fB, chtype \fP\fIch\fP\fB, int \fP\fIn\fP\fB);\fR
++\fBint whline(WINDOW *\fP\fIwin\fP\fB, chtype \fP\fIch\fP\fB, int \fP\fIn\fP\fB);\fP
+ .br
+-\fBint vline(chtype \fP\fIch\fP\fB, int \fP\fIn\fP\fB);\fR
++\fBint vline(chtype \fP\fIch\fP\fB, int \fP\fIn\fP\fB);\fP
+ .br
+-\fBint wvline(WINDOW *\fP\fIwin\fP\fB, chtype \fP\fIch\fP\fB, int \fP\fIn\fP\fB);\fR
++\fBint wvline(WINDOW *\fP\fIwin\fP\fB, chtype \fP\fIch\fP\fB, int \fP\fIn\fP\fB);\fP
+ .sp
+-\fBint mvhline(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype \fP\fIch\fP\fB, int \fP\fIn\fP\fB);\fR
++\fBint mvhline(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype \fP\fIch\fP\fB, int \fP\fIn\fP\fB);\fP
+ .br
+-\fBint mvwhline(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype \fP\fIch\fP\fB, int \fP\fIn\fP\fB);\fR
++\fBint mvwhline(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype \fP\fIch\fP\fB, int \fP\fIn\fP\fB);\fP
+ .br
+-\fBint mvvline(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype \fP\fIch\fP\fB, int \fP\fIn\fP\fB);\fR
++\fBint mvvline(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype \fP\fIch\fP\fB, int \fP\fIn\fP\fB);\fP
+ .br
+-\fBint mvwvline(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype \fP\fIch\fP\fB, int \fP\fIn\fP\fB);\fR
++\fBint mvwvline(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype \fP\fIch\fP\fB, int \fP\fIn\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-The \fBborder\fR, \fBwborder\fR and \fBbox\fR routines
++The \fBborder\fP, \fBwborder\fP and \fBbox\fP routines
+ draw a box around the edges of a window.
+ Other than the window, each argument is a character with attributes:
+ .sp
+ .RS
+-\fIls\fR \- left side,
++\fIls\fP \- left side,
+ .br
+-\fIrs\fR \- right side,
++\fIrs\fP \- right side,
+ .br
+-\fIts\fR \- top side,
++\fIts\fP \- top side,
+ .br
+-\fIbs\fR \- bottom side,
++\fIbs\fP \- bottom side,
+ .br
+-\fItl\fR \- top left-hand corner,
++\fItl\fP \- top left-hand corner,
+ .br
+-\fItr\fR \- top right-hand corner,
++\fItr\fP \- top right-hand corner,
+ .br
+-\fIbl\fR \- bottom left-hand corner, and
++\fIbl\fP \- bottom left-hand corner, and
+ .br
+-\fIbr\fR \- bottom right-hand corner.
++\fIbr\fP \- bottom right-hand corner.
+ .RE
+ .PP
+ If any of these arguments is zero, then the corresponding
+-default values (defined in \fBcurses.h\fR) are used instead:
++default values (defined in \fBcurses.h\fP) are used instead:
+ .sp
+ .RS
+-\fBACS_VLINE\fR,
++\fBACS_VLINE\fP,
+ .br
+-\fBACS_VLINE\fR,
++\fBACS_VLINE\fP,
+ .br
+-\fBACS_HLINE\fR,
++\fBACS_HLINE\fP,
+ .br
+-\fBACS_HLINE\fR,
++\fBACS_HLINE\fP,
+ .br
+-\fBACS_ULCORNER\fR,
++\fBACS_ULCORNER\fP,
+ .br
+-\fBACS_URCORNER\fR,
++\fBACS_URCORNER\fP,
+ .br
+-\fBACS_LLCORNER\fR,
++\fBACS_LLCORNER\fP,
+ .br
+-\fBACS_LRCORNER\fR.
++\fBACS_LRCORNER\fP.
+ .RE
+ .PP
+-\fBbox(\fR\fIwin\fR\fB, \fR\fIverch\fR\fB, \fR\fIhorch\fR\fB)\fR is a shorthand
+-for the following call: \fBwborder(\fR\fIwin\fR\fB,\fR \fIverch\fR\fB,\fR
+-\fIverch\fR\fB,\fR \fIhorch\fR\fB,\fR \fIhorch\fR\fB, 0, 0, 0, 0)\fR.
++\fBbox(\fP\fIwin\fP\fB, \fP\fIverch\fP\fB, \fP\fIhorch\fP\fB)\fP is a shorthand
++for the following call: \fBwborder(\fP\fIwin\fP\fB,\fP \fIverch\fP\fB,\fP
++\fIverch\fP\fB,\fP \fIhorch\fP\fB,\fP \fIhorch\fP\fB, 0, 0, 0, 0)\fP.
+ .PP
+-The \fBhline\fR and \fBwhline\fR functions draw a horizontal (left to right)
+-line using \fIch\fR starting at the current cursor position in the window.
++The \fBhline\fP and \fBwhline\fP functions draw a horizontal (left to right)
++line using \fIch\fP starting at the current cursor position in the window.
+ The
+ current cursor position is not changed.
+-The line is at most \fIn\fR characters
++The line is at most \fIn\fP characters
+ long, or as many as fit into the window.
+ .PP
+-The \fBvline\fR and \fBwvline\fR functions draw a vertical (top to bottom) line
+-using \fIch\fR starting at the current cursor position in the window.
++The \fBvline\fP and \fBwvline\fP functions draw a vertical (top to bottom) line
++using \fIch\fP starting at the current cursor position in the window.
+ The
+ current cursor position is not changed.
+-The line is at most \fIn\fR characters
++The line is at most \fIn\fP characters
+ long, or as many as fit into the window.
+ .SH RETURN VALUE
+-All routines return the integer \fBOK\fR.
++All routines return the integer \fBOK\fP.
+ The SVr4.0 manual says "or a
+-non-negative integer if \fBimmedok\fR is set", but this appears to be an error.
++non-negative integer if \fBimmedok\fP is set", but this appears to be an error.
+ .PP
+ X/Open does not define any error conditions.
+ This implementation returns an error
+@@ -151,13 +151,13 @@
+ \fBwmove\fP, and return an error if the position is outside the window,
+ or if the window pointer is null.
+ .SH NOTES
+-The borders generated by these functions are \fIinside\fR borders (this
++The borders generated by these functions are \fIinside\fP borders (this
+ is also true of SVr4 curses, though the fact is not documented).
+ .PP
+-Note that \fBborder\fR and \fBbox\fR may be macros.
++Note that \fBborder\fP and \fBbox\fP may be macros.
+ .SH PORTABILITY
+ These functions are described in the XSI Curses standard, Issue 4.
+-The standard specifies that they return \fBERR\fR on failure,
++The standard specifies that they return \fBERR\fP on failure,
+ but specifies no error conditions.
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBcurs_outopts\fR(3X).
++\fBcurses\fP(3X), \fBcurs_outopts\fP(3X).
+Index: man/curs_border_set.3x
+Prereq:  1.13 
+--- ncurses-6.3-20211219+/man/curs_border_set.3x	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_border_set.3x	2021-12-25 21:41:58.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2019,2020 Thomas E. Dickey                                     *
++.\" Copyright 2019-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 2002-2011,2012 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_border_set.3x,v 1.13 2020/02/02 23:34:34 tom Exp $
++.\" $Id: curs_border_set.3x,v 1.15 2021/12/25 21:41:58 tom Exp $
+ .TH curs_border_set 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -36,168 +36,168 @@
+ .na
+ .hy 0
+ .SH NAME
+-\fBborder_set\fR,
+-\fBwborder_set\fR,
+-\fBbox_set\fR,
+-\fBhline_set\fR,
+-\fBwhline_set\fR,
+-\fBmvhline_set\fR,
+-\fBmvwhline_set\fR,
+-\fBvline_set\fR,
+-\fBwvline_set\fR,
+-\fBmvvline_set\fR,
+-\fBmvwvline_set\fR \- create \fBcurses\fR borders or lines using complex characters and renditions
++\fBborder_set\fP,
++\fBwborder_set\fP,
++\fBbox_set\fP,
++\fBhline_set\fP,
++\fBwhline_set\fP,
++\fBmvhline_set\fP,
++\fBmvwhline_set\fP,
++\fBvline_set\fP,
++\fBwvline_set\fP,
++\fBmvvline_set\fP,
++\fBmvwvline_set\fP \- create \fBcurses\fP borders or lines using complex characters and renditions
+ .ad
+ .hy
+ .SH SYNOPSIS
+ .PP
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBint border_set(\fR
+-   \fBconst cchar_t *\fR\fIls\fR, \fBconst cchar_t *\fR\fIrs\fR,
+-   \fBconst cchar_t *\fR\fIts\fR, \fBconst cchar_t *\fR\fIbs\fR,
+-   \fBconst cchar_t *\fR\fItl\fR, \fBconst cchar_t *\fR\fItr\fR,
+-   \fBconst cchar_t *\fR\fIbl\fR, \fBconst cchar_t *\fR\fIbr\fR
+-\fB);\fR
+-.br
+-\fBint wborder_set(\fR
+-   \fBWINDOW *win\fR,
+-   \fBconst cchar_t *\fR\fIls\fR, \fBconst cchar_t *\fR\fIrs\fR,
+-   \fBconst cchar_t *\fR\fIts\fR, \fBconst cchar_t *\fR\fIbs\fR,
+-   \fBconst cchar_t *\fR\fItl\fR, \fBconst cchar_t *\fR\fItr\fR,
+-   \fBconst cchar_t *\fR\fIbl\fR, \fBconst cchar_t *\fR\fIbr\fR\fB);\fR
+-.br
+-\fBint box_set(\fR
+-   \fBWINDOW *win\fR,
+-   \fBconst cchar_t *\fR\fIverch\fR,
+-   \fBconst cchar_t *\fR\fIhorch\fR\fB);\fR
+-.br
+-\fBint hline_set(\fR
+-   \fBconst cchar_t *\fR\fIwch\fR, \fBint \fR\fIn\fR\fB);\fR
+-.br
+-\fBint whline_set(\fR
+-   \fBWINDOW *\fR\fIwin\fR,
+-   \fBconst cchar_t *\fR\fIwch\fR, \fBint \fR\fIn\fR\fB);\fR
+-.br
+-\fBint mvhline_set(\fR
+-   \fBint \fR\fIy\fR, \fBint \fR\fIx\fR,
+-   \fBconst cchar_t *\fR\fIwch\fR, \fBint \fR\fIn\fR\fB);\fR
+-.br
+-\fBint mvwhline_set(\fR
+-   \fBWINDOW *\fR\fIwin\fR,
+-   \fBint \fR\fIy\fR, \fBint \fR\fIx\fR,
+-   \fBconst cchar_t *\fR\fIwch\fR, \fBint \fR\fIn\fR\fB);\fR
+-.br
+-\fBint vline_set(\fR
+-   \fBconst cchar_t *\fR\fIwch\fR, \fBint \fR\fIn\fR\fB);\fR
+-.br
+-\fBint wvline_set(\fR
+-   \fBWINDOW *\fR\fIwin\fR,
+-   \fBconst cchar_t *\fR\fIwch\fR, \fBint \fR\fIn\fR\fB);\fR
+-.br
+-\fBint mvvline_set(\fR
+-   \fBint \fR\fIy\fR, \fBint \fR\fIx\fR,
+-   \fBconst cchar_t *\fR\fIwch\fR, \fBint \fR\fIn\fR\fB);\fR
+-.br
+-\fBint mvwvline_set(\fR
+-   \fBWINDOW *\fR\fIwin\fR,
+-   \fBint \fR\fIy\fR, \fBint \fR\fIx\fR,
+-   \fBconst cchar_t *\fR\fIwch\fR, \fBint \fR\fIn\fR\fB);\fR
++\fBint border_set(\fP
++   \fBconst cchar_t *\fP\fIls\fP, \fBconst cchar_t *\fP\fIrs\fP,
++   \fBconst cchar_t *\fP\fIts\fP, \fBconst cchar_t *\fP\fIbs\fP,
++   \fBconst cchar_t *\fP\fItl\fP, \fBconst cchar_t *\fP\fItr\fP,
++   \fBconst cchar_t *\fP\fIbl\fP, \fBconst cchar_t *\fP\fIbr\fP
++\fB);\fP
++.br
++\fBint wborder_set(\fP
++   \fBWINDOW *win\fP,
++   \fBconst cchar_t *\fP\fIls\fP, \fBconst cchar_t *\fP\fIrs\fP,
++   \fBconst cchar_t *\fP\fIts\fP, \fBconst cchar_t *\fP\fIbs\fP,
++   \fBconst cchar_t *\fP\fItl\fP, \fBconst cchar_t *\fP\fItr\fP,
++   \fBconst cchar_t *\fP\fIbl\fP, \fBconst cchar_t *\fP\fIbr\fP\fB);\fP
++.br
++\fBint box_set(\fP
++   \fBWINDOW *win\fP,
++   \fBconst cchar_t *\fP\fIverch\fP,
++   \fBconst cchar_t *\fP\fIhorch\fP\fB);\fP
++.br
++\fBint hline_set(\fP
++   \fBconst cchar_t *\fP\fIwch\fP, \fBint \fP\fIn\fP\fB);\fP
++.br
++\fBint whline_set(\fP
++   \fBWINDOW *\fP\fIwin\fP,
++   \fBconst cchar_t *\fP\fIwch\fP, \fBint \fP\fIn\fP\fB);\fP
++.br
++\fBint mvhline_set(\fP
++   \fBint \fP\fIy\fP, \fBint \fP\fIx\fP,
++   \fBconst cchar_t *\fP\fIwch\fP, \fBint \fP\fIn\fP\fB);\fP
++.br
++\fBint mvwhline_set(\fP
++   \fBWINDOW *\fP\fIwin\fP,
++   \fBint \fP\fIy\fP, \fBint \fP\fIx\fP,
++   \fBconst cchar_t *\fP\fIwch\fP, \fBint \fP\fIn\fP\fB);\fP
++.br
++\fBint vline_set(\fP
++   \fBconst cchar_t *\fP\fIwch\fP, \fBint \fP\fIn\fP\fB);\fP
++.br
++\fBint wvline_set(\fP
++   \fBWINDOW *\fP\fIwin\fP,
++   \fBconst cchar_t *\fP\fIwch\fP, \fBint \fP\fIn\fP\fB);\fP
++.br
++\fBint mvvline_set(\fP
++   \fBint \fP\fIy\fP, \fBint \fP\fIx\fP,
++   \fBconst cchar_t *\fP\fIwch\fP, \fBint \fP\fIn\fP\fB);\fP
++.br
++\fBint mvwvline_set(\fP
++   \fBWINDOW *\fP\fIwin\fP,
++   \fBint \fP\fIy\fP, \fBint \fP\fIx\fP,
++   \fBconst cchar_t *\fP\fIwch\fP, \fBint \fP\fIn\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+ .PP
+ The
+-\fBborder_set\fR
++\fBborder_set\fP
+ and
+-\fBwborder_set\fR
++\fBwborder_set\fP
+ functions draw a border around the edges of the current or specified window.
+ These functions do not change the cursor position, and do not wrap.
+ .PP
+ Other than the window, each argument is a complex character with attributes:
+ .RS
+-\fIls\fR \- left side,
++\fIls\fP \- left side,
+ .br
+-\fIrs\fR \- right side,
++\fIrs\fP \- right side,
+ .br
+-\fIts\fR \- top side,
++\fIts\fP \- top side,
+ .br
+-\fIbs\fR \- bottom side,
++\fIbs\fP \- bottom side,
+ .br
+-\fItl\fR \- top left-hand corner,
++\fItl\fP \- top left-hand corner,
+ .br
+-\fItr\fR \- top right-hand corner,
++\fItr\fP \- top right-hand corner,
+ .br
+-\fIbl\fR \- bottom left-hand corner, and
++\fIbl\fP \- bottom left-hand corner, and
+ .br
+-\fIbr\fR \- bottom right-hand corner.
++\fIbr\fP \- bottom right-hand corner.
+ .RE
+ .PP
+ If any of these arguments is zero, then the corresponding
+-default values (defined in \fBcurses.h\fR) are used instead:
++default values (defined in \fBcurses.h\fP) are used instead:
+ .RS
+-\fBWACS_VLINE\fR,
++\fBWACS_VLINE\fP,
+ .br
+-\fBWACS_VLINE\fR,
++\fBWACS_VLINE\fP,
+ .br
+-\fBWACS_HLINE\fR,
++\fBWACS_HLINE\fP,
+ .br
+-\fBWACS_HLINE\fR,
++\fBWACS_HLINE\fP,
+ .br
+-\fBWACS_ULCORNER\fR,
++\fBWACS_ULCORNER\fP,
+ .br
+-\fBWACS_URCORNER\fR,
++\fBWACS_URCORNER\fP,
+ .br
+-\fBWACS_LLCORNER\fR, and
++\fBWACS_LLCORNER\fP, and
+ .br
+-\fBWACS_LRCORNER\fR.
++\fBWACS_LRCORNER\fP.
+ .RE
+ .PP
+-\fBbox_set(\fR\fIwin\fR, \fIverch\fR\fB, \fR\fIhorch\fR\fB);\fR
++\fBbox_set(\fP\fIwin\fP, \fIverch\fP\fB, \fP\fIhorch\fP\fB);\fP
+ is a shorthand for the following call:
+ .PP
+-\fBwborder_set(\fR\fIwin\fR\fB, \fR\fIverch\fR\fB, \fR\fIverch\fR\fB,\fR
+-    \fIhorch\fR\fB, \fR\fIhorch\fR\fB, NULL, NULL, NULL, NULL);\fR
++\fBwborder_set(\fP\fIwin\fP\fB, \fP\fIverch\fP\fB, \fP\fIverch\fP\fB,\fP
++    \fIhorch\fP\fB, \fP\fIhorch\fP\fB, NULL, NULL, NULL, NULL);\fP
+ .PP
+ The
+-\fB*line_set\fR
++\fB*line_set\fP
+ functions use
+-\fIwch\fR
++\fIwch\fP
+ to draw a line starting at the current cursor position in the window.
+-The line is at most \fIn\fR characters long or as many as fit into the window.
++The line is at most \fIn\fP characters long or as many as fit into the window.
+ The current cursor position is not changed.
+ .PP
+ The
+-\fBhline_set\fR,
+-\fBmvhline_set\fR,
+-\fBmvwhline_set\fR, and
+-\fBwhline_set\fR
++\fBhline_set\fP,
++\fBmvhline_set\fP,
++\fBmvwhline_set\fP, and
++\fBwhline_set\fP
+ functions draw a line proceeding toward the last column of the same line.
+ .PP
+ The
+-\fBvline_set\fR,
+-\fBmvvline_set\fR,
+-\fBmvwvline_set\fR, and
+-\fBwvline_set\fR
++\fBvline_set\fP,
++\fBmvvline_set\fP,
++\fBmvwvline_set\fP, and
++\fBwvline_set\fP
+ functions draw a line proceeding toward the last line of the window.
+ .br
+ .SH NOTES
+ .PP
+ Note that
+-\fBborder_set\fR,
+-\fBhline_set\fR,
+-\fBmvhline_set\fR,
+-\fBmvvline_set\fR,
+-\fBmvwhline_set\fR,
+-\fBmvwvline_set\fR, and
+-\fBvline_set\fR
++\fBborder_set\fP,
++\fBhline_set\fP,
++\fBmvhline_set\fP,
++\fBmvvline_set\fP,
++\fBmvwhline_set\fP,
++\fBmvwvline_set\fP, and
++\fBvline_set\fP
+ may be macros.
+ .br
+ .SH RETURN VALUE
+ .PP
+ Upon successful completion, these functions return
+-\fBOK\fR.
++\fBOK\fP.
+ Otherwise, they return
+-\fBERR\fR.
++\fBERR\fP.
+ .PP
+ Functions using a window parameter return an error if it is null.
+ .PP
+@@ -205,7 +205,7 @@
+ \fBwmove\fP, and return an error if the position is outside the window,
+ or if the window pointer is null.
+ .SH SEE ALSO
+-\fBncurses\fR(3X),
+-\fBcurs_add_wch\fR(3X),
+-\fBcurs_border\fR(3X),
+-\fBcurs_outopts\fR(3X)
++\fBncurses\fP(3X),
++\fBcurs_add_wch\fP(3X),
++\fBcurs_border\fP(3X),
++\fBcurs_outopts\fP(3X)
+Index: man/curs_clear.3x
+Prereq:  1.20 
+--- ncurses-6.3-20211219+/man/curs_clear.3x	2020-10-24 09:19:37.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_clear.3x	2021-12-25 21:41:58.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018,2020 Thomas E. Dickey                                     *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2016 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_clear.3x,v 1.20 2020/10/24 09:19:37 tom Exp $
++.\" $Id: curs_clear.3x,v 1.22 2021/12/25 21:41:58 tom Exp $
+ .TH curs_clear 3X ""
+ .na
+ .hy 0
+@@ -36,56 +36,56 @@
+ .el    .IP \(bu 2
+ ..
+ .SH NAME
+-\fBerase\fR,
+-\fBwerase\fR,
+-\fBclear\fR,
+-\fBwclear\fR,
+-\fBclrtobot\fR,
+-\fBwclrtobot\fR,
+-\fBclrtoeol\fR,
+-\fBwclrtoeol\fR \- clear all or part of a \fBcurses\fR window
++\fBerase\fP,
++\fBwerase\fP,
++\fBclear\fP,
++\fBwclear\fP,
++\fBclrtobot\fP,
++\fBwclrtobot\fP,
++\fBclrtoeol\fP,
++\fBwclrtoeol\fP \- clear all or part of a \fBcurses\fP window
+ .ad
+ .hy
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBint erase(void);\fR
++\fBint erase(void);\fP
+ .br
+-\fBint werase(WINDOW *\fP\fIwin\fP\fB);\fR
++\fBint werase(WINDOW *\fP\fIwin\fP\fB);\fP
+ .sp
+-\fBint clear(void);\fR
++\fBint clear(void);\fP
+ .br
+-\fBint wclear(WINDOW *\fP\fIwin\fP\fB);\fR
++\fBint wclear(WINDOW *\fP\fIwin\fP\fB);\fP
+ .sp
+-\fBint clrtobot(void);\fR
++\fBint clrtobot(void);\fP
+ .br
+-\fBint wclrtobot(WINDOW *\fP\fIwin\fP\fB);\fR
++\fBint wclrtobot(WINDOW *\fP\fIwin\fP\fB);\fP
+ .sp
+-\fBint clrtoeol(void);\fR
++\fBint clrtoeol(void);\fP
+ .br
+-\fBint wclrtoeol(WINDOW *\fP\fIwin\fP\fB);\fR
++\fBint wclrtoeol(WINDOW *\fP\fIwin\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-The \fBerase\fR and \fBwerase\fR routines copy blanks to every
++The \fBerase\fP and \fBwerase\fP routines copy blanks to every
+ position in the window, clearing the screen.
+ .PP
+-The \fBclear\fR and \fBwclear\fR routines are like \fBerase\fR and
+-\fBwerase\fR, but they also call \fBclearok\fR, so that the screen is
+-cleared completely on the next call to \fBwrefresh\fR for that window
++The \fBclear\fP and \fBwclear\fP routines are like \fBerase\fP and
++\fBwerase\fP, but they also call \fBclearok\fP, so that the screen is
++cleared completely on the next call to \fBwrefresh\fP for that window
+ and repainted from scratch.
+ .PP
+-The \fBclrtobot\fR and \fBwclrtobot\fR routines erase from the cursor to the
++The \fBclrtobot\fP and \fBwclrtobot\fP routines erase from the cursor to the
+ end of screen.
+ That is, they erase all lines below the cursor in the window.
+ Also, the current line to the right of the cursor, inclusive, is erased.
+ .PP
+-The \fBclrtoeol\fR and \fBwclrtoeol\fR routines erase the current line
++The \fBclrtoeol\fP and \fBwclrtoeol\fP routines erase the current line
+ to the right of the cursor, inclusive, to the end of the current line.
+ .PP
+ Blanks created by erasure have the current background rendition (as set
+-by \fBwbkgdset\fR) merged into them.
++by \fBwbkgdset\fP) merged into them.
+ .SH RETURN VALUE
+-All routines return the integer \fBOK\fR on success and \fBERR\fP on failure.
++All routines return the integer \fBOK\fP on success and \fBERR\fP on failure.
+ .PP
+ X/Open defines no error conditions.
+ In this implementation,
+@@ -95,23 +95,23 @@
+ \fBwclrtoeol\fP returns an error
+ if the cursor position is about to wrap.
+ .SH NOTES
+-Note that \fBerase\fR, \fBwerase\fR, \fBclear\fR, \fBwclear\fR,
+-\fBclrtobot\fR, and \fBclrtoeol\fR may be macros.
++Note that \fBerase\fP, \fBwerase\fP, \fBclear\fP, \fBwclear\fP,
++\fBclrtobot\fP, and \fBclrtoeol\fP may be macros.
+ .SH PORTABILITY
+ These functions are described in the XSI Curses standard, Issue 4.
+ The
+-standard specifies that they return \fBERR\fR on failure, but specifies no
++standard specifies that they return \fBERR\fP on failure, but specifies no
+ error conditions.
+ .PP
+ The SVr4.0 manual says that these functions could
+-return "a non-negative integer if \fBimmedok\fR is set",
++return "a non-negative integer if \fBimmedok\fP is set",
+ referring to the return-value of \fBwrefresh\fP.
+ In that implementation, \fBwrefresh\fP would return a count of
+ the number of characters written to the terminal.
+ .PP
+ Some historic curses implementations had, as an undocumented feature, the
+-ability to do the equivalent of \fBclearok(..., 1)\fR by saying
+-\fBtouchwin(stdscr)\fR or \fBclear(stdscr)\fR.
++ability to do the equivalent of \fBclearok(..., 1)\fP by saying
++\fBtouchwin(stdscr)\fP or \fBclear(stdscr)\fP.
+ This will not work under
+ ncurses.
+ .PP
+@@ -128,7 +128,7 @@
+ If you do not want to clear the screen during the next \fBwrefresh\fP,
+ use \fBwerase\fP instead.
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBcurs_outopts\fR(3X),
+-\fBcurs_refresh\fR(3X),
+-\fBcurs_variables\fR(3X)
++\fBcurses\fP(3X),
++\fBcurs_outopts\fP(3X),
++\fBcurs_refresh\fP(3X),
++\fBcurs_variables\fP(3X)
+Index: man/curs_color.3x
+Prereq:  1.66 
+--- ncurses-6.3-20211219+/man/curs_color.3x	2021-09-04 19:42:20.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_color.3x	2021-12-25 17:39:16.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_color.3x,v 1.66 2021/09/04 19:42:20 tom Exp $
++.\" $Id: curs_color.3x,v 1.67 2021/12/25 17:39:16 tom Exp $
+ .TH curs_color 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -41,81 +41,81 @@
+ .na
+ .hy 0
+ .SH NAME
+-\fBstart_color\fR,
+-\fBhas_colors\fR,
+-\fBcan_change_color\fR,
+-\fBinit_pair\fR,
+-\fBinit_color\fR,
+-\fBinit_extended_pair\fR,
+-\fBinit_extended_color\fR,
+-\fBcolor_content\fR,
+-\fBpair_content\fR,
+-\fBextended_color_content\fR,
+-\fBextended_pair_content\fR,
+-\fBreset_color_pairs\fR,
+-\fBCOLOR_PAIR\fR,
+-\fBPAIR_NUMBER\fR \- \fBcurses\fR color manipulation routines
++\fBstart_color\fP,
++\fBhas_colors\fP,
++\fBcan_change_color\fP,
++\fBinit_pair\fP,
++\fBinit_color\fP,
++\fBinit_extended_pair\fP,
++\fBinit_extended_color\fP,
++\fBcolor_content\fP,
++\fBpair_content\fP,
++\fBextended_color_content\fP,
++\fBextended_pair_content\fP,
++\fBreset_color_pairs\fP,
++\fBCOLOR_PAIR\fP,
++\fBPAIR_NUMBER\fP \- \fBcurses\fP color manipulation routines
+ .ad
+ .hy
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBint start_color(void);\fR
++\fBint start_color(void);\fP
+ .sp
+-\fBbool has_colors(void);\fR
++\fBbool has_colors(void);\fP
+ .br
+-\fBbool can_change_color(void);\fR
++\fBbool can_change_color(void);\fP
+ .sp
+-\fBint init_pair(short \fP\fIpair\fP\fB, short \fP\fIf\fP\fB, short \fP\fIb\fP\fB);\fR
++\fBint init_pair(short \fP\fIpair\fP\fB, short \fP\fIf\fP\fB, short \fP\fIb\fP\fB);\fP
+ .br
+-\fBint init_color(short \fP\fIcolor\fP\fB, short \fP\fIr\fP\fB, short \fP\fIg\fP\fB, short \fP\fIb\fP\fB);\fR
++\fBint init_color(short \fP\fIcolor\fP\fB, short \fP\fIr\fP\fB, short \fP\fIg\fP\fB, short \fP\fIb\fP\fB);\fP
+ .br
+ /* extensions */
+ .br
+-\fBint init_extended_pair(int \fP\fIpair\fP\fB, int \fP\fIf\fP\fB, int \fP\fIb\fP\fB);\fR
++\fBint init_extended_pair(int \fP\fIpair\fP\fB, int \fP\fIf\fP\fB, int \fP\fIb\fP\fB);\fP
+ .br
+-\fBint init_extended_color(int \fP\fIcolor\fP\fB, int \fP\fIr\fP\fB, int \fP\fIg\fP\fB, int \fP\fIb\fP\fB);\fR
++\fBint init_extended_color(int \fP\fIcolor\fP\fB, int \fP\fIr\fP\fB, int \fP\fIg\fP\fB, int \fP\fIb\fP\fB);\fP
+ .sp
+-\fBint color_content(short \fP\fIcolor\fP\fB, short *\fP\fIr\fP\fB, short *\fP\fIg\fP\fB, short *\fP\fIb\fP\fB);\fR
++\fBint color_content(short \fP\fIcolor\fP\fB, short *\fP\fIr\fP\fB, short *\fP\fIg\fP\fB, short *\fP\fIb\fP\fB);\fP
+ .br
+-\fBint pair_content(short \fP\fIpair\fP\fB, short *\fP\fIf\fP\fB, short *\fP\fIb\fP\fB);\fR
++\fBint pair_content(short \fP\fIpair\fP\fB, short *\fP\fIf\fP\fB, short *\fP\fIb\fP\fB);\fP
+ .br
+ /* extensions */
+ .br
+-\fBint extended_color_content(int \fP\fIcolor\fP\fB, int *\fP\fIr\fP\fB, int *\fP\fIg\fP\fB, int *\fP\fIb\fP\fB);\fR
++\fBint extended_color_content(int \fP\fIcolor\fP\fB, int *\fP\fIr\fP\fB, int *\fP\fIg\fP\fB, int *\fP\fIb\fP\fB);\fP
+ .br
+-\fBint extended_pair_content(int \fP\fIpair\fP\fB, int *\fP\fIf\fP\fB, int *\fP\fIb\fP\fB);\fR
++\fBint extended_pair_content(int \fP\fIpair\fP\fB, int *\fP\fIf\fP\fB, int *\fP\fIb\fP\fB);\fP
+ .sp
+ /* extensions */
+ .br
+-\fBvoid reset_color_pairs(void);\fR
++\fBvoid reset_color_pairs(void);\fP
+ .sp
+-\fBint COLOR_PAIR(int \fP\fIn\fP\fB);\fR
++\fBint COLOR_PAIR(int \fP\fIn\fP\fB);\fP
+ .br
+-\fBPAIR_NUMBER(\fR\fIattrs\fR\fB);\fP
++\fBPAIR_NUMBER(\fP\fIattrs\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+ .SS Overview
+-\fBcurses\fR supports color attributes on terminals with that capability.
+-To use these routines \fBstart_color\fR must be called, usually right after
+-\fBinitscr\fR.
++\fBcurses\fP supports color attributes on terminals with that capability.
++To use these routines \fBstart_color\fP must be called, usually right after
++\fBinitscr\fP.
+ Colors are always used in pairs (referred to as color-pairs).
+ A color-pair consists of a foreground color (for characters) and a background
+ color (for the blank field on which the characters are displayed).
+-A programmer initializes a color-pair with the routine \fBinit_pair\fR.
+-After it has been initialized, \fBCOLOR_PAIR\fR(\fIn\fR)
++A programmer initializes a color-pair with the routine \fBinit_pair\fP.
++After it has been initialized, \fBCOLOR_PAIR\fP(\fIn\fP)
+ can be used to convert the pair to a video attribute.
+ .PP
+ If a terminal is capable of redefining colors, the programmer can use the
+-routine \fBinit_color\fR to change the definition of a color.
+-The routines \fBhas_colors\fR and \fBcan_change_color\fR
+-return \fBTRUE\fR or \fBFALSE\fR,
++routine \fBinit_color\fP to change the definition of a color.
++The routines \fBhas_colors\fP and \fBcan_change_color\fP
++return \fBTRUE\fP or \fBFALSE\fP,
+ depending on whether the terminal has color capabilities and whether the
+ programmer can change the colors.
+-The routine \fBcolor_content\fR allows a
++The routine \fBcolor_content\fP allows a
+ programmer to extract the amounts of red, green, and blue components in an
+ initialized color.
+-The routine \fBpair_content\fR allows a programmer to find
++The routine \fBpair_content\fP allows a programmer to find
+ out how a given color-pair is currently defined.
+ .SS Color Rendering
+ The \fBcurses\fP library combines these inputs to produce the
+@@ -163,20 +163,20 @@
+ the background character.
+ .SH CONSTANTS
+ .PP
+-In \fB\fR the following macros are defined.
++In \fB\fP the following macros are defined.
+ These are the standard colors (ISO-6429).
+-\fBcurses\fR also assumes that \fBCOLOR_BLACK\fR is the default
++\fBcurses\fP also assumes that \fBCOLOR_BLACK\fP is the default
+ background color for all terminals.
+ .PP
+ .nf
+-      \fBCOLOR_BLACK\fR
+-      \fBCOLOR_RED\fR
+-      \fBCOLOR_GREEN\fR
+-      \fBCOLOR_YELLOW\fR
+-      \fBCOLOR_BLUE\fR
+-      \fBCOLOR_MAGENTA\fR
+-      \fBCOLOR_CYAN\fR
+-      \fBCOLOR_WHITE\fR
++      \fBCOLOR_BLACK\fP
++      \fBCOLOR_RED\fP
++      \fBCOLOR_GREEN\fP
++      \fBCOLOR_YELLOW\fP
++      \fBCOLOR_BLUE\fP
++      \fBCOLOR_MAGENTA\fP
++      \fBCOLOR_CYAN\fP
++      \fBCOLOR_WHITE\fP
+ .fi
+ .PP
+ Some terminals support more than the eight (8) \*(``ANSI\*('' colors.
+@@ -190,14 +190,14 @@
+ the terminal can support.
+ .SH FUNCTIONS
+ .SS start_color
+-The \fBstart_color\fR routine requires no arguments.
++The \fBstart_color\fP routine requires no arguments.
+ It must be called if the programmer wants to use colors, and before any other
+ color manipulation routine is called.
+-It is good practice to call this routine right after \fBinitscr\fR.
+-\fBstart_color\fR does this:
++It is good practice to call this routine right after \fBinitscr\fP.
++\fBstart_color\fP does this:
+ .bP
+-It initializes two global variables, \fBCOLORS\fR and
+-\fBCOLOR_PAIRS\fR (respectively defining the maximum number of colors
++It initializes two global variables, \fBCOLORS\fP and
++\fBCOLOR_PAIRS\fP (respectively defining the maximum number of colors
+ and color-pairs the terminal can support).
+ .bP
+ It initializes the special color pair \fB0\fP to the default foreground
+@@ -237,8 +237,8 @@
+ These limits apply to color values and color pairs.
+ Values outside these limits are not legal, and may result in a runtime error:
+ .bP
+-\fBCOLORS\fP corresponds to the terminal database's \fBmax_colors\fR capability,
+-(see \fBterminfo\fR(\*n)).
++\fBCOLORS\fP corresponds to the terminal database's \fBmax_colors\fP capability,
++(see \fBterminfo\fP(\*n)).
+ .bP
+ color values are expected to be in the range \fB0\fP to \fBCOLORS\-1\fP,
+ inclusive (including \fB0\fP and \fBCOLORS\-1\fP).
+@@ -248,7 +248,7 @@
+ .bP
+ \fBCOLOR_PAIRS\fP corresponds to
+ the terminal database's \fBmax_pairs\fP capability,
+-(see \fBterminfo\fR(\*n)).
++(see \fBterminfo\fP(\*n)).
+ .bP
+ legal color pair values are in the range \fB1\fP to \fBCOLOR_PAIRS\-1\fP,
+ inclusive.
+@@ -260,22 +260,22 @@
+ It cannot be modified by the application.
+ .SS has_colors
+ .PP
+-The \fBhas_colors\fR routine requires no arguments.
+-It returns \fBTRUE\fR if
+-the terminal can manipulate colors; otherwise, it returns \fBFALSE\fR.
++The \fBhas_colors\fP routine requires no arguments.
++It returns \fBTRUE\fP if
++the terminal can manipulate colors; otherwise, it returns \fBFALSE\fP.
+ This routine facilitates writing terminal-independent programs.
+ For example, a programmer can use it to decide
+ whether to use color or some other video attribute.
+ .SS can_change_color
+ .PP
+-The \fBcan_change_color\fR routine requires no arguments.
+-It returns \fBTRUE\fR if the terminal supports colors
++The \fBcan_change_color\fP routine requires no arguments.
++It returns \fBTRUE\fP if the terminal supports colors
+ and can change their definitions;
+-other, it returns \fBFALSE\fR.
++other, it returns \fBFALSE\fP.
+ This routine facilitates writing terminal-independent programs.
+ .SS init_pair
+ .PP
+-The \fBinit_pair\fR routine changes the definition of a color-pair.
++The \fBinit_pair\fP routine changes the definition of a color-pair.
+ It takes three arguments:
+ the number of the color-pair to be changed, the foreground
+ color number, and the background color number.
+@@ -293,9 +293,9 @@
+ are changed to the new definition.
+ .PP
+ As an extension, ncurses allows you to set color pair \fB0\fP via
+-the \fBassume_default_colors\fR(3X) routine, or to specify the use of
+-default colors (color number \fB\-1\fR) if you first invoke the
+-\fBuse_default_colors\fR(3X) routine.
++the \fBassume_default_colors\fP(3X) routine, or to specify the use of
++default colors (color number \fB\-1\fP) if you first invoke the
++\fBuse_default_colors\fP(3X) routine.
+ .SS init_extended_pair
+ .PP
+ Because \fBinit_pair\fP uses signed \fBshort\fPs for its parameters,
+@@ -306,19 +306,19 @@
+ allowing a larger number of colors to be supported.
+ .SS init_color
+ .PP
+-The \fBinit_color\fR routine changes the definition of a color.
++The \fBinit_color\fP routine changes the definition of a color.
+ It takes four arguments:
+ the number of the color to be changed followed by three RGB values
+ (for the amounts of red, green, and blue components).
+ .bP
+ The first argument must be a legal color value;
+ default colors are not allowed here.
+-(See the section \fBColors\fR for the default color index.)
++(See the section \fBColors\fP for the default color index.)
+ .bP
+ Each of the last three arguments
+ must be a value in the range \fB0\fP through \fB1000\fP.
+ .PP
+-When \fBinit_color\fR is used, all
++When \fBinit_color\fP is used, all
+ occurrences of that color on the screen immediately change to the new
+ definition.
+ .SS init_extended_color
+@@ -332,7 +332,7 @@
+ allowing a larger number of colors to be supported.
+ .SS color_content
+ .PP
+-The \fBcolor_content\fR routine gives programmers a way to find the intensity
++The \fBcolor_content\fP routine gives programmers a way to find the intensity
+ of the red, green, and blue (RGB) components in a color.
+ It requires four arguments: the color number, and three addresses
+ of \fBshort\fRs for storing
+@@ -357,18 +357,18 @@
+ allowing a larger number of colors to be supported.
+ .SS pair_content
+ .PP
+-The \fBpair_content\fR routine allows programmers to find out what colors a
++The \fBpair_content\fP routine allows programmers to find out what colors a
+ given color-pair consists of.
+ It requires three arguments: the color-pair
+ number, and two addresses of \fBshort\fRs for storing the foreground and the
+ background color numbers.
+ .bP
+ The first argument must be a legal color value,
+-i.e., in the range \fB1\fP through \fBCOLOR_PAIRS\-1\fR, inclusive.
++i.e., in the range \fB1\fP through \fBCOLOR_PAIRS\-1\fP, inclusive.
+ .bP
+ The values that are stored at the addresses pointed
+ to by the second and third arguments are in the
+-range \fB0\fP through \fBCOLORS\fR, inclusive.
++range \fB0\fP through \fBCOLORS\fP, inclusive.
+ .SS extended_pair_content
+ .PP
+ Because \fBpair_content\fP uses signed \fBshort\fPs for its parameters,
+@@ -385,27 +385,27 @@
+ switch color palettes rapidly.
+ .SS PAIR_NUMBER
+ .PP
+-\fBPAIR_NUMBER(\fR\fIattrs\fR) extracts the color
++\fBPAIR_NUMBER(\fP\fIattrs\fP) extracts the color
+ value from its \fIattrs\fP parameter and returns it as a color pair number.
+ .SS COLOR_PAIR
+-Its inverse \fBCOLOR_PAIR(\fR\fIn\fR\fB)\fR converts a color pair number
++Its inverse \fBCOLOR_PAIR(\fP\fIn\fP\fB)\fP converts a color pair number
+ to an attribute.
+ Attributes can hold color pairs in the range 0 to 255.
+ If you need a color pair larger than that, you must use functions
+ such as \fBattr_set\fP (which pass the color pair as a separate parameter)
+ rather than the legacy functions such as \fBattrset\fP.
+ .SH RETURN VALUE
+-The routines \fBcan_change_color\fR and \fBhas_colors\fR return \fBTRUE\fR
+-or \fBFALSE\fR.
++The routines \fBcan_change_color\fP and \fBhas_colors\fP return \fBTRUE\fP
++or \fBFALSE\fP.
+ .PP
+-All other routines return the integer \fBERR\fR upon failure and an \fBOK\fR
++All other routines return the integer \fBERR\fP upon failure and an \fBOK\fP
+ (SVr4 specifies only \*(``an integer value
+-other than \fBERR\fR\*('') upon successful completion.
++other than \fBERR\fP\*('') upon successful completion.
+ .PP
+ X/Open defines no error conditions.
+ SVr4 does document some error conditions which apply in general:
+ .bP
+-This implementation will return \fBERR\fR on attempts to
++This implementation will return \fBERR\fP on attempts to
+ use color values outside the range \fB0\fP to \fBCOLORS\fP\-1
+ (except for the default colors extension),
+ or use color pairs outside the range \fB0\fP to \fBCOLOR_PAIRS\-1\fP.
+@@ -440,10 +440,10 @@
+ returns an error if the color table cannot be allocated.
+ .RE
+ .SH NOTES
+-In the \fBncurses\fR implementation, there is a separate color activation flag,
++In the \fBncurses\fP implementation, there is a separate color activation flag,
+ color palette, color pairs table,
+ and associated \fBCOLORS\fP and \fBCOLOR_PAIRS\fP counts
+-for each screen; the \fBstart_color\fR function only affects the current
++for each screen; the \fBstart_color\fP function only affects the current
+ screen.
+ The SVr4/XSI interface is not really designed with this in mind, and
+ historical implementations may use a single shared color palette.
+@@ -452,13 +452,13 @@
+ character cells that a character write operation explicitly touches.
+ To change
+ the background color used when parts of a window are blanked by erasing or
+-scrolling operations, see \fBcurs_bkgd\fR(3X).
++scrolling operations, see \fBcurs_bkgd\fP(3X).
+ .PP
+ Several caveats apply on older x86 machines
+ (e.g., i386, i486) with VGA-compatible graphics:
+ .bP
+ COLOR_YELLOW is actually brown.
+-To get yellow, use COLOR_YELLOW combined with the \fBA_BOLD\fR attribute.
++To get yellow, use COLOR_YELLOW combined with the \fBA_BOLD\fP attribute.
+ .bP
+ The A_BLINK attribute should in theory cause the background to go bright.
+ This often fails to work, and even some cards for which it mostly works
+@@ -517,15 +517,15 @@
+ by the size of the bitfield.
+ .SH PORTABILITY
+ This implementation satisfies XSI Curses's minimum maximums
+-for \fBCOLORS\fR and \fBCOLOR_PAIRS\fR.
++for \fBCOLORS\fP and \fBCOLOR_PAIRS\fP.
+ .PP
+ The \fBinit_pair\fP routine accepts negative values of foreground
+-and background color to support the \fBuse_default_colors\fR(3X) extension,
++and background color to support the \fBuse_default_colors\fP(3X) extension,
+ but only if that routine has been first invoked.
+ .PP
+-The assumption that \fBCOLOR_BLACK\fR is the default
++The assumption that \fBCOLOR_BLACK\fP is the default
+ background color for all terminals can be modified using the
+-\fBassume_default_colors\fR(3X) extension.
++\fBassume_default_colors\fP(3X) extension.
+ .PP
+ This implementation checks the pointers,
+ e.g., for the values returned by
+@@ -543,8 +543,8 @@
+ .PP
+ The \fBreset_color_pairs\fP function is an extension of ncurses.
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBcurs_initscr\fR(3X),
+-\fBcurs_attr\fR(3X),
+-\fBcurs_variables\fR(3X),
+-\fBdefault_colors\fR(3X)
++\fBcurses\fP(3X),
++\fBcurs_initscr\fP(3X),
++\fBcurs_attr\fP(3X),
++\fBcurs_variables\fP(3X),
++\fBdefault_colors\fP(3X)
+Index: man/curs_delch.3x
+Prereq:  1.15 
+--- ncurses-6.3-20211219+/man/curs_delch.3x	2020-10-24 09:36:43.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_delch.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,50 +27,50 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_delch.3x,v 1.15 2020/10/24 09:36:43 tom Exp $
++.\" $Id: curs_delch.3x,v 1.17 2021/12/25 21:49:32 tom Exp $
+ .TH curs_delch 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+ .ie \n(.g .ds '' \(rq
+ .el       .ds '' ''
+ .SH NAME
+-\fBdelch\fR,
+-\fBwdelch\fR,
+-\fBmvdelch\fR,
+-\fBmvwdelch\fR \- delete character under the cursor in a \fBcurses\fR window
++\fBdelch\fP,
++\fBwdelch\fP,
++\fBmvdelch\fP,
++\fBmvwdelch\fP \- delete character under the cursor in a \fBcurses\fP window
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBint delch(void);\fR
++\fBint delch(void);\fP
+ .br
+-\fBint wdelch(WINDOW *\fP\fIwin\fP\fB);\fR
++\fBint wdelch(WINDOW *\fP\fIwin\fP\fB);\fP
+ .br
+-\fBint mvdelch(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fR
++\fBint mvdelch(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fP
+ .br
+-\fBint mvwdelch(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fR
++\fBint mvwdelch(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+ These routines delete the character under the cursor; all characters to the
+ right of the cursor on the same line are moved to the left one position and the
+ last character on the line is filled with a blank.
+ The cursor position does
+-not change (after moving to \fIy\fR, \fIx\fR, if specified).
++not change (after moving to \fIy\fP, \fIx\fP, if specified).
+ (This does not
+ imply use of the hardware delete character feature.)
+ .SH RETURN VALUE
+-All routines return the integer \fBERR\fR upon failure and an \fBOK\fR (SVr4
+-specifies only "an integer value other than \fBERR\fR") upon successful
++All routines return the integer \fBERR\fP upon failure and an \fBOK\fP (SVr4
++specifies only "an integer value other than \fBERR\fP") upon successful
+ completion.
+ .PP
+ Functions with a \*(``mv\*('' prefix first perform a cursor movement using
+ \fBwmove\fP, and return an error if the position is outside the window,
+ or if the window pointer is null.
+ .SH NOTES
+-Note that \fBdelch\fR, \fBmvdelch\fR, and \fBmvwdelch\fR may be macros.
++Note that \fBdelch\fP, \fBmvdelch\fP, and \fBmvwdelch\fP may be macros.
+ .SH PORTABILITY
+ These functions are described in the XSI Curses standard, Issue 4.
+ The
+-standard specifies that they return \fBERR\fR on failure, but specifies no
++standard specifies that they return \fBERR\fP on failure, but specifies no
+ error conditions.
+ .SH SEE ALSO
+-\fBcurses\fR(3X)
++\fBcurses\fP(3X)
+Index: man/curs_deleteln.3x
+Prereq:  1.17 
+--- ncurses-6.3-20211219+/man/curs_deleteln.3x	2020-10-18 00:28:51.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_deleteln.3x	2021-12-25 21:41:58.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018,2020 Thomas E. Dickey                                     *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,51 +27,51 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_deleteln.3x,v 1.17 2020/10/18 00:28:51 tom Exp $
++.\" $Id: curs_deleteln.3x,v 1.19 2021/12/25 21:41:58 tom Exp $
+ .TH curs_deleteln 3X ""
+ .SH NAME
+-\fBdeleteln\fR,
+-\fBwdeleteln\fR,
+-\fBinsdelln\fR,
+-\fBwinsdelln\fR,
+-\fBinsertln\fR,
+-\fBwinsertln\fR \- delete and insert lines in a \fBcurses\fR window
++\fBdeleteln\fP,
++\fBwdeleteln\fP,
++\fBinsdelln\fP,
++\fBwinsdelln\fP,
++\fBinsertln\fP,
++\fBwinsertln\fP \- delete and insert lines in a \fBcurses\fP window
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBint deleteln(void);\fR
++\fBint deleteln(void);\fP
+ .br
+-\fBint wdeleteln(WINDOW *\fP\fIwin\fP\fB);\fR
++\fBint wdeleteln(WINDOW *\fP\fIwin\fP\fB);\fP
+ .sp
+-\fBint insdelln(int \fP\fIn\fP\fB);\fR
++\fBint insdelln(int \fP\fIn\fP\fB);\fP
+ .br
+-\fBint winsdelln(WINDOW *\fP\fIwin\fP\fB, int \fP\fIn\fP\fB);\fR
++\fBint winsdelln(WINDOW *\fP\fIwin\fP\fB, int \fP\fIn\fP\fB);\fP
+ .sp
+-\fBint insertln(void);\fR
++\fBint insertln(void);\fP
+ .br
+-\fBint winsertln(WINDOW *\fP\fIwin\fP\fB);\fR
++\fBint winsertln(WINDOW *\fP\fIwin\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-The \fBdeleteln\fR and \fBwdeleteln\fR routines delete the line under the
++The \fBdeleteln\fP and \fBwdeleteln\fP routines delete the line under the
+ cursor in the window; all lines below the current line are moved up one line.
+ The bottom line of the window is cleared.
+ The cursor position does not change.
+ .PP
+-The \fBinsdelln\fR and \fBwinsdelln\fR routines, for positive \fIn\fR, insert
+-\fIn\fR lines into the specified window above the current line.
+-The \fIn\fR
++The \fBinsdelln\fP and \fBwinsdelln\fP routines, for positive \fIn\fP, insert
++\fIn\fP lines into the specified window above the current line.
++The \fIn\fP
+ bottom lines are lost.
+-For negative \fIn\fR, delete \fIn\fR lines (starting
++For negative \fIn\fP, delete \fIn\fP lines (starting
+ with the one under the cursor), and move the remaining lines up.
+ The bottom
+-\fIn\fR lines are cleared.
++\fIn\fP lines are cleared.
+ The current cursor position remains the same.
+ .PP
+-The \fBinsertln\fR and \fBwinsertln\fR routines insert a blank line above the
++The \fBinsertln\fP and \fBwinsertln\fP routines insert a blank line above the
+ current line and the bottom line is lost.
+ .SH RETURN VALUE
+-All routines return the integer \fBERR\fR upon failure and an \fBOK\fR (SVr4
+-specifies only "an integer value other than \fBERR\fR") upon successful
++All routines return the integer \fBERR\fP upon failure and an \fBOK\fP (SVr4
++specifies only "an integer value other than \fBERR\fP") upon successful
+ completion.
+ .PP
+ X/Open defines no error conditions.
+@@ -80,14 +80,14 @@
+ .SH PORTABILITY
+ These functions are described in the XSI Curses standard, Issue 4.
+ The
+-standard specifies that they return \fBERR\fR on failure, but specifies no
++standard specifies that they return \fBERR\fP on failure, but specifies no
+ error conditions.
+ .SH NOTES
+-Note that all but \fBwinsdelln\fR may be macros.
++Note that all but \fBwinsdelln\fP may be macros.
+ .PP
+ These routines do not require a hardware line delete or insert feature in the
+ terminal.
+ In fact, they will not use hardware line delete/insert unless
+-\fBidlok(..., TRUE)\fR has been set on the current window.
++\fBidlok(..., TRUE)\fP has been set on the current window.
+ .SH SEE ALSO
+-\fBcurses\fR(3X)
++\fBcurses\fP(3X)
+Index: man/curs_extend.3x
+Prereq:  1.26 
+--- ncurses-6.3-20211219+/man/curs_extend.3x	2021-03-13 13:43:05.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_extend.3x	2021-12-25 17:39:16.000000000 +0000
+@@ -29,7 +29,7 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1999-on
+ .\"
+-.\" $Id: curs_extend.3x,v 1.26 2021/03/13 13:43:05 tom Exp $
++.\" $Id: curs_extend.3x,v 1.27 2021/12/25 17:39:16 tom Exp $
+ .TH curs_extend 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -83,15 +83,15 @@
+ It is recommended that
+ any code depending on them be conditioned using NCURSES_VERSION.
+ .SH SEE ALSO
+-\fBcurs_getch\fR(3X),
+-\fBcurs_mouse\fR(3X),
+-\fBcurs_print\fR(3X),
+-\fBcurs_util\fR(3X),
+-\fBdefault_colors\fR(3X),
+-\fBdefine_key\fR(3X),
+-\fBkeybound\fR(3X),
+-\fBkeyok\fR(3X),
+-\fBresizeterm\fR(3X),
+-\fBwresize\fR(3X).
++\fBcurs_getch\fP(3X),
++\fBcurs_mouse\fP(3X),
++\fBcurs_print\fP(3X),
++\fBcurs_util\fP(3X),
++\fBdefault_colors\fP(3X),
++\fBdefine_key\fP(3X),
++\fBkeybound\fP(3X),
++\fBkeyok\fP(3X),
++\fBresizeterm\fP(3X),
++\fBwresize\fP(3X).
+ .SH AUTHOR
+ Thomas Dickey.
+Index: man/curs_get_wch.3x
+Prereq:  1.15 
+--- ncurses-6.3-20211219+/man/curs_get_wch.3x	2021-05-22 22:33:19.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_get_wch.3x	2021-12-25 17:39:16.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_get_wch.3x,v 1.15 2021/05/22 22:33:19 tom Exp $
++.\" $Id: curs_get_wch.3x,v 1.16 2021/12/25 17:39:16 tom Exp $
+ .TH curs_get_wch 3X ""
+ .na
+ .hy 0
+@@ -40,58 +40,58 @@
+ .el    .IP \(bu 2
+ ..
+ .SH NAME
+-\fBget_wch\fR,
+-\fBwget_wch\fR,
+-\fBmvget_wch\fR,
+-\fBmvwget_wch\fR,
+-\fBunget_wch\fR \- get (or push back) a wide character from curses terminal keyboard
++\fBget_wch\fP,
++\fBwget_wch\fP,
++\fBmvget_wch\fP,
++\fBmvwget_wch\fP,
++\fBunget_wch\fP \- get (or push back) a wide character from curses terminal keyboard
+ .ad
+ .hy
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBint get_wch(wint_t *\fR\fIwch\fR\fB);\fR
++\fBint get_wch(wint_t *\fP\fIwch\fP\fB);\fP
+ .br
+-\fBint wget_wch(WINDOW *\fR\fIwin\fR\fB, wint_t *\fR\fIwch\fR\fB);\fR
++\fBint wget_wch(WINDOW *\fP\fIwin\fP\fB, wint_t *\fP\fIwch\fP\fB);\fP
+ .br
+-\fBint mvget_wch(int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, wint_t *\fR\fIwch\fR\fB);\fR
++\fBint mvget_wch(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, wint_t *\fP\fIwch\fP\fB);\fP
+ .br
+-\fBint mvwget_wch(WINDOW *\fR\fIwin\fR\fB, int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, wint_t *\fR\fIwch\fR\fB);\fR
++\fBint mvwget_wch(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, wint_t *\fP\fIwch\fP\fB);\fP
+ .sp
+-\fBint unget_wch(const wchar_t \fR\fIwch\fR\fB);\fR
++\fBint unget_wch(const wchar_t \fP\fIwch\fP\fB);\fP
+ .SH DESCRIPTION
+ .SS wget_wch
+ The
+-\fBget_wch\fR,
+-\fBwget_wch\fR,
+-\fBmvget_wch\fR, and
+-\fBmvwget_wch\fR
++\fBget_wch\fP,
++\fBwget_wch\fP,
++\fBmvget_wch\fP, and
++\fBmvwget_wch\fP
+ functions read a character
+ from the terminal associated with the current or specified window.
+ In no-delay mode,
+-if no input is waiting, the value \fBERR\fR is returned.
++if no input is waiting, the value \fBERR\fP is returned.
+ In delay mode,
+ the program waits until the system passes text through to the program.
+-Depending on the setting of \fBcbreak\fR,
++Depending on the setting of \fBcbreak\fP,
+ this is after one character (cbreak mode),
+ or after the first newline (nocbreak mode).
+ In half-delay mode,
+ the program waits until the user types a character or the specified
+ timeout interval has elapsed.
+ .PP
+-Unless \fBnoecho\fR has been set,
++Unless \fBnoecho\fP has been set,
+ these routines echo the character into the designated window.
+ .PP
+ If the window is not a pad and has been moved or modified since the
+-last call to \fBwrefresh\fR,
+-\fBwrefresh\fR will be called before another character is read.
++last call to \fBwrefresh\fP,
++\fBwrefresh\fP will be called before another character is read.
+ .PP
+-If \fBkeypad\fR is enabled,
++If \fBkeypad\fP is enabled,
+ these functions respond to
+ the pressing of a function key by setting the object pointed to by
+-\fIwch\fR
++\fIwch\fP
+ to the keycode assigned to the function key,
+-and returning \fBKEY_CODE_YES\fR.
++and returning \fBKEY_CODE_YES\fP.
+ If a character (such as escape) that could be the
+ beginning of a function key is received, curses sets a timer.
+ If the remainder
+@@ -105,27 +105,27 @@
+ returned by \fBwgetch\fP:
+ .bP
+ The predefined function
+-keys are listed in \fB\fR as macros with values outside the range
++keys are listed in \fB\fP as macros with values outside the range
+ of 8-bit characters.
+-Their names begin with \fBKEY_\fR.
++Their names begin with \fBKEY_\fP.
+ .bP
+ Other (user-defined) function keys
+ which may be defined using \fBdefine_key\fP(3X) have no names,
+ but also are expected to have values outside the range of 8-bit characters.
+ .SS unget_wch
+ The
+-\fBunget_wch\fR
++\fBunget_wch\fP
+ function pushes the wide character
+-\fIwch\fR
++\fIwch\fP
+ back onto the head of the input queue, so the wide character
+ is returned by the next call to
+-\fBget_wch\fR.
++\fBget_wch\fP.
+ The pushback of
+ one character is guaranteed.
+ If the program calls
+-\fBunget_wch\fR
++\fBunget_wch\fP
+ too many times without an intervening call to
+-\fBget_wch\fR,
++\fBget_wch\fP,
+ the operation may fail.
+ .PP
+ Unlike \fBungetch\fP and \fBwgetch\fP,
+@@ -133,62 +133,62 @@
+ returned by \fBwget_wch\fP from ordinary characters.
+ An application can push special keys
+ which it may read via \fBwget_wch\fP
+-by checking for the \fBKEY_CODE_YES\fR result,
++by checking for the \fBKEY_CODE_YES\fP result,
+ and using \fBungetch\fP for those special keys.
+ .SH NOTES
+ The header file
+-\fB\fR
++\fB\fP
+ automatically
+ includes the header file
+-\fB\fR.
++\fB\fP.
+ .PP
+ Applications should not define the escape key by itself as a single-character
+ function.
+ .PP
+ When using
+-\fBget_wch\fR,
+-\fBwget_wch\fR,
+-\fBmvget_wch\fR, or
+-\fBmvwget_wch\fR, applications should
++\fBget_wch\fP,
++\fBwget_wch\fP,
++\fBmvget_wch\fP, or
++\fBmvwget_wch\fP, applications should
+ not use
+-\fBnocbreak\fR
++\fBnocbreak\fP
+ mode and
+-\fBecho\fR
++\fBecho\fP
+ mode
+ at the same time.
+ Depending on the state of the tty driver when each character
+ is typed, the program may produce undesirable results.
+ .PP
+-All functions except \fBwget_wch\fR and \fBunget_wch\fR
++All functions except \fBwget_wch\fP and \fBunget_wch\fP
+ may be macros.
+ .SH RETURN VALUE
+ When
+-\fBget_wch\fR,
+-\fBwget_wch\fR,
+-\fBmvget_wch\fR, and
+-\fBmvwget_wch\fR
++\fBget_wch\fP,
++\fBwget_wch\fP,
++\fBmvget_wch\fP, and
++\fBmvwget_wch\fP
+ functions successfully
+ report the pressing of a function key, they return
+-\fBKEY_CODE_YES\fR.
++\fBKEY_CODE_YES\fP.
+ When they successfully report a wide character, they return
+-\fBOK\fR.
++\fBOK\fP.
+ Otherwise, they return
+-\fBERR\fR.
++\fBERR\fP.
+ .PP
+ Upon successful completion,
+-\fBunget_wch\fR
++\fBunget_wch\fP
+ returns
+-\fBOK\fR.
++\fBOK\fP.
+ Otherwise, the function returns
+-\fBERR\fR.
++\fBERR\fP.
+ .PP
+ Functions with a \*(``mv\*('' prefix first perform a cursor movement using
+ \fBwmove\fP, and return an error if the position is outside the window,
+ or if the window pointer is null.
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBcurs_getch\fR(3X),
+-\fBcurs_ins_wch\fR(3X),
+-\fBcurs_inopts\fR(3X),
+-\fBcurs_move\fR(3X),
+-\fBcurs_refresh\fR(3X)
++\fBcurses\fP(3X),
++\fBcurs_getch\fP(3X),
++\fBcurs_ins_wch\fP(3X),
++\fBcurs_inopts\fP(3X),
++\fBcurs_move\fP(3X),
++\fBcurs_refresh\fP(3X)
+Index: man/curs_get_wstr.3x
+Prereq:  1.21 
+--- ncurses-6.3-20211219+/man/curs_get_wstr.3x	2020-10-17 23:17:24.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_get_wstr.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_get_wstr.3x,v 1.21 2020/10/17 23:17:24 tom Exp $
++.\" $Id: curs_get_wstr.3x,v 1.25 2021/12/25 21:49:32 tom Exp $
+ .TH curs_get_wstr 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -40,127 +40,127 @@
+ .na
+ .hy 0
+ .SH NAME
+-\fBget_wstr\fR,
+-\fBgetn_wstr\fR,
+-\fBwget_wstr\fR,
+-\fBwgetn_wstr\fR,
+-\fBmvget_wstr\fR,
+-\fBmvgetn_wstr\fR,
+-\fBmvwget_wstr\fR,
+-\fBmvwgetn_wstr\fR \- get an array of wide characters from a curses terminal keyboard
++\fBget_wstr\fP,
++\fBgetn_wstr\fP,
++\fBwget_wstr\fP,
++\fBwgetn_wstr\fP,
++\fBmvget_wstr\fP,
++\fBmvgetn_wstr\fP,
++\fBmvwget_wstr\fP,
++\fBmvwgetn_wstr\fP \- get an array of wide characters from a curses terminal keyboard
+ .ad
+ .hy
+ .SH SYNOPSIS
+ .nf
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBint get_wstr(wint_t *\fR\fIwstr\fR\fB);\fR
++\fBint get_wstr(wint_t *\fP\fIwstr\fP\fB);\fP
+ .br
+-\fBint getn_wstr(wint_t *\fR\fIwstr\fR\fB, int \fR\fIn\fR\fB);\fR
++\fBint getn_wstr(wint_t *\fP\fIwstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .br
+-\fBint wget_wstr(WINDOW *\fR\fIwin\fR\fB, wint_t *\fR\fIwstr\fR\fB);\fR
++\fBint wget_wstr(WINDOW *\fP\fIwin\fP\fB, wint_t *\fP\fIwstr\fP\fB);\fP
+ .br
+-\fBint wgetn_wstr(WINDOW *\fR\fIwin\fR\fB, wint_t *\fR\fIwstr\fR\fB, int \fR\fIn\fR\fB);\fR
++\fBint wgetn_wstr(WINDOW *\fP\fIwin\fP\fB, wint_t *\fP\fIwstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .sp
+-\fBint mvget_wstr(int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, wint_t *\fR\fIwstr\fR\fB);\fR
++\fBint mvget_wstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, wint_t *\fP\fIwstr\fP\fB);\fP
+ .br
+-\fBint mvgetn_wstr(int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, wint_t *\fR\fIwstr\fR\fB, int \fR\fIn\fR\fB);\fR
++\fBint mvgetn_wstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, wint_t *\fP\fIwstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .br
+-\fBint mvwget_wstr(WINDOW *\fR\fIwin\fR\fB, int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, wint_t *\fR\fIwstr\fR\fB);\fR
++\fBint mvwget_wstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, wint_t *\fP\fIwstr\fP\fB);\fP
+ .br
+-\fBint mvwgetn_wstr(WINDOW *\fR\fIwin\fR\fB, int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, wint_t *\fR\fIwstr\fR\fB, int \fR\fIn\fR\fB);\fR
++\fBint mvwgetn_wstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, wint_t *\fP\fIwstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .fi
+ .SH DESCRIPTION
+ The effect of
+-\fBget_wstr\fR
++\fBget_wstr\fP
+ is as though a series of calls
+ to
+-\fBget_wch\fR(3X)
++\fBget_wch\fP(3X)
+ were made, until a newline, other end-of-line,
+ or end-of-file condition is processed.
+-An end-of-file condition is represented by \fBWEOF\fR,
+-as defined in \fB\fR.
++An end-of-file condition is represented by \fBWEOF\fP,
++as defined in \fB\fP.
+ The newline and end-of-line conditions are represented
+-by the \fB\\n\fR \fBwchar_t\fR value.
+-In all instances, the end of the string is terminated by a null \fBwchar_t\fR.
+-The routine places resulting values in the area pointed to by \fIwstr\fR.
++by the \fB\\n\fP \fBwchar_t\fP value.
++In all instances, the end of the string is terminated by a null \fBwchar_t\fP.
++The routine places resulting values in the area pointed to by \fIwstr\fP.
+ .PP
+ The user's erase and kill characters are interpreted.
+ If keypad
+-mode is on for the window, \fBKEY_LEFT\fR and \fBKEY_BACKSPACE\fR
++mode is on for the window, \fBKEY_LEFT\fP and \fBKEY_BACKSPACE\fP
+ are both considered equivalent to the user's kill character.
+ .PP
+-Characters input are echoed only if \fBecho\fR is currently on.
++Characters input are echoed only if \fBecho\fP is currently on.
+ In that case,
+ backspace is echoed as deletion of the previous character (typically a left
+ motion).
+ .PP
+ The effect of
+-\fBwget_wstr\fR
++\fBwget_wstr\fP
+ is as though a series of
+ calls to
+-\fBwget_wch\fR
++\fBwget_wch\fP
+ were made.
+ .PP
+ The effect of
+-\fBmvget_wstr\fR
++\fBmvget_wstr\fP
+ is as though a call to
+-\fBmove\fR
++\fBmove\fP
+ and then a series of calls to
+-\fBget_wch\fR
++\fBget_wch\fP
+ were
+ made.
+ .PP
+ The effect of
+-\fBmvwget_wstr\fR
++\fBmvwget_wstr\fP
+ is as though a call to
+-\fBwmove\fR
++\fBwmove\fP
+ and then a series of calls to
+-\fBwget_wch\fR
++\fBwget_wch\fP
+ were made.
+ .PP
+ The
+-\fBgetn_wstr\fR,
+-\fBmvgetn_wstr\fR,
+-\fBmvwgetn_wstr\fR, and
+-\fBwgetn_wstr\fR
++\fBgetn_wstr\fP,
++\fBmvgetn_wstr\fP,
++\fBmvwgetn_wstr\fP, and
++\fBwgetn_wstr\fP
+ functions are identical
+ to the
+-\fBget_wstr\fR,
+-\fBmvget_wstr\fR,
+-\fBmvwget_wstr\fR, and
+-\fBwget_wstr\fR
++\fBget_wstr\fP,
++\fBmvget_wstr\fP,
++\fBmvwget_wstr\fP, and
++\fBwget_wstr\fP
+ functions, respectively,
+ except that the
+-\fB*n_*\fR
++\fB*n_*\fP
+ versions read at most
+-\fIn\fR
++\fIn\fP
+ characters, letting the application prevent overflow of the
+ input buffer.
+ .SH NOTES
+ Using
+-\fBget_wstr\fR,
+-\fBmvget_wstr\fR,
+-\fBmvwget_wstr\fR, or
+-\fBwget_wstr\fR
++\fBget_wstr\fP,
++\fBmvget_wstr\fP,
++\fBmvwget_wstr\fP, or
++\fBwget_wstr\fP
+ to read a line that
+ overflows the array pointed to by
+-\fBwstr\fR
++\fBwstr\fP
+ causes undefined
+ results.
+ The use of
+-\fBgetn_wstr\fR,
+-\fBmvgetn_wstr\fR,
+-\fBmvwgetn_wstr\fR, or
+-\fBwgetn_wstr\fR, respectively, is recommended.
++\fBgetn_wstr\fP,
++\fBmvgetn_wstr\fP,
++\fBmvwgetn_wstr\fP, or
++\fBwgetn_wstr\fP, respectively, is recommended.
+ .PP
+-These functions cannot return \fBKEY_\fR values because there
+-is no way to distinguish a \fBKEY_\fR value from a valid \fBwchar_t\fR value.
++These functions cannot return \fBKEY_\fP values because there
++is no way to distinguish a \fBKEY_\fP value from a valid \fBwchar_t\fP value.
+ .PP
+-All of these routines except \fBwgetn_wstr\fR may be macros.
++All of these routines except \fBwgetn_wstr\fP may be macros.
+ .SH RETURN VALUE
+-All of these functions return \fBOK\fR upon successful completion.
+-Otherwise, they return \fBERR\fR.
++All of these functions return \fBOK\fP upon successful completion.
++Otherwise, they return \fBERR\fP.
+ .PP
+ Functions using a window parameter return an error if it is null.
+ .RS
+@@ -176,23 +176,23 @@
+ These functions are described in The Single Unix Specification, Version 2.
+ No error conditions are defined.
+ This implementation returns \fBERR\fP if the window pointer is null,
+-or if the lower-level \fBwget_wch\fR call returns an \fBERR\fP.
++or if the lower-level \fBwget_wch\fP call returns an \fBERR\fP.
+ In the latter case,
+ an \fBERR\fP return without other data is treated as an end-of-file condition,
+-and the returned array contains a \fBWEOF\fR followed by a null \fBwchar_t\fR.
++and the returned array contains a \fBWEOF\fP followed by a null \fBwchar_t\fP.
+ .PP
+-X/Open curses documented these functions to pass an array of \fBwchar_t\fR
++X/Open curses documented these functions to pass an array of \fBwchar_t\fP
+ in 1997, but that was an error because of this part of the description:
+ .RS
+ .PP
+-The effect of \fIget_wstr()\fP is as though a series of calls to
+-\fIget_wch()\fP were made, until a newline character, end-of-line character, or
++The effect of \fBget_wstr\fP is as though a series of calls to
++\fBget_wch\fP were made, until a newline character, end-of-line character, or
+ end-of-file character is processed.
+ .RE
+ .PP
+-The latter function \fIget_wch()\fP can return a negative value,
++The latter function \fIget_wch\fP can return a negative value,
+ while \fBwchar_t\fP is a unsigned type.
+-All of the vendors implement this using \fBwint_t\fR, following the standard.
++All of the vendors implement this using \fBwint_t\fP, following the standard.
+ .PP
+ X/Open Curses, Issue 7 (2009) is unclear regarding whether
+ the terminating \fInull \fP\fBwchar_t\fP
+@@ -214,6 +214,6 @@
+ treating a \fB\-1\fP as an indefinite number of characters.
+ .SH SEE ALSO
+ Functions:
+-\fBcurses\fR(3X),
+-\fBcurs_get_wch\fR(3X),
+-\fBcurs_getstr\fR(3X).
++\fBcurses\fP(3X),
++\fBcurs_get_wch\fP(3X),
++\fBcurs_getstr\fP(3X).
+Index: man/curs_getcchar.3x
+Prereq:  1.25 
+--- ncurses-6.3-20211219+/man/curs_getcchar.3x	2021-06-17 21:26:02.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_getcchar.3x	2021-12-25 20:35:03.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_getcchar.3x,v 1.25 2021/06/17 21:26:02 tom Exp $
++.\" $Id: curs_getcchar.3x,v 1.27 2021/12/25 20:35:03 tom Exp $
+ .TH curs_getcchar 3X ""
+ .de bP
+ .ie n  .IP \(bu 4
+@@ -177,7 +177,7 @@
+ HP-UX\ 10 uses an opaque structure with 28 bytes,
+ which is large enough for the 6 \fBwchar_t\fP values.
+ .bP
+-Solaris xpg4 curses uses a single array of 6 \fBwchar_t\fP values.
++Solaris \fIxpg4\fP curses uses a single array of 6 \fBwchar_t\fP values.
+ .PP
+ This implementation's \fBcchar_t\fP was defined in 1995
+ using \fB5\fP for the total of spacing and non-spacing characters
+@@ -196,7 +196,7 @@
+ .SH SEE ALSO
+ .PP
+ Functions:
+-\fBcurs_attr\fR(3X),
+-\fBcurs_color\fR(3X),
+-\fBcurses\fR(3X),
+-\fBwcwidth\fR(3).
++\fBcurs_attr\fP(3X),
++\fBcurs_color\fP(3X),
++\fBcurses\fP(3X),
++\fBwcwidth\fP(3).
+Index: man/curs_getch.3x
+Prereq:  1.57 
+--- ncurses-6.3-20211219+/man/curs_getch.3x	2020-12-19 21:38:20.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_getch.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_getch.3x,v 1.57 2020/12/19 21:38:20 tom Exp $
++.\" $Id: curs_getch.3x,v 1.61 2021/12/25 21:49:32 tom Exp $
+ .TH curs_getch 3X ""
+ .na
+ .hy 0
+@@ -41,55 +41,55 @@
+ .el    .IP \(bu 2
+ ..
+ .SH NAME
+-\fBgetch\fR,
+-\fBwgetch\fR,
+-\fBmvgetch\fR,
+-\fBmvwgetch\fR,
+-\fBungetch\fR,
+-\fBhas_key\fR \- get (or push back) characters from \fBcurses\fR terminal keyboard
++\fBgetch\fP,
++\fBwgetch\fP,
++\fBmvgetch\fP,
++\fBmvwgetch\fP,
++\fBungetch\fP,
++\fBhas_key\fP \- get (or push back) characters from \fBcurses\fP terminal keyboard
+ .ad
+ .hy
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .PP
+-\fBint getch(void);\fR
++\fBint getch(void);\fP
+ .br
+-\fBint wgetch(WINDOW *\fP\fIwin);\fR
++\fBint wgetch(WINDOW *\fP\fIwin);\fP
+ .sp
+-\fBint mvgetch(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fR
++\fBint mvgetch(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fP
+ .br
+-\fBint mvwgetch(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fR
++\fBint mvwgetch(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fP
+ .sp
+-\fBint ungetch(int \fP\fIch\fP\fB);\fR
++\fBint ungetch(int \fP\fIch\fP\fB);\fP
+ .sp
+ /* extension */
+ .br
+-\fBint has_key(int \fP\fIch\fP\fB);\fR
++\fBint has_key(int \fP\fIch\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+ .SS Reading characters
+-The \fBgetch\fR, \fBwgetch\fR, \fBmvgetch\fR and \fBmvwgetch\fR, routines read
++The \fBgetch\fP, \fBwgetch\fP, \fBmvgetch\fP and \fBmvwgetch\fP, routines read
+ a character from the window.
+-In no-delay mode, if no input is waiting, the value \fBERR\fR is returned.
++In no-delay mode, if no input is waiting, the value \fBERR\fP is returned.
+ In delay mode, the program waits until the system
+ passes text through to the program.
+-Depending on the setting of \fBcbreak\fR,
++Depending on the setting of \fBcbreak\fP,
+ this is after one character (cbreak mode),
+ or after the first newline (nocbreak mode).
+ In half-delay mode,
+ the program waits until a character is typed or the
+ specified timeout has been reached.
+ .PP
+-If \fBecho\fR is enabled, and the window is not a pad,
++If \fBecho\fP is enabled, and the window is not a pad,
+ then the character will also be echoed into the
+ designated window according to the following rules:
+ .bP
+ If the character is the current erase character, left arrow, or backspace,
+ the cursor is moved one space to the left and that screen position is erased
+-as if \fBdelch\fR had been called.
++as if \fBdelch\fP had been called.
+ .bP
+-If the character value is any other \fBKEY_\fR define, the user is alerted
+-with a \fBbeep\fR call.
++If the character value is any other \fBKEY_\fP define, the user is alerted
++with a \fBbeep\fP call.
+ .bP
+ If the character is a carriage-return,
+ and if \fBnl\fP is enabled,
+@@ -98,17 +98,17 @@
+ Otherwise the character is simply output to the screen.
+ .PP
+ If the window is not a pad, and it has been moved or modified since the last
+-call to \fBwrefresh\fR, \fBwrefresh\fR will be called before another character
++call to \fBwrefresh\fP, \fBwrefresh\fP will be called before another character
+ is read.
+ .SS Keypad mode
+ .PP
+-If \fBkeypad\fR is \fBTRUE\fR, and a function key is pressed, the token for
++If \fBkeypad\fP is \fBTRUE\fP, and a function key is pressed, the token for
+ that function key is returned instead of the raw characters:
+ .bP
+ The predefined function
+-keys are listed in \fB\fR as macros with values outside the range
++keys are listed in \fB\fP as macros with values outside the range
+ of 8-bit characters.
+-Their names begin with \fBKEY_\fR.
++Their names begin with \fBKEY_\fP.
+ .bP
+ Other (user-defined) function keys which may be defined
+ using \fBdefine_key\fP(3X)
+@@ -121,7 +121,7 @@
+ .PP
+ When a character that could be the beginning of a function key is received
+ (which, on modern terminals, means an escape character),
+-\fBcurses\fR sets a timer.
++\fBcurses\fP sets a timer.
+ If the remainder of the sequence does not come in within the designated
+ time, the character is passed through;
+ otherwise, the function key value is returned.
+@@ -137,15 +137,15 @@
+ until another key is pressed.
+ .SS Ungetting characters
+ .PP
+-The \fBungetch\fR routine places \fIch\fR back onto the input queue to be
+-returned by the next call to \fBwgetch\fR.
++The \fBungetch\fP routine places \fIch\fP back onto the input queue to be
++returned by the next call to \fBwgetch\fP.
+ There is just one input queue for all windows.
+ .PP
+ .SS Predefined key-codes
+-The following special keys are defined in \fB\fR.
++The following special keys are defined in \fB\fP.
+ .bP
+ Except for the special case \fBKEY_RESIZE\fP,
+-it is necessary to enable \fBkeypad\fR for \fBgetch\fP to return these codes.
++it is necessary to enable \fBkeypad\fP for \fBgetch\fP to return these codes.
+ .bP
+ Not all of these are necessarily supported on any particular terminal.
+ .bP
+@@ -157,7 +157,7 @@
+ .TS
+ center tab(/) ;
+ l l .
+-\fIName\fR/\fIKey\fR \fIname\fR
++\fBName\fP/\fBKey\fP \fBname\fP
+ _
+ KEY_BREAK/Break key
+ KEY_DOWN/The four arrow keys ...
+@@ -169,8 +169,8 @@
+ KEY_F0/T{
+ Function keys; space for 64 keys is reserved.
+ T}
+-KEY_F(\fIn\fR)/T{
+-For 0 \(<= \fIn\fR \(<= 63
++KEY_F(\fIn\fP)/T{
++For 0 \(<= \fIn\fP \(<= 63
+ T}
+ KEY_DL/Delete line
+ KEY_IL/Insert line
+@@ -262,27 +262,27 @@
+ .TS
+ center allbox tab(/) ;
+ c c c .
+-\fBA1\fR/\fBup\fR/\fBA3\fR
+-\fBleft\fR/\fBB2\fR/\fBright\fR
+-\fBC1\fR/\fBdown\fR/\fBC3\fR
++\fBA1\fP/\fBup\fP/\fBA3\fP
++\fBleft\fP/\fBB2\fP/\fBright\fP
++\fBC1\fP/\fBdown\fP/\fBC3\fP
+ .TE
+ .sp
+ A few of these predefined values do \fInot\fP correspond to a real key:
+ .bP
+ .B KEY_RESIZE
+ is returned when the \fBSIGWINCH\fP signal has been detected
+-(see \fBinitscr\fP(3X) and \fBresizeterm\fR(3X)).
++(see \fBinitscr\fP(3X) and \fBresizeterm\fP(3X)).
+ This code is returned whether or not \fBkeypad\fP has been enabled.
+ .bP
+ .B KEY_MOUSE
+-is returned for mouse-events (see \fBcurs_mouse\fR(3X)).
++is returned for mouse-events (see \fBcurs_mouse\fP(3X)).
+ This code relies upon whether or not \fBkeypad\fP(3X) has been enabled,
+-because (e.g., with \fIxterm\fP mouse prototocol) ncurses must
++because (e.g., with \fBxterm\fP(1) mouse prototocol) ncurses must
+ read escape sequences,
+ just like a function key.
+ .SS Testing key-codes
+ .PP
+-The \fBhas_key\fR routine takes a key-code value from the above list, and
++The \fBhas_key\fP routine takes a key-code value from the above list, and
+ returns \fBTRUE\fP or \fBFALSE\fP according to whether
+ the current terminal type recognizes a key with that value.
+ .PP
+@@ -298,8 +298,8 @@
+ .RE
+ .PP
+ .SH RETURN VALUE
+-All routines return the integer \fBERR\fR upon failure and an integer value
+-other than \fBERR\fR (\fBOK\fR in the case of \fBungetch\fP) upon successful
++All routines return the integer \fBERR\fP upon failure and an integer value
++other than \fBERR\fP (\fBOK\fP in the case of \fBungetch\fP) upon successful
+ completion.
+ .RS 3
+ .TP 5
+@@ -311,8 +311,8 @@
+ returns \fBERR\fP
+ if the window pointer is null, or
+ if its timeout expires without having any data, or
+-if the execution was interrupted by a signal (\fBerrno\fR will be set to
+-\fBEINTR\fR).
++if the execution was interrupted by a signal (\fBerrno\fP will be set to
++\fBEINTR\fP).
+ .RE
+ .PP
+ Functions with a \*(``mv\*('' prefix first perform a cursor movement using
+@@ -330,9 +330,9 @@
+ Some curses implementations may differ according to whether they
+ treat these control keys specially (and ignore the terminfo), or
+ use the terminfo definitions.
+-\fBNcurses\fR uses the terminfo definition.
++\fBNcurses\fP uses the terminfo definition.
+ If it says that \fBKEY_ENTER\fP is control/M,
+-\fBgetch\fR will return \fBKEY_ENTER\fP
++\fBgetch\fP will return \fBKEY_ENTER\fP
+ when you press control/M.
+ .PP
+ Generally, \fBKEY_ENTER\fP denotes the character(s) sent by the \fIEnter\fP
+@@ -349,42 +349,42 @@
+ .bP
+ \*(``Enter or send\*('' is the standard description for this key.
+ .PP
+-When using \fBgetch\fR, \fBwgetch\fR, \fBmvgetch\fR, or
+-\fBmvwgetch\fR, nocbreak mode (\fBnocbreak\fR) and echo mode
+-(\fBecho\fR) should not be used at the same time.
++When using \fBgetch\fP, \fBwgetch\fP, \fBmvgetch\fP, or
++\fBmvwgetch\fP, nocbreak mode (\fBnocbreak\fP) and echo mode
++(\fBecho\fP) should not be used at the same time.
+ Depending on the
+ state of the tty driver when each character is typed, the program may
+ produce undesirable results.
+ .PP
+-Note that \fBgetch\fR, \fBmvgetch\fR, and \fBmvwgetch\fR may be macros.
++Note that \fBgetch\fP, \fBmvgetch\fP, and \fBmvwgetch\fP may be macros.
+ .PP
+ Historically, the set of keypad macros was largely defined by the extremely
+ function-key-rich keyboard of the AT&T 7300, aka 3B1, aka Safari 4.
+ Modern
+ personal computers usually have only a small subset of these.
+ IBM PC-style
+-consoles typically support little more than \fBKEY_UP\fR, \fBKEY_DOWN\fR,
+-\fBKEY_LEFT\fR, \fBKEY_RIGHT\fR, \fBKEY_HOME\fR, \fBKEY_END\fR,
+-\fBKEY_NPAGE\fR, \fBKEY_PPAGE\fR, and function keys 1 through 12.
++consoles typically support little more than \fBKEY_UP\fP, \fBKEY_DOWN\fP,
++\fBKEY_LEFT\fP, \fBKEY_RIGHT\fP, \fBKEY_HOME\fP, \fBKEY_END\fP,
++\fBKEY_NPAGE\fP, \fBKEY_PPAGE\fP, and function keys 1 through 12.
+ The Ins key
+-is usually mapped to \fBKEY_IC\fR.
++is usually mapped to \fBKEY_IC\fP.
+ .SH PORTABILITY
+ The *get* functions are described in the XSI Curses standard, Issue 4.
+ They
+ read single-byte characters only.
+ The standard specifies that they return
+-\fBERR\fR on failure, but specifies no error conditions.
++\fBERR\fP on failure, but specifies no error conditions.
+ .PP
+-The echo behavior of these functions on input of \fBKEY_\fR or backspace
++The echo behavior of these functions on input of \fBKEY_\fP or backspace
+ characters was not specified in the SVr4 documentation.
+ This description is
+ adopted from the XSI Curses standard.
+ .PP
+-The behavior of \fBgetch\fR and friends in the presence of handled signals is
++The behavior of \fBgetch\fP and friends in the presence of handled signals is
+ unspecified in the SVr4 and XSI Curses documentation.
+ Under historical curses
+ implementations, it varied depending on whether the operating system's
+-implementation of handled signal receipt interrupts a \fBread\fR(2) call in
++implementation of handled signal receipt interrupts a \fBread\fP(2) call in
+ progress or not, and also (in some implementations) depending on whether an
+ input timeout or non-blocking mode has been set.
+ .PP
+@@ -396,23 +396,23 @@
+ NetBSD curses later added this extension.
+ .PP
+ Programmers concerned about portability should be prepared for either of two
+-cases: (a) signal receipt does not interrupt \fBgetch\fR; (b) signal receipt
+-interrupts \fBgetch\fR and causes it to return \fBERR\fP with \fBerrno\fR set to
+-\fBEINTR\fR.
++cases: (a) signal receipt does not interrupt \fBgetch\fP; (b) signal receipt
++interrupts \fBgetch\fP and causes it to return \fBERR\fP with \fBerrno\fP set to
++\fBEINTR\fP.
+ .PP
+-The \fBhas_key\fR function is unique to \fBncurses\fR.
++The \fBhas_key\fP function is unique to \fBncurses\fP.
+ We recommend that
+-any code using it be conditionalized on the \fBNCURSES_VERSION\fR feature macro.
++any code using it be conditionalized on the \fBNCURSES_VERSION\fP feature macro.
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBcurs_inopts\fR(3X),
+-\fBcurs_mouse\fR(3X),
+-\fBcurs_move\fR(3X),
+-\fBcurs_outopts\fR(3X),
+-\fBcurs_refresh\fR(3X),
+-\fBcurs_variables\fR(3X),
+-\fBresizeterm\fR(3X).
++\fBcurses\fP(3X),
++\fBcurs_inopts\fP(3X),
++\fBcurs_mouse\fP(3X),
++\fBcurs_move\fP(3X),
++\fBcurs_outopts\fP(3X),
++\fBcurs_refresh\fP(3X),
++\fBcurs_variables\fP(3X),
++\fBresizeterm\fP(3X).
+ .PP
+ Comparable functions in the wide-character (ncursesw) library are
+ described in
+-\fBcurs_get_wch\fR(3X).
++\fBcurs_get_wch\fP(3X).
+Index: man/curs_getstr.3x
+Prereq:  1.33 
+--- ncurses-6.3-20211219+/man/curs_getstr.3x	2021-05-22 21:36:35.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_getstr.3x	2021-12-25 20:14:56.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_getstr.3x,v 1.33 2021/05/22 21:36:35 tom Exp $
++.\" $Id: curs_getstr.3x,v 1.35 2021/12/25 20:14:56 tom Exp $
+ .TH curs_getstr 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -40,52 +40,52 @@
+ .na
+ .hy 0
+ .SH NAME
+-\fBgetstr\fR,
+-\fBgetnstr\fR,
+-\fBwgetstr\fR,
+-\fBwgetnstr\fR,
+-\fBmvgetstr\fR,
+-\fBmvgetnstr\fR,
+-\fBmvwgetstr\fR,
+-\fBmvwgetnstr\fR \- accept character strings from \fBcurses\fR terminal keyboard
++\fBgetstr\fP,
++\fBgetnstr\fP,
++\fBwgetstr\fP,
++\fBwgetnstr\fP,
++\fBmvgetstr\fP,
++\fBmvgetnstr\fP,
++\fBmvwgetstr\fP,
++\fBmvwgetnstr\fP \- accept character strings from \fBcurses\fP terminal keyboard
+ .ad
+ .hy
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBint getstr(char *\fP\fIstr\fP\fB);\fR
++\fBint getstr(char *\fP\fIstr\fP\fB);\fP
+ .br
+-\fBint getnstr(char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fR
++\fBint getnstr(char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .br
+-\fBint wgetstr(WINDOW *\fP\fIwin\fP\fB, char *\fP\fIstr\fP\fB);\fR
++\fBint wgetstr(WINDOW *\fP\fIwin\fP\fB, char *\fP\fIstr\fP\fB);\fP
+ .br
+-\fBint wgetnstr(WINDOW *\fP\fIwin\fP\fB, char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fR
++\fBint wgetnstr(WINDOW *\fP\fIwin\fP\fB, char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .sp
+-\fBint mvgetstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, char *\fP\fIstr\fP\fB);\fR
++\fBint mvgetstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, char *\fP\fIstr\fP\fB);\fP
+ .br
+-\fBint mvwgetstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, char *\fP\fIstr\fP\fB);\fR
++\fBint mvwgetstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, char *\fP\fIstr\fP\fB);\fP
+ .br
+-\fBint mvgetnstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fR
++\fBint mvgetnstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .br
+-\fBint mvwgetnstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fR
++\fBint mvwgetnstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-The function \fBgetstr\fR is equivalent to a series of calls to \fBgetch\fR,
++The function \fBgetstr\fP is equivalent to a series of calls to \fBgetch\fP,
+ until a newline or carriage return is received (the terminating character is
+ not included in the returned string).
+ .\" X/Open says also until EOf
+ .\" X/Open says then an EOS is added to the result
+ .\" X/Open doesn't mention n<0
+ The resulting value is placed in the
+-area pointed to by the character pointer \fIstr\fR,
++area pointed to by the character pointer \fIstr\fP,
+ followed by a NUL.
+ .PP
+-The \fBgetnstr\fR function reads
+-from the \fIstdscr\fR default window.
++The \fBgetnstr\fP function reads
++from the \fIstdscr\fP default window.
+ The other functions, such as \fBwgetnstr\fP,
+ read from the window given as a parameter.
+ .PP
+-\fBgetnstr\fR reads at most \fIn\fR characters, thus preventing a possible
++\fBgetnstr\fP reads at most \fIn\fP characters, thus preventing a possible
+ overflow of the input buffer.
+ Any attempt to enter more characters (other
+ than the terminating newline or carriage return) causes a beep.
+@@ -98,19 +98,19 @@
+ at the end of the buffer, moving the cursor to the left.
+ .IP
+ If \fIkeypad\fP mode is on for the window,
+-\fBKEY_LEFT\fR and \fBKEY_BACKSPACE\fR
++\fBKEY_LEFT\fP and \fBKEY_BACKSPACE\fP
+ are both considered equivalent to the user's erase character.
+ .bP
+ The \fIkill\fP character (e.g., \fB^U\fP) erases the entire buffer,
+ leaving the cursor at the beginning of the buffer.
+ .PP
+-Characters input are echoed only if \fBecho\fR is currently on.
++Characters input are echoed only if \fBecho\fP is currently on.
+ In that case,
+ backspace is echoed as deletion of the previous character (typically a left
+ motion).
+ .SH RETURN VALUE
+-All routines return the integer \fBERR\fR upon failure and an \fBOK\fR (SVr4
+-specifies only \*(``an integer value other than \fBERR\fR\*('') upon successful
++All routines return the integer \fBERR\fP upon failure and an \fBOK\fP (SVr4
++specifies only \*(``an integer value other than \fBERR\fP\*('') upon successful
+ completion.
+ .PP
+ X/Open defines no error conditions.
+@@ -128,27 +128,27 @@
+ \fBwmove\fP, and return an error if the position is outside the window,
+ or if the window pointer is null.
+ .SH NOTES
+-Note that \fBgetstr\fR, \fBmvgetstr\fR, and \fBmvwgetstr\fR may be macros.
++Note that \fBgetstr\fP, \fBmvgetstr\fP, and \fBmvwgetstr\fP may be macros.
+ .SH PORTABILITY
+ These functions are described in the XSI Curses standard, Issue 4.
+ They read single-byte characters only.
+ The standard does not define any error conditions.
+ This implementation returns \fBERR\fP if the window pointer is null,
+-or if the lower-level \fBwgetch\fR(3X) call returns an \fBERR\fP.
++or if the lower-level \fBwgetch\fP(3X) call returns an \fBERR\fP.
+ .PP
+ SVr3 and early SVr4 curses implementations did not reject function keys;
+ the SVr4.0 documentation claimed that \*(``special keys\*(''
+ (such as function keys,
+ \*(``home\*('' key,
+ \*(``clear\*('' key,
+-\fIetc\fR.) are \*(``interpreted\*('',
++\fIetc\fP.) are \*(``interpreted\*('',
+ without giving details.
+ It lied.
+ In fact, the \*(``character\*('' value appended to the
+ string by those implementations was predictable but not useful
+ (being, in fact, the low-order eight bits of the key's KEY_ value).
+ .PP
+-The functions \fBgetnstr\fR, \fBmvgetnstr\fR, and \fBmvwgetnstr\fR were
++The functions \fBgetnstr\fP, \fBmvgetnstr\fP, and \fBmvwgetnstr\fP were
+ present but not documented in SVr4.
+ .PP
+ X/Open Curses, Issue 5 (2007) stated that these functions
+@@ -225,7 +225,7 @@
+ mode set by the caller into account when deciding whether to handle
+ echoing within \fBgetnstr\fP or as a side-effect of the \fBgetch\fP calls.
+ .bP
+-The original ncurses (as pcurses in 1986) set \fBnoraw\fP and \fBcbreak\fP
++The original ncurses (as \fIpcurses\fP in 1986) set \fBnoraw\fP and \fBcbreak\fP
+ when accepting input for \fBgetnstr\fP.
+ That may have been done to make function- and cursor-keys work;
+ it is not necessary with ncurses.
+@@ -240,7 +240,7 @@
+ rather than \fBnoraw\fP and \fBcbreak\fP for better compatibility with
+ SVr4-curses, e.g., allowing one to enter a \fB^C\fP into the buffer.
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBcurs_getch\fR(3X),
+-\fBcurs_termattrs\fR(3X),
+-\fBcurs_variables\fR(3X).
++\fBcurses\fP(3X),
++\fBcurs_getch\fP(3X),
++\fBcurs_termattrs\fP(3X),
++\fBcurs_variables\fP(3X).
+Index: man/curs_getyx.3x
+Prereq:  1.20 
+--- ncurses-6.3-20211219+/man/curs_getyx.3x	2020-10-24 09:38:43.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_getyx.3x	2021-12-25 21:50:36.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2020 Thomas E. Dickey                                          *
++.\" Copyright 2020,2021 Thomas E. Dickey                                     *
+ .\" Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,58 +27,58 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_getyx.3x,v 1.20 2020/10/24 09:38:43 tom Exp $
++.\" $Id: curs_getyx.3x,v 1.22 2021/12/25 21:50:36 tom Exp $
+ .TH curs_getyx 3X ""
+ .SH NAME
+-\fBgetyx\fR,
+-\fBgetparyx\fR,
+-\fBgetbegyx\fR,
+-\fBgetmaxyx\fR \- get \fBcurses\fR cursor and window coordinates
++\fBgetyx\fP,
++\fBgetparyx\fP,
++\fBgetbegyx\fP,
++\fBgetmaxyx\fP \- get \fBcurses\fP cursor and window coordinates
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBvoid getyx(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fR
++\fBvoid getyx(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fP
+ .br
+-\fBvoid getparyx(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fR
++\fBvoid getparyx(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fP
+ .br
+-\fBvoid getbegyx(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fR
++\fBvoid getbegyx(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fP
+ .br
+-\fBvoid getmaxyx(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fR
++\fBvoid getmaxyx(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-The \fBgetyx\fR macro places the current cursor position of the given window in
+-the two integer variables \fIy\fR and \fIx\fR.
++The \fBgetyx\fP macro places the current cursor position of the given window in
++the two integer variables \fIy\fP and \fIx\fP.
+ .PP
+-If \fIwin\fR is a subwindow, the \fBgetparyx\fR macro places the beginning
++If \fIwin\fP is a subwindow, the \fBgetparyx\fP macro places the beginning
+ coordinates of the subwindow relative to the parent window into two integer
+-variables \fIy\fR and \fIx\fR.
+-Otherwise, \fB\-1\fR is placed into \fIy\fR and \fIx\fR.
++variables \fIy\fP and \fIx\fP.
++Otherwise, \fB\-1\fP is placed into \fIy\fP and \fIx\fP.
+ .PP
+-Like \fBgetyx\fR, the \fBgetbegyx\fR and \fBgetmaxyx\fR macros store
++Like \fBgetyx\fP, the \fBgetbegyx\fP and \fBgetmaxyx\fP macros store
+ the current beginning coordinates and size of the specified window.
+ .SH RETURN VALUE
+ The return values of these macros are undefined (i.e.,
+ they should not be used as the right-hand side of assignment statements).
+ .SH NOTES
+ All of these interfaces are macros.
+-A "\fB&\fR" is not necessary before the variables \fIy\fR and \fIx\fR.
++A "\fB&\fP" is not necessary before the variables \fIy\fP and \fIx\fP.
+ .SH PORTABILITY
+ The
+-\fBgetyx\fR,
+-\fBgetparyx\fR,
+-\fBgetbegyx\fR and
+-\fBgetmaxyx\fR
++\fBgetyx\fP,
++\fBgetparyx\fP,
++\fBgetbegyx\fP and
++\fBgetmaxyx\fP
+ macros are described in the XSI Curses standard, Issue 4.
+ .PP
+ This implementation also provides functions
+-\fBgetbegx\fR,
+-\fBgetbegy\fR,
+-\fBgetcurx\fR,
+-\fBgetcury\fR,
+-\fBgetmaxx\fR,
+-\fBgetmaxy\fR,
+-\fBgetparx\fR and
+-\fBgetpary\fR
++\fBgetbegx\fP,
++\fBgetbegy\fP,
++\fBgetcurx\fP,
++\fBgetcury\fP,
++\fBgetmaxx\fP,
++\fBgetmaxy\fP,
++\fBgetparx\fP and
++\fBgetpary\fP
+ for compatibility with older versions of curses.
+ .PP
+ Although X/Open Curses does not address this,
+@@ -96,6 +96,6 @@
+ other implementations.
+ The difference is hidden by means of the macro \fBgetmaxyx\fP.
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBcurs_legacy\fR(3X),
+-\fBcurs_opaque\fR(3X)
++\fBcurses\fP(3X),
++\fBcurs_legacy\fP(3X),
++\fBcurs_opaque\fP(3X)
+Index: man/curs_in_wch.3x
+Prereq:  1.10 
+--- ncurses-6.3-20211219+/man/curs_in_wch.3x	2020-10-17 23:19:29.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_in_wch.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 2002-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,35 +27,35 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_in_wch.3x,v 1.10 2020/10/17 23:19:29 tom Exp $
++.\" $Id: curs_in_wch.3x,v 1.12 2021/12/25 21:49:32 tom Exp $
+ .TH curs_in_wch 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+ .ie \n(.g .ds '' \(rq
+ .el       .ds '' ''
+ .SH NAME
+-\fBin_wch\fR,
+-\fBmvin_wch\fR,
+-\fBmvwin_wch\fR,
+-\fBwin_wch\fR \- extract a complex character and rendition from a window
++\fBin_wch\fP,
++\fBmvin_wch\fP,
++\fBmvwin_wch\fP,
++\fBwin_wch\fP \- extract a complex character and rendition from a window
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBint in_wch(cchar_t *\fR\fIwcval\fR\fB);\fR
++\fBint in_wch(cchar_t *\fP\fIwcval\fP\fB);\fP
+ .br
+-\fBint win_wch(WINDOW *\fR\fIwin\fR\fB, cchar_t *\fR\fIwcval\fR\fB);\fR
++\fBint win_wch(WINDOW *\fP\fIwin\fP\fB, cchar_t *\fP\fIwcval\fP\fB);\fP
+ .sp
+-\fBint mvin_wch(int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, cchar_t *\fR\fIwcval\fR\fB);\fR
++\fBint mvin_wch(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, cchar_t *\fP\fIwcval\fP\fB);\fP
+ .br
+-\fBint mvwin_wch(WINDOW *\fR\fIwin\fR\fB, int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, cchar_t *\fR\fIwcval\fR\fB);\fR
++\fBint mvwin_wch(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, cchar_t *\fP\fIwcval\fP\fB);\fP
+ .SH DESCRIPTION
+ These functions extract the complex character and rendition from
+-the current position in the named window into the \fBcchar_t\fR object
++the current position in the named window into the \fBcchar_t\fP object
+ referenced by wcval.
+ .SH RETURN VALUE
+ No errors are defined in the XSI Curses standard.
+ This implementation checks for null pointers, returns \fBERR\fP in that case.
+-Also, the \fImv\fR routines check for error moving the cursor,
++Also, the \fImv\fP routines check for error moving the cursor,
+ returning \fBERR\fP in that case.
+ Otherwise they return \fBOK\fP.
+ .PP
+@@ -67,5 +67,5 @@
+ .SH PORTABILITY
+ These functions are described in the XSI Curses standard, Issue 4.
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBcurs_inch\fR(3X).
++\fBcurses\fP(3X),
++\fBcurs_inch\fP(3X).
+Index: man/curs_in_wchstr.3x
+Prereq:  1.14 
+--- ncurses-6.3-20211219+/man/curs_in_wchstr.3x	2020-10-17 23:19:44.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_in_wchstr.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_in_wchstr.3x,v 1.14 2020/10/17 23:19:44 tom Exp $
++.\" $Id: curs_in_wchstr.3x,v 1.16 2021/12/25 21:49:32 tom Exp $
+ .TH curs_in_wchstr 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -36,79 +36,79 @@
+ .na
+ .hy 0
+ .SH NAME
+-\fBin_wchstr\fR,
+-\fBin_wchnstr\fR,
+-\fBwin_wchstr\fR,
+-\fBwin_wchnstr\fR,
+-\fBmvin_wchstr\fR,
+-\fBmvin_wchnstr\fR,
+-\fBmvwin_wchstr\fR,
+-\fBmvwin_wchnstr\fR \- get an array of complex characters and renditions from a curses window
++\fBin_wchstr\fP,
++\fBin_wchnstr\fP,
++\fBwin_wchstr\fP,
++\fBwin_wchnstr\fP,
++\fBmvin_wchstr\fP,
++\fBmvin_wchnstr\fP,
++\fBmvwin_wchstr\fP,
++\fBmvwin_wchnstr\fP \- get an array of complex characters and renditions from a curses window
+ .ad
+ .hy
+ .SH SYNOPSIS
+ .nf
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBint in_wchstr(cchar_t *\fR\fIwchstr\fR\fB);\fR
++\fBint in_wchstr(cchar_t *\fP\fIwchstr\fP\fB);\fP
+ .br
+-\fBint in_wchnstr(cchar_t *\fR\fIwchstr\fR\fB, int \fR\fIn\fR\fB);\fR
++\fBint in_wchnstr(cchar_t *\fP\fIwchstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .br
+-\fBint win_wchstr(WINDOW *\fR\fIwin\fR\fB, cchar_t *\fR\fIwchstr\fR\fB);\fR
++\fBint win_wchstr(WINDOW *\fP\fIwin\fP\fB, cchar_t *\fP\fIwchstr\fP\fB);\fP
+ .br
+-\fBint win_wchnstr(WINDOW *\fR\fIwin\fR\fB, cchar_t *\fR\fIwchstr\fR\fB, int \fR\fIn\fR\fB);\fR
++\fBint win_wchnstr(WINDOW *\fP\fIwin\fP\fB, cchar_t *\fP\fIwchstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .sp
+-\fBint mvin_wchstr(int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, cchar_t *\fR\fIwchstr\fR\fB);\fR
++\fBint mvin_wchstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, cchar_t *\fP\fIwchstr\fP\fB);\fP
+ .br
+-\fBint mvin_wchnstr(int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, cchar_t *\fR\fIwchstr\fR\fB, int \fR\fIn\fR\fB);\fR
++\fBint mvin_wchnstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, cchar_t *\fP\fIwchstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .br
+-\fBint mvwin_wchstr(WINDOW *\fR\fIwin\fR\fB, int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, cchar_t *\fR\fIwchstr\fR\fB);\fR
++\fBint mvwin_wchstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, cchar_t *\fP\fIwchstr\fP\fB);\fP
+ .br
+-\fBint mvwin_wchnstr(WINDOW *\fR\fIwin\fR\fB, int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, cchar_t *\fR\fIwchstr\fR, int \fIn\fR\fB);\fR
++\fBint mvwin_wchnstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, cchar_t *\fP\fIwchstr\fP, int \fIn\fP\fB);\fP
+ .fi
+ .SH DESCRIPTION
+-These functions return an array of complex characters in \fIwchstr\fR,
++These functions return an array of complex characters in \fIwchstr\fP,
+ starting at the current cursor position in the named window.
+ Attributes (rendition) are stored with the characters.
+ .PP
+ The
+-\fBin_wchnstr\fR,
+-\fBmvin_wchnstr\fR,
+-\fBmvwin_wchnstr\fR
++\fBin_wchnstr\fP,
++\fBmvin_wchnstr\fP,
++\fBmvwin_wchnstr\fP
+ and
+-\fBwin_wchnstr\fR
++\fBwin_wchnstr\fP
+ fill the array
+ with at most
+-\fIn\fR
+-\fBcchar_t\fR
++\fIn\fP
++\fBcchar_t\fP
+ elements.
+ .br
+ .SH NOTES
+ Note that all routines except
+-\fBwin_wchnstr\fR
++\fBwin_wchnstr\fP
+ may be
+ macros.
+ .PP
+ Reading a line that overflows the array pointed to by
+-\fIwchstr\fR
++\fIwchstr\fP
+ with
+-\fBin_wchstr\fR,
+-\fBmvin_wchstr\fR,
+-\fBmvwin_wchstr\fR
++\fBin_wchstr\fP,
++\fBmvin_wchstr\fP,
++\fBmvwin_wchstr\fP
+ or
+-\fBwin_wchstr\fR
++\fBwin_wchstr\fP
+ causes undefined results.
+ Therefore, the use of
+-\fBin_wchnstr\fR,
+-\fBmvin_wchnstr\fR,
+-\fBmvwin_wchnstr\fR, or
+-\fBwin_wchnstr\fR
++\fBin_wchnstr\fP,
++\fBmvin_wchnstr\fP,
++\fBmvwin_wchnstr\fP, or
++\fBwin_wchnstr\fP
+ is recommended.
+ .SH RETURN VALUE
+ Upon successful completion, these functions return
+-\fBOK\fR.
++\fBOK\fP.
+ Otherwise, they return
+-\fBERR\fR.
++\fBERR\fP.
+ .PP
+ Functions with a \*(``mv\*('' prefix first perform a cursor movement using
+ \fBwmove\fP, and return an error if the position is outside the window,
+@@ -119,8 +119,8 @@
+ returning \fBERR\fP in that case.
+ .SH SEE ALSO
+ Functions:
+-\fBcurses\fR(3X),
+-\fBcurs_in_wch\fR(3X),
+-\fBcurs_instr\fR(3X),
+-\fBcurs_inwstr\fR(3X)
+-\fBcurs_inchstr\fR(3X)
++\fBcurses\fP(3X),
++\fBcurs_in_wch\fP(3X),
++\fBcurs_instr\fP(3X),
++\fBcurs_inwstr\fP(3X)
++\fBcurs_inchstr\fP(3X)
+Index: man/curs_inch.3x
+Prereq:  1.26 
+--- ncurses-6.3-20211219+/man/curs_inch.3x	2021-06-17 21:30:22.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_inch.3x	2021-12-25 17:39:16.000000000 +0000
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_inch.3x,v 1.26 2021/06/17 21:30:22 tom Exp $
++.\" $Id: curs_inch.3x,v 1.27 2021/12/25 17:39:16 tom Exp $
+ .TH curs_inch 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -39,38 +39,38 @@
+ .el    .IP \(bu 2
+ ..
+ .SH NAME
+-\fBinch\fR,
+-\fBwinch\fR,
+-\fBmvinch\fR,
+-\fBmvwinch\fR \- get a character and attributes from a \fBcurses\fR window
++\fBinch\fP,
++\fBwinch\fP,
++\fBmvinch\fP,
++\fBmvwinch\fP \- get a character and attributes from a \fBcurses\fP window
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBchtype inch(void);\fR
++\fBchtype inch(void);\fP
+ .br
+-\fBchtype winch(WINDOW *\fP\fIwin\fP\fB);\fR
++\fBchtype winch(WINDOW *\fP\fIwin\fP\fB);\fP
+ .sp
+-\fBchtype mvinch(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fR
++\fBchtype mvinch(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fP
+ .br
+-\fBchtype mvwinch(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fR
++\fBchtype mvwinch(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-These routines return the character, of type \fBchtype\fR, at the current
++These routines return the character, of type \fBchtype\fP, at the current
+ position in the named window.
+ If any attributes are set for that position,
+ their values are OR'ed into the value returned.
+ Constants defined in
+-\fB\fR can be used with the \fB&\fR (logical AND) operator to
++\fB\fP can be used with the \fB&\fP (logical AND) operator to
+ extract the character or attributes alone.
+ .
+ .SS Attributes
+-The following bit-masks may be AND-ed with characters returned by \fBwinch\fR.
++The following bit-masks may be AND-ed with characters returned by \fBwinch\fP.
+ .
+ .TS
+ l l .
+-\fBA_CHARTEXT\fR	Bit-mask to extract character
+-\fBA_ATTRIBUTES\fR	Bit-mask to extract attributes
+-\fBA_COLOR\fR	Bit-mask to extract color-pair field information
++\fBA_CHARTEXT\fP	Bit-mask to extract character
++\fBA_ATTRIBUTES\fP	Bit-mask to extract attributes
++\fBA_COLOR\fP	Bit-mask to extract color-pair field information
+ .TE
+ .SH RETURN VALUE
+ Functions with a \*(``mv\*('' prefix first perform a cursor movement using
+@@ -108,12 +108,12 @@
+ should use the wide-character equivalents to these functions.
+ .SH SEE ALSO
+ .TP 5
+-\fBcurses\fR(3X)
++\fBcurses\fP(3X)
+ gives an overview of the WINDOW and \fBchtype\fP data types.
+ .TP 5
+-\fBcurs_attr\fR(3X)
++\fBcurs_attr\fP(3X)
+ goes into more detail, pointing out portability problems and
+ constraints on the use of \fBchtype\fP for returning window information.
+ .TP 5
+-\fBcurs_in_wch\fR(3X)
++\fBcurs_in_wch\fP(3X)
+ describes comparable functions for the wide-character (ncursesw) library.
+Index: man/curs_inchstr.3x
+Prereq:  1.21 
+--- ncurses-6.3-20211219+/man/curs_inchstr.3x	2020-10-18 00:24:36.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_inchstr.3x	2021-12-25 21:41:58.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018,2020 Thomas E. Dickey                                     *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_inchstr.3x,v 1.21 2020/10/18 00:24:36 tom Exp $
++.\" $Id: curs_inchstr.3x,v 1.23 2021/12/25 21:41:58 tom Exp $
+ .TH curs_inchstr 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -40,48 +40,48 @@
+ .na
+ .hy 0
+ .SH NAME
+-\fBinchstr\fR,
+-\fBinchnstr\fR,
+-\fBwinchstr\fR,
+-\fBwinchnstr\fR,
+-\fBmvinchstr\fR,
+-\fBmvinchnstr\fR,
+-\fBmvwinchstr\fR,
+-\fBmvwinchnstr\fR \- get a string of characters (and attributes) from a \fBcurses\fR window
++\fBinchstr\fP,
++\fBinchnstr\fP,
++\fBwinchstr\fP,
++\fBwinchnstr\fP,
++\fBmvinchstr\fP,
++\fBmvinchnstr\fP,
++\fBmvwinchstr\fP,
++\fBmvwinchnstr\fP \- get a string of characters (and attributes) from a \fBcurses\fP window
+ .ad
+ .hy
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBint inchstr(chtype *\fP\fIchstr\fP\fB);\fR
++\fBint inchstr(chtype *\fP\fIchstr\fP\fB);\fP
+ .br
+-\fBint inchnstr(chtype *\fP\fIchstr\fP\fB, int \fP\fIn\fP\fB);\fR
++\fBint inchnstr(chtype *\fP\fIchstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .br
+-\fBint winchstr(WINDOW *\fP\fIwin\fP\fB, chtype *\fP\fIchstr\fP\fB);\fR
++\fBint winchstr(WINDOW *\fP\fIwin\fP\fB, chtype *\fP\fIchstr\fP\fB);\fP
+ .br
+-\fBint winchnstr(WINDOW *\fP\fIwin\fP\fB, chtype *\fP\fIchstr\fP\fB, int \fP\fIn\fP\fB);\fR
++\fBint winchnstr(WINDOW *\fP\fIwin\fP\fB, chtype *\fP\fIchstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .sp
+-\fBint mvinchstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype *\fP\fIchstr\fP\fB);\fR
++\fBint mvinchstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype *\fP\fIchstr\fP\fB);\fP
+ .br
+-\fBint mvinchnstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype *\fP\fIchstr\fP\fB, int \fP\fIn\fP\fB);\fR
++\fBint mvinchnstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype *\fP\fIchstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .br
+-\fBint mvwinchstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype *\fP\fIchstr\fP\fB);\fR
++\fBint mvwinchstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype *\fP\fIchstr\fP\fB);\fP
+ .br
+-\fBint mvwinchnstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype *\fP\fIchstr\fP\fB, int \fP\fIn\fP\fB);\fR
++\fBint mvwinchnstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype *\fP\fIchstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-These routines return a NULL-terminated array of \fBchtype\fR quantities,
++These routines return a NULL-terminated array of \fBchtype\fP quantities,
+ starting at the current cursor position in the named window and ending at the
+ right margin of the window.
+-The four functions with \fIn\fR as
+-the last argument, return a leading substring at most \fIn\fR characters long
++The four functions with \fIn\fP as
++the last argument, return a leading substring at most \fIn\fP characters long
+ (exclusive of the trailing (chtype)0).
+-Constants defined in \fB\fR can be used with the \fB&\fR (logical
++Constants defined in \fB\fP can be used with the \fB&\fP (logical
+ AND) operator to extract the character or the attribute alone from any position
+-in the \fIchstr\fR [see \fBcurs_inch\fR(3X)].
++in the \fIchstr\fP [see \fBcurs_inch\fP(3X)].
+ .SH RETURN VALUE
+-All routines return the integer \fBERR\fR upon failure and an integer value
+-other than \fBERR\fR upon successful completion (the number of characters
++All routines return the integer \fBERR\fP upon failure and an integer value
++other than \fBERR\fP upon successful completion (the number of characters
+ retrieved, exclusive of the trailing 0).
+ .PP
+ X/Open Curses defines no error conditions.
+@@ -95,7 +95,7 @@
+ \fBwmove\fP, and return an error if the position is outside the window,
+ or if the window pointer is null.
+ .SH NOTES
+-Note that all routines except \fBwinchnstr\fR may be macros.
++Note that all routines except \fBwinchnstr\fP may be macros.
+ SVr4 does not
+ document whether the result string is zero-terminated; it does not document
+ whether a length limit argument includes any trailing 0; and it does not
+@@ -105,10 +105,10 @@
+ It is no
+ more specific than the SVr4 documentation on the trailing 0.
+ It does specify
+-that the successful return of the functions is \fBOK\fR.
++that the successful return of the functions is \fBOK\fP.
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBcurs_inch\fR(3X).
++\fBcurses\fP(3X), \fBcurs_inch\fP(3X).
+ .PP
+ Comparable functions in the wide-character (ncursesw) library are
+ described in
+-\fBcurs_in_wchstr\fR(3X).
++\fBcurs_in_wchstr\fP(3X).
+Index: man/curs_initscr.3x
+Prereq:  1.33 
+--- ncurses-6.3-20211219+/man/curs_initscr.3x	2020-10-17 23:20:48.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_initscr.3x	2021-12-25 21:41:58.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018,2020 Thomas E. Dickey                                     *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_initscr.3x,v 1.33 2020/10/17 23:20:48 tom Exp $
++.\" $Id: curs_initscr.3x,v 1.36 2021/12/25 21:41:58 tom Exp $
+ .TH curs_initscr 3X ""
+ .de bP
+ .ie n  .IP \(bu 4
+@@ -40,75 +40,75 @@
+ .na
+ .hy 0
+ .SH NAME
+-\fBinitscr\fR,
+-\fBnewterm\fR,
+-\fBendwin\fR,
+-\fBisendwin\fR,
+-\fBset_term\fR,
+-\fBdelscreen\fR \- \fBcurses\fR screen initialization and manipulation routines
++\fBinitscr\fP,
++\fBnewterm\fP,
++\fBendwin\fP,
++\fBisendwin\fP,
++\fBset_term\fP,
++\fBdelscreen\fP \- \fBcurses\fP screen initialization and manipulation routines
+ .ad
+ .hy
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBWINDOW *initscr(void);\fR
++\fBWINDOW *initscr(void);\fP
+ .br
+-\fBint endwin(void);\fR
++\fBint endwin(void);\fP
+ .sp
+-\fBbool isendwin(void);\fR
++\fBbool isendwin(void);\fP
+ .sp
+-\fBSCREEN *newterm(const char *\fP\fItype\fP\fB, FILE *\fP\fIoutfd\fP\fB, FILE *\fP\fIinfd\fP\fB);\fR
++\fBSCREEN *newterm(const char *\fP\fItype\fP\fB, FILE *\fP\fIoutfd\fP\fB, FILE *\fP\fIinfd\fP\fB);\fP
+ .br
+-\fBSCREEN *set_term(SCREEN *\fP\fInew\fP\fB);\fR
++\fBSCREEN *set_term(SCREEN *\fP\fInew\fP\fB);\fP
+ .br
+-\fBvoid delscreen(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBvoid delscreen(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+ .SS initscr
+-\fBinitscr\fR is normally the first \fBcurses\fR routine to call when
++\fBinitscr\fP is normally the first \fBcurses\fP routine to call when
+ initializing a program.
+ A few special routines sometimes need to be called before it;
+-these are \fBslk_init\fR(3X), \fBfilter\fR, \fBripoffline\fR,
+-\fBuse_env\fR.
++these are \fBslk_init\fP(3X), \fBfilter\fP, \fBripoffline\fP,
++\fBuse_env\fP.
+ For multiple-terminal applications,
+-\fBnewterm\fR may be called before \fBinitscr\fR.
++\fBnewterm\fP may be called before \fBinitscr\fP.
+ .PP
+-The initscr code determines the terminal type and initializes all \fBcurses\fR
++The initscr code determines the terminal type and initializes all \fBcurses\fP
+ data structures.
+-\fBinitscr\fR also causes the first call to \fBrefresh\fR(3X)
++\fBinitscr\fP also causes the first call to \fBrefresh\fP(3X)
+ to clear the screen.
+-If errors occur, \fBinitscr\fR writes an appropriate error
++If errors occur, \fBinitscr\fP writes an appropriate error
+ message to standard error and exits;
+-otherwise, a pointer is returned to \fBstdscr\fR.
++otherwise, a pointer is returned to \fBstdscr\fP.
+ .SS newterm
+ .PP
+-A program that outputs to more than one terminal should use the \fBnewterm\fR
+-routine for each terminal instead of \fBinitscr\fR.
++A program that outputs to more than one terminal should use the \fBnewterm\fP
++routine for each terminal instead of \fBinitscr\fP.
+ A program that needs to inspect capabilities,
+ so it can continue to run in a line-oriented mode if the
+ terminal cannot support a screen-oriented program, would also use
+-\fBnewterm\fR.
+-The routine \fBnewterm\fR should be called once for each terminal.
+-It returns a variable of type \fBSCREEN *\fR which should be saved
++\fBnewterm\fP.
++The routine \fBnewterm\fP should be called once for each terminal.
++It returns a variable of type \fBSCREEN *\fP which should be saved
+ as a reference to that terminal.
+ \fBnewterm\fP's arguments are
+ .bP
+-the \fItype\fR of the terminal to be used in place of \fB$TERM\fR,
++the \fItype\fP of the terminal to be used in place of \fB$TERM\fP,
+ .bP
+ a file pointer for output to the terminal, and
+ .bP
+ another file pointer for input from the terminal
+ .PP
+-If the \fItype\fR parameter is \fBNULL\fR, \fB$TERM\fR will be used.
++If the \fItype\fP parameter is \fBNULL\fP, \fB$TERM\fP will be used.
+ .SS endwin
+ .PP
+ The program must also call
+-\fBendwin\fR for each terminal being used before exiting from \fBcurses\fR.
+-If \fBnewterm\fR is called more than once for the same terminal, the first
+-terminal referred to must be the last one for which \fBendwin\fR is called.
++\fBendwin\fP for each terminal being used before exiting from \fBcurses\fP.
++If \fBnewterm\fP is called more than once for the same terminal, the first
++terminal referred to must be the last one for which \fBendwin\fP is called.
+ .PP
+-A program should always call \fBendwin\fR before exiting or escaping from
+-\fBcurses\fR mode temporarily.
++A program should always call \fBendwin\fP before exiting or escaping from
++\fBcurses\fP mode temporarily.
+ This routine
+ .bP
+ resets colors to correspond with the default color pair 0,
+@@ -123,32 +123,32 @@
+ .bP
+ restores tty modes (see \fBreset_shell_mode\fP(3X)).
+ .PP
+-Calling \fBrefresh\fR(3X) or \fBdoupdate\fR(3X) after a
++Calling \fBrefresh\fP(3X) or \fBdoupdate\fP(3X) after a
+ temporary escape causes the program to resume visual mode.
+ .SS isendwin
+ .PP
+-The \fBisendwin\fR routine returns \fBTRUE\fR if \fBendwin\fR has been
+-called without any subsequent calls to \fBwrefresh\fR,
+-and \fBFALSE\fR otherwise.
++The \fBisendwin\fP routine returns \fBTRUE\fP if \fBendwin\fP has been
++called without any subsequent calls to \fBwrefresh\fP,
++and \fBFALSE\fP otherwise.
+ .SS set_term
+ .PP
+-The \fBset_term\fR routine is used to switch between different terminals.
+-The screen reference \fBnew\fR becomes the new current terminal.
++The \fBset_term\fP routine is used to switch between different terminals.
++The screen reference \fInew\fP becomes the new current terminal.
+ The previous terminal is returned by the routine.
+-This is the only routine which manipulates \fBSCREEN\fR pointers;
++This is the only routine which manipulates \fBSCREEN\fP pointers;
+ all other routines affect only the current terminal.
+ .SS delscreen
+ .PP
+-The \fBdelscreen\fR routine frees storage associated with the
+-\fBSCREEN\fR data structure.
+-The \fBendwin\fR routine does not do
+-this, so \fBdelscreen\fR should be called after \fBendwin\fR if a
+-particular \fBSCREEN\fR is no longer needed.
++The \fBdelscreen\fP routine frees storage associated with the
++\fBSCREEN\fP data structure.
++The \fBendwin\fP routine does not do
++this, so \fBdelscreen\fP should be called after \fBendwin\fP if a
++particular \fBSCREEN\fP is no longer needed.
+ .SH RETURN VALUE
+-\fBendwin\fR returns the integer \fBERR\fR upon failure and \fBOK\fR
++\fBendwin\fP returns the integer \fBERR\fP upon failure and \fBOK\fP
+ upon successful completion.
+ .PP
+-Routines that return pointers always return \fBNULL\fR on error.
++Routines that return pointers always return \fBNULL\fP on error.
+ .PP
+ X/Open defines no error conditions.
+ In this implementation
+@@ -168,7 +168,7 @@
+ As of 2015, the current document is X/Open Curses, Issue 7.
+ .SS Differences
+ X/Open specifies that portable applications must not
+-call \fBinitscr\fR more than once:
++call \fBinitscr\fP more than once:
+ .bP
+ The portable way to use \fBinitscr\fP is once only,
+ using \fBrefresh\fP (see curs_refresh(3X))
+@@ -177,8 +177,8 @@
+ This implementation allows using \fBinitscr\fP after \fBendwin\fP.
+ .PP
+ Old versions of curses, e.g., BSD 4.4, may have returned a null pointer
+-from \fBinitscr\fR when an error is detected, rather than exiting.
+-It is safe but redundant to check the return value of \fBinitscr\fR
++from \fBinitscr\fP when an error is detected, rather than exiting.
++It is safe but redundant to check the return value of \fBinitscr\fP
+ in XSI Curses.
+ .SS Unset TERM Variable
+ .PP
+@@ -238,7 +238,7 @@
+ input with \fBflushinput\fP (see curs_util(3X)), and repaints the screen
+ assuming that it has been completely altered.
+ It also updates the saved terminal modes with \fBdef_shell_mode\fP
+-(see \fBcurs_kernel\fR(3X)).
++(see \fBcurs_kernel\fP(3X)).
+ .TP 5
+ .B SIGWINCH
+ This handles the window-size changes which were ignored in
+@@ -251,10 +251,10 @@
+ standard screen \fBstdscr\fP,
+ and update other data such as \fBLINES\fP and \fBCOLS\fP.
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBcurs_kernel\fR(3X),
+-\fBcurs_refresh\fR(3X),
+-\fBcurs_slk\fR(3X),
+-\fBcurs_terminfo\fR(3X),
+-\fBcurs_util\fR(3X),
+-\fBcurs_variables\fR(3X).
++\fBcurses\fP(3X),
++\fBcurs_kernel\fP(3X),
++\fBcurs_refresh\fP(3X),
++\fBcurs_slk\fP(3X),
++\fBcurs_terminfo\fP(3X),
++\fBcurs_util\fP(3X),
++\fBcurs_variables\fP(3X).
+Index: man/curs_inopts.3x
+Prereq:  1.33 
+--- ncurses-6.3-20211219+/man/curs_inopts.3x	2020-12-05 19:38:18.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_inopts.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_inopts.3x,v 1.33 2020/12/05 19:38:18 Benno.Schulenberg Exp $
++.\" $Id: curs_inopts.3x,v 1.35 2021/12/25 21:49:32 tom Exp $
+ .TH curs_inopts 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -36,67 +36,67 @@
+ .na
+ .hy 0
+ .SH NAME
+-\fBcbreak\fR,
+-\fBnocbreak\fR,
+-\fBecho\fR,
+-\fBnoecho\fR,
+-\fBhalfdelay\fR,
+-\fBintrflush\fR,
+-\fBkeypad\fR,
+-\fBmeta\fR,
+-\fBnl\fR,
+-\fBnonl\fR,
+-\fBnodelay\fR,
+-\fBnotimeout\fR,
+-\fBraw\fR,
+-\fBnoraw\fR,
+-\fBqiflush\fR,
+-\fBnoqiflush\fR,
+-\fBtimeout\fR,
+-\fBwtimeout\fR,
+-\fBtypeahead\fR \- \fBcurses\fR input options
++\fBcbreak\fP,
++\fBnocbreak\fP,
++\fBecho\fP,
++\fBnoecho\fP,
++\fBhalfdelay\fP,
++\fBintrflush\fP,
++\fBkeypad\fP,
++\fBmeta\fP,
++\fBnl\fP,
++\fBnonl\fP,
++\fBnodelay\fP,
++\fBnotimeout\fP,
++\fBraw\fP,
++\fBnoraw\fP,
++\fBqiflush\fP,
++\fBnoqiflush\fP,
++\fBtimeout\fP,
++\fBwtimeout\fP,
++\fBtypeahead\fP \- \fBcurses\fP input options
+ .ad
+ .hy
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .PP
+-\fBint cbreak(void);\fR
++\fBint cbreak(void);\fP
+ .br
+-\fBint nocbreak(void);\fR
++\fBint nocbreak(void);\fP
+ .sp
+-\fBint echo(void);\fR
++\fBint echo(void);\fP
+ .br
+-\fBint noecho(void);\fR
++\fBint noecho(void);\fP
+ .sp
+-\fBint intrflush(WINDOW *\fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fR
++\fBint intrflush(WINDOW *\fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fP
+ .br
+-\fBint keypad(WINDOW *\fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fR
++\fBint keypad(WINDOW *\fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fP
+ .br
+-\fBint meta(WINDOW *\fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fR
++\fBint meta(WINDOW *\fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fP
+ .br
+-\fBint nodelay(WINDOW *\fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fR
++\fBint nodelay(WINDOW *\fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fP
+ .br
+-\fBint notimeout(WINDOW *\fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fR
++\fBint notimeout(WINDOW *\fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fP
+ .sp
+-\fBint nl(void);\fR
++\fBint nl(void);\fP
+ .br
+-\fBint nonl(void);\fR
++\fBint nonl(void);\fP
+ .sp
+-\fBint raw(void);\fR
++\fBint raw(void);\fP
+ .br
+-\fBint noraw(void);\fR
++\fBint noraw(void);\fP
+ .sp
+-\fBvoid qiflush(void);\fR
++\fBvoid qiflush(void);\fP
+ .br
+-\fBvoid noqiflush(void);\fR
++\fBvoid noqiflush(void);\fP
+ .sp
+-\fBint halfdelay(int \fP\fItenths\fP\fB);\fR
++\fBint halfdelay(int \fP\fItenths\fP\fB);\fP
+ .br
+-\fBvoid timeout(int \fP\fIdelay\fP\fB);\fR
++\fBvoid timeout(int \fP\fIdelay\fP\fB);\fP
+ .br
+-\fBvoid wtimeout(WINDOW *\fP\fIwin\fP\fB, int \fP\fIdelay\fP\fB);\fR
++\fBvoid wtimeout(WINDOW *\fP\fIwin\fP\fB, int \fP\fIdelay\fP\fB);\fP
+ .sp
+-\fBint typeahead(int \fP\fIfd\fP\fB);\fR
++\fBint typeahead(int \fP\fIfd\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+ The \fBncurses\fP library provides several functions which let an application
+@@ -111,74 +111,74 @@
+ .SS cbreak/nocbreak
+ Normally, the tty driver buffers typed characters until a newline or carriage
+ return is typed.
+-The \fBcbreak\fR routine disables line buffering and
++The \fBcbreak\fP routine disables line buffering and
+ erase/kill character-processing (interrupt and flow control characters are
+ unaffected), making characters typed by the user immediately available to the
+ program.
+-The \fBnocbreak\fR routine returns the terminal to normal (cooked)
++The \fBnocbreak\fP routine returns the terminal to normal (cooked)
+ mode.
+ .PP
+-Initially the terminal may or may not be in \fBcbreak\fR mode, as the mode is
+-inherited; therefore, a program should call \fBcbreak\fR or \fBnocbreak\fR
++Initially the terminal may or may not be in \fBcbreak\fP mode, as the mode is
++inherited; therefore, a program should call \fBcbreak\fP or \fBnocbreak\fP
+ explicitly.
+-Most interactive programs using \fBcurses\fR set the \fBcbreak\fR
++Most interactive programs using \fBcurses\fP set the \fBcbreak\fP
+ mode.
+-Note that \fBcbreak\fR overrides \fBraw\fR.
+-[See \fBcurs_getch\fR(3X) for a
+-discussion of how these routines interact with \fBecho\fR and \fBnoecho\fR.]
++Note that \fBcbreak\fP overrides \fBraw\fP.
++[See \fBcurs_getch\fP(3X) for a
++discussion of how these routines interact with \fBecho\fP and \fBnoecho\fP.]
+ .\"
+ .SS echo/noecho
+ .PP
+-The \fBecho\fR and \fBnoecho\fR routines control whether characters typed by
+-the user are echoed by \fBgetch\fR(3X) as they are typed.
++The \fBecho\fP and \fBnoecho\fP routines control whether characters typed by
++the user are echoed by \fBgetch\fP(3X) as they are typed.
+ Echoing by the tty
+-driver is always disabled, but initially \fBgetch\fR is in echo mode, so
++driver is always disabled, but initially \fBgetch\fP is in echo mode, so
+ characters typed are echoed.
+ Authors of most interactive programs prefer to do
+ their own echoing in a controlled area of the screen, or not to echo at all, so
+-they disable echoing by calling \fBnoecho\fR.
+-[See \fBcurs_getch\fR(3X) for a
+-discussion of how these routines interact with \fBcbreak\fR and
+-\fBnocbreak\fR.]
++they disable echoing by calling \fBnoecho\fP.
++[See \fBcurs_getch\fP(3X) for a
++discussion of how these routines interact with \fBcbreak\fP and
++\fBnocbreak\fP.]
+ .\"
+ .SS halfdelay
+ .PP
+-The \fBhalfdelay\fR routine is used for half-delay mode, which is similar to
+-\fBcbreak\fR mode in that characters typed by the user are immediately
++The \fBhalfdelay\fP routine is used for half-delay mode, which is similar to
++\fBcbreak\fP mode in that characters typed by the user are immediately
+ available to the program.
+-However, after blocking for \fItenths\fR tenths of
++However, after blocking for \fItenths\fP tenths of
+ seconds, \fBERR\fP is returned if nothing has been typed.
+-The value of \fItenths\fR
++The value of \fItenths\fP
+ must be a number between 1 and 255.
+-Use \fBnocbreak\fR to leave half-delay
++Use \fBnocbreak\fP to leave half-delay
+ mode.
+ .\"
+ .SS intrflush
+ .PP
+-If the \fBintrflush\fR option is enabled (\fIbf\fR is \fBTRUE\fR), and an
++If the \fBintrflush\fP option is enabled (\fIbf\fP is \fBTRUE\fP), and an
+ interrupt key is pressed on the keyboard (interrupt, break, quit), all output in
+ the tty driver queue will be flushed, giving the effect of faster response to
+-the interrupt, but causing \fBcurses\fR to have the wrong idea of what is on
++the interrupt, but causing \fBcurses\fP to have the wrong idea of what is on
+ the screen.
+-Disabling the option (\fIbf\fR is \fBFALSE\fR) prevents the
++Disabling the option (\fIbf\fP is \fBFALSE\fP) prevents the
+ flush.
+ The default for the option is inherited from the tty driver settings.
+ The window argument is ignored.
+ .\"
+ .SS keypad
+ .PP
+-The \fBkeypad\fR option enables the keypad of the user's terminal.
++The \fBkeypad\fP option enables the keypad of the user's terminal.
+ If
+-enabled (\fIbf\fR is \fBTRUE\fR), the user can press a function key
+-(such as an arrow key) and \fBwgetch\fR(3X) returns a single value
+-representing the function key, as in \fBKEY_LEFT\fR.
++enabled (\fIbf\fP is \fBTRUE\fP), the user can press a function key
++(such as an arrow key) and \fBwgetch\fP(3X) returns a single value
++representing the function key, as in \fBKEY_LEFT\fP.
+ If disabled
+-(\fIbf\fR is \fBFALSE\fR), \fBcurses\fR does not treat function keys
++(\fIbf\fP is \fBFALSE\fP), \fBcurses\fP does not treat function keys
+ specially and the program has to interpret the escape sequences
+ itself.
+ If the keypad in the terminal can be turned on (made to
+ transmit) and off (made to work locally), turning on this option
+-causes the terminal keypad to be turned on when \fBwgetch\fR(3X) is
++causes the terminal keypad to be turned on when \fBwgetch\fP(3X) is
+ called.
+ The default value for keypad is \fBFALSE\fP.
+ .\"
+@@ -186,101 +186,101 @@
+ .PP
+ Initially, whether the terminal returns 7 or 8 significant bits on
+ input depends on the control mode of the tty driver [see \fBtermios\fP(3)].
+-To force 8 bits to be returned, invoke \fBmeta\fR(\fIwin\fR,
+-\fBTRUE\fR); this is equivalent, under POSIX, to setting the CS8 flag
++To force 8 bits to be returned, invoke \fBmeta\fP(\fIwin\fP,
++\fBTRUE\fP); this is equivalent, under POSIX, to setting the CS8 flag
+ on the terminal.
+ To force 7 bits to be returned, invoke
+-\fBmeta\fR(\fIwin\fR, \fBFALSE\fR); this is equivalent, under POSIX,
++\fBmeta\fP(\fIwin\fP, \fBFALSE\fP); this is equivalent, under POSIX,
+ to setting the CS7 flag on the terminal.
+ The window argument,
+-\fIwin\fR, is always ignored.
+-If the terminfo capabilities \fBsmm\fR
+-(meta_on) and \fBrmm\fR (meta_off) are defined for the terminal,
+-\fBsmm\fR is sent to the terminal when \fBmeta\fR(\fIwin\fR,
+-\fBTRUE\fR) is called and \fBrmm\fR is sent when \fBmeta\fR(\fIwin\fR,
+-\fBFALSE\fR) is called.
++\fIwin\fP, is always ignored.
++If the terminfo capabilities \fBsmm\fP
++(meta_on) and \fBrmm\fP (meta_off) are defined for the terminal,
++\fBsmm\fP is sent to the terminal when \fBmeta\fP(\fIwin\fP,
++\fBTRUE\fP) is called and \fBrmm\fP is sent when \fBmeta\fP(\fIwin\fP,
++\fBFALSE\fP) is called.
+ .\"
+ .SS nl/nonl
+ .PP
+-The \fBnl\fR and \fBnonl\fR routines control whether the underlying display
++The \fBnl\fP and \fBnonl\fP routines control whether the underlying display
+ device translates the return key into newline on input.
+ .\"
+ .SS nodelay
+ .PP
+-The \fBnodelay\fR option causes \fBgetch\fR to be a non-blocking call.
+-If no input is ready, \fBgetch\fR returns \fBERR\fR.
++The \fBnodelay\fP option causes \fBgetch\fP to be a non-blocking call.
++If no input is ready, \fBgetch\fP returns \fBERR\fP.
+ If disabled
+-(\fIbf\fR is \fBFALSE\fR), \fBgetch\fR waits until a key is pressed.
++(\fIbf\fP is \fBFALSE\fP), \fBgetch\fP waits until a key is pressed.
+ .SS notimeout
+ .PP
+-When interpreting an escape sequence, \fBwgetch\fR(3X) sets a timer
++When interpreting an escape sequence, \fBwgetch\fP(3X) sets a timer
+ while waiting for the next character.
+-If \fBnotimeout(\fR\fIwin\fR,
+-\fBTRUE\fR) is called, then \fBwgetch\fR does not set a timer.
++If \fBnotimeout(\fP\fIwin\fP,
++\fBTRUE\fP) is called, then \fBwgetch\fP does not set a timer.
+ The
+ purpose of the timeout is to differentiate between sequences received
+ from a function key and those typed by a user.
+ .\"
+ .SS raw/noraw
+ .PP
+-The \fBraw\fR and \fBnoraw\fR routines place the terminal into or out of raw
++The \fBraw\fP and \fBnoraw\fP routines place the terminal into or out of raw
+ mode.
+-Raw mode is similar to \fBcbreak\fR mode, in that characters typed are
++Raw mode is similar to \fBcbreak\fP mode, in that characters typed are
+ immediately passed through to the user program.
+ The differences are that in
+ raw mode, the interrupt, quit, suspend, and flow control characters are all
+ passed through uninterpreted, instead of generating a signal.
+ The behavior of
+ the BREAK key depends on other bits in the tty driver that are not set by
+-\fBcurses\fR.
++\fBcurses\fP.
+ .\"
+ .SS qiflush/noqiflush
+ .PP
+-When the \fBnoqiflush\fR routine is used, normal flush of input and
+-output queues associated with the \fBINTR\fR, \fBQUIT\fR and
+-\fBSUSP\fR characters will not be done [see \fBtermios\fP(3)].
++When the \fBnoqiflush\fP routine is used, normal flush of input and
++output queues associated with the \fBINTR\fP, \fBQUIT\fP and
++\fBSUSP\fP characters will not be done [see \fBtermios\fP(3)].
+ When
+-\fBqiflush\fR is called, the queues will be flushed when these control
++\fBqiflush\fP is called, the queues will be flushed when these control
+ characters are read.
+-You may want to call \fBnoqiflush\fR in a signal
++You may want to call \fBnoqiflush\fP in a signal
+ handler if you want output to continue as though the interrupt
+ had not occurred, after the handler exits.
+ .\"
+ .SS timeout/wtimeout
+ .PP
+-The \fBtimeout\fR and \fBwtimeout\fR routines set blocking or
++The \fBtimeout\fP and \fBwtimeout\fP routines set blocking or
+ non-blocking read for a given window.
+-If \fIdelay\fR is negative,
++If \fIdelay\fP is negative,
+ blocking read is used (i.e., waits indefinitely for
+ input).
+-If \fIdelay\fR is zero, then non-blocking read is used
+-(i.e., read returns \fBERR\fR if no input is waiting).
++If \fIdelay\fP is zero, then non-blocking read is used
++(i.e., read returns \fBERR\fP if no input is waiting).
+ If
+-\fIdelay\fR is positive, then read blocks for \fIdelay\fR
+-milliseconds, and returns \fBERR\fR if there is still no input.
+-Hence, these routines provide the same functionality as \fBnodelay\fR,
++\fIdelay\fP is positive, then read blocks for \fIdelay\fP
++milliseconds, and returns \fBERR\fP if there is still no input.
++Hence, these routines provide the same functionality as \fBnodelay\fP,
+ plus the additional capability of being able to block for only
+-\fIdelay\fR milliseconds (where \fIdelay\fR is positive).
++\fIdelay\fP milliseconds (where \fIdelay\fP is positive).
+ .\"
+ .SS typeahead
+ .PP
+-The \fBcurses\fR library does \*(``line-breakout optimization\*(''
++The \fBcurses\fP library does \*(``line-breakout optimization\*(''
+ by looking for typeahead periodically while updating the screen.
+ If input is found, and it is coming from a tty,
+ the current update is postponed until
+-\fBrefresh\fR(3X) or \fBdoupdate\fR is called again.
++\fBrefresh\fP(3X) or \fBdoupdate\fP is called again.
+ This allows faster response to commands typed in advance.
+ Normally, the input FILE
+-pointer passed to \fBnewterm\fR, or \fBstdin\fR in the case that
+-\fBinitscr\fR was used, will be used to do this typeahead checking.
+-The \fBtypeahead\fR routine specifies that the file descriptor
+-\fIfd\fR is to be used to check for typeahead instead.
+-If \fIfd\fR is
++pointer passed to \fBnewterm\fP, or \fBstdin\fP in the case that
++\fBinitscr\fP was used, will be used to do this typeahead checking.
++The \fBtypeahead\fP routine specifies that the file descriptor
++\fIfd\fP is to be used to check for typeahead instead.
++If \fIfd\fP is
+ \-1, then no typeahead checking is done.
+ .\"
+ .SH RETURN VALUE
+-All routines that return an integer return \fBERR\fR upon failure and \fBOK\fP
+-(SVr4 specifies only \*(``an integer value other than \fBERR\fR\*('')
++All routines that return an integer return \fBERR\fP upon failure and \fBOK\fP
++(SVr4 specifies only \*(``an integer value other than \fBERR\fP\*('')
+ upon successful completion,
+ unless otherwise noted in the preceding routine descriptions.
+ .PP
+@@ -302,13 +302,13 @@
+ AT&T curses implementations, in that the echo bit is cleared when curses
+ initializes the terminal state.
+ BSD curses differed from this slightly; it
+-left the echo bit on at initialization, but the BSD \fBraw\fR call turned it
++left the echo bit on at initialization, but the BSD \fBraw\fP call turned it
+ off as a side-effect.
+ For best portability, set \fBecho \fPor \fBnoecho\fP explicitly
+ just after initialization, even if your program remains in cooked mode.
+ .PP
+-The XSI Curses standard is ambiguous on the question of whether \fBraw\fR
+-should disable the CRLF translations controlled by \fBnl\fR and \fBnonl\fR.
++The XSI Curses standard is ambiguous on the question of whether \fBraw\fP
++should disable the CRLF translations controlled by \fBnl\fP and \fBnonl\fP.
+ BSD curses did turn off these translations; AT&T curses (at least as late as
+ SVr1) did not.
+ We chose to do so, on the theory that a programmer requesting
+@@ -352,29 +352,29 @@
+ the later definition is the one used.
+ .SH NOTES
+ Note that
+-\fBecho\fR,
+-\fBnoecho\fR,
+-\fBhalfdelay\fR,
+-\fBintrflush\fR,
+-\fBmeta\fR,
+-\fBnl\fR,
+-\fBnonl\fR,
+-\fBnodelay\fR,
+-\fBnotimeout\fR,
+-\fBnoqiflush\fR,
+-\fBqiflush\fR,
+-\fBtimeout\fR, and
+-\fBwtimeout\fR may be macros.
++\fBecho\fP,
++\fBnoecho\fP,
++\fBhalfdelay\fP,
++\fBintrflush\fP,
++\fBmeta\fP,
++\fBnl\fP,
++\fBnonl\fP,
++\fBnodelay\fP,
++\fBnotimeout\fP,
++\fBnoqiflush\fP,
++\fBqiflush\fP,
++\fBtimeout\fP, and
++\fBwtimeout\fP may be macros.
+ .PP
+-The \fBnoraw\fR and \fBnocbreak\fR calls follow historical practice in that
++The \fBnoraw\fP and \fBnocbreak\fP calls follow historical practice in that
+ they attempt to restore to normal (\*(``cooked\*('') mode
+ from raw and cbreak modes respectively.
+ Mixing raw/noraw and cbreak/nocbreak calls leads to tty driver
+ control states that are hard to predict or understand; it is not recommended.
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBcurs_getch\fR(3X),
+-\fBcurs_initscr\fR(3X),
+-\fBcurs_util\fR(3X),
+-\fBdefine_key\fR(3X),
+-\fBtermios\fR(3)
++\fBcurses\fP(3X),
++\fBcurs_getch\fP(3X),
++\fBcurs_initscr\fP(3X),
++\fBcurs_util\fP(3X),
++\fBdefine_key\fP(3X),
++\fBtermios\fP(3)
+Index: man/curs_ins_wch.3x
+Prereq:  1.10 
+--- ncurses-6.3-20211219+/man/curs_ins_wch.3x	2020-10-18 00:22:21.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_ins_wch.3x	2021-12-25 21:41:58.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2019,2020 Thomas E. Dickey                                     *
++.\" Copyright 2019-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 2002-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,29 +27,29 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_ins_wch.3x,v 1.10 2020/10/18 00:22:21 tom Exp $
++.\" $Id: curs_ins_wch.3x,v 1.12 2021/12/25 21:41:58 tom Exp $
+ .TH curs_ins_wch 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+ .ie \n(.g .ds '' \(rq
+ .el       .ds '' ''
+ .SH NAME
+-\fBins_wch\fR,
+-\fBmvins_wch\fR,
+-\fBmvwins_wch\fR,
+-\fBwins_wch\fR \- insert a complex character and rendition into a window
++\fBins_wch\fP,
++\fBmvins_wch\fP,
++\fBmvwins_wch\fP,
++\fBwins_wch\fP \- insert a complex character and rendition into a window
+ .SH SYNOPSIS
+ #include 
+ .sp
+-\fBint ins_wch(const cchar_t *\fR\fIwch\fR\fB);\fR
++\fBint ins_wch(const cchar_t *\fP\fIwch\fP\fB);\fP
+ .br
+-\fBint wins_wch(WINDOW *\fR\fIwin\fP\fB, const cchar_t *\fR\fIwch\fR\fB);\fR
++\fBint wins_wch(WINDOW *\fP\fIwin\fP\fB, const cchar_t *\fP\fIwch\fP\fB);\fP
+ .sp
+-\fBint mvins_wch(int \fR\fIy\fP\fB, int \fR\fIx\fP\fB, const cchar_t *\fR\fIwch\fR\fB);\fR
++\fBint mvins_wch(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const cchar_t *\fP\fIwch\fP\fB);\fP
+ .br
+-\fBint mvwins_wch(WINDOW *\fR\fIwin\fP\fB, int \fR\fIy\fP\fB, int \fR\fIx\fP\fB, const cchar_t *\fR\fIwch\fR\fB);\fR
++\fBint mvwins_wch(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const cchar_t *\fP\fIwch\fP\fB);\fP
+ .SH DESCRIPTION
+-These routines, insert the complex character \fIwch\fR with rendition
++These routines, insert the complex character \fIwch\fP with rendition
+ before the character under the cursor.
+ All characters to the right of the cursor are moved one space to the right,
+ with the possibility of the rightmost character on the line being lost.
+@@ -64,5 +64,5 @@
+ .SH ERRORS
+ No errors are defined.
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBcurs_insch\fR(3X).
++\fBcurses\fP(3X),
++\fBcurs_insch\fP(3X).
+Index: man/curs_ins_wstr.3x
+Prereq:  1.11 
+--- ncurses-6.3-20211219+/man/curs_ins_wstr.3x	2020-10-17 23:21:25.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_ins_wstr.3x	2021-12-25 21:41:58.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2019,2020 Thomas E. Dickey                                     *
++.\" Copyright 2019-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_ins_wstr.3x,v 1.11 2020/10/17 23:21:25 tom Exp $
++.\" $Id: curs_ins_wstr.3x,v 1.13 2021/12/25 21:41:58 tom Exp $
+ .TH curs_ins_wstr 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -36,56 +36,56 @@
+ .na
+ .hy 0
+ .SH NAME
+-\fBins_wstr\fR,
+-\fBins_nwstr\fR,
+-\fBwins_wstr\fR,
+-\fBwins_nwstr\fR,
+-\fBmvins_wstr\fR,
+-\fBmvins_nwstr\fR,
+-\fBmvwins_wstr\fR,
+-\fBmvwins_nwstr\fR \- insert a wide-character string into a curses window
++\fBins_wstr\fP,
++\fBins_nwstr\fP,
++\fBwins_wstr\fP,
++\fBwins_nwstr\fP,
++\fBmvins_wstr\fP,
++\fBmvins_nwstr\fP,
++\fBmvwins_wstr\fP,
++\fBmvwins_nwstr\fP \- insert a wide-character string into a curses window
+ .ad
+ .hy
+ .SH SYNOPSIS
+ .nf
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBint ins_wstr(const wchar_t *\fR\fIwstr);\fR
++\fBint ins_wstr(const wchar_t *\fP\fIwstr);\fP
+ .br
+-\fBint ins_nwstr(const wchar_t *\fR\fIwstr\fR\fB, int \fR\fIn\fR\fB);\fR
++\fBint ins_nwstr(const wchar_t *\fP\fIwstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .br
+-\fBint wins_wstr(WINDOW *\fR\fIwin\fR\fB, const wchar_t *\fR\fIwstr\fR\fB);\fR
++\fBint wins_wstr(WINDOW *\fP\fIwin\fP\fB, const wchar_t *\fP\fIwstr\fP\fB);\fP
+ .br
+-\fBint wins_nwstr(WINDOW *\fR\fIwin\fR\fB, const wchar_t *\fR\fIwstr\fR\fB, int \fR\fIn\fR\fB);\fR
++\fBint wins_nwstr(WINDOW *\fP\fIwin\fP\fB, const wchar_t *\fP\fIwstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .sp
+-\fBint mvins_wstr(int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, const wchar_t *\fR\fIwstr\fR\fB);\fR
++\fBint mvins_wstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const wchar_t *\fP\fIwstr\fP\fB);\fP
+ .br
+-\fBint mvins_nwstr(int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, const wchar_t *\fR\fIwstr\fR\fB, int \fR\fIn\fR\fB);\fR
++\fBint mvins_nwstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const wchar_t *\fP\fIwstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .br
+-\fBint mvwins_wstr(WINDOW *\fR\fIwin\fR\fB, int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, const wchar_t *\fR\fIwstr\fR\fB);\fR
++\fBint mvwins_wstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const wchar_t *\fP\fIwstr\fP\fB);\fP
+ .br
+-\fBint mvwins_nwstr(WINDOW *\fR\fIwin\fR\fB, int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, const wchar_t *\fR\fIwstr\fR\fB, int \fR\fIn\fR\fB);\fR
++\fBint mvwins_nwstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const wchar_t *\fP\fIwstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .fi
+ .SH DESCRIPTION
+-These routines insert a \fBwchar_t\fR character string
++These routines insert a \fBwchar_t\fP character string
+ (as many characters as will fit on the line)
+ before the character under the cursor.
+ All characters to the right of the cursor are shifted right,
+ with the possibility of the rightmost characters on the line being lost.
+ No wrapping is performed.
+ The cursor position does not change
+-(after moving to \fIy\fR, \fIx\fR, if specified).
+-The four routines with \fIn\fR as the last argument
+-insert a leading substring of at most \fIn\fR \fBwchar_t\fR characters.
+-If \fIn\fR is less than 1, the entire string is inserted.
++(after moving to \fIy\fP, \fIx\fP, if specified).
++The four routines with \fIn\fP as the last argument
++insert a leading substring of at most \fIn\fP \fBwchar_t\fP characters.
++If \fIn\fP is less than 1, the entire string is inserted.
+ .PP
+-If a character in \fIwstr\fR is a tab, newline, carriage return or
++If a character in \fIwstr\fP is a tab, newline, carriage return or
+ backspace, the cursor is moved appropriately within the window.
+-A newline also does a \fBclrtoeol\fR before moving.
++A newline also does a \fBclrtoeol\fP before moving.
+ Tabs are considered to be at every eighth column.
+-If a character in \fIwstr\fR is another control character,
+-it is drawn in the \fB^\fR\fIX\fR notation.
+-Calling \fBwin_wch\fR after adding a control character
++If a character in \fIwstr\fP is another control character,
++it is drawn in the \fB^\fP\fIX\fP notation.
++Calling \fBwin_wch\fP after adding a control character
+ (and moving to it, if necessary)
+ does not return the control character,
+ but instead returns a character in the ^-representation
+@@ -105,7 +105,7 @@
+ \fBwmove\fP, and return an error if the position is outside the window,
+ or if the window pointer is null.
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBcurs_insstr\fR(3X),
+-\fBcurs_in_wch\fR(3X),
+-\fBcurs_ins_wch\fR(3X).
++\fBcurses\fP(3X),
++\fBcurs_insstr\fP(3X),
++\fBcurs_in_wch\fP(3X),
++\fBcurs_ins_wch\fP(3X).
+Index: man/curs_insch.3x
+Prereq:  1.19 
+--- ncurses-6.3-20211219+/man/curs_insch.3x	2020-10-18 00:21:39.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_insch.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,37 +27,37 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_insch.3x,v 1.19 2020/10/18 00:21:39 tom Exp $
++.\" $Id: curs_insch.3x,v 1.21 2021/12/25 21:49:32 tom Exp $
+ .TH curs_insch 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+ .ie \n(.g .ds '' \(rq
+ .el       .ds '' ''
+ .SH NAME
+-\fBinsch\fR,
+-\fBwinsch\fR,
+-\fBmvinsch\fR,
+-\fBmvwinsch\fR \- insert a character before cursor in a \fBcurses\fR window
++\fBinsch\fP,
++\fBwinsch\fP,
++\fBmvinsch\fP,
++\fBmvwinsch\fP \- insert a character before cursor in a \fBcurses\fP window
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBint insch(chtype \fP\fIch\fP\fB);\fR
++\fBint insch(chtype \fP\fIch\fP\fB);\fP
+ .br
+-\fBint winsch(WINDOW *\fP\fIwin\fP\fB, chtype \fP\fIch\fP\fB);\fR
++\fBint winsch(WINDOW *\fP\fIwin\fP\fB, chtype \fP\fIch\fP\fB);\fP
+ .sp
+-\fBint mvinsch(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype \fP\fIch\fP\fB);\fR
++\fBint mvinsch(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype \fP\fIch\fP\fB);\fP
+ .br
+-\fBint mvwinsch(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype \fP\fIch\fP\fB);\fR
++\fBint mvwinsch(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype \fP\fIch\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-These routines insert the character \fIch\fR before the character under the
++These routines insert the character \fIch\fP before the character under the
+ cursor.
+ All characters to the right of the cursor are moved one space to the
+ right, with the possibility of the rightmost character on the line being lost.
+ The insertion operation does not change the cursor position.
+ .SH RETURN VALUE
+-All routines that return an integer return \fBERR\fR upon failure and \fBOK\fP
+-(SVr4 specifies only "an integer value other than \fBERR\fR")
++All routines that return an integer return \fBERR\fP upon failure and \fBOK\fP
++(SVr4 specifies only "an integer value other than \fBERR\fP")
+ upon successful completion,
+ unless otherwise noted in the preceding routine descriptions.
+ .PP
+@@ -68,12 +68,12 @@
+ These routines do not necessarily imply use of a hardware insert character
+ feature.
+ .PP
+-Note that \fBinsch\fR, \fBmvinsch\fR, and \fBmvwinsch\fR may be macros.
++Note that \fBinsch\fP, \fBmvinsch\fP, and \fBmvwinsch\fP may be macros.
+ .SH PORTABILITY
+ These functions are described in the XSI Curses standard, Issue 4.
+ .SH SEE ALSO
+-\fBcurses\fR(3X).
++\fBcurses\fP(3X).
+ .PP
+ Comparable functions in the wide-character (ncursesw) library are
+ described in
+-\fBcurs_ins_wch\fR(3X).
++\fBcurs_ins_wch\fP(3X).
+Index: man/curs_insstr.3x
+Prereq:  1.27 
+--- ncurses-6.3-20211219+/man/curs_insstr.3x	2021-06-17 21:26:02.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_insstr.3x	2021-12-25 17:39:16.000000000 +0000
+@@ -27,39 +27,39 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_insstr.3x,v 1.27 2021/06/17 21:26:02 tom Exp $
++.\" $Id: curs_insstr.3x,v 1.28 2021/12/25 17:39:16 tom Exp $
+ .TH curs_insstr 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+ .ie \n(.g .ds '' \(rq
+ .el       .ds '' ''
+ .SH NAME
+-\fBinsstr\fR,
+-\fBinsnstr\fR,
+-\fBwinsstr\fR,
+-\fBwinsnstr\fR,
+-\fBmvinsstr\fR,
+-\fBmvinsnstr\fR,
+-\fBmvwinsstr\fR,
+-\fBmvwinsnstr\fR \- insert string before cursor in a \fBcurses\fR window
++\fBinsstr\fP,
++\fBinsnstr\fP,
++\fBwinsstr\fP,
++\fBwinsnstr\fP,
++\fBmvinsstr\fP,
++\fBmvinsnstr\fP,
++\fBmvwinsstr\fP,
++\fBmvwinsnstr\fP \- insert string before cursor in a \fBcurses\fP window
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .br
+-\fBint insstr(const char *\fP\fIstr\fP\fB);\fR
++\fBint insstr(const char *\fP\fIstr\fP\fB);\fP
+ .br
+-\fBint insnstr(const char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fR
++\fBint insnstr(const char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .br
+-\fBint winsstr(WINDOW *\fP\fIwin\fP\fB, const char *\fP\fIstr\fP\fB);\fR
++\fBint winsstr(WINDOW *\fP\fIwin\fP\fB, const char *\fP\fIstr\fP\fB);\fP
+ .br
+-\fBint winsnstr(WINDOW *\fP\fIwin\fP\fB, const char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fR
++\fBint winsnstr(WINDOW *\fP\fIwin\fP\fB, const char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .sp
+-\fBint mvinsstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const char *\fP\fIstr\fP\fB);\fR
++\fBint mvinsstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const char *\fP\fIstr\fP\fB);\fP
+ .br
+-\fBint mvinsnstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fR
++\fBint mvinsnstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .br
+-\fBint mvwinsstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const char *\fP\fIstr\fP\fB);\fR
++\fBint mvwinsstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const char *\fP\fIstr\fP\fB);\fP
+ .br
+-\fBint mvwinsnstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fR
++\fBint mvwinsnstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+ These routines insert a character string
+@@ -68,15 +68,15 @@
+ All characters to the right of the cursor are shifted right
+ with the possibility of the rightmost characters on the line being lost.
+ The cursor position does not change
+-(after moving to \fIy\fR, \fIx\fR, if specified).
+-The functions with \fIn\fR as the last argument
+-insert a leading substring of at most \fIn\fR characters.
+-If \fIn\fR<=0, then the entire string is inserted.
++(after moving to \fIy\fP, \fIx\fP, if specified).
++The functions with \fIn\fP as the last argument
++insert a leading substring of at most \fIn\fP characters.
++If \fIn\fP<=0, then the entire string is inserted.
+ .PP
+ Special characters are handled as in \fBaddch\fP.
+ .SH RETURN VALUE
+-All routines that return an integer return \fBERR\fR upon failure and \fBOK\fP
+-(SVr4 specifies only "an integer value other than \fBERR\fR")
++All routines that return an integer return \fBERR\fP upon failure and \fBOK\fP
++(SVr4 specifies only "an integer value other than \fBERR\fP")
+ upon successful completion,
+ unless otherwise noted in the preceding routine descriptions.
+ .PP
+@@ -89,7 +89,7 @@
+ \fBwmove\fP, and return an error if the position is outside the window,
+ or if the window pointer is null.
+ .SH NOTES
+-Note that all but \fBwinsnstr\fR may be macros.
++Note that all but \fBwinsnstr\fP may be macros.
+ .SH PORTABILITY
+ These functions are described in the XSI Curses standard, Issue 4, which adds
+ const qualifiers to the arguments.
+@@ -99,7 +99,7 @@
+ This is probably an error, since it makes this group of functions inconsistent.
+ Also, no implementation of curses documents this inconsistency.
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBcurs_util\fR(3X),
+-\fBcurs_clear\fR(3X),
+-\fBcurs_inch\fR(3X).
++\fBcurses\fP(3X),
++\fBcurs_util\fP(3X),
++\fBcurs_clear\fP(3X),
++\fBcurs_inch\fP(3X).
+Index: man/curs_instr.3x
+Prereq:  1.22 
+--- ncurses-6.3-20211219+/man/curs_instr.3x	2020-10-18 00:18:27.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_instr.3x	2021-12-25 21:41:58.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018,2020 Thomas E. Dickey                                     *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_instr.3x,v 1.22 2020/10/18 00:18:27 tom Exp $
++.\" $Id: curs_instr.3x,v 1.24 2021/12/25 21:41:58 tom Exp $
+ .TH curs_instr 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -38,42 +38,42 @@
+ .el    .IP \(bu 2
+ ..
+ .SH NAME
+-\fBinstr\fR,
+-\fBinnstr\fR,
+-\fBwinstr\fR,
+-\fBwinnstr\fR,
+-\fBmvinstr\fR,
+-\fBmvinnstr\fR,
+-\fBmvwinstr\fR,
+-\fBmvwinnstr\fR \- get a string of characters from a \fBcurses\fR window
++\fBinstr\fP,
++\fBinnstr\fP,
++\fBwinstr\fP,
++\fBwinnstr\fP,
++\fBmvinstr\fP,
++\fBmvinnstr\fP,
++\fBmvwinstr\fP,
++\fBmvwinnstr\fP \- get a string of characters from a \fBcurses\fP window
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBint instr(char *\fP\fIstr\fP\fB);\fR
++\fBint instr(char *\fP\fIstr\fP\fB);\fP
+ .br
+-\fBint innstr(char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fR
++\fBint innstr(char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .br
+-\fBint winstr(WINDOW *\fP\fIwin\fP\fB, char *\fP\fIstr\fP\fB);\fR
++\fBint winstr(WINDOW *\fP\fIwin\fP\fB, char *\fP\fIstr\fP\fB);\fP
+ .br
+-\fBint winnstr(WINDOW *\fP\fIwin\fP\fB, char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fR
++\fBint winnstr(WINDOW *\fP\fIwin\fP\fB, char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .sp
+-\fBint mvinstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, char *\fP\fIstr\fP\fB);\fR
++\fBint mvinstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, char *\fP\fIstr\fP\fB);\fP
+ .br
+-\fBint mvinnstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fR
++\fBint mvinnstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .br
+-\fBint mvwinstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, char *\fP\fIstr\fP\fB);\fR
++\fBint mvwinstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, char *\fP\fIstr\fP\fB);\fP
+ .br
+-\fBint mvwinnstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fR
++\fBint mvwinnstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-These routines return a string of characters in \fIstr\fR, extracted starting
++These routines return a string of characters in \fIstr\fP, extracted starting
+ at the current cursor position in the named window.
+ Attributes are stripped from the characters.
+ The four
+-functions with \fIn\fR as the last argument return a leading substring at most
+-\fIn\fR characters long (exclusive of the trailing NUL).
++functions with \fIn\fP as the last argument return a leading substring at most
++\fIn\fP characters long (exclusive of the trailing NUL).
+ .SH RETURN VALUE
+-All of the functions return \fBERR\fR upon failure,
++All of the functions return \fBERR\fP upon failure,
+ or the number of characters actually read into the string.
+ .PP
+ X/Open Curses defines no error conditions.
+@@ -87,13 +87,13 @@
+ \fBwmove\fP, and return an error if the position is outside the window,
+ or if the window pointer is null.
+ .SH NOTES
+-Note that all routines except \fBwinnstr\fR may be macros.
++Note that all routines except \fBwinnstr\fP may be macros.
+ .SH PORTABILITY
+ SVr4 does not
+ document whether a length limit includes or excludes the trailing NUL.
+ .PP
+ The ncurses library extends the XSI description by allowing a negative
+-value for \fIn\fR.
++value for \fIn\fP.
+ In this case, the functions return the string ending at the right margin.
+ .SH SEE ALSO
+-\fBcurses\fR(3X).
++\fBcurses\fP(3X).
+Index: man/curs_inwstr.3x
+Prereq:  1.14 
+--- ncurses-6.3-20211219+/man/curs_inwstr.3x	2020-10-17 23:22:11.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_inwstr.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,58 +27,58 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_inwstr.3x,v 1.14 2020/10/17 23:22:11 tom Exp $
++.\" $Id: curs_inwstr.3x,v 1.16 2021/12/25 21:49:32 tom Exp $
+ .TH curs_inwstr 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+ .ie \n(.g .ds '' \(rq
+ .el       .ds '' ''
+ .SH NAME
+-\fBinwstr\fR,
+-\fBinnwstr\fR,
+-\fBwinwstr\fR,
+-\fBwinnwstr\fR,
+-\fBmvinwstr\fR,
+-\fBmvinnwstr\fR,
+-\fBmvwinwstr\fR,
+-\fBmvwinnwstr\fR \- get a string of \fBwchar_t\fR characters from a curses window
++\fBinwstr\fP,
++\fBinnwstr\fP,
++\fBwinwstr\fP,
++\fBwinnwstr\fP,
++\fBmvinwstr\fP,
++\fBmvinnwstr\fP,
++\fBmvwinwstr\fP,
++\fBmvwinnwstr\fP \- get a string of \fBwchar_t\fP characters from a curses window
+ .SH SYNOPSIS
+ .nf
+-\fB#include  \fR
++\fB#include  \fP
+ .sp
+-\fBint inwstr(\fR\fBwchar_t *\fR\fIwstr\fR\fB);\fR
++\fBint inwstr(\fP\fBwchar_t *\fP\fIwstr\fP\fB);\fP
+ .br
+-\fBint innwstr(\fR\fBwchar_t *\fR\fIwstr\fR\fB, int \fR\fIn\fR\fB);\fR
++\fBint innwstr(\fP\fBwchar_t *\fP\fIwstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .br
+-\fBint winwstr(\fR\fBWINDOW *\fR\fIwin\fR\fB, wchar_t *\fR\fIwstr\fR\fB);\fR
++\fBint winwstr(\fP\fBWINDOW *\fP\fIwin\fP\fB, wchar_t *\fP\fIwstr\fP\fB);\fP
+ .br
+-\fBint winnwstr(\fR\fBWINDOW *\fR\fIwin\fR\fB, wchar_t *\fR\fIwstr\fR\fB, int \fR\fIn\fR\fB);\fR
++\fBint winnwstr(\fP\fBWINDOW *\fP\fIwin\fP\fB, wchar_t *\fP\fIwstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .sp
+-\fBint mvinwstr(\fR\fBint \fR\fIy\fR\fB, int \fR\fIx\fR\fB, wchar_t *\fR\fIwstr\fR\fB);\fR
++\fBint mvinwstr(\fP\fBint \fP\fIy\fP\fB, int \fP\fIx\fP\fB, wchar_t *\fP\fIwstr\fP\fB);\fP
+ .br
+-\fBint mvinnwstr(\fR\fBint \fR\fIy\fR\fB, int \fR\fIx\fR\fB, wchar_t *\fR\fIwstr\fR\fB, int \fR\fIn\fR\fB);\fR
++\fBint mvinnwstr(\fP\fBint \fP\fIy\fP\fB, int \fP\fIx\fP\fB, wchar_t *\fP\fIwstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .br
+-\fBint mvwinwstr(\fR\fBWINDOW *\fR\fIwin\fR\fB, int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, wchar_t *\fR\fIwstr\fR\fB);\fR
++\fBint mvwinwstr(\fP\fBWINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, wchar_t *\fP\fIwstr\fP\fB);\fP
+ .br
+-\fBint mvwinnwstr(\fR\fBWINDOW *\fR\fIwin\fR\fB, int \fR\fIy\fR\fB, int \fR\fIx\fR\fB, wchar_t *\fR\fIwstr\fR\fB, int \fR\fIn\fR\fB);\fR
++\fBint mvwinnwstr(\fP\fBWINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, wchar_t *\fP\fIwstr\fP\fB, int \fP\fIn\fP\fB);\fP
+ .fi
+ .SH DESCRIPTION
+ .PP
+-These routines return a string of \fBwchar_t\fR wide characters in \fIwstr\fR,
++These routines return a string of \fBwchar_t\fP wide characters in \fIwstr\fP,
+ extracted starting at the current cursor position in the named window.
+ .PP
+-The four functions with \fIn\fR as the last argument return
+-a leading substring at most \fIn\fR characters long
++The four functions with \fIn\fP as the last argument return
++a leading substring at most \fIn\fP characters long
+ (exclusive of the trailing NUL).
+-Transfer stops at the end of the current line, or when \fIn\fR characters have
+-been stored at the location referenced by \fIwstr\fR.
++Transfer stops at the end of the current line, or when \fIn\fP characters have
++been stored at the location referenced by \fIwstr\fP.
+ .PP
+-If the size \fIn\fR is not large enough to store a complete complex character,
++If the size \fIn\fP is not large enough to store a complete complex character,
+ an error is generated.
+ .SH NOTES
+ .PP
+ All routines except
+-\fBwinnwstr\fR
++\fBwinnwstr\fP
+ may be macros.
+ .PP
+ Each cell in the window holds a complex character (i.e., base-
+@@ -88,12 +88,12 @@
+ Use \fBin_wchstr\fP to return the complex characters from a window.
+ .SH RETURN VALUE
+ All routines return
+-\fBERR\fR
++\fBERR\fP
+ upon failure.
+ Upon
+-successful completion, the *\fBinwstr\fR
++successful completion, the *\fBinwstr\fP
+ routines return
+-\fBOK\fR, and the *\fBinnwstr\fR
++\fBOK\fP, and the *\fBinnwstr\fP
+ routines return the
+ number of characters read into the string.
+ .PP
+@@ -101,6 +101,6 @@
+ \fBwmove\fP, and return an error if the position is outside the window,
+ or if the window pointer is null.
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBcurs_instr\fR(3X),
+-\fBcurs_in_wchstr\fR(3X)
++\fBcurses\fP(3X),
++\fBcurs_instr\fP(3X),
++\fBcurs_in_wchstr\fP(3X)
+Index: man/curs_kernel.3x
+Prereq:  1.29 
+--- ncurses-6.3-20211219+/man/curs_kernel.3x	2020-10-17 23:22:35.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_kernel.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_kernel.3x,v 1.29 2020/10/17 23:22:35 tom Exp $
++.\" $Id: curs_kernel.3x,v 1.31 2021/12/25 21:49:32 tom Exp $
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+ .ie \n(.g .ds '' \(rq
+@@ -40,116 +40,116 @@
+ .na
+ .hy 0
+ .SH NAME
+-\fBdef_prog_mode\fR,
+-\fBdef_shell_mode\fR,
+-\fBreset_prog_mode\fR,
+-\fBreset_shell_mode\fR,
+-\fBresetty\fR,
+-\fBsavetty\fR,
+-\fBgetsyx\fR,
+-\fBsetsyx\fR,
+-\fBripoffline\fR,
+-\fBcurs_set\fR,
+-\fBnapms\fR \- low-level \fBcurses\fR routines
++\fBdef_prog_mode\fP,
++\fBdef_shell_mode\fP,
++\fBreset_prog_mode\fP,
++\fBreset_shell_mode\fP,
++\fBresetty\fP,
++\fBsavetty\fP,
++\fBgetsyx\fP,
++\fBsetsyx\fP,
++\fBripoffline\fP,
++\fBcurs_set\fP,
++\fBnapms\fP \- low-level \fBcurses\fP routines
+ .ad
+ .hy
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBint def_prog_mode(void);\fR
++\fBint def_prog_mode(void);\fP
+ .br
+-\fBint def_shell_mode(void);\fR
++\fBint def_shell_mode(void);\fP
+ .sp
+-\fBint reset_prog_mode(void);\fR
++\fBint reset_prog_mode(void);\fP
+ .br
+-\fBint reset_shell_mode(void);\fR
++\fBint reset_shell_mode(void);\fP
+ .sp
+-\fBint resetty(void);\fR
++\fBint resetty(void);\fP
+ .br
+-\fBint savetty(void);\fR
++\fBint savetty(void);\fP
+ .sp
+-\fBvoid getsyx(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fR
++\fBvoid getsyx(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fP
+ .br
+-\fBvoid setsyx(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fR
++\fBvoid setsyx(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fP
+ .sp
+-\fBint ripoffline(int \fP\fIline\fP\fB, int (*\fP\fIinit\fP\fB)(WINDOW *, int));\fR
++\fBint ripoffline(int \fP\fIline\fP\fB, int (*\fP\fIinit\fP\fB)(WINDOW *, int));\fP
+ .br
+-\fBint curs_set(int \fP\fIvisibility\fP\fB);\fR
++\fBint curs_set(int \fP\fIvisibility\fP\fB);\fP
+ .br
+-\fBint napms(int \fP\fIms\fP\fB);\fR
++\fBint napms(int \fP\fIms\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+ The following routines give low-level access
+-to various \fBcurses\fR capabilities.
++to various \fBcurses\fP capabilities.
+ These routines typically are used inside library routines.
+ .SS def_prog_mode, def_shell_mode
+ .PP
+-The \fBdef_prog_mode\fR and \fBdef_shell_mode\fR routines save the
+-current terminal modes as the \*(``program\*('' (in \fBcurses\fR) or \*(``shell\*(''
+-(not in \fBcurses\fR) state for use by the \fBreset_prog_mode\fR and
+-\fBreset_shell_mode\fR routines.
+-This is done automatically by \fBinitscr\fR.
++The \fBdef_prog_mode\fP and \fBdef_shell_mode\fP routines save the
++current terminal modes as the \*(``program\*('' (in \fBcurses\fP) or \*(``shell\*(''
++(not in \fBcurses\fP) state for use by the \fBreset_prog_mode\fP and
++\fBreset_shell_mode\fP routines.
++This is done automatically by \fBinitscr\fP.
+ There is one such save area for each screen context
+-allocated by \fBnewterm\fR.
++allocated by \fBnewterm\fP.
+ .SS reset_prog_mode, reset_shell_mode
+ .PP
+-The \fBreset_prog_mode\fR and \fBreset_shell_mode\fR routines restore
+-the terminal to \*(``program\*('' (in \fBcurses\fR) or \*(``shell\*('' (out of
+-\fBcurses\fR) state.
+-These are done automatically by \fBendwin\fR(3X) and,
+-after an \fBendwin\fR, by \fBdoupdate\fR,
++The \fBreset_prog_mode\fP and \fBreset_shell_mode\fP routines restore
++the terminal to \*(``program\*('' (in \fBcurses\fP) or \*(``shell\*('' (out of
++\fBcurses\fP) state.
++These are done automatically by \fBendwin\fP(3X) and,
++after an \fBendwin\fP, by \fBdoupdate\fP,
+ so they normally are not called.
+ .SS resetty, savetty
+ .PP
+-The \fBresetty\fR and \fBsavetty\fR routines save and restore the
++The \fBresetty\fP and \fBsavetty\fP routines save and restore the
+ state of the terminal modes.
+-\fBsavetty\fR saves the current state in
+-a buffer and \fBresetty\fR restores the state to what it was at the
+-last call to \fBsavetty\fR.
++\fBsavetty\fP saves the current state in
++a buffer and \fBresetty\fP restores the state to what it was at the
++last call to \fBsavetty\fP.
+ .SS getsyx
+ .PP
+-The \fBgetsyx\fR routine returns the current coordinates
+-of the \fIvirtual screen\fP cursor in \fIy\fR and \fIx\fR.
+-If \fBleaveok\fR is currently \fBTRUE\fR, then
+-\fB\-1\fR,\fB\-1\fR is returned.
++The \fBgetsyx\fP routine returns the current coordinates
++of the \fIvirtual screen\fP cursor in \fIy\fP and \fIx\fP.
++If \fBleaveok\fP is currently \fBTRUE\fP, then
++\fB\-1\fP,\fB\-1\fP is returned.
+ If lines have been removed from the top of the
+-screen, using \fBripoffline\fR, \fIy\fR and \fIx\fR include these lines;
+-therefore, \fIy\fR and \fIx\fR should be used only as arguments for
+-\fBsetsyx\fR.
++screen, using \fBripoffline\fP, \fIy\fP and \fIx\fP include these lines;
++therefore, \fIy\fP and \fIx\fP should be used only as arguments for
++\fBsetsyx\fP.
+ .PP
+ Few applications will use this feature,
+ most use \fBgetyx\fP instead.
+ .SS setsyx
+ .PP
+-The \fBsetsyx\fR routine sets
+-the \fIvirtual screen\fP cursor to \fIy\fR, \fIx\fR.
+-If \fIy\fR and \fIx\fR are both \fB\-1\fR, then
+-\fBleaveok\fR is set.
+-The two routines \fBgetsyx\fR and \fBsetsyx\fR
++The \fBsetsyx\fP routine sets
++the \fIvirtual screen\fP cursor to \fIy\fP, \fIx\fP.
++If \fIy\fP and \fIx\fP are both \fB\-1\fP, then
++\fBleaveok\fP is set.
++The two routines \fBgetsyx\fP and \fBsetsyx\fP
+ are designed to be used by a library routine, which manipulates
+-\fBcurses\fR windows but does not want to change the current position
++\fBcurses\fP windows but does not want to change the current position
+ of the program's cursor.
+-The library routine would call \fBgetsyx\fR
++The library routine would call \fBgetsyx\fP
+ at the beginning, do its manipulation of its own windows, do a
+-\fBwnoutrefresh\fR on its windows, call \fBsetsyx\fR, and then call
+-\fBdoupdate\fR.
++\fBwnoutrefresh\fP on its windows, call \fBsetsyx\fP, and then call
++\fBdoupdate\fP.
+ .PP
+ Few applications will use this feature,
+ most use \fBwmove\fP instead.
+ .SS ripoffline
+ .PP
+-The \fBripoffline\fR routine provides access to the same facility that
+-\fBslk_init\fR [see \fBcurs_slk\fR(3X)] uses to reduce the size of the
++The \fBripoffline\fP routine provides access to the same facility that
++\fBslk_init\fP [see \fBcurs_slk\fP(3X)] uses to reduce the size of the
+ screen.
+-\fBripoffline\fR must be called before \fBinitscr\fR or
+-\fBnewterm\fR is called, to prepare these initial actions:
++\fBripoffline\fP must be called before \fBinitscr\fP or
++\fBnewterm\fP is called, to prepare these initial actions:
+ .bP
+-If \fIline\fR is positive, a line is removed from the top of \fBstdscr\fR.
++If \fIline\fP is positive, a line is removed from the top of \fBstdscr\fP.
+ .bP
+-if \fIline\fR is negative, a line is removed from the bottom.
++if \fIline\fP is negative, a line is removed from the bottom.
+ .PP
+-When the resulting initialization is done inside \fBinitscr\fR, the
+-routine \fBinit\fR (supplied by the user) is called with two
++When the resulting initialization is done inside \fBinitscr\fP, the
++routine \fBinit\fP (supplied by the user) is called with two
+ arguments:
+ .bP
+ a window pointer to the one-line window that has been
+@@ -157,37 +157,37 @@
+ .bP
+ an integer with the number of columns in the window.
+ .PP
+-Inside this initialization routine, the integer variables \fBLINES\fR
+-and \fBCOLS\fR (defined in \fB\fR) are not guaranteed to be
+-accurate and \fBwrefresh\fR or \fBdoupdate\fR must not be called.
+-It is allowable to call \fBwnoutrefresh\fR during the initialization routine.
++Inside this initialization routine, the integer variables \fBLINES\fP
++and \fBCOLS\fP (defined in \fB\fP) are not guaranteed to be
++accurate and \fBwrefresh\fP or \fBdoupdate\fP must not be called.
++It is allowable to call \fBwnoutrefresh\fP during the initialization routine.
+ .PP
+-\fBripoffline\fR can be called up to five times before calling \fBinitscr\fR or
+-\fBnewterm\fR.
++\fBripoffline\fP can be called up to five times before calling \fBinitscr\fP or
++\fBnewterm\fP.
+ .SS curs_set
+ .PP
+-The \fBcurs_set\fR routine sets the cursor state to invisible,
+-normal, or very visible for \fBvisibility\fR equal to \fB0\fR,
+-\fB1\fR, or \fB2\fR respectively.
+-If the terminal supports the \fIvisibility\fR requested,
+-the previous \fIcursor\fR state is returned;
+-otherwise, \fBERR\fR is returned.
++The \fBcurs_set\fP routine sets the cursor state to invisible,
++normal, or very visible for \fBvisibility\fP equal to \fB0\fP,
++\fB1\fP, or \fB2\fP respectively.
++If the terminal supports the \fIvisibility\fP requested,
++the previous \fIcursor\fP state is returned;
++otherwise, \fBERR\fP is returned.
+ .SS napms
+ .PP
+-The \fBnapms\fR routine is used to sleep for \fIms\fR milliseconds.
++The \fBnapms\fP routine is used to sleep for \fIms\fP milliseconds.
+ .SH RETURN VALUE
+-Except for \fBcurs_set\fR, these routines always return \fBOK\fR.
++Except for \fBcurs_set\fP, these routines always return \fBOK\fP.
+ .PP
+-\fBcurs_set\fR
+-returns the previous cursor state, or \fBERR\fR if the
+-requested \fIvisibility\fR is not supported.
++\fBcurs_set\fP
++returns the previous cursor state, or \fBERR\fP if the
++requested \fIvisibility\fP is not supported.
+ .PP
+ X/Open defines no error conditions.
+ In this implementation
+ .TP 5
+ .na
+ .hy 0
+-\fBdef_prog_mode\fR, \fBdef_shell_mode\fR, \fBreset_prog_mode\fR, \fBreset_shell_mode\fR
++\fBdef_prog_mode\fP, \fBdef_shell_mode\fP, \fBreset_prog_mode\fP, \fBreset_shell_mode\fP
+ .hy
+ .ad
+ return an error
+@@ -198,34 +198,34 @@
+ returns an error if the maximum number of ripped-off lines
+ exceeds the maximum (NRIPS = 5).
+ .SH NOTES
+-Note that \fBgetsyx\fR is a macro, so \fB&\fR is not necessary before
+-the variables \fIy\fR and \fIx\fR.
++Note that \fBgetsyx\fP is a macro, so \fB&\fP is not necessary before
++the variables \fIy\fP and \fIx\fP.
+ .PP
+ Older SVr4 man pages warn that the return value
+-of \fBcurs_set\fR \*(``is currently incorrect\*(''.
++of \fBcurs_set\fP \*(``is currently incorrect\*(''.
+ This implementation gets it right, but it may be unwise to count
+ on the correctness of the return value anywhere else.
+ .PP
+-Both ncurses and SVr4 will call \fBcurs_set\fR in \fBendwin\fR
+-if \fBcurs_set\fR
++Both ncurses and SVr4 will call \fBcurs_set\fP in \fBendwin\fP
++if \fBcurs_set\fP
+ has been called to make the cursor other than normal, i.e., either
+ invisible or very visible.
+ There is no way for ncurses to determine the initial cursor state to
+ restore that.
+ .SH PORTABILITY
+-The \fIvirtual screen\fP functions \fBsetsyx\fR and \fBgetsyx\fR
++The \fIvirtual screen\fP functions \fBsetsyx\fP and \fBgetsyx\fP
+ are not described in the XSI Curses standard, Issue 4.
+ All other functions are as described in XSI Curses.
+ .PP
+-The SVr4 documentation describes \fBsetsyx\fR and \fBgetsyx\fR
++The SVr4 documentation describes \fBsetsyx\fP and \fBgetsyx\fP
+ as having return type int.
+ This is misleading, as they are macros with no documented semantics
+ for the return value.
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBcurs_initscr\fR(3X),
+-\fBcurs_outopts\fR(3X),
+-\fBcurs_refresh\fR(3X),
+-\fBcurs_scr_dump\fR(3X),
+-\fBcurs_slk\fR(3X),
+-\fBcurs_variables\fR(3X).
++\fBcurses\fP(3X),
++\fBcurs_initscr\fP(3X),
++\fBcurs_outopts\fP(3X),
++\fBcurs_refresh\fP(3X),
++\fBcurs_scr_dump\fP(3X),
++\fBcurs_slk\fP(3X),
++\fBcurs_variables\fP(3X).
+Index: man/curs_memleaks.3x
+Prereq:  1.11 
+--- ncurses-6.3-20211219+/man/curs_memleaks.3x	2021-01-02 23:47:51.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_memleaks.3x	2021-12-25 17:39:16.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_memleaks.3x,v 1.11 2021/01/02 23:47:51 tom Exp $
++.\" $Id: curs_memleaks.3x,v 1.12 2021/12/25 17:39:16 tom Exp $
+ .TH curs_memleaks 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -37,25 +37,25 @@
+ .hy 0
+ .SH NAME
+ \fBexit_curses\fP,
+-\fBexit_terminfo\fP \- \fBcurses\fR memory-leak checking
++\fBexit_terminfo\fP \- \fBcurses\fP memory-leak checking
+ .ad
+ .hy
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .br
+-\fBvoid exit_curses(int \fP\fIcode\fP\fB);\fR
++\fBvoid exit_curses(int \fP\fIcode\fP\fB);\fP
+ .sp
+-\fB#include \fR
++\fB#include \fP
+ .br
+-\fBvoid exit_terminfo(int \fP\fIcode\fP\fB);\fR
++\fBvoid exit_terminfo(int \fP\fIcode\fP\fB);\fP
+ .sp
+ /* deprecated (intentionally not declared in curses.h or term.h) */
+ .br
+-\fBvoid _nc_freeall(void);\fR
++\fBvoid _nc_freeall(void);\fP
+ .br
+-\fBvoid _nc_free_and_exit(int \fP\fIcode\fP\fB);\fR
++\fBvoid _nc_free_and_exit(int \fP\fIcode\fP\fB);\fP
+ .br
+-\fBvoid _nc_free_tinfo(int \fP\fIcode\fP\fB);\fR
++\fBvoid _nc_free_tinfo(int \fP\fIcode\fP\fB);\fP
+ .SH DESCRIPTION
+ These functions are used to simplify analysis of memory leaks in the ncurses
+ library.
+@@ -103,4 +103,4 @@
+ These functions are not part of X/Open Curses;
+ nor do other implementations of curses provide a similar feature.
+ .SH SEE ALSO
+-\fBcurses\fR(3X).
++\fBcurses\fP(3X).
+Index: man/curs_mouse.3x
+Prereq:  1.53 
+--- ncurses-6.3-20211219+/man/curs_mouse.3x	2020-10-17 23:25:08.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_mouse.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_mouse.3x,v 1.53 2020/10/17 23:25:08 tom Exp $
++.\" $Id: curs_mouse.3x,v 1.57 2021/12/25 21:49:32 tom Exp $
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+ .ie \n(.g .ds '' \(rq
+@@ -55,51 +55,51 @@
+ .na
+ .hy 0
+ .SH NAME
+-\fBhas_mouse\fR,
+-\fBgetmouse\fR, \fBungetmouse\fR,
+-\fBmousemask\fR, \fBwenclose\fR,
+-\fBmouse_trafo\fR, \fBwmouse_trafo\fR,
+-\fBmouseinterval\fR \- mouse interface through curses
++\fBhas_mouse\fP,
++\fBgetmouse\fP, \fBungetmouse\fP,
++\fBmousemask\fP, \fBwenclose\fP,
++\fBmouse_trafo\fP, \fBwmouse_trafo\fP,
++\fBmouseinterval\fP \- mouse interface through curses
+ .ad
+ .hy
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .PP
+-\fBtypedef unsigned long mmask_t;\fR
++\fBtypedef unsigned long mmask_t;\fP
+ .PP
+ .nf
+-\fBtypedef struct {\fR
+-\fB    short id;         \fR\fI/* ID to distinguish multiple devices */\fR
+-\fB    int x, y, z;      \fR\fI/* event coordinates */\fR
+-\fB    mmask_t bstate;   \fR\fI/* button state bits */\fR
+-\fB} MEVENT;\fR
++\fBtypedef struct {\fP
++\fB    short id;         \fP\fI/* ID to distinguish multiple devices */\fP
++\fB    int x, y, z;      \fP\fI/* event coordinates */\fP
++\fB    mmask_t bstate;   \fP\fI/* button state bits */\fP
++\fB} MEVENT;\fP
+ .fi
+ .PP
+-\fBbool has_mouse(void);\fR
++\fBbool has_mouse(void);\fP
+ .sp
+-\fBint getmouse(MEVENT *\fP\fIevent\fP\fB);\fR
++\fBint getmouse(MEVENT *\fP\fIevent\fP\fB);\fP
+ .br
+-\fBint ungetmouse(MEVENT *\fP\fIevent\fP\fB);\fR
++\fBint ungetmouse(MEVENT *\fP\fIevent\fP\fB);\fP
+ .sp
+-\fBmmask_t mousemask(mmask_t \fP\fInewmask\fP\fB, mmask_t *\fP\fIoldmask\fP\fB);\fR
++\fBmmask_t mousemask(mmask_t \fP\fInewmask\fP\fB, mmask_t *\fP\fIoldmask\fP\fB);\fP
+ .sp
+-\fBbool wenclose(const WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fR
++\fBbool wenclose(const WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fP
+ .sp
+-\fBbool mouse_trafo(int* \fP\fIpY\fP\fB, int* \fP\fIpX\fP\fB, bool \fP\fIto_screen\fP\fB);\fR
++\fBbool mouse_trafo(int* \fP\fIpY\fP\fB, int* \fP\fIpX\fP\fB, bool \fP\fIto_screen\fP\fB);\fP
+ .br
+-\fBbool wmouse_trafo(const WINDOW* \fP\fIwin\fP\fB,\fR
+-                  \fBint* \fP\fIpY\fP\fB, int* \fP\fIpX\fP\fB, bool \fP\fIto_screen\fP\fB);\fR
++\fBbool wmouse_trafo(const WINDOW* \fP\fIwin\fP\fB,\fP
++                  \fBint* \fP\fIpY\fP\fB, int* \fP\fIpX\fP\fB, bool \fP\fIto_screen\fP\fB);\fP
+ .sp
+-\fBint mouseinterval(int \fP\fIerval\fP\fB);\fR
++\fBint mouseinterval(int \fP\fIerval\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+ These functions provide an interface to mouse events from
+-\fBncurses\fR(3X).
+-Mouse events are represented by \fBKEY_MOUSE\fR
+-pseudo-key values in the \fBwgetch\fR(3X) input stream.
++\fBncurses\fP(3X).
++Mouse events are represented by \fBKEY_MOUSE\fP
++pseudo-key values in the \fBwgetch\fP(3X) input stream.
+ .SS mousemask
+ .PP
+-To make mouse events visible, use the \fBmousemask\fR function.
++To make mouse events visible, use the \fBmousemask\fP function.
+ This will set
+ the mouse events to be reported.
+ By default, no mouse events are reported.
+@@ -120,7 +120,7 @@
+ l l
+ _ _
+ l l.
+-\fIName\fR	\fIDescription\fR
++\fBName\fP	\fBDescription\fP
+ BUTTON1_PRESSED	mouse button 1 down
+ BUTTON1_RELEASED	mouse button 1 up
+ BUTTON1_CLICKED	mouse button 1 clicked
+@@ -161,13 +161,13 @@
+ .SS getmouse
+ .PP
+ Once a class of mouse events has been made visible in a window,
+-calling the \fBwgetch\fR function on that window may return
+-\fBKEY_MOUSE\fR as an indicator that a mouse event has been queued.
++calling the \fBwgetch\fP function on that window may return
++\fBKEY_MOUSE\fP as an indicator that a mouse event has been queued.
+ To read the event data and pop the event off the queue, call
+-\fBgetmouse\fR.
+-This function will return \fBOK\fR if a mouse event
+-is actually visible in the given window, \fBERR\fR otherwise.
+-When \fBgetmouse\fR returns \fBOK\fR, the data deposited as y and
++\fBgetmouse\fP.
++This function will return \fBOK\fP if a mouse event
++is actually visible in the given window, \fBERR\fP otherwise.
++When \fBgetmouse\fP returns \fBOK\fP, the data deposited as y and
+ x in the event structure coordinates will be screen-relative character-cell
+ coordinates.
+ The returned state mask will have exactly one bit set to
+@@ -177,62 +177,62 @@
+ item from the queue.
+ .SS ungetmouse
+ .PP
+-The \fBungetmouse\fR function behaves analogously to \fBungetch\fR.
++The \fBungetmouse\fP function behaves analogously to \fBungetch\fP.
+ It pushes
+-a \fBKEY_MOUSE\fR event onto the input queue, and associates with that event
++a \fBKEY_MOUSE\fP event onto the input queue, and associates with that event
+ the given state data and screen-relative character-cell coordinates.
+ .SS wenclose
+ .PP
+-The \fBwenclose\fR function tests whether a given pair of screen-relative
++The \fBwenclose\fP function tests whether a given pair of screen-relative
+ character-cell coordinates is enclosed by a given window, returning \fBTRUE\fP
+ if it is and \fBFALSE\fP otherwise.
+ It is useful for determining what subset of
+ the screen windows enclose the location of a mouse event.
+ .SS wmouse_trafo
+ .PP
+-The \fBwmouse_trafo\fR function transforms a given pair of coordinates
++The \fBwmouse_trafo\fP function transforms a given pair of coordinates
+ from stdscr-relative coordinates
+ to coordinates relative to the given window or vice versa.
+ The resulting stdscr-relative coordinates are not always identical
+ to window-relative coordinates due to the mechanism to reserve lines on top
+ or bottom of the screen for other purposes
+-(see the \fBripoffline\fP and \fBslk_init\fR(3X) calls, for example).
++(see the \fBripoffline\fP and \fBslk_init\fP(3X) calls, for example).
+ .bP
+-If the parameter \fBto_screen\fR is \fBTRUE\fR, the pointers
+-\fBpY, pX\fR must reference the coordinates of a location
+-inside the window \fBwin\fR.
++If the parameter \fIto_screen\fP is \fBTRUE\fP, the pointers
++\fIpY, pX\fP must reference the coordinates of a location
++inside the window \fIwin\fP.
+ They are converted to window-relative coordinates and returned
+ through the pointers.
+-If the conversion was successful, the function returns \fBTRUE\fR.
++If the conversion was successful, the function returns \fBTRUE\fP.
+ .bP
+ If one of the parameters was NULL or the location is
+-not inside the window, \fBFALSE\fR is returned.
++not inside the window, \fBFALSE\fP is returned.
+ .bP
+-If \fBto_screen\fR is
+-\fBFALSE\fR, the pointers \fBpY, pX\fR must reference window-relative
++If \fIto_screen\fP is
++\fBFALSE\fP, the pointers \fIpY, pX\fP must reference window-relative
+ coordinates.
+ They are converted to stdscr-relative coordinates if the
+-window \fBwin\fR encloses this point.
+-In this case the function returns \fBTRUE\fR.
++window \fIwin\fP encloses this point.
++In this case the function returns \fBTRUE\fP.
+ .bP
+ If one of the parameters is NULL or the point is not inside the
+-window, \fBFALSE\fR is returned.
++window, \fBFALSE\fP is returned.
+ The referenced coordinates
+ are only replaced by the converted coordinates if the transformation was
+ successful.
+ .SS mouse_trafo
+ .PP
+-The \fBmouse_trafo\fR function performs the same translation
+-as \fBwmouse_trafo\fR,
+-using stdscr for \fBwin\fR.
++The \fBmouse_trafo\fP function performs the same translation
++as \fBwmouse_trafo\fP,
++using stdscr for \fIwin\fP.
+ .SS mouseinterval
+ .PP
+-The \fBmouseinterval\fR function sets the maximum time (in thousands of a
++The \fBmouseinterval\fP function sets the maximum time (in thousands of a
+ second) that can elapse between press and release events for them to
+ be recognized as a click.
+-Use \fBmouseinterval(0)\fR to disable click resolution.
++Use \fBmouseinterval(0)\fP to disable click resolution.
+ This function returns the previous interval value.
+-Use \fBmouseinterval(\-1)\fR to obtain the interval without altering it.
++Use \fBmouseinterval(\-1)\fP to obtain the interval without altering it.
+ The default is one sixth of a second.
+ .SS has_mouse
+ .PP
+@@ -241,11 +241,11 @@
+ .PP
+ Note that mouse events will be ignored when input is in cooked mode, and will
+ cause an error beep when cooked mode is being simulated in a window by a
+-function such as \fBgetstr\fR that expects a linefeed for input-loop
++function such as \fBgetstr\fP that expects a linefeed for input-loop
+ termination.
+ .SH RETURN VALUE
+-\fBgetmouse\fR and \fBungetmouse\fR
+-return the integer \fBERR\fR upon failure or \fBOK\fR
++\fBgetmouse\fP and \fBungetmouse\fP
++return the integer \fBERR\fP upon failure or \fBOK\fP
+ upon successful completion:
+ .RS 3
+ .TP 5
+@@ -261,22 +261,22 @@
+ returns an error if the FIFO is full.
+ .RE
+ .PP
+-\fBmousemask\fR
++\fBmousemask\fP
+ returns the mask of reportable events.
+ .PP
+-\fBmouseinterval\fR
++\fBmouseinterval\fP
+ returns the previous interval value, unless
+ the terminal was not initialized.
+ In that case, it returns the maximum interval value (166).
+ .PP
+-\fBwenclose\fR and \fBwmouse_trafo\fR
+-are boolean functions returning \fBTRUE\fR or \fBFALSE\fR depending
++\fBwenclose\fP and \fBwmouse_trafo\fP
++are boolean functions returning \fBTRUE\fP or \fBFALSE\fP depending
+ on their test result.
+ .SH PORTABILITY
+-These calls were designed for \fBncurses\fR(3X), and are not found in SVr4
++These calls were designed for \fBncurses\fP(3X), and are not found in SVr4
+ curses, 4.4BSD curses, or any other previous version of curses.
+ .PP
+-SVr4 curses had support for the mouse in a variant of \fBxterm\fP.
++SVr4 curses had support for the mouse in a variant of \fBxterm\fP(1).
+ It is mentioned in a few places, but with no supporting documentation:
+ .bP
+ the \*(``libcurses\*('' manual page lists functions for this feature
+@@ -322,11 +322,11 @@
+ making it unnecessary to be concerned about compatibility with the
+ escape sequences.
+ .PP
+-The feature macro \fBNCURSES_MOUSE_VERSION\fR is provided so the preprocessor
++The feature macro \fBNCURSES_MOUSE_VERSION\fP is provided so the preprocessor
+ can be used to test whether these features are present.
+-If the interface is changed, the value of \fBNCURSES_MOUSE_VERSION\fR will be
++If the interface is changed, the value of \fBNCURSES_MOUSE_VERSION\fP will be
+ incremented.
+-These values for \fBNCURSES_MOUSE_VERSION\fR may be
++These values for \fBNCURSES_MOUSE_VERSION\fP may be
+ specified when configuring ncurses:
+ .RS 3
+ .TP 3
+@@ -340,10 +340,10 @@
+ The mask uses 29 bits.
+ .RE
+ .PP
+-The order of the \fBMEVENT\fR structure members is not guaranteed.
++The order of the \fBMEVENT\fP structure members is not guaranteed.
+ Additional fields may be added to the structure in the future.
+ .PP
+-Under \fBncurses\fR(3X), these calls are implemented using either
++Under \fBncurses\fP(3X), these calls are implemented using either
+ xterm's built-in mouse-tracking API or
+ platform-specific drivers including
+ .RS 3
+@@ -357,13 +357,13 @@
+ .PP
+ If you are using an unsupported configuration,
+ mouse events will not be visible to
+-\fBncurses\fR(3X) (and the \fBmousemask\fR function will always
+-return \fB0\fR).
++\fBncurses\fP(3X) (and the \fBmousemask\fP function will always
++return \fB0\fP).
+ .PP
+-If the terminfo entry contains a \fBXM\fR string,
++If the terminfo entry contains a \fBXM\fP string,
+ this is used in the xterm mouse driver to control the
+ way the terminal is initialized for mouse operation.
+-The default, if \fBXM\fR is not found,
++The default, if \fBXM\fP is not found,
+ corresponds to private mode 1000 of xterm:
+ .PP
+ .RS 3
+@@ -388,21 +388,21 @@
+ presses of buttons 4 or 5 without matching button-releases.
+ .SH BUGS
+ Mouse events under xterm will not in fact be ignored during cooked mode,
+-if they have been enabled by \fBmousemask\fR.
++if they have been enabled by \fBmousemask\fP.
+ Instead, the xterm mouse
+ report sequence will appear in the string read.
+ .PP
+ Mouse events under xterm will not be detected correctly in a window with
+ its keypad bit off, since they are interpreted as a variety of function key.
+-Your terminfo description should have \fBkmous\fR set to \*(``\\E[M\*(''
++Your terminfo description should have \fBkmous\fP set to \*(``\\E[M\*(''
+ (the beginning of the response from xterm for mouse clicks).
+-Other values for \fBkmous\fR are permitted,
++Other values for \fBkmous\fP are permitted,
+ but under the same assumption,
+ i.e., it is the beginning of the response.
+ .PP
+ Because there are no standard terminal responses that would serve to identify
+-terminals which support the xterm mouse protocol, \fBncurses\fR assumes that
+-if \fBkmous\fR is defined in the terminal description,
++terminals which support the xterm mouse protocol, \fBncurses\fP assumes that
++if \fBkmous\fP is defined in the terminal description,
+ or if the terminal description's primary name or aliases
+ contain the string \*(``xterm\*('',
+ then the terminal may send mouse events.
+@@ -410,7 +410,7 @@
+ allowing the use of newer xterm mouse protocols
+ such as xterm's private mode 1006.
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBcurs_kernel\fR(3X),
+-\fBcurs_slk\fR(3X),
+-\fBcurs_variables\fR(3X).
++\fBcurses\fP(3X),
++\fBcurs_kernel\fP(3X),
++\fBcurs_slk\fP(3X),
++\fBcurs_variables\fP(3X).
+Index: man/curs_move.3x
+Prereq:  1.19 
+--- ncurses-6.3-20211219+/man/curs_move.3x	2020-10-24 09:39:41.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_move.3x	2021-12-25 21:41:58.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018,2020 Thomas E. Dickey                                     *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,40 +27,40 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_move.3x,v 1.19 2020/10/24 09:39:41 tom Exp $
++.\" $Id: curs_move.3x,v 1.21 2021/12/25 21:41:58 tom Exp $
+ .TH curs_move 3X ""
+ .na
+ .hy 0
+ .SH NAME
+-\fBmove\fR,
+-\fBwmove\fR \- move \fBcurses\fR window cursor
++\fBmove\fP,
++\fBwmove\fP \- move \fBcurses\fP window cursor
+ .ad
+ .hy
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBint move(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fR
++\fBint move(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fP
+ .br
+-\fBint wmove(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fR
++\fBint wmove(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-These routines move the cursor associated with the window to line \fIy\fR and
+-column \fIx\fR.
++These routines move the cursor associated with the window to line \fIy\fP and
++column \fIx\fP.
+ This routine does not move the physical cursor of the terminal
+-until \fBrefresh\fR(3X) is called.
++until \fBrefresh\fP(3X) is called.
+ The position specified is relative to the upper
+ left-hand corner of the window, which is (0,0).
+ .SH RETURN VALUE
+-These routines return \fBERR\fR upon failure and \fBOK\fP (SVr4
+-specifies only "an integer value other than \fBERR\fR") upon successful
++These routines return \fBERR\fP upon failure and \fBOK\fP (SVr4
++specifies only "an integer value other than \fBERR\fP") upon successful
+ completion.
+ .PP
+ Specifically, they return an error
+ if the window pointer is null, or
+ if the position is outside the window.
+ .SH NOTES
+-Note that \fBmove\fR may be a macro.
++Note that \fBmove\fP may be a macro.
+ .SH PORTABILITY
+ These functions are described in the XSI Curses standard, Issue 4.
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBcurs_refresh\fR(3X)
++\fBcurses\fP(3X), \fBcurs_refresh\fP(3X)
+Index: man/curs_opaque.3x
+Prereq:  1.15 
+--- ncurses-6.3-20211219+/man/curs_opaque.3x	2020-10-24 09:41:22.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_opaque.3x	2021-12-25 21:50:36.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2020 Thomas E. Dickey                                          *
++.\" Copyright 2020,2021 Thomas E. Dickey                                     *
+ .\" Copyright 2007-2014,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_opaque.3x,v 1.15 2020/10/24 09:41:22 tom Exp $
++.\" $Id: curs_opaque.3x,v 1.17 2021/12/25 21:50:36 tom Exp $
+ .TH curs_opaque 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -36,107 +36,107 @@
+ .na
+ .hy 0
+ .SH NAME
+-\fBis_cleared\fR,
+-\fBis_idlok\fR,
+-\fBis_idcok\fR,
+-\fBis_immedok\fR,
+-\fBis_keypad\fR,
+-\fBis_leaveok\fR,
+-\fBis_nodelay\fR,
+-\fBis_notimeout\fR,
+-\fBis_pad\fR,
+-\fBis_scrollok\fR,
+-\fBis_subwin\fR,
+-\fBis_syncok\fR,
+-\fBwgetdelay\fR,
+-\fBwgetparent\fR,
+-\fBwgetscrreg\fR \- \fBcurses\fR window properties
++\fBis_cleared\fP,
++\fBis_idlok\fP,
++\fBis_idcok\fP,
++\fBis_immedok\fP,
++\fBis_keypad\fP,
++\fBis_leaveok\fP,
++\fBis_nodelay\fP,
++\fBis_notimeout\fP,
++\fBis_pad\fP,
++\fBis_scrollok\fP,
++\fBis_subwin\fP,
++\fBis_syncok\fP,
++\fBwgetdelay\fP,
++\fBwgetparent\fP,
++\fBwgetscrreg\fP \- \fBcurses\fP window properties
+ .ad
+ .hy
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBbool is_cleared(const WINDOW *\fP\fIwin\fP\fB);\fR
++\fBbool is_cleared(const WINDOW *\fP\fIwin\fP\fB);\fP
+ .br
+-\fBbool is_idcok(const WINDOW *\fP\fIwin\fP\fB);\fR
++\fBbool is_idcok(const WINDOW *\fP\fIwin\fP\fB);\fP
+ .br
+-\fBbool is_idlok(const WINDOW *\fP\fIwin\fP\fB);\fR
++\fBbool is_idlok(const WINDOW *\fP\fIwin\fP\fB);\fP
+ .br
+-\fBbool is_immedok(const WINDOW *\fP\fIwin\fP\fB);\fR
++\fBbool is_immedok(const WINDOW *\fP\fIwin\fP\fB);\fP
+ .br
+-\fBbool is_keypad(const WINDOW *\fP\fIwin\fP\fB);\fR
++\fBbool is_keypad(const WINDOW *\fP\fIwin\fP\fB);\fP
+ .br
+-\fBbool is_leaveok(const WINDOW *\fP\fIwin\fP\fB);\fR
++\fBbool is_leaveok(const WINDOW *\fP\fIwin\fP\fB);\fP
+ .br
+-\fBbool is_nodelay(const WINDOW *\fP\fIwin\fP\fB);\fR
++\fBbool is_nodelay(const WINDOW *\fP\fIwin\fP\fB);\fP
+ .br
+-\fBbool is_notimeout(const WINDOW *\fP\fIwin\fP\fB);\fR
++\fBbool is_notimeout(const WINDOW *\fP\fIwin\fP\fB);\fP
+ .br
+-\fBbool is_pad(const WINDOW *\fP\fIwin\fP\fB);\fR
++\fBbool is_pad(const WINDOW *\fP\fIwin\fP\fB);\fP
+ .br
+-\fBbool is_scrollok(const WINDOW *\fP\fIwin\fP\fB);\fR
++\fBbool is_scrollok(const WINDOW *\fP\fIwin\fP\fB);\fP
+ .br
+-\fBbool is_subwin(const WINDOW *\fP\fIwin\fP\fB);\fR
++\fBbool is_subwin(const WINDOW *\fP\fIwin\fP\fB);\fP
+ .br
+-\fBbool is_syncok(const WINDOW *\fP\fIwin\fP\fB);\fR
++\fBbool is_syncok(const WINDOW *\fP\fIwin\fP\fB);\fP
+ .br
+-\fBWINDOW * wgetparent(const WINDOW *\fP\fIwin\fP\fB);\fR
++\fBWINDOW * wgetparent(const WINDOW *\fP\fIwin\fP\fB);\fP
+ .br
+-\fBint wgetdelay(const WINDOW *\fP\fIwin\fP\fB);\fR
++\fBint wgetdelay(const WINDOW *\fP\fIwin\fP\fB);\fP
+ .br
+-\fBint wgetscrreg(const WINDOW *\fP\fIwin\fP\fB, int *\fP\fItop\fP\fB, int *\fP\fIbottom\fP\fB);\fR
++\fBint wgetscrreg(const WINDOW *\fP\fIwin\fP\fB, int *\fP\fItop\fP\fB, int *\fP\fIbottom\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+ This implementation provides functions which return properties
+ set in the WINDOW structure, allowing it to be \*(``opaque\*('' if
+-the symbol \fBNCURSES_OPAQUE\fR is defined:
++the symbol \fBNCURSES_OPAQUE\fP is defined:
+ .TP 5
+-\fBis_cleared\fR
+-returns the value set in \fBclearok\fR
++\fBis_cleared\fP
++returns the value set in \fBclearok\fP
+ .TP 5
+-\fBis_idcok\fR
+-returns the value set in \fBidcok\fR
++\fBis_idcok\fP
++returns the value set in \fBidcok\fP
+ .TP 5
+-\fBis_idlok\fR
+-returns the value set in \fBidlok\fR
++\fBis_idlok\fP
++returns the value set in \fBidlok\fP
+ .TP 5
+-\fBis_immedok\fR
+-returns the value set in \fBimmedok\fR
++\fBis_immedok\fP
++returns the value set in \fBimmedok\fP
+ .TP 5
+-\fBis_keypad\fR
+-returns the value set in \fBkeypad\fR
++\fBis_keypad\fP
++returns the value set in \fBkeypad\fP
+ .TP 5
+-\fBis_leaveok\fR
+-returns the value set in \fBleaveok\fR
++\fBis_leaveok\fP
++returns the value set in \fBleaveok\fP
+ .TP 5
+-\fBis_nodelay\fR
+-returns the value set in \fBnodelay\fR
++\fBis_nodelay\fP
++returns the value set in \fBnodelay\fP
+ .TP 5
+-\fBis_notimeout\fR
+-returns the value set in \fBnotimeout\fR
++\fBis_notimeout\fP
++returns the value set in \fBnotimeout\fP
+ .TP 5
+-\fBis_pad\fR
++\fBis_pad\fP
+ returns \fBTRUE\fP if the window is a pad
+ i.e., created by \fBnewpad\fP
+ .TP 5
+-\fBis_scrollok\fR
+-returns the value set in \fBscrollok\fR
++\fBis_scrollok\fP
++returns the value set in \fBscrollok\fP
+ .TP 5
+-\fBis_subwin\fR
++\fBis_subwin\fP
+ returns \fBTRUE\fP if the window is a subwindow,
+ i.e., created by \fBsubwin\fP or \fBderwin\fP
+ .TP 5
+-\fBis_syncok\fR
+-returns the value set in \fBsyncok\fR
++\fBis_syncok\fP
++returns the value set in \fBsyncok\fP
+ .TP 5
+-\fBwgetdelay\fR
++\fBwgetdelay\fP
+ returns the delay timeout as set in \fBwtimeout\fP.
+ .TP 5
+-\fBwgetparent\fR
++\fBwgetparent\fP
+ returns the parent WINDOW pointer for subwindows,
+ or NULL for windows having no parent.
+ .TP 5
+-\fBwgetscrreg\fR
++\fBwgetscrreg\fP
+ returns the top and bottom rows for the scrolling margin
+ as set in \fBwsetscrreg\fP.
+ .SH RETURN VALUE
+@@ -149,7 +149,7 @@
+ It is recommended that any code depending on ncurses extensions
+ be conditioned using NCURSES_VERSION.
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBcurs_inopts\fR(3X),
+-\fBcurs_outopts\fR(3X),
+-\fBcurs_window\fR(3X)
++\fBcurses\fP(3X),
++\fBcurs_inopts\fP(3X),
++\fBcurs_outopts\fP(3X),
++\fBcurs_window\fP(3X)
+Index: man/curs_outopts.3x
+Prereq:  1.33 
+--- ncurses-6.3-20211219+/man/curs_outopts.3x	2020-10-03 22:04:09.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_outopts.3x	2021-12-25 21:41:58.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018,2020 Thomas E. Dickey                                     *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_outopts.3x,v 1.33 2020/10/03 22:04:09 tom Exp $
++.\" $Id: curs_outopts.3x,v 1.35 2021/12/25 21:41:58 tom Exp $
+ .TH curs_outopts 3X ""
+ .na
+ .hy 0
+@@ -36,58 +36,58 @@
+ .el    .IP \(bu 2
+ ..
+ .SH NAME
+-\fBclearok\fR,
+-\fBidlok\fR,
+-\fBidcok\fR,
+-\fBimmedok\fR,
+-\fBleaveok\fR,
+-\fBsetscrreg\fR,
+-\fBwsetscrreg\fR,
+-\fBscrollok\fR \- \fBcurses\fR output options
++\fBclearok\fP,
++\fBidlok\fP,
++\fBidcok\fP,
++\fBimmedok\fP,
++\fBleaveok\fP,
++\fBsetscrreg\fP,
++\fBwsetscrreg\fP,
++\fBscrollok\fP \- \fBcurses\fP output options
+ .ad
+ .hy
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBint clearok(WINDOW *\fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fR
++\fBint clearok(WINDOW *\fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fP
+ .br
+-\fBint idlok(WINDOW *\fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fR
++\fBint idlok(WINDOW *\fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fP
+ .br
+-\fBvoid idcok(WINDOW *\fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fR
++\fBvoid idcok(WINDOW *\fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fP
+ .br
+-\fBvoid immedok(WINDOW *\fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fR
++\fBvoid immedok(WINDOW *\fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fP
+ .br
+-\fBint leaveok(WINDOW *\fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fR
++\fBint leaveok(WINDOW *\fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fP
+ .br
+-\fBint scrollok(WINDOW *\fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fR
++\fBint scrollok(WINDOW *\fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fP
+ .sp
+-\fBint setscrreg(int \fP\fItop\fP\fB, int \fP\fIbot\fP\fB);\fR
++\fBint setscrreg(int \fP\fItop\fP\fB, int \fP\fIbot\fP\fB);\fP
+ .br
+-\fBint wsetscrreg(WINDOW *\fP\fIwin\fP\fB, int \fP\fItop\fP\fB, int \fP\fIbot\fP\fB);\fR
++\fBint wsetscrreg(WINDOW *\fP\fIwin\fP\fB, int \fP\fItop\fP\fB, int \fP\fIbot\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+ .PP
+ These routines set options that change the style of output within
+-\fBcurses\fR.
+-All options are initially \fBFALSE\fR, unless otherwise stated.
+-It is not necessary to turn these options off before calling \fBendwin\fR(3X).
++\fBcurses\fP.
++All options are initially \fBFALSE\fP, unless otherwise stated.
++It is not necessary to turn these options off before calling \fBendwin\fP(3X).
+ .SS clearok
+ .PP
+-If \fBclearok\fR is called with \fBTRUE\fR as argument, the next
+-call to \fBwrefresh\fR with this window will clear the screen completely and
++If \fBclearok\fP is called with \fBTRUE\fP as argument, the next
++call to \fBwrefresh\fP with this window will clear the screen completely and
+ redraw the entire screen from scratch.
+ This is useful when the contents of the
+ screen are uncertain, or in some cases for a more pleasing visual effect.
+ If
+-the \fIwin\fR argument to \fBclearok\fR is the global variable \fBcurscr\fR,
+-the next call to \fBwrefresh\fR with any window causes the screen to be cleared
++the \fIwin\fP argument to \fBclearok\fP is the global variable \fBcurscr\fP,
++the next call to \fBwrefresh\fP with any window causes the screen to be cleared
+ and repainted from scratch.
+ .SS idlok
+ .PP
+-If \fBidlok\fR is called with \fBTRUE\fR as second argument, \fBcurses\fR
++If \fBidlok\fP is called with \fBTRUE\fP as second argument, \fBcurses\fP
+ considers using the hardware insert/delete line feature of terminals so
+ equipped.
+-Calling \fBidlok\fR with \fBFALSE\fR as second argument disables use
++Calling \fBidlok\fP with \fBFALSE\fP as second argument disables use
+ of line insertion and deletion.
+ This option should be enabled only if the
+ application needs insert/delete line, for example, for a screen editor.
+@@ -95,66 +95,66 @@
+ disabled by default because insert/delete line tends to be visually annoying
+ when used in applications where it is not really needed.
+ If insert/delete line
+-cannot be used, \fBcurses\fR redraws the changed portions of all lines.
++cannot be used, \fBcurses\fP redraws the changed portions of all lines.
+ .SS idcok
+ .PP
+-If \fBidcok\fR is called with \fBFALSE\fR as second argument, \fBcurses\fR
++If \fBidcok\fP is called with \fBFALSE\fP as second argument, \fBcurses\fP
+ no longer considers using the hardware insert/delete character feature of
+ terminals so equipped.
+ Use of character insert/delete is enabled by default.
+-Calling \fBidcok\fR with \fBTRUE\fR as second argument re-enables use
++Calling \fBidcok\fP with \fBTRUE\fP as second argument re-enables use
+ of character insertion and deletion.
+ .SS immedok
+ .PP
+-If \fBimmedok\fR is called with \fBTRUE as argument\fR, any change
+-in the window image, such as the ones caused by \fBwaddch, wclrtobot, wscrl\fR,
+-etc., automatically cause a call to \fBwrefresh\fR.
++If \fBimmedok\fP is called with \fBTRUE as argument\fP, any change
++in the window image, such as the ones caused by \fBwaddch, wclrtobot, wscrl\fP,
++etc., automatically cause a call to \fBwrefresh\fP.
+ However, it may
+-degrade performance considerably, due to repeated calls to \fBwrefresh\fR.
++degrade performance considerably, due to repeated calls to \fBwrefresh\fP.
+ It is disabled by default.
+ .SS leaveok
+ .PP
+ Normally, the hardware cursor is left at the location of the window cursor
+ being refreshed.
+-The \fBleaveok\fR option allows the cursor to be left
++The \fBleaveok\fP option allows the cursor to be left
+ wherever the update happens to leave it.
+ It is useful for applications where
+ the cursor is not used, since it reduces the need for cursor motions.
+ .SS scrollok
+ .PP
+-The \fBscrollok\fR option controls what happens when the cursor of a window is
++The \fBscrollok\fP option controls what happens when the cursor of a window is
+ moved off the edge of the window or scrolling region, either as a result of a
+ newline action on the bottom line, or typing the last character of the last
+ line.
+-If disabled, (\fIbf\fR is \fBFALSE\fR), the cursor is left on the bottom
++If disabled, (\fIbf\fP is \fBFALSE\fP), the cursor is left on the bottom
+ line.
+-If enabled, (\fIbf\fR is \fBTRUE\fR), the window is scrolled up one line
++If enabled, (\fIbf\fP is \fBTRUE\fP), the window is scrolled up one line
+ (Note that to get the physical scrolling effect on the terminal, it is
+-also necessary to call \fBidlok\fR).
++also necessary to call \fBidlok\fP).
+ .SS  setscrreg/wsetscrreg
+ .PP
+-The \fBsetscrreg\fR and \fBwsetscrreg\fR routines allow the application
++The \fBsetscrreg\fP and \fBwsetscrreg\fP routines allow the application
+ programmer to set a software scrolling region in a window.
+-The \fItop\fR and
+-\fIbot\fR parameters
++The \fItop\fP and
++\fIbot\fP parameters
+ are the line numbers of the top and bottom margin of the scrolling
+ region.
+ (Line 0 is the top line of the window.)  If this option and
+-\fBscrollok\fR are enabled, an attempt to move off the bottom margin line
++\fBscrollok\fP are enabled, an attempt to move off the bottom margin line
+ causes all lines in the scrolling region to scroll one line in the direction
+ of the first line.
+ Only the text of the window is scrolled.
+ (Note that this
+ has nothing to do with the use of a physical scrolling region capability in the
+ terminal, like that in the VT100.
+-If \fBidlok\fR is enabled and the terminal
++If \fBidlok\fP is enabled and the terminal
+ has either a scrolling region or insert/delete line capability, they will
+ probably be used by the output routines.)
+ .SH RETURN VALUE
+-The functions \fBsetscrreg\fR and \fBwsetscrreg\fR return \fBOK\fR upon success
+-and \fBERR\fR upon failure.
++The functions \fBsetscrreg\fP and \fBwsetscrreg\fP return \fBOK\fP upon success
++and \fBERR\fP upon failure.
+ All other routines that return an integer always
+-return \fBOK\fR.
++return \fBOK\fP.
+ .PP
+ X/Open Curses does not define any error conditions.
+ .PP
+@@ -187,37 +187,37 @@
+ to eliminate their effect on output.
+ .PP
+ Some historic curses implementations had, as an undocumented feature, the
+-ability to do the equivalent of \fBclearok(..., 1)\fR by saying
+-\fBtouchwin(stdscr)\fR or \fBclear(stdscr)\fR.
++ability to do the equivalent of \fBclearok(..., 1)\fP by saying
++\fBtouchwin(stdscr)\fP or \fBclear(stdscr)\fP.
+ This will not work under ncurses.
+ .PP
+-Earlier System V curses implementations specified that with \fBscrollok\fR
++Earlier System V curses implementations specified that with \fBscrollok\fP
+ enabled, any window modification triggering a scroll also forced a physical
+ refresh.
+-XSI Curses does not require this, and \fBncurses\fR avoids doing
+-it to perform better vertical-motion optimization at \fBwrefresh\fR
++XSI Curses does not require this, and \fBncurses\fP avoids doing
++it to perform better vertical-motion optimization at \fBwrefresh\fP
+ time.
+ .PP
+ The XSI Curses standard does not mention that the cursor should be
+-made invisible as a side-effect of \fBleaveok\fR.
++made invisible as a side-effect of \fBleaveok\fP.
+ SVr4 curses documentation does this, but the code does not.
+-Use \fBcurs_set\fR to make the cursor invisible.
++Use \fBcurs_set\fP to make the cursor invisible.
+ .SH NOTES
+ Note that
+-\fBclearok\fR,
+-\fBleaveok\fR,
+-\fBscrollok\fR,
+-\fBidcok\fR, and
+-\fBsetscrreg\fR may be macros.
++\fBclearok\fP,
++\fBleaveok\fP,
++\fBscrollok\fP,
++\fBidcok\fP, and
++\fBsetscrreg\fP may be macros.
+ .PP
+-The \fBimmedok\fR routine is useful for windows that are used as terminal
++The \fBimmedok\fP routine is useful for windows that are used as terminal
+ emulators.
+ .SH SEE ALSO
+ .na
+-\fBcurses\fR(3X),
+-\fBcurs_addch\fR(3X),
+-\fBcurs_clear\fR(3X),
+-\fBcurs_initscr\fR(3X),
+-\fBcurs_scroll\fR(3X),
+-\fBcurs_refresh\fR(3X),
+-\fBcurs_variables\fR(3X).
++\fBcurses\fP(3X),
++\fBcurs_addch\fP(3X),
++\fBcurs_clear\fP(3X),
++\fBcurs_initscr\fP(3X),
++\fBcurs_scroll\fP(3X),
++\fBcurs_refresh\fP(3X),
++\fBcurs_variables\fP(3X).
+Index: man/curs_overlay.3x
+Prereq:  1.19 
+--- ncurses-6.3-20211219+/man/curs_overlay.3x	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_overlay.3x	2021-12-25 21:50:36.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2020 Thomas E. Dickey                                          *
++.\" Copyright 2020,2021 Thomas E. Dickey                                     *
+ .\" Copyright 1998-2013,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,48 +27,48 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_overlay.3x,v 1.19 2020/02/02 23:34:34 tom Exp $
++.\" $Id: curs_overlay.3x,v 1.21 2021/12/25 21:50:36 tom Exp $
+ .TH curs_overlay 3X ""
+ .na
+ .hy 0
+ .SH NAME
+-\fBoverlay\fR,
+-\fBoverwrite\fR,
+-\fBcopywin\fR \- overlay and manipulate overlapped \fBcurses\fR windows
++\fBoverlay\fP,
++\fBoverwrite\fP,
++\fBcopywin\fP \- overlay and manipulate overlapped \fBcurses\fP windows
+ .ad
+ .hy
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBint overlay(const WINDOW *\fP\fIsrcwin\fP\fB, WINDOW *\fP\fIdstwin\fP\fB);\fR
++\fBint overlay(const WINDOW *\fP\fIsrcwin\fP\fB, WINDOW *\fP\fIdstwin\fP\fB);\fP
+ .br
+-\fBint overwrite(const WINDOW *\fP\fIsrcwin\fP\fB, WINDOW *\fP\fIdstwin\fP\fB);\fR
++\fBint overwrite(const WINDOW *\fP\fIsrcwin\fP\fB, WINDOW *\fP\fIdstwin\fP\fB);\fP
+ .br
+-\fBint copywin(const WINDOW *\fP\fIsrcwin\fP\fB, WINDOW *\fP\fIdstwin\fP\fB, int \fP\fIsminrow\fP\fB,\fR
+-      \fBint \fP\fIsmincol\fP\fB, int \fP\fIdminrow\fP\fB, int \fP\fIdmincol\fP\fB, int \fP\fIdmaxrow\fP\fB,\fR
+-      \fBint \fP\fIdmaxcol\fP\fB, int \fP\fIoverlay\fP\fB);\fR
++\fBint copywin(const WINDOW *\fP\fIsrcwin\fP\fB, WINDOW *\fP\fIdstwin\fP\fB, int \fP\fIsminrow\fP\fB,\fP
++      \fBint \fP\fIsmincol\fP\fB, int \fP\fIdminrow\fP\fB, int \fP\fIdmincol\fP\fB, int \fP\fIdmaxrow\fP\fB,\fP
++      \fBint \fP\fIdmaxcol\fP\fB, int \fP\fIoverlay\fP\fB);\fP
+ .SH DESCRIPTION
+ .SS overlay, overwrite
+-The \fBoverlay\fR and \fBoverwrite\fR routines overlay \fIsrcwin\fR on
+-top of \fIdstwin\fR.
+-\fIscrwin\fR and \fIdstwin\fR are not required
++The \fBoverlay\fP and \fBoverwrite\fP routines overlay \fIsrcwin\fP on
++top of \fIdstwin\fP.
++\fIscrwin\fP and \fIdstwin\fP are not required
+ to be the same size; only text where the two windows overlap is copied.
+-The difference is that \fBoverlay\fR is non-destructive
+-(blanks are not copied) whereas \fBoverwrite\fR is destructive.
++The difference is that \fBoverlay\fP is non-destructive
++(blanks are not copied) whereas \fBoverwrite\fP is destructive.
+ .SS copywin
+ .PP
+-The \fBcopywin\fR routine provides a finer granularity of control over the
+-\fBoverlay\fR and \fBoverwrite\fR routines.
+-As in the \fBprefresh\fR routine,
+-a rectangle is specified in the destination window, (\fIdminrow\fR,
+-\fIdmincol\fR) and (\fIdmaxrow\fR, \fIdmaxcol\fR), and the upper-left-corner
+-coordinates of the source window, (\fIsminrow\fR, \fIsmincol\fR).
+-If the argument \fIoverlay\fR is \fBtrue\fR,
++The \fBcopywin\fP routine provides a finer granularity of control over the
++\fBoverlay\fP and \fBoverwrite\fP routines.
++As in the \fBprefresh\fP routine,
++a rectangle is specified in the destination window, (\fIdminrow\fP,
++\fIdmincol\fP) and (\fIdmaxrow\fP, \fIdmaxcol\fP), and the upper-left-corner
++coordinates of the source window, (\fIsminrow\fP, \fIsmincol\fP).
++If the argument \fIoverlay\fP is \fBtrue\fP,
+ then copying is non-destructive,
+-as in \fBoverlay\fR.
++as in \fBoverlay\fP.
+ .SH RETURN VALUE
+-Routines that return an integer return \fBERR\fR upon failure, and \fBOK\fR
+-(SVr4 only specifies "an integer value other than \fBERR\fR") upon successful
++Routines that return an integer return \fBERR\fP upon failure, and \fBOK\fP
++(SVr4 only specifies "an integer value other than \fBERR\fP") upon successful
+ completion.
+ .PP
+ X/Open defines no error conditions.
+@@ -78,11 +78,11 @@
+ if either of the window pointers are null, or
+ if some part of the window would be placed off-screen.
+ .SH NOTES
+-Note that \fBoverlay\fR and \fBoverwrite\fR may be macros.
++Note that \fBoverlay\fP and \fBoverwrite\fP may be macros.
+ .SH PORTABILITY
+ The XSI Curses standard, Issue 4 describes these functions (adding the const
+ qualifiers).
+ It further specifies their behavior in the presence of characters
+ with multibyte renditions (not yet supported in this implementation).
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBcurs_pad\fR(3X), \fBcurs_refresh\fR(3X)
++\fBcurses\fP(3X), \fBcurs_pad\fP(3X), \fBcurs_refresh\fP(3X)
+Index: man/curs_pad.3x
+Prereq:  1.26 
+--- ncurses-6.3-20211219+/man/curs_pad.3x	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_pad.3x	2021-12-25 21:41:58.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018,2020 Thomas E. Dickey                                     *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_pad.3x,v 1.26 2020/02/02 23:34:34 tom Exp $
++.\" $Id: curs_pad.3x,v 1.28 2021/12/25 21:41:58 tom Exp $
+ .de bP
+ .ie n  .IP \(bu 4
+ .el    .IP \(bu 2
+@@ -36,36 +36,36 @@
+ .na
+ .hy 0
+ .SH NAME
+-\fBnewpad\fR,
+-\fBsubpad\fR,
+-\fBprefresh\fR,
+-\fBpnoutrefresh\fR,
+-\fBpechochar\fR,
+-\fBpecho_wchar\fR \- create and display \fBcurses\fR pads
++\fBnewpad\fP,
++\fBsubpad\fP,
++\fBprefresh\fP,
++\fBpnoutrefresh\fP,
++\fBpechochar\fP,
++\fBpecho_wchar\fP \- create and display \fBcurses\fP pads
+ .ad
+ .hy
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBWINDOW *newpad(int \fP\fInlines\fP\fB, int \fP\fIncols\fP\fB);\fR
++\fBWINDOW *newpad(int \fP\fInlines\fP\fB, int \fP\fIncols\fP\fB);\fP
+ .br
+-\fBWINDOW *subpad(WINDOW *\fP\fIorig\fP\fB, int \fP\fInlines\fP\fB, int \fP\fIncols\fP\fB,\fR
+-      \fBint \fP\fIbegin_y\fP\fB, int \fP\fIbegin_x\fP\fB);\fR
++\fBWINDOW *subpad(WINDOW *\fP\fIorig\fP\fB, int \fP\fInlines\fP\fB, int \fP\fIncols\fP\fB,\fP
++      \fBint \fP\fIbegin_y\fP\fB, int \fP\fIbegin_x\fP\fB);\fP
+ .br
+-\fBint prefresh(WINDOW *\fP\fIpad\fP\fB, int \fP\fIpminrow\fP\fB, int \fP\fIpmincol\fP\fB,\fR
+-      \fBint \fP\fIsminrow\fP\fB, int \fP\fIsmincol\fP\fB, int \fP\fIsmaxrow\fP\fB, int \fP\fIsmaxcol\fP\fB);\fR
++\fBint prefresh(WINDOW *\fP\fIpad\fP\fB, int \fP\fIpminrow\fP\fB, int \fP\fIpmincol\fP\fB,\fP
++      \fBint \fP\fIsminrow\fP\fB, int \fP\fIsmincol\fP\fB, int \fP\fIsmaxrow\fP\fB, int \fP\fIsmaxcol\fP\fB);\fP
+ .br
+-\fBint pnoutrefresh(WINDOW *\fP\fIpad\fP\fB, int \fP\fIpminrow\fP\fB, int \fP\fIpmincol\fP\fB,\fR
+-      \fBint \fP\fIsminrow\fP\fB, int \fP\fIsmincol\fP\fB, int \fP\fIsmaxrow\fP\fB, int \fP\fIsmaxcol\fP\fB);\fR
++\fBint pnoutrefresh(WINDOW *\fP\fIpad\fP\fB, int \fP\fIpminrow\fP\fB, int \fP\fIpmincol\fP\fB,\fP
++      \fBint \fP\fIsminrow\fP\fB, int \fP\fIsmincol\fP\fB, int \fP\fIsmaxrow\fP\fB, int \fP\fIsmaxcol\fP\fB);\fP
+ .br
+-\fBint pechochar(WINDOW *\fP\fIpad\fP\fB, chtype \fP\fIch\fP\fB);\fR
++\fBint pechochar(WINDOW *\fP\fIpad\fP\fB, chtype \fP\fIch\fP\fB);\fP
+ .br
+-\fBint pecho_wchar(WINDOW *\fP\fIpad\fP\fB, const cchar_t *\fP\fIwch\fP\fB);\fR
++\fBint pecho_wchar(WINDOW *\fP\fIpad\fP\fB, const cchar_t *\fP\fIwch\fP\fB);\fP
+ .SH DESCRIPTION
+ .SS newpad
+-The \fBnewpad\fR routine creates and returns a pointer to a new pad data
+-structure with the given number of lines, \fInlines\fR, and columns,
+-\fIncols\fR.
++The \fBnewpad\fP routine creates and returns a pointer to a new pad data
++structure with the given number of lines, \fInlines\fP, and columns,
++\fIncols\fP.
+ A pad is like a window, except that it is not restricted by the
+ screen size, and is not necessarily associated with a particular part of the
+ screen.
+@@ -75,36 +75,36 @@
+ (e.g., from scrolling or echoing of input) do not occur.
+ .PP
+ It is not
+-legal to call \fBwrefresh\fR with a \fIpad\fR as an argument; the routines
+-\fBprefresh\fR or \fBpnoutrefresh\fR should be called instead.
++legal to call \fBwrefresh\fP with a \fIpad\fP as an argument; the routines
++\fBprefresh\fP or \fBpnoutrefresh\fP should be called instead.
+ Note that these
+ routines require additional parameters to specify the part of the pad to be
+ displayed and the location on the screen to be used for the display.
+ .SS subpad
+ .PP
+-The \fBsubpad\fR routine creates and returns a pointer to a subwindow within a
+-pad with the given number of lines, \fInlines\fR, and columns, \fIncols\fR.
+-Unlike \fBsubwin\fR, which uses screen coordinates, the window is at position
+-(\fIbegin\fR_\fIx\fR\fB,\fR \fIbegin\fR_\fIy\fR) on the pad.
++The \fBsubpad\fP routine creates and returns a pointer to a subwindow within a
++pad with the given number of lines, \fInlines\fP, and columns, \fIncols\fP.
++Unlike \fBsubwin\fP, which uses screen coordinates, the window is at position
++(\fIbegin\fR_\fIx\fP\fB,\fP \fIbegin\fR_\fIy\fP) on the pad.
+ The window is
+-made in the middle of the window \fIorig\fR, so that changes made to one window
++made in the middle of the window \fIorig\fP, so that changes made to one window
+ affect both windows.
+ During the use of this routine, it will often be
+-necessary to call \fBtouchwin\fR or \fBtouchline\fR on \fIorig\fR before
+-calling \fBprefresh\fR.
++necessary to call \fBtouchwin\fP or \fBtouchline\fP on \fIorig\fP before
++calling \fBprefresh\fP.
+ .SS prefresh, pnoutrefresh
+ .PP
+-The \fBprefresh\fR and \fBpnoutrefresh\fR routines are analogous to
+-\fBwrefresh\fR and \fBwnoutrefresh\fR except that they relate to pads instead
++The \fBprefresh\fP and \fBpnoutrefresh\fP routines are analogous to
++\fBwrefresh\fP and \fBwnoutrefresh\fP except that they relate to pads instead
+ of windows.
+ The additional parameters are needed to indicate what part of the
+ pad and screen are involved.
+ .bP
+-The \fIpminrow\fR and \fIpmincol\fR parameters specify the upper
++The \fIpminrow\fP and \fIpmincol\fP parameters specify the upper
+ left-hand corner of the rectangle to be displayed in the pad.
+ .bP
+-The \fIsminrow\fR,
+-\fIsmincol\fR, \fIsmaxrow\fR, and \fIsmaxcol\fR
++The \fIsminrow\fP,
++\fIsmincol\fP, \fIsmaxrow\fP, and \fIsmaxcol\fP
+ parameters specify the edges of the
+ rectangle to be displayed on the screen.
+ .PP
+@@ -114,34 +114,34 @@
+ Both rectangles must be entirely
+ contained within their respective structures.
+ Negative values of
+-\fIpminrow\fR, \fIpmincol\fR, \fIsminrow\fR, or \fIsmincol\fR are treated as if
++\fIpminrow\fP, \fIpmincol\fP, \fIsminrow\fP, or \fIsmincol\fP are treated as if
+ they were zero.
+ .SS pechochar
+ .PP
+-The \fBpechochar\fR routine is functionally equivalent to a call to \fBaddch\fR
+-followed by a call to \fBrefresh\fR(3X),
+-a call to \fBwaddch\fR followed by a call
+-to \fBwrefresh\fR, or a call to \fBwaddch\fR followed by a call to
+-\fBprefresh\fR.
++The \fBpechochar\fP routine is functionally equivalent to a call to \fBaddch\fP
++followed by a call to \fBrefresh\fP(3X),
++a call to \fBwaddch\fP followed by a call
++to \fBwrefresh\fP, or a call to \fBwaddch\fP followed by a call to
++\fBprefresh\fP.
+ The knowledge that only a single character is being output is
+ taken into consideration and, for non-control characters, a considerable
+ performance gain might be seen by using these routines instead of their
+ equivalents.
+-In the case of \fBpechochar\fR, the last location of the pad on
+-the screen is reused for the arguments to \fBprefresh\fR.
++In the case of \fBpechochar\fP, the last location of the pad on
++the screen is reused for the arguments to \fBprefresh\fP.
+ .SS pecho_wchar
+ .PP
+-The \fBpecho_wchar\fR function is the analogous wide-character
+-form of \fBpechochar\fR.
++The \fBpecho_wchar\fP function is the analogous wide-character
++form of \fBpechochar\fP.
+ It outputs one character to a pad and immediately refreshes the pad.
+-It does this by a call to \fBwadd_wch\fR followed by a call to \fBprefresh\fR.
++It does this by a call to \fBwadd_wch\fP followed by a call to \fBprefresh\fP.
+ .SH RETURN VALUE
+-Routines that return an integer return \fBERR\fR upon failure and \fBOK\fR
+-(SVr4 only specifies "an integer value other than \fBERR\fR") upon successful
++Routines that return an integer return \fBERR\fP upon failure and \fBOK\fP
++(SVr4 only specifies "an integer value other than \fBERR\fP") upon successful
+ completion.
+ .PP
+-Routines that return pointers return \fBNULL\fR on error, and set \fBerrno\fR
+-to \fBENOMEM\fR.
++Routines that return pointers return \fBNULL\fP on error, and set \fBerrno\fP
++to \fBENOMEM\fP.
+ .PP
+ X/Open does not define any error conditions.
+ In this implementation
+@@ -165,7 +165,7 @@
+ to \fBwecho_wchar\fP returns an error.
+ .RE
+ .SH NOTES
+-Note that \fBpechochar\fR may be a macro.
++Note that \fBpechochar\fP may be a macro.
+ .SH PORTABILITY
+ BSD curses has no \fIpad\fP feature.
+ .PP
+@@ -236,7 +236,7 @@
+ ensures that \fBdupwin\fP and \fBgetwin\fP treat
+ pads versus windows consistently.
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBcurs_refresh\fR(3X),
+-\fBcurs_touch\fR(3X),
+-\fBcurs_addch\fR(3X).
++\fBcurses\fP(3X),
++\fBcurs_refresh\fP(3X),
++\fBcurs_touch\fP(3X),
++\fBcurs_addch\fP(3X).
+Index: man/curs_print.3x
+Prereq:  1.16 
+--- ncurses-6.3-20211219+/man/curs_print.3x	2020-10-24 09:25:14.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_print.3x	2021-12-25 21:41:58.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018,2020 Thomas E. Dickey                                     *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,19 +27,19 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_print.3x,v 1.16 2020/10/24 09:25:14 tom Exp $
++.\" $Id: curs_print.3x,v 1.18 2021/12/25 21:41:58 tom Exp $
+ .TH curs_print 3X ""
+ .SH NAME
+-\fBmcprint\fR \- ship binary data to printer
++\fBmcprint\fP \- ship binary data to printer
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBint mcprint(char *\fP\fIdata\fP\fB, int \fP\fIlen\fP\fB);\fR
++\fBint mcprint(char *\fP\fIdata\fP\fB, int \fP\fIlen\fP\fB);\fP
+ .SH DESCRIPTION
+-This function uses the \fBmc5p\fR or \fBmc4\fR and \fBmc5\fR capabilities,
++This function uses the \fBmc5p\fP or \fBmc4\fP and \fBmc5\fP capabilities,
+ if they are present, to ship given data to a printer attached to the terminal.
+ .PP
+-Note that the \fBmcprint\fR code has no way to do flow control with the printer
++Note that the \fBmcprint\fP code has no way to do flow control with the printer
+ or to know how much buffering it has.
+ Your application is responsible for
+ keeping the rate of writes to the printer below its continuous throughput rate
+@@ -49,7 +49,7 @@
+ rule of thumb is to sleep for a second after shipping each 80-character line.
+ .
+ .SH RETURN VALUE
+-The \fBmcprint\fR function returns \fBERR\fR if the write operation aborted
++The \fBmcprint\fP function returns \fBERR\fP if the write operation aborted
+ for some reason.
+ In this case, \fBerrno\fP will contain either an error associated
+ with \fBwrite\fP(2) or one of the following:
+@@ -60,13 +60,13 @@
+ ENOMEM
+ Couldn't allocate sufficient memory to buffer the printer write.
+ .PP
+-When \fBmcprint\fR succeeds, it returns the number of characters actually
++When \fBmcprint\fP succeeds, it returns the number of characters actually
+ sent to the printer.
+ .SH PORTABILITY
+-The \fBmcprint\fR call was designed for \fBncurses\fR(3X), and is not found
++The \fBmcprint\fP call was designed for \fBncurses\fP(3X), and is not found
+ in SVr4 curses, 4.4BSD curses, or any other previous version of curses.
+ .SH BUGS
+-Padding in the \fBmc5p\fR, \fBmc4\fR and \fBmc5\fR capabilities will not be
++Padding in the \fBmc5p\fP, \fBmc4\fP and \fBmc5\fP capabilities will not be
+ interpreted.
+ .SH SEE ALSO
+-\fBcurses\fR(3X)
++\fBcurses\fP(3X)
+Index: man/curs_printw.3x
+Prereq:  1.28 
+--- ncurses-6.3-20211219+/man/curs_printw.3x	2020-10-24 09:22:45.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_printw.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_printw.3x,v 1.28 2020/10/24 09:22:45 tom Exp $
++.\" $Id: curs_printw.3x,v 1.31 2021/12/25 21:49:32 tom Exp $
+ .TH curs_printw 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -40,44 +40,44 @@
+ .na
+ .hy 0
+ .SH NAME
+-\fBprintw\fR,
+-\fBwprintw\fR,
+-\fBmvprintw\fR,
+-\fBmvwprintw\fR,
+-\fBvwprintw\fR, \fBvw_printw\fR \- print formatted output in \fBcurses\fR windows
++\fBprintw\fP,
++\fBwprintw\fP,
++\fBmvprintw\fP,
++\fBmvwprintw\fP,
++\fBvwprintw\fP, \fBvw_printw\fP \- print formatted output in \fBcurses\fP windows
+ .ad
+ .hy
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBint printw(const char *\fP\fIfmt\fP\fB, ...);\fR
++\fBint printw(const char *\fP\fIfmt\fP\fB, ...);\fP
+ .br
+-\fBint wprintw(WINDOW *\fP\fIwin\fP\fB, const char *\fP\fIfmt\fP\fB, ...);\fR
++\fBint wprintw(WINDOW *\fP\fIwin\fP\fB, const char *\fP\fIfmt\fP\fB, ...);\fP
+ .br
+-\fBint mvprintw(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const char *\fP\fIfmt\fP\fB, ...);\fR
++\fBint mvprintw(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const char *\fP\fIfmt\fP\fB, ...);\fP
+ .br
+-\fBint mvwprintw(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const char *\fP\fIfmt\fP\fB, ...);\fR
++\fBint mvwprintw(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const char *\fP\fIfmt\fP\fB, ...);\fP
+ .br
+-\fBint vw_printw(WINDOW *\fP\fIwin\fP\fB, const char *\fP\fIfmt\fP\fB, va_list \fP\fIvarglist\fP\fB);\fR
++\fBint vw_printw(WINDOW *\fP\fIwin\fP\fB, const char *\fP\fIfmt\fP\fB, va_list \fP\fIvarglist\fP\fB);\fP
+ .sp
+ /* obsolete */
+ .br
+-\fBint vwprintw(WINDOW *\fP\fIwin\fP\fB, const char *\fP\fIfmt\fP\fB, va_list \fP\fIvarglist\fP\fB);\fR
++\fBint vwprintw(WINDOW *\fP\fIwin\fP\fB, const char *\fP\fIfmt\fP\fB, va_list \fP\fIvarglist\fP\fB);\fP
+ .SH DESCRIPTION
+-The \fBprintw\fR, \fBwprintw\fR, \fBmvprintw\fR and \fBmvwprintw\fR
+-routines are analogous to \fBprintf\fR [see \fBprintf\fR(3)].
++The \fBprintw\fP, \fBwprintw\fP, \fBmvprintw\fP and \fBmvwprintw\fP
++routines are analogous to \fBprintf\fP [see \fBprintf\fP(3)].
+ In
+-effect, the string that would be output by \fBprintf\fR is output
+-instead as though \fBwaddstr\fR were used on the given window.
++effect, the string that would be output by \fBprintf\fP is output
++instead as though \fBwaddstr\fP were used on the given window.
+ .PP
+-The \fBvwprintw\fR and \fBvw_printw\fR routines are analogous
+-to \fBvprintf\fR [see \fBprintf\fR(3)]
+-and perform a \fBwprintw\fR using a variable argument list.
+-The third argument is a \fBva_list\fR, a pointer to a
+-list of arguments, as defined in \fB\fR.
++The \fBvwprintw\fP and \fBvw_printw\fP routines are analogous
++to \fBvprintf\fP [see \fBprintf\fP(3)]
++and perform a \fBwprintw\fP using a variable argument list.
++The third argument is a \fBva_list\fP, a pointer to a
++list of arguments, as defined in \fB\fP.
+ .SH RETURN VALUE
+-Routines that return an integer return \fBERR\fR upon failure and \fBOK\fR
+-(SVr4 only specifies "an integer value other than \fBERR\fR") upon successful
++Routines that return an integer return \fBERR\fP upon failure and \fBOK\fP
++(SVr4 only specifies "an integer value other than \fBERR\fP") upon successful
+ completion.
+ .PP
+ X/Open defines no error conditions.
+@@ -117,7 +117,7 @@
+ SVr3 also added \fBvwprintw\fP, saying that the third parameter
+ is a \fBva_list\fP, defined in ,
+ and referring the reader to the manual pages for \fIvarargs\fP and
+-\fIvprintf\fP for detailed descriptions.
++\fBvprintf\fP for detailed descriptions.
+ .PP
+ SVr4 added no new variations of \fBprintw\fP,
+ but provided for using  or  to define the \fBva_list\fP
+@@ -132,23 +132,23 @@
+ .bP
+ The XSI Curses standard, Issue 4 described these functions.
+ The function
+-\fBvwprintw\fR is marked TO BE WITHDRAWN, and is to be replaced by a function
+-\fBvw_printw\fR using the \fB\fR interface.
++\fBvwprintw\fP is marked TO BE WITHDRAWN, and is to be replaced by a function
++\fBvw_printw\fP using the \fB\fP interface.
+ .bP
+ The Single Unix Specification, Version 2 states that
+-\fBvw_printw\fR  is preferred to \fBvwprintw\fR since the latter requires
+-including \fB\fR, which
+-cannot be used in the same file as \fB\fR.
+-This implementation uses \fB\fR for both,
+-because that header is included in \fB.
++\fBvw_printw\fP  is preferred to \fBvwprintw\fP since the latter requires
++including \fB\fP, which
++cannot be used in the same file as \fB\fP.
++This implementation uses \fB\fP for both,
++because that header is included in \fB.
+ .bP
+ X/Open Curses, Issue 5 (December 2007) marked \fBvwprintw\fP (along with
+ \fBvwscanw\fP and the termcap interface) as withdrawn.
+ .SH SEE ALSO
+ .na
+-\fBcurses\fR(3X),
+-\fBcurs_addstr\fR(3X),
+-\fBcurs_scanw\fR(3X),
++\fBcurses\fP(3X),
++\fBcurs_addstr\fP(3X),
++\fBcurs_scanw\fP(3X),
+ \fBcurs_termcap\fP(3X),
+-\fBprintf\fR(3),
+-\fBvprintf\fR(3).
++\fBprintf\fP(3),
++\fBvprintf\fP(3).
+Index: man/curs_refresh.3x
+Prereq:  1.22 
+--- ncurses-6.3-20211219+/man/curs_refresh.3x	2020-10-24 09:43:49.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_refresh.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2016 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_refresh.3x,v 1.22 2020/10/24 09:43:49 tom Exp $
++.\" $Id: curs_refresh.3x,v 1.24 2021/12/25 21:49:32 tom Exp $
+ .TH curs_refresh 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -40,95 +40,95 @@
+ .na
+ .hy 0
+ .SH NAME
+-\fBdoupdate\fR,
+-\fBredrawwin\fR,
+-\fBrefresh\fR,
+-\fBwnoutrefresh\fR,
+-\fBwredrawln\fR,
+-\fBwrefresh\fR \- refresh \fBcurses\fR windows and lines
++\fBdoupdate\fP,
++\fBredrawwin\fP,
++\fBrefresh\fP,
++\fBwnoutrefresh\fP,
++\fBwredrawln\fP,
++\fBwrefresh\fP \- refresh \fBcurses\fP windows and lines
+ .ad
+ .hy
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBint refresh(void);\fR
++\fBint refresh(void);\fP
+ .br
+-\fBint wrefresh(WINDOW *\fP\fIwin\fP\fB);\fR
++\fBint wrefresh(WINDOW *\fP\fIwin\fP\fB);\fP
+ .br
+-\fBint wnoutrefresh(WINDOW *\fP\fIwin\fP\fB);\fR
++\fBint wnoutrefresh(WINDOW *\fP\fIwin\fP\fB);\fP
+ .br
+-\fBint doupdate(void);\fR
++\fBint doupdate(void);\fP
+ .sp
+-\fBint redrawwin(WINDOW *\fP\fIwin\fP\fB);\fR
++\fBint redrawwin(WINDOW *\fP\fIwin\fP\fB);\fP
+ .br
+-\fBint wredrawln(WINDOW *\fP\fIwin\fP\fB, int \fP\fIbeg_line\fP\fB, int \fP\fInum_lines\fP\fB);\fR
++\fBint wredrawln(WINDOW *\fP\fIwin\fP\fB, int \fP\fIbeg_line\fP\fB, int \fP\fInum_lines\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+ .SS refresh/wrefresh
+-The \fBrefresh\fR and \fBwrefresh\fR routines (or \fBwnoutrefresh\fR and
+-\fBdoupdate\fR) must be called to get actual output to the terminal,
++The \fBrefresh\fP and \fBwrefresh\fP routines (or \fBwnoutrefresh\fP and
++\fBdoupdate\fP) must be called to get actual output to the terminal,
+ as other routines merely manipulate data structures.
+-The routine \fBwrefresh\fR copies
++The routine \fBwrefresh\fP copies
+ the named window to the \fIphysical screen\fP,
+ taking into account what is already there to do optimizations.
+-The \fBrefresh\fR routine is the
+-same, using \fBstdscr\fR as the default window.
+-Unless \fBleaveok\fR has been
++The \fBrefresh\fP routine is the
++same, using \fBstdscr\fP as the default window.
++Unless \fBleaveok\fP has been
+ enabled, the physical cursor of the terminal is left at the location of the
+ cursor for that window.
+ .SS wnoutrefresh/doupdate
+ .PP
+-The \fBwnoutrefresh\fR and \fBdoupdate\fR routines allow multiple updates with
+-more efficiency than \fBwrefresh\fR alone.
++The \fBwnoutrefresh\fP and \fBdoupdate\fP routines allow multiple updates with
++more efficiency than \fBwrefresh\fP alone.
+ In addition to all the window
+-structures, \fBcurses\fR keeps two data structures representing the terminal
++structures, \fBcurses\fP keeps two data structures representing the terminal
+ screen:
+ .bP
+ a \fIphysical screen\fP, describing what is actually on the screen, and
+ .bP
+ a \fIvirtual screen\fP, describing what the programmer wants to have on the screen.
+ .PP
+-The routine \fBwrefresh\fR works by
++The routine \fBwrefresh\fP works by
+ .bP
+-first calling \fBwnoutrefresh\fR,
++first calling \fBwnoutrefresh\fP,
+ which copies the named window to the \fIvirtual screen\fP, and
+ .bP
+-then calling \fBdoupdate\fR, which compares
++then calling \fBdoupdate\fP, which compares
+ the \fIvirtual screen\fP to the \fIphysical screen\fP
+ and does the actual update.
+ .PP
+ If the programmer wishes to output several windows at once, a series
+-of calls to \fBwrefresh\fR results in alternating calls to \fBwnoutrefresh\fR
+-and \fBdoupdate\fR, causing several bursts of output to the screen.
++of calls to \fBwrefresh\fP results in alternating calls to \fBwnoutrefresh\fP
++and \fBdoupdate\fP, causing several bursts of output to the screen.
+ By first
+-calling \fBwnoutrefresh\fR for each window, it is then possible to call
+-\fBdoupdate\fR once, resulting in only one burst of output, with fewer total
++calling \fBwnoutrefresh\fP for each window, it is then possible to call
++\fBdoupdate\fP once, resulting in only one burst of output, with fewer total
+ characters transmitted and less CPU time used.
+ .PP
+-If the \fIwin\fR argument to
+-\fBwrefresh\fR is the \fIphysical screen\fP
+-(i.e., the global variable \fBcurscr\fR),
++If the \fIwin\fP argument to
++\fBwrefresh\fP is the \fIphysical screen\fP
++(i.e., the global variable \fBcurscr\fP),
+ the screen is immediately cleared and repainted from scratch.
+ .PP
+ The phrase \*(``copies the named window
+ to the virtual screen\*('' above is ambiguous.
+-What actually happens is that all \fItouched\fR (changed) lines in the window
++What actually happens is that all \fItouched\fP (changed) lines in the window
+ are copied to the virtual screen.
+ This affects programs that use overlapping
+ windows; it means that if two windows overlap, you can refresh them in either
+ order and the overlap region will be modified only when it is explicitly
+ changed.
+-(But see the section on \fBPORTABILITY\fR below for a warning about
++(But see the section on \fBPORTABILITY\fP below for a warning about
+ exploiting this behavior.)
+ .SS wredrawln/redrawwin
+ .PP
+-The \fBwredrawln\fR routine indicates to \fBcurses\fR that some screen lines
++The \fBwredrawln\fP routine indicates to \fBcurses\fP that some screen lines
+ are corrupted and should be thrown away before anything is written over them.
+ It touches the indicated lines (marking them changed).
+-The routine \fBredrawwin\fR touches the entire window.
++The routine \fBredrawwin\fP touches the entire window.
+ .SH RETURN VALUE
+-Routines that return an integer return \fBERR\fR upon failure, and \fBOK\fR
+-(SVr4 only specifies "an integer value other than \fBERR\fR") upon successful
++Routines that return an integer return \fBERR\fP upon failure, and \fBOK\fP
++(SVr4 only specifies "an integer value other than \fBERR\fP") upon successful
+ completion.
+ .PP
+ X/Open does not define any error conditions.
+@@ -145,19 +145,19 @@
+ if the associated call to \fBtouchln\fP returns an error.
+ .RE
+ .SH NOTES
+-Note that \fBrefresh\fR and \fBredrawwin\fR may be macros.
++Note that \fBrefresh\fP and \fBredrawwin\fP may be macros.
+ .SH PORTABILITY
+ The XSI Curses standard, Issue 4 describes these functions.
+ .PP
+-Whether \fBwnoutrefresh\fR copies to the virtual screen the entire contents
++Whether \fBwnoutrefresh\fP copies to the virtual screen the entire contents
+ of a window or just its changed portions has never been well-documented in
+ historic curses versions (including SVr4).
+ It might be unwise to rely on
+ either behavior in programs that might have to be linked with other curses
+ implementations.
+-Instead, you can do an explicit \fBtouchwin\fR before the
+-\fBwnoutrefresh\fR call to guarantee an entire-contents copy anywhere.
++Instead, you can do an explicit \fBtouchwin\fP before the
++\fBwnoutrefresh\fP call to guarantee an entire-contents copy anywhere.
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBcurs_outopts\fR(3X)
+-\fBcurs_variables\fR(3X).
++\fBcurses\fP(3X),
++\fBcurs_outopts\fP(3X)
++\fBcurs_variables\fP(3X).
+Index: man/curs_scanw.3x
+Prereq:  1.28 
+--- ncurses-6.3-20211219+/man/curs_scanw.3x	2020-10-24 09:29:26.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_scanw.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_scanw.3x,v 1.28 2020/10/24 09:29:26 tom Exp $
++.\" $Id: curs_scanw.3x,v 1.31 2021/12/25 21:49:32 tom Exp $
+ .TH curs_scanw 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -38,46 +38,46 @@
+ .el    .IP \(bu 2
+ ..
+ .SH NAME
+-\fBscanw\fR,
+-\fBwscanw\fR,
+-\fBmvscanw\fR,
+-\fBmvwscanw\fR,
+-\fBvwscanw\fR, \fBvw_scanw\fR \- convert formatted input from a \fBcurses\fR window
++\fBscanw\fP,
++\fBwscanw\fP,
++\fBmvscanw\fP,
++\fBmvwscanw\fP,
++\fBvwscanw\fP, \fBvw_scanw\fP \- convert formatted input from a \fBcurses\fP window
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBint scanw(const char *\fP\fIfmt\fP\fB, ...);\fR
++\fBint scanw(const char *\fP\fIfmt\fP\fB, ...);\fP
+ .br
+-\fBint wscanw(WINDOW *\fP\fIwin\fP\fB, const char *\fP\fIfmt\fP\fB, ...);\fR
++\fBint wscanw(WINDOW *\fP\fIwin\fP\fB, const char *\fP\fIfmt\fP\fB, ...);\fP
+ .br
+-\fBint mvscanw(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const char *\fP\fIfmt\fP\fB, ...);\fR
++\fBint mvscanw(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const char *\fP\fIfmt\fP\fB, ...);\fP
+ .br
+-\fBint mvwscanw(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const char *\fP\fIfmt\fP\fB, ...);\fR
++\fBint mvwscanw(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const char *\fP\fIfmt\fP\fB, ...);\fP
+ .sp
+-\fBint vw_scanw(WINDOW *\fP\fIwin\fP\fB, const char *\fP\fIfmt\fP\fB, va_list \fP\fIvarglist\fP\fB);\fR
++\fBint vw_scanw(WINDOW *\fP\fIwin\fP\fB, const char *\fP\fIfmt\fP\fB, va_list \fP\fIvarglist\fP\fB);\fP
+ .sp
+ /* obsolete */
+ .br
+-\fBint vwscanw(WINDOW *\fP\fIwin\fP\fB, const char *\fP\fIfmt\fP\fB, va_list \fP\fIvarglist\fP\fB);\fR
++\fBint vwscanw(WINDOW *\fP\fIwin\fP\fB, const char *\fP\fIfmt\fP\fB, va_list \fP\fIvarglist\fP\fB);\fP
+ .SH DESCRIPTION
+-The \fBscanw\fR, \fBwscanw\fR and \fBmvscanw\fR routines are analogous to
+-\fBscanf\fR [see \fBscanf\fR(3)].
++The \fBscanw\fP, \fBwscanw\fP and \fBmvscanw\fP routines are analogous to
++\fBscanf\fP [see \fBscanf\fP(3)].
+ The effect of these routines is as though
+-\fBwgetstr\fR were called on the window, and the resulting line used as input
+-for \fBsscanf\fR(3).
+-Fields which do not map to a variable in the \fIfmt\fR
++\fBwgetstr\fP were called on the window, and the resulting line used as input
++for \fBsscanf\fP(3).
++Fields which do not map to a variable in the \fIfmt\fP
+ field are lost.
+ .PP
+-The \fBvwscanw\fR and \fBvw_scanw\fR routines are analogous to \fBvscanf\fR(3).
+-They perform a \fBwscanw\fR using a variable argument list.
+-The third argument is a \fIva_list\fR,
+-a pointer to a list of arguments, as defined in \fB\fR.
++The \fBvwscanw\fP and \fBvw_scanw\fP routines are analogous to \fBvscanf\fP(3).
++They perform a \fBwscanw\fP using a variable argument list.
++The third argument is a \fBva_list\fP,
++a pointer to a list of arguments, as defined in \fB\fP.
+ .SH RETURN VALUE
+-\fBvwscanw\fR returns \fBERR\fR on failure and an integer equal to the
++\fBvwscanw\fP returns \fBERR\fP on failure and an integer equal to the
+ number of fields scanned on success.
+ .PP
+-Applications may use the return value from the \fBscanw\fR, \fBwscanw\fR,
+-\fBmvscanw\fR and \fBmvwscanw\fR routines to determine the number of fields
++Applications may use the return value from the \fBscanw\fP, \fBwscanw\fP,
++\fBmvscanw\fP and \fBmvwscanw\fP routines to determine the number of fields
+ which were mapped in the call.
+ .PP
+ Functions with a \*(``mv\*('' prefix first perform a cursor movement using
+@@ -111,9 +111,9 @@
+ SVr3 also added \fBvwscanw\fP, saying that the third parameter
+ is a \fBva_list\fP, defined in ,
+ and referring the reader to the manual pages for \fIvarargs\fP and
+-\fIvprintf\fP for detailed descriptions.
+-(Because the SVr3 documentation does not mention \fIvscanf\fP,
+-that reference to \fIvprintf\fP may not be an error).
++\fBvprintf\fP for detailed descriptions.
++(Because the SVr3 documentation does not mention \fBvscanf\fP,
++that reference to \fBvprintf\fP may not be an error).
+ .PP
+ SVr4 added no new variations of \fBscanw\fP,
+ but provided for using  or  to define the \fBva_list\fP
+@@ -128,15 +128,15 @@
+ .bP
+ The XSI Curses standard, Issue 4 described these functions,
+ noting that the function
+-\fBvwscanw\fR is marked TO BE WITHDRAWN, and is to be replaced by a function
+-\fBvw_scanw\fR using the \fB\fR interface.
++\fBvwscanw\fP is marked TO BE WITHDRAWN, and is to be replaced by a function
++\fBvw_scanw\fP using the \fB\fP interface.
+ .bP
+ The Single Unix Specification, Version 2 states that
+-\fBvw_scanw\fR  is preferred to \fBvwscanw\fR since the latter requires
+-including \fB\fR, which
+-cannot be used in the same file as \fB\fR.
+-This implementation uses \fB\fR for both, because that header
+-is included in \fB.
++\fBvw_scanw\fP  is preferred to \fBvwscanw\fP since the latter requires
++including \fB\fP, which
++cannot be used in the same file as \fB\fP.
++This implementation uses \fB\fP for both, because that header
++is included in \fB.
+ .bP
+ X/Open Curses, Issue 5 (December 2007) marked \fBvwscanw\fP (along with
+ \fBvwprintw\fP and the termcap interface) as withdrawn.
+@@ -144,7 +144,7 @@
+ Both XSI and The Single Unix Specification, Version 2 state that these
+ functions return \fBERR\fP or \fBOK\fP.
+ .bP
+-Since the underlying \fBscanf\fR(3) can return the number of items scanned,
++Since the underlying \fBscanf\fP(3) can return the number of items scanned,
+ and the SVr4 code was documented to use this feature,
+ this is probably an editing error which was introduced in XSI,
+ rather than being done intentionally.
+@@ -162,8 +162,8 @@
+ at the end of the format string to ensure that something was processed.
+ .SH SEE ALSO
+ .na
+-\fBcurses\fR(3X),
+-\fBcurs_getstr\fR(3X),
+-\fBcurs_printw\fR(3X),
++\fBcurses\fP(3X),
++\fBcurs_getstr\fP(3X),
++\fBcurs_printw\fP(3X),
+ \fBcurs_termcap\fP(3X),
+-\fBscanf\fR(3).
++\fBscanf\fP(3).
+Index: man/curs_scr_dump.3x
+Prereq:  1.17 
+--- ncurses-6.3-20211219+/man/curs_scr_dump.3x	2021-10-20 22:37:48.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_scr_dump.3x	2021-12-25 21:12:41.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_scr_dump.3x,v 1.17 2021/10/20 22:37:48 tom Exp $
++.\" $Id: curs_scr_dump.3x,v 1.19 2021/12/25 21:12:41 tom Exp $
+ .TH curs_scr_dump 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -40,81 +40,81 @@
+ .na
+ .hy 0
+ .SH NAME
+-\fBscr_dump\fR,
+-\fBscr_restore\fR,
+-\fBscr_init\fR,
+-\fBscr_set\fR \- read (write) a \fBcurses\fR screen from (to) a file
++\fBscr_dump\fP,
++\fBscr_restore\fP,
++\fBscr_init\fP,
++\fBscr_set\fP \- read (write) a \fBcurses\fP screen from (to) a file
+ .ad
+ .hy
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBint scr_dump(const char *\fP\fIfilename\fP\fB);\fR
++\fBint scr_dump(const char *\fP\fIfilename\fP\fB);\fP
+ .br
+-\fBint scr_restore(const char *\fP\fIfilename\fP\fB);\fR
++\fBint scr_restore(const char *\fP\fIfilename\fP\fB);\fP
+ .br
+-\fBint scr_init(const char *\fP\fIfilename\fP\fB);\fR
++\fBint scr_init(const char *\fP\fIfilename\fP\fB);\fP
+ .br
+-\fBint scr_set(const char *\fP\fIfilename\fP\fB);\fR
++\fBint scr_set(const char *\fP\fIfilename\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+ .SS scr_dump
+ .PP
+-The \fBscr_dump\fR routine dumps the current contents
++The \fBscr_dump\fP routine dumps the current contents
+ of the \fIvirtual screen\fP
+-to the file \fIfilename\fR.
++to the file \fIfilename\fP.
+ .SS scr_restore
+ .PP
+-The \fBscr_restore\fR routine sets the \fIvirtual screen\fP to the contents
+-of \fIfilename\fR, which must have been written using \fBscr_dump\fR.
+-The next call to \fBdoupdate\fR restores
++The \fBscr_restore\fP routine sets the \fIvirtual screen\fP to the contents
++of \fIfilename\fP, which must have been written using \fBscr_dump\fP.
++The next call to \fBdoupdate\fP restores
+ the \fIphysical screen\fP to the way it looked in the dump file.
+ .SS scr_init
+ .PP
+-The \fBscr_init\fR routine reads in the contents of \fIfilename\fR and uses
+-them to initialize the \fBcurses\fR data structures about what the terminal
++The \fBscr_init\fP routine reads in the contents of \fIfilename\fP and uses
++them to initialize the \fBcurses\fP data structures about what the terminal
+ currently has on its screen.
+ If the data is determined to be valid,
+-\fBcurses\fR bases its next update of the screen on this information rather
++\fBcurses\fP bases its next update of the screen on this information rather
+ than clearing the screen and starting from scratch.
+-\fBscr_init\fR is used
+-after \fBinitscr\fR or a \fBsystem\fR call to share
+-the screen with another process which has done a \fBscr_dump\fR after its
+-\fBendwin\fR(3X) call.
++\fBscr_init\fP is used
++after \fBinitscr\fP(3X) or a \fBsystem\fP(3) call to share
++the screen with another process which has done a \fBscr_dump\fP after its
++\fBendwin\fP(3X) call.
+ The data is declared invalid
+ .bP
+-if the terminfo capabilities \fBrmcup\fR and \fBnrrmc\fR exist, also
++if the terminfo capabilities \fBrmcup\fP and \fBnrrmc\fP exist, also
+ .bP
+-if the terminal has been written to since the preceding \fBscr_dump\fR call.
++if the terminal has been written to since the preceding \fBscr_dump\fP call.
+ .SS scr_set
+ .PP
+-The \fBscr_set\fR routine is a combination of \fBscr_restore\fR and
+-\fBscr_init\fR.  It tells the program that the information in \fIfilename\fR is
++The \fBscr_set\fP routine is a combination of \fBscr_restore\fP and
++\fBscr_init\fP.  It tells the program that the information in \fIfilename\fP is
+ what is currently on the screen, and also what the program wants on the screen.
+ This can be thought of as a screen inheritance function.
+ .PP
+-To read (write) a window from (to) a file, use the \fBgetwin\fR and
+-\fBputwin\fR routines [see \fBcurs_util\fR(3X)].
++To read (write) a window from (to) a file, use the \fBgetwin\fP and
++\fBputwin\fP routines [see \fBcurs_util\fP(3X)].
+ .SH RETURN VALUE
+-All routines return the integer \fBERR\fR upon failure and \fBOK\fR
++All routines return the integer \fBERR\fP upon failure and \fBOK\fP
+ upon success.
+ .PP
+ X/Open defines no error conditions.
+ In this implementation,
+ each will return an error if the file cannot be opened.
+ .SH NOTES
+-Note that \fBscr_init\fR, \fBscr_set\fR, and \fBscr_restore\fR may be macros.
++Note that \fBscr_init\fP, \fBscr_set\fP, and \fBscr_restore\fP may be macros.
+ .SH PORTABILITY
+ The XSI Curses standard, Issue 4, describes these functions (adding the const
+ qualifiers).
+ .PP
+-The SVr4 docs merely say under \fBscr_init\fR that the dump data is also
++The SVr4 docs merely say under \fBscr_init\fP that the dump data is also
+ considered invalid "if the time-stamp of the tty is old" but do not define
+ \*(``old\*(''.
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBcurs_initscr\fR(3X),
+-\fBcurs_refresh\fR(3X),
+-\fBcurs_util\fR(3X),
+-\fBscr_dump\fR(5),
+-\fBsystem\fR(3)
++\fBcurses\fP(3X),
++\fBcurs_initscr\fP(3X),
++\fBcurs_refresh\fP(3X),
++\fBcurs_util\fP(3X),
++\fBscr_dump\fP(5),
++\fBsystem\fP(3)
+Index: man/curs_scroll.3x
+Prereq:  1.19 
+--- ncurses-6.3-20211219+/man/curs_scroll.3x	2020-10-24 09:45:48.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_scroll.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_scroll.3x,v 1.19 2020/10/24 09:45:48 tom Exp $
++.\" $Id: curs_scroll.3x,v 1.21 2021/12/25 21:49:32 tom Exp $
+ .TH curs_scroll 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -36,39 +36,39 @@
+ .na
+ .hy 0
+ .SH NAME
+-\fBscroll\fR,
+-\fBscrl\fR,
+-\fBwscrl\fR \- scroll a \fBcurses\fR window
++\fBscroll\fP,
++\fBscrl\fP,
++\fBwscrl\fP \- scroll a \fBcurses\fP window
+ .ad
+ .hy
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBint scroll(WINDOW *\fP\fIwin\fP\fB);\fR
++\fBint scroll(WINDOW *\fP\fIwin\fP\fB);\fP
+ .sp
+-\fBint scrl(int \fP\fIn\fP\fB);\fR
++\fBint scrl(int \fP\fIn\fP\fB);\fP
+ .br
+-\fBint wscrl(WINDOW *\fP\fIwin\fP\fB, int \fP\fIn\fP\fB);\fR
++\fBint wscrl(WINDOW *\fP\fIwin\fP\fB, int \fP\fIn\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-The \fBscroll\fR routine scrolls the window up one line.
++The \fBscroll\fP routine scrolls the window up one line.
+ This involves moving
+ the lines in the window data structure.
+ As an optimization, if the scrolling
+ region of the window is the entire screen,
+ the \fIphysical screen\fP may be scrolled at the same time.
+ .PP
+-For positive \fIn\fR, the \fBscrl\fR and \fBwscrl\fR routines scroll the
+-window up \fIn\fR lines (line \fIi\fR+\fIn\fR becomes \fIi\fR); otherwise
+-scroll the window down \fIn\fR lines.
++For positive \fIn\fP, the \fBscrl\fP and \fBwscrl\fP routines scroll the
++window up \fIn\fP lines (line \fIi\fP+\fIn\fP becomes \fIi\fP); otherwise
++scroll the window down \fIn\fP lines.
+ This involves moving the lines in the
+ window character image structure.
+ The current cursor position is not changed.
+ .PP
+-For these functions to work, scrolling must be enabled via \fBscrollok\fR.
++For these functions to work, scrolling must be enabled via \fBscrollok\fP.
+ .SH RETURN VALUE
+-These routines return \fBERR\fR upon failure, and \fBOK\fR (SVr4 only specifies
+-"an integer value other than \fBERR\fR") upon successful completion.
++These routines return \fBERR\fP upon failure, and \fBOK\fP (SVr4 only specifies
++"an integer value other than \fBERR\fP") upon successful completion.
+ .PP
+ X/Open defines no error conditions.
+ .PP
+@@ -76,7 +76,7 @@
+ if the window pointer is null, or
+ if scrolling is not enabled in the window, e.g., with \fBscrollok\fP.
+ .SH NOTES
+-Note that \fBscrl\fR and \fBscroll\fR may be macros.
++Note that \fBscrl\fP and \fBscroll\fP may be macros.
+ .PP
+ The SVr4 documentation says that the optimization of physically scrolling
+ immediately if the scroll region is the entire screen \*(``is\*('' performed, not
+@@ -92,4 +92,4 @@
+ .SH PORTABILITY
+ The XSI Curses standard, Issue 4 describes these functions.
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBcurs_outopts\fR(3X)
++\fBcurses\fP(3X), \fBcurs_outopts\fP(3X)
+Index: man/curs_slk.3x
+Prereq:  1.38 
+--- ncurses-6.3-20211219+/man/curs_slk.3x	2021-06-17 21:26:02.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_slk.3x	2021-12-25 17:39:16.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_slk.3x,v 1.38 2021/06/17 21:26:02 tom Exp $
++.\" $Id: curs_slk.3x,v 1.39 2021/12/25 17:39:16 tom Exp $
+ .TH curs_slk 3X ""
+ .de bP
+ .ie n  .IP \(bu 4
+@@ -36,75 +36,75 @@
+ .na
+ .hy 0
+ .SH NAME
+-\fBslk_init\fR,
+-\fBslk_set\fR,
+-\fBslk_wset\fR,
+-\fBslk_refresh\fR,
+-\fBslk_noutrefresh\fR,
+-\fBslk_label\fR,
+-\fBslk_clear\fR,
+-\fBslk_restore\fR,
+-\fBslk_touch\fR,
+-\fBslk_attron\fR,
+-\fBslk_attrset\fR,
+-\fBslk_attroff\fR,
+-\fBslk_attr_on\fR,
+-\fBslk_attr_set\fR,
+-\fBslk_attr_off\fR,
+-\fBslk_attr\fR,
+-\fBslk_color\fR,
+-\fBextended_slk_color\fR \- \fBcurses\fR soft label routines
++\fBslk_init\fP,
++\fBslk_set\fP,
++\fBslk_wset\fP,
++\fBslk_refresh\fP,
++\fBslk_noutrefresh\fP,
++\fBslk_label\fP,
++\fBslk_clear\fP,
++\fBslk_restore\fP,
++\fBslk_touch\fP,
++\fBslk_attron\fP,
++\fBslk_attrset\fP,
++\fBslk_attroff\fP,
++\fBslk_attr_on\fP,
++\fBslk_attr_set\fP,
++\fBslk_attr_off\fP,
++\fBslk_attr\fP,
++\fBslk_color\fP,
++\fBextended_slk_color\fP \- \fBcurses\fP soft label routines
+ .ad
+ .hy
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBint slk_init(int \fP\fIfmt\fP\fB);\fR
++\fBint slk_init(int \fP\fIfmt\fP\fB);\fP
+ .sp
+-\fBint slk_set(int \fP\fIlabnum\fP\fB, const char *\fP\fIlabel\fP\fB, int \fP\fIfmt\fP\fB);\fR
++\fBint slk_set(int \fP\fIlabnum\fP\fB, const char *\fP\fIlabel\fP\fB, int \fP\fIfmt\fP\fB);\fP
+ .br
+ /* extension */
+ .br
+-\fBint slk_wset(int \fP\fIlabnum\fP\fB, const wchar_t *\fP\fIlabel\fP\fB, int \fP\fIfmt\fP\fB);\fR
++\fBint slk_wset(int \fP\fIlabnum\fP\fB, const wchar_t *\fP\fIlabel\fP\fB, int \fP\fIfmt\fP\fB);\fP
+ .sp
+-\fBchar *slk_label(int \fP\fIlabnum\fP\fB);\fR
++\fBchar *slk_label(int \fP\fIlabnum\fP\fB);\fP
+ .sp
+-\fBint slk_refresh(void);\fR
++\fBint slk_refresh(void);\fP
+ .br
+-\fBint slk_noutrefresh(void);\fR
++\fBint slk_noutrefresh(void);\fP
+ .br
+-\fBint slk_clear(void);\fR
++\fBint slk_clear(void);\fP
+ .br
+-\fBint slk_restore(void);\fR
++\fBint slk_restore(void);\fP
+ .br
+-\fBint slk_touch(void);\fR
++\fBint slk_touch(void);\fP
+ .sp
+-\fBint slk_attron(const chtype \fP\fIattrs\fP\fB);\fR
++\fBint slk_attron(const chtype \fP\fIattrs\fP\fB);\fP
+ .br
+-\fBint slk_attroff(const chtype \fP\fIattrs\fP\fB);\fR
++\fBint slk_attroff(const chtype \fP\fIattrs\fP\fB);\fP
+ .br
+-\fBint slk_attrset(const chtype \fP\fIattrs\fP\fB);\fR
++\fBint slk_attrset(const chtype \fP\fIattrs\fP\fB);\fP
+ .br
+-\fBint slk_attr_on(attr_t \fP\fIattrs\fP\fB, void* \fP\fIopts\fP\fB);\fR
++\fBint slk_attr_on(attr_t \fP\fIattrs\fP\fB, void* \fP\fIopts\fP\fB);\fP
+ .br
+-\fBint slk_attr_off(const attr_t \fP\fIattrs\fP\fB, void * \fP\fIopts\fP\fB);\fR
++\fBint slk_attr_off(const attr_t \fP\fIattrs\fP\fB, void * \fP\fIopts\fP\fB);\fP
+ .br
+-\fBint slk_attr_set(const attr_t \fP\fIattrs\fP\fB, short \fP\fIpair\fP\fB, void* \fP\fIopts\fP\fB);\fR
++\fBint slk_attr_set(const attr_t \fP\fIattrs\fP\fB, short \fP\fIpair\fP\fB, void* \fP\fIopts\fP\fB);\fP
+ .sp
+-\fBattr_t slk_attr(void);\fR
++\fBattr_t slk_attr(void);\fP
+ .sp
+-\fBint slk_color(short \fP\fIpair\fP\fB);\fR
++\fBint slk_color(short \fP\fIpair\fP\fB);\fP
+ .br
+ /* extension */
+ .br
+-\fBint extended_slk_color(int \fP\fIpair\fP\fB);\fR
++\fBint extended_slk_color(int \fP\fIpair\fP\fB);\fP
+ .SH DESCRIPTION
+ The slk* functions manipulate the set of soft function-key labels that exist on
+ many terminals.
+ For those terminals that do not have soft labels,
+-\fBcurses\fR takes over the bottom line of \fBstdscr\fR, reducing the size of
+-\fBstdscr\fR and the variable \fBLINES\fR.
+-\fBcurses\fR standardizes on eight
++\fBcurses\fP takes over the bottom line of \fBstdscr\fP, reducing the size of
++\fBstdscr\fP and the variable \fBLINES\fP.
++\fBcurses\fP standardizes on eight
+ labels of up to eight characters each.
+ In addition to this, the ncurses
+ implementation supports a mode where it simulates 12 labels of up to five
+@@ -116,11 +116,11 @@
+ mode.
+ .SS Initialization
+ .PP
+-The \fBslk_init\fR routine must be called before \fBinitscr\fR or \fBnewterm\fR
++The \fBslk_init\fP routine must be called before \fBinitscr\fP or \fBnewterm\fP
+ is called.
+-If \fBinitscr\fR eventually uses a line from \fBstdscr\fR to
++If \fBinitscr\fP eventually uses a line from \fBstdscr\fP to
+ emulate the soft labels,
+-then \fIfmt\fR determines how the labels are arranged on the screen:
++then \fIfmt\fP determines how the labels are arranged on the screen:
+ .RS 3
+ .TP 3
+ .B 0
+@@ -140,13 +140,13 @@
+ .RE
+ .SS Labels
+ .PP
+-The \fBslk_set\fR routine
+-(and the \fBslk_wset\fR routine for the wide-character library)
++The \fBslk_set\fP routine
++(and the \fBslk_wset\fP routine for the wide-character library)
+ has three parameters:
+ .RS 3
+ .TP 5
+ .I labnum
+-is the label number, from \fB1\fR to \fB8\fR
++is the label number, from \fB1\fP to \fB8\fP
+ (12 for \fIfmt\fP in \fBslk_init\fP is \fB2\fP or \fB3\fP);
+ .TP
+ .I label
+@@ -158,55 +158,55 @@
+ .TP
+ .I fmt
+ is either
+-\fB0\fR, \fB1\fR, or \fB2\fR, indicating whether the label is to be
++\fB0\fP, \fB1\fP, or \fB2\fP, indicating whether the label is to be
+ left-justified, centered, or right-justified, respectively, within the
+ label.
+ .RE
+ .PP
+-The \fBslk_label\fR routine returns the current label for label number
+-\fIlabnum\fR, with leading and trailing blanks stripped.
++The \fBslk_label\fP routine returns the current label for label number
++\fIlabnum\fP, with leading and trailing blanks stripped.
+ .SS Screen updates
+ .PP
+-The \fBslk_refresh\fR and \fBslk_noutrefresh\fR routines correspond to
+-the \fBwrefresh\fR and \fBwnoutrefresh\fR routines.
++The \fBslk_refresh\fP and \fBslk_noutrefresh\fP routines correspond to
++the \fBwrefresh\fP and \fBwnoutrefresh\fP routines.
+ .PP
+-The \fBslk_clear\fR routine clears the soft labels from the screen.
++The \fBslk_clear\fP routine clears the soft labels from the screen.
+ .PP
+-The \fBslk_restore\fR routine restores the soft labels to the screen
+-after a \fBslk_clear\fR has been performed.
++The \fBslk_restore\fP routine restores the soft labels to the screen
++after a \fBslk_clear\fP has been performed.
+ .PP
+-The \fBslk_touch\fR routine forces all the soft labels to be output
+-the next time a \fBslk_noutrefresh\fR is performed.
++The \fBslk_touch\fP routine forces all the soft labels to be output
++the next time a \fBslk_noutrefresh\fP is performed.
+ .SS Video attributes
+ .PP
+ The
+-\fBslk_attron\fR, \fBslk_attrset\fR, \fBslk_attroff\fR and \fBslk_attr\fR
++\fBslk_attron\fP, \fBslk_attrset\fP, \fBslk_attroff\fP and \fBslk_attr\fP
+ routines correspond to
+-\fBattron\fR, \fBattrset\fR, \fBattroff\fR and \fBattr_get\fR, respectively.
++\fBattron\fP, \fBattrset\fP, \fBattroff\fP and \fBattr_get\fP, respectively.
+ They have an effect only if soft labels are simulated on the bottom line of
+ the screen.
+ The default highlight for soft keys is A_STANDOUT (as in
+ System V curses, which does not document this fact).
+ .SS Colors
+ .PP
+-The \fBslk_color\fR routine corresponds to \fBcolor_set\fR.
++The \fBslk_color\fP routine corresponds to \fBcolor_set\fP.
+ It has an effect only
+ if soft labels are simulated on the bottom line of the screen.
+ .PP
+-Because \fBslk_color\fR accepts only \fBshort\fP (signed 16-bit integer) values,
++Because \fBslk_color\fP accepts only \fBshort\fP (signed 16-bit integer) values,
+ this implementation provides
+-\fBextended_slk_color\fR which accepts an integer value, e.g., 32-bits.
++\fBextended_slk_color\fP which accepts an integer value, e.g., 32-bits.
+ .
+ .SH RETURN VALUE
+-These routines return \fBERR\fR upon failure
+-and \fBOK\fP (SVr4 specifies only "an integer value other than \fBERR\fR")
++These routines return \fBERR\fP upon failure
++and \fBOK\fP (SVr4 specifies only "an integer value other than \fBERR\fP")
+ upon successful completion.
+ .PP
+ X/Open defines no error conditions.
+ In this implementation
+ .RS 3
+ .TP 5
+-\fBslk_attr\fR
++\fBslk_attr\fP
+ returns the attribute used for the soft keys.
+ .TP 5
+ .na
+@@ -231,12 +231,12 @@
+ if the terminal or the softkeys were not initialized, or
+ the color pair is outside the range 0..COLOR_PAIRS\-1.
+ .TP 5
+-\fBslk_init\fR
++\fBslk_init\fP
+ returns an error
+ if the format parameter is outside the range 0..3.
+ .TP 5
+-\fBslk_label\fR
+-returns \fBNULL\fR on error.
++\fBslk_label\fP
++returns \fBNULL\fP on error.
+ .TP 5
+ \fBslk_set\fP
+ returns an error
+@@ -280,16 +280,16 @@
+ if \fIopts\fP is set it is treated as a pointer to \fBint\fP,
+ and used to  set  the  color pair instead of the \fBshort\fP pair parameter.
+ .SH NOTES
+-Most applications would use \fBslk_noutrefresh\fR because a
+-\fBwrefresh\fR is likely to follow soon.
++Most applications would use \fBslk_noutrefresh\fP because a
++\fBwrefresh\fP is likely to follow soon.
+ .SH PORTABILITY
+ The XSI Curses standard, Issue 4, described the soft-key functions,
+ with some differences from SVr4 curses:
+ .bP
+ It added functions like the SVr4
+-attribute-manipulation functions \fBslk_attron\fR,
+-\fBslk_attroff\fR, \fBslk_attrset\fR,
+-but which use \fBattr_t\fR parameters (rather than \fBchtype\fP),
++attribute-manipulation functions \fBslk_attron\fP,
++\fBslk_attroff\fP, \fBslk_attrset\fP,
++but which use \fBattr_t\fP parameters (rather than \fBchtype\fP),
+ along with a reserved \fIopts\fP parameter.
+ .IP
+ Two of these new functions (unlike the SVr4 functions) have no provision
+@@ -297,12 +297,12 @@
+ .IP
+ The third function (\fBslk_attr_set\fP) has a color-pair parameter.
+ .bP
+-It added \fBconst\fR qualifiers to parameters (unnecessarily), and
++It added \fBconst\fP qualifiers to parameters (unnecessarily), and
+ .bP
+ It added \fBslk_color\fP.
+ .PP
+-The format codes \fB2\fR and \fB3\fR for \fBslk_init\fR and the
+-function \fBslk_attr\fR are specific to ncurses.
++The format codes \fB2\fP and \fB3\fP for \fBslk_init\fP and the
++function \fBslk_attr\fP are specific to ncurses.
+ .PP
+ X/Open Curses does not specify a limit for the number of colors and
+ color pairs which a terminal can support.
+@@ -313,8 +313,8 @@
+ which use \fBshort\fP parameters,
+ allowing applications to use larger color- and pair-numbers.
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBcurs_attr\fR(3X),
+-\fBcurs_initscr\fR(3X),
+-\fBcurs_refresh\fR(3X),
+-\fBcurs_variables\fR(3X).
++\fBcurses\fP(3X),
++\fBcurs_attr\fP(3X),
++\fBcurs_initscr\fP(3X),
++\fBcurs_refresh\fP(3X),
++\fBcurs_variables\fP(3X).
+Index: man/curs_sp_funcs.3x
+Prereq:  1.25 
+--- ncurses-6.3-20211219+/man/curs_sp_funcs.3x	2021-05-22 22:12:46.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_sp_funcs.3x	2021-12-25 17:54:00.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_sp_funcs.3x,v 1.25 2021/05/22 22:12:46 tom Exp $
++.\" $Id: curs_sp_funcs.3x,v 1.26 2021/12/25 17:54:00 tom Exp $
+ .TH curs_sp_funcs 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -36,286 +36,286 @@
+ .na
+ .hy 0
+ .SH NAME
+-curs_sp_funcs \- \fBcurses\fR screen-pointer extension
++curs_sp_funcs \- \fBcurses\fP screen-pointer extension
+ .ad
+ .hy
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .nf
+ .sp
+-\fBint alloc_pair_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIfg\fP\fB, int \fP\fIbg\fP\fB);\fR
++\fBint alloc_pair_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIfg\fP\fB, int \fP\fIbg\fP\fB);\fP
+ .br
+-\fBint assume_default_colors_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIfg\fP\fB, int \fP\fIbg\fP\fB);\fR
++\fBint assume_default_colors_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIfg\fP\fB, int \fP\fIbg\fP\fB);\fP
+ .br
+-\fBint baudrate_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBint baudrate_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBint beep_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBint beep_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBbool can_change_color_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBbool can_change_color_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBint cbreak_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBint cbreak_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBint color_content_sp(SCREEN* \fP\fIsp\fP\fB, short \fP\fIcolor\fP\fB, short* \fP\fIr\fP\fB, short* \fP\fIg\fP\fB, short* \fP\fIb\fP\fB);\fR
++\fBint color_content_sp(SCREEN* \fP\fIsp\fP\fB, short \fP\fIcolor\fP\fB, short* \fP\fIr\fP\fB, short* \fP\fIg\fP\fB, short* \fP\fIb\fP\fB);\fP
+ .br
+-\fBint curs_set_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIvisibility\fP);\fR
++\fBint curs_set_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIvisibility\fP);\fP
+ .br
+-\fBint def_prog_mode_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBint def_prog_mode_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBint def_shell_mode_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBint def_shell_mode_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .sp
+-\fBint define_key_sp(SCREEN* \fP\fIsp\fP\fB, const char * \fP\fIdefinition\fP\fB, int \fP\fIkeycode\fP\fB);\fR
++\fBint define_key_sp(SCREEN* \fP\fIsp\fP\fB, const char * \fP\fIdefinition\fP\fB, int \fP\fIkeycode\fP\fB);\fP
+ .br
+-\fBint delay_output_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIms\fP\fB);\fR
++\fBint delay_output_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIms\fP\fB);\fP
+ .br
+-\fBint doupdate_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBint doupdate_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBint echo_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBint echo_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBint endwin_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBint endwin_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBchar erasechar_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBchar erasechar_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBint erasewchar_sp(SCREEN* \fP\fIsp\fP\fB, wchar_t *\fP\fIch\fP\fB);\fR
++\fBint erasewchar_sp(SCREEN* \fP\fIsp\fP\fB, wchar_t *\fP\fIch\fP\fB);\fP
+ .br
+-\fBint extended_color_content_sp(SCREEN * \fP\fIsp\fP\fB, int \fP\fIcolor\fP\fB, int * \fP\fIr\fP\fB, int * \fP\fIg\fP\fB, int * \fP\fIb\fP\fB);\fR
++\fBint extended_color_content_sp(SCREEN * \fP\fIsp\fP\fB, int \fP\fIcolor\fP\fB, int * \fP\fIr\fP\fB, int * \fP\fIg\fP\fB, int * \fP\fIb\fP\fB);\fP
+ .br
+-\fBint extended_pair_content_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIpair\fP\fB, int * \fP\fIfg\fP\fB, int * \fP\fIbg\fP\fB);\fR
++\fBint extended_pair_content_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIpair\fP\fB, int * \fP\fIfg\fP\fB, int * \fP\fIbg\fP\fB);\fP
+ .br
+-\fBint extended_slk_color_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIpair\fP\fB);\fR
++\fBint extended_slk_color_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIpair\fP\fB);\fP
+ .sp
+-\fBvoid filter_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBvoid filter_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBint find_pair_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIfg\fP\fB, int \fP\fIbg\fP\fB);\fR
++\fBint find_pair_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIfg\fP\fB, int \fP\fIbg\fP\fB);\fP
+ .br
+-\fBint flash_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBint flash_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBint flushinp_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBint flushinp_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBint free_pair_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIpair\fP\fB);\fR
++\fBint free_pair_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIpair\fP\fB);\fP
+ .br
+-\fBint get_escdelay_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBint get_escdelay_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBint getmouse_sp(SCREEN* \fP\fIsp\fP\fB, MEVENT* \fP\fBevent\fP\fB);\fR
++\fBint getmouse_sp(SCREEN* \fP\fIsp\fP\fB, MEVENT* \fP\fBevent\fP\fB);\fP
+ .br
+-\fBWINDOW* getwin_sp(SCREEN* \fP\fIsp\fP\fB, FILE* \fP\fIfilep\fP\fB);\fR
++\fBWINDOW* getwin_sp(SCREEN* \fP\fIsp\fP\fB, FILE* \fP\fIfilep\fP\fB);\fP
+ .br
+-\fBint halfdelay_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fItenths\fP\fB);\fR
++\fBint halfdelay_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fItenths\fP\fB);\fP
+ .br
+-\fBbool has_colors_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBbool has_colors_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .sp
+-\fBbool has_ic_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBbool has_ic_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBbool has_il_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBbool has_il_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBint has_key_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIch\fP\fB);\fR
++\fBint has_key_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIch\fP\fB);\fP
+ .br
+-\fBbool has_mouse_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBbool has_mouse_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBint init_color_sp(SCREEN* \fP\fIsp\fP\fB, short \fP\fIcolor\fP\fB, short \fP\fIr\fP\fB, short \fP\fIg\fP\fB, short \fP\fIb\fP\fB);\fR
++\fBint init_color_sp(SCREEN* \fP\fIsp\fP\fB, short \fP\fIcolor\fP\fB, short \fP\fIr\fP\fB, short \fP\fIg\fP\fB, short \fP\fIb\fP\fB);\fP
+ .br
+-\fBint init_extended_color_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIcolor\fP\fB, int \fP\fIr\fP\fB, int \fP\fIg\fP\fB, int \fP\fIb\fP\fB);\fR
++\fBint init_extended_color_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIcolor\fP\fB, int \fP\fIr\fP\fB, int \fP\fIg\fP\fB, int \fP\fIb\fP\fB);\fP
+ .br
+-\fBint init_extended_pair_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIpair\fP\fB, int \fP\fIfg\fP\fB, int \fP\fIbg\fP\fB);\fR
++\fBint init_extended_pair_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIpair\fP\fB, int \fP\fIfg\fP\fB, int \fP\fIbg\fP\fB);\fP
+ .br
+-\fBint init_pair_sp(SCREEN* \fP\fIsp\fP\fB, short \fP\fIpair\fP\fB, short \fP\fIfg\fP\fB, short \fP\fIbg\fP\fB);\fR
++\fBint init_pair_sp(SCREEN* \fP\fIsp\fP\fB, short \fP\fIpair\fP\fB, short \fP\fIfg\fP\fB, short \fP\fIbg\fP\fB);\fP
+ .br
+-\fBint intrflush_sp(SCREEN* \fP\fIsp\fP\fB, WINDOW* \fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fR
++\fBint intrflush_sp(SCREEN* \fP\fIsp\fP\fB, WINDOW* \fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fP
+ .br
+-\fBbool is_term_resized_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIlines\fP\fB, int \fP\fIcolumns\fP\fB);\fR
++\fBbool is_term_resized_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIlines\fP\fB, int \fP\fIcolumns\fP\fB);\fP
+ .sp
+-\fBbool isendwin_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBbool isendwin_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBint key_defined_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIdefinition\fP\fB);\fR
++\fBint key_defined_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIdefinition\fP\fB);\fP
+ .br
+-\fBchar* keybound_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIkeycode\fP\fB, int \fP\fIcount\fP\fB);\fR
++\fBchar* keybound_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIkeycode\fP\fB, int \fP\fIcount\fP\fB);\fP
+ .br
+-\fBNCURSES_CONST char * keyname_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIc\fP\fB);\fR
++\fBNCURSES_CONST char * keyname_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIc\fP\fB);\fP
+ .br
+-\fBint keyok_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIkeycode\fP\fB, bool \fP\fIenable\fP\fB);\fR
++\fBint keyok_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIkeycode\fP\fB, bool \fP\fIenable\fP\fB);\fP
+ .br
+-\fBchar killchar_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBchar killchar_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBint killwchar_sp(SCREEN* \fP\fIsp\fP\fB, wchar_t *\fP\fIch\fP\fB);\fR
++\fBint killwchar_sp(SCREEN* \fP\fIsp\fP\fB, wchar_t *\fP\fIch\fP\fB);\fP
+ .br
+-\fBchar* longname_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBchar* longname_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBint mcprint_sp(SCREEN* \fP\fIsp\fP\fB, char *\fP\fIdata\fP\fB, int \fP\fIlen\fP\fB);\fR
++\fBint mcprint_sp(SCREEN* \fP\fIsp\fP\fB, char *\fP\fIdata\fP\fB, int \fP\fIlen\fP\fB);\fP
+ .br
+-\fBint mouseinterval_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIerval\fP\fB);\fR
++\fBint mouseinterval_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIerval\fP\fB);\fP
+ .sp
+-\fBmmask_t mousemask_sp(SCREEN* \fP\fIsp\fP\fB, mmask_t \fP\fInewmask\fP\fB, mmask_t *\fP\fIoldmask\fP\fB);\fR
++\fBmmask_t mousemask_sp(SCREEN* \fP\fIsp\fP\fB, mmask_t \fP\fInewmask\fP\fB, mmask_t *\fP\fIoldmask\fP\fB);\fP
+ .br
+-\fBint mvcur_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIoldrow\fP\fB, int \fP\fIoldcol\fP\fB, int \fP\fInewrow\fP\fB, int \fP\fInewcol\fP\fB);\fR
++\fBint mvcur_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIoldrow\fP\fB, int \fP\fIoldcol\fP\fB, int \fP\fInewrow\fP\fB, int \fP\fInewcol\fP\fB);\fP
+ .br
+-\fBint napms_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIms\fP\fB);\fR
++\fBint napms_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIms\fP\fB);\fP
+ .br
+-\fBWINDOW* newpad_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fInrows\fP\fB, int \fP\fIncols\fP\fB);\fR
++\fBWINDOW* newpad_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fInrows\fP\fB, int \fP\fIncols\fP\fB);\fP
+ .br
+-\fBSCREEN* new_prescr(void);\fR
++\fBSCREEN* new_prescr(void);\fP
+ .br
+-\fBSCREEN* newterm_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fItype\fP\fB, FILE *\fP\fIoutfd\fP\fB, FILE *\fP\fIinfd\fP\fB);\fR
++\fBSCREEN* newterm_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fItype\fP\fB, FILE *\fP\fIoutfd\fP\fB, FILE *\fP\fIinfd\fP\fB);\fP
+ .br
+-\fBWINDOW* newwin_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fInlines\fP\fB, int \fP\fIncols\fP\fB, int \fP\fIbegin_y\fP\fB, int \fP\fIbegin_x\fP\fB);\fR
++\fBWINDOW* newwin_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fInlines\fP\fB, int \fP\fIncols\fP\fB, int \fP\fIbegin_y\fP\fB, int \fP\fIbegin_x\fP\fB);\fP
+ .br
+-\fBint nl_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBint nl_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBint nocbreak_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBint nocbreak_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBint noecho_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBint noecho_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .sp
+-\fBvoid nofilter_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBvoid nofilter_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBint nonl_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBint nonl_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBvoid noqiflush_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBvoid noqiflush_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBint noraw_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBint noraw_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBint pair_content_sp(SCREEN* \fP\fIsp\fP\fB, short \fP\fIpair\fP\fB, short* \fP\fIfg\fP\fB, short* \fP\fIbg\fP\fB);\fR
++\fBint pair_content_sp(SCREEN* \fP\fIsp\fP\fB, short \fP\fIpair\fP\fB, short* \fP\fIfg\fP\fB, short* \fP\fIbg\fP\fB);\fP
+ .br
+-\fBvoid qiflush_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBvoid qiflush_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBint raw_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBint raw_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBint reset_prog_mode_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBint reset_prog_mode_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBvoid reset_color_pairs_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBvoid reset_color_pairs_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBint reset_shell_mode_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBint reset_shell_mode_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .sp
+-\fBint resetty_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBint resetty_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBint resize_term_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIlines\fP\fB, int \fP\fIcolumns\fP\fB);\fR
++\fBint resize_term_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIlines\fP\fB, int \fP\fIcolumns\fP\fB);\fP
+ .br
+-\fBint resizeterm_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIlines\fP\fB, int \fP\fIcolumns\fP\fB);\fR
++\fBint resizeterm_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIlines\fP\fB, int \fP\fIcolumns\fP\fB);\fP
+ .br
+-\fBint ripoffline_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIline\fP\fB, int (*\fP\fIinit\fP\fB)(WINDOW* \fP\fIwin\fP\fB, int \fP\fIfmt\fP\fB));\fR
++\fBint ripoffline_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIline\fP\fB, int (*\fP\fIinit\fP\fB)(WINDOW* \fP\fIwin\fP\fB, int \fP\fIfmt\fP\fB));\fP
+ .br
+-\fBint savetty_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBint savetty_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBint scr_init_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIfilename\fP\fB);\fR
++\fBint scr_init_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIfilename\fP\fB);\fP
+ .br
+-\fBint scr_restore_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIfilename\fP\fB);\fR
++\fBint scr_restore_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIfilename\fP\fB);\fP
+ .br
+-\fBint scr_set_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIfilename\fP\fB);\fR
++\fBint scr_set_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIfilename\fP\fB);\fP
+ .br
+-\fBint set_escdelay_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIms\fP\fB);\fR
++\fBint set_escdelay_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIms\fP\fB);\fP
+ .br
+-\fBint set_tabsize_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIcols\fP\fB);\fR
++\fBint set_tabsize_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIcols\fP\fB);\fP
+ .sp
+-\fBint slk_attr_set_sp(SCREEN* \fP\fIsp\fP\fB, const attr_t \fP\fIattrs\fP\fB, short \fP\fIpair\fP\fB, void*\fP\fIopts\fP\fB);\fR
++\fBint slk_attr_set_sp(SCREEN* \fP\fIsp\fP\fB, const attr_t \fP\fIattrs\fP\fB, short \fP\fIpair\fP\fB, void*\fP\fIopts\fP\fB);\fP
+ .br
+-\fBint slk_attrset_sp(SCREEN* \fP\fIsp\fP\fB, const chtype \fP\fIa\fP\fB);\fR
++\fBint slk_attrset_sp(SCREEN* \fP\fIsp\fP\fB, const chtype \fP\fIa\fP\fB);\fP
+ .br
+-\fBint slk_attroff_sp(SCREEN* \fP\fIsp\fP\fB, const chtype \fP\fIa\fP\fB);\fR
++\fBint slk_attroff_sp(SCREEN* \fP\fIsp\fP\fB, const chtype \fP\fIa\fP\fB);\fP
+ .br
+-\fBint slk_attron_sp(SCREEN* \fP\fIsp\fP\fB, const chtype \fP\fIa\fP\fB);\fR
++\fBint slk_attron_sp(SCREEN* \fP\fIsp\fP\fB, const chtype \fP\fIa\fP\fB);\fP
+ .br
+-\fBattr_t slk_attr_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBattr_t slk_attr_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBint slk_clear_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBint slk_clear_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBint slk_color_sp(SCREEN* \fP\fIsp\fP\fB, short \fP\fIpair\fP\fB);\fR
++\fBint slk_color_sp(SCREEN* \fP\fIsp\fP\fB, short \fP\fIpair\fP\fB);\fP
+ .br
+-\fBint slk_init_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIfmt\fP\fB);\fR
++\fBint slk_init_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIfmt\fP\fB);\fP
+ .br
+-\fBchar* slk_label_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIlabnum\fP\fB);\fR
++\fBchar* slk_label_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIlabnum\fP\fB);\fP
+ .br
+-\fBint slk_noutrefresh_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBint slk_noutrefresh_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .sp
+-\fBint slk_refresh_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBint slk_refresh_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBint slk_restore_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBint slk_restore_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBint slk_set_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIlabnum\fP\fB, const char * \fP\fIlabel\fP\fB, int \fP\fIfmt\fP\fB);\fR
++\fBint slk_set_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIlabnum\fP\fB, const char * \fP\fIlabel\fP\fB, int \fP\fIfmt\fP\fB);\fP
+ .br
+-\fBint slk_touch_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBint slk_touch_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBint start_color_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBint start_color_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBattr_t term_attrs_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBattr_t term_attrs_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBchtype termattrs_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBchtype termattrs_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBchar* termname_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBchar* termname_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBint typeahead_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIfd\fP\fB);\fR
++\fBint typeahead_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIfd\fP\fB);\fP
+ .br
+-\fBint unget_wch_sp(SCREEN* \fP\fIsp\fP\fB, const wchar_t \fP\fIwch\fP\fB);\fR
++\fBint unget_wch_sp(SCREEN* \fP\fIsp\fP\fB, const wchar_t \fP\fIwch\fP\fB);\fP
+ .sp
+-\fBint ungetch_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIch\fP\fB);\fR
++\fBint ungetch_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIch\fP\fB);\fP
+ .br
+-\fBint ungetmouse_sp(SCREEN* \fP\fIsp\fP\fB,MEVENT * \fP\fBevent\fP\fB);\fR
++\fBint ungetmouse_sp(SCREEN* \fP\fIsp\fP\fB,MEVENT * \fP\fBevent\fP\fB);\fP
+ .br
+-\fBint use_default_colors_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBint use_default_colors_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBvoid use_env_sp(SCREEN* \fP\fIsp\fP\fB, bool \fP\fIbf\fP\fB);\fR
++\fBvoid use_env_sp(SCREEN* \fP\fIsp\fP\fB, bool \fP\fIbf\fP\fB);\fP
+ .br
+-\fBint use_legacy_coding_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIlevel\fP\fB);\fR
++\fBint use_legacy_coding_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIlevel\fP\fB);\fP
+ .br
+-\fBvoid use_tioctl_sp(SCREEN *\fP\fIsp\fP\fB, bool \fP\fIbf\fP\fB);\fR
++\fBvoid use_tioctl_sp(SCREEN *\fP\fIsp\fP\fB, bool \fP\fIbf\fP\fB);\fP
+ .br
+-\fBint vid_attr_sp(SCREEN* \fP\fIsp\fP\fB, attr_t \fP\fIattrs\fP\fB, short \fP\fIpair\fP\fB, void * \fP\fIopts\fP\fB);\fR
++\fBint vid_attr_sp(SCREEN* \fP\fIsp\fP\fB, attr_t \fP\fIattrs\fP\fB, short \fP\fIpair\fP\fB, void * \fP\fIopts\fP\fB);\fP
+ .br
+-\fBint vid_puts_sp(SCREEN* \fP\fIsp\fP\fB, attr_t \fP\fIattrs\fP\fB, short \fP\fIpair\fP\fB, void * \fP\fIopts\fP\fB, NCURSES_SP_OUTC \fP\fIputc\fP\fB);\fR
++\fBint vid_puts_sp(SCREEN* \fP\fIsp\fP\fB, attr_t \fP\fIattrs\fP\fB, short \fP\fIpair\fP\fB, void * \fP\fIopts\fP\fB, NCURSES_SP_OUTC \fP\fIputc\fP\fB);\fP
+ .br
+-\fBint vidattr_sp(SCREEN* \fP\fIsp\fP\fB, chtype \fP\fIattrs\fP\fB);\fR
++\fBint vidattr_sp(SCREEN* \fP\fIsp\fP\fB, chtype \fP\fIattrs\fP\fB);\fP
+ .br
+-\fBint vidputs_sp(SCREEN* \fP\fIsp\fP\fB, chtype \fP\fIattrs\fP\fB, NCURSES_SP_OUTC \fP\fIputc\fP\fB);\fR
++\fBint vidputs_sp(SCREEN* \fP\fIsp\fP\fB, chtype \fP\fIattrs\fP\fB, NCURSES_SP_OUTC \fP\fIputc\fP\fB);\fP
+ .br
+-\fBwchar_t* wunctrl_sp(SCREEN* \fP\fIsp\fP\fB, cchar_t *\fP\fIch\fP\fB);\fR
++\fBwchar_t* wunctrl_sp(SCREEN* \fP\fIsp\fP\fB, cchar_t *\fP\fIch\fP\fB);\fP
+ .sp
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBFORM* new_form_sp(SCREEN* \fP\fIsp\fP\fB, FIELD **\fP\fIfields\fP\fB);\fR
++\fBFORM* new_form_sp(SCREEN* \fP\fIsp\fP\fB, FIELD **\fP\fIfields\fP\fB);\fP
+ .sp
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBMENU* new_menu_sp(SCREEN* \fP\fIsp\fP\fB, ITEM **\fP\fIitems\fP\fB);\fR
++\fBMENU* new_menu_sp(SCREEN* \fP\fIsp\fP\fB, ITEM **\fP\fIitems\fP\fB);\fP
+ .sp
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBPANEL* ceiling_panel(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBPANEL* ceiling_panel(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBPANEL* ground_panel(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBPANEL* ground_panel(SCREEN* \fP\fIsp\fP\fB);\fP
+ .br
+-\fBvoid update_panels_sp(SCREEN* \fP\fIsp\fP\fB);\fR
++\fBvoid update_panels_sp(SCREEN* \fP\fIsp\fP\fB);\fP
+ .sp
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBint del_curterm_sp(SCREEN* \fP\fIsp\fP\fB, TERMINAL *\fP\fIoterm\fP\fB);\fR
++\fBint del_curterm_sp(SCREEN* \fP\fIsp\fP\fB, TERMINAL *\fP\fIoterm\fP\fB);\fP
+ .br
+-\fBint putp_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIstr\fP\fB);\fR
++\fBint putp_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIstr\fP\fB);\fP
+ .br
+-\fBint restartterm_sp(SCREEN* \fP\fIsp\fP\fB, NCURSES_CONST char*\fP\fIterm\fP\fB, int \fP\fIfiledes\fP\fB, int *\fP\fIerrret\fP\fB);\fR
++\fBint restartterm_sp(SCREEN* \fP\fIsp\fP\fB, NCURSES_CONST char*\fP\fIterm\fP\fB, int \fP\fIfiledes\fP\fB, int *\fP\fIerrret\fP\fB);\fP
+ .br
+-\fBTERMINAL* set_curterm_sp(SCREEN* \fP\fIsp\fP\fB, TERMINAL*\fP\fInterm\fP\fB);\fR
++\fBTERMINAL* set_curterm_sp(SCREEN* \fP\fIsp\fP\fB, TERMINAL*\fP\fInterm\fP\fB);\fP
+ .br
+-\fBint tgetent_sp(SCREEN* \fP\fIsp\fP\fB, char *\fP\fIbp\fP\fB, const char *\fP\fIname\fP\fB);\fR
++\fBint tgetent_sp(SCREEN* \fP\fIsp\fP\fB, char *\fP\fIbp\fP\fB, const char *\fP\fIname\fP\fB);\fP
+ .br
+-\fBint tgetflag_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIcapname\fP\fB);\fR
++\fBint tgetflag_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIcapname\fP\fB);\fP
+ .br
+-\fBint tgetnum_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIcapname\fP\fB);\fR
++\fBint tgetnum_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIcapname\fP\fB);\fP
+ .br
+-\fBchar* tgetstr_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIcapname\fP\fB, char **\fP\fIarea\fP\fB);\fR
++\fBchar* tgetstr_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIcapname\fP\fB, char **\fP\fIarea\fP\fB);\fP
+ .br
+-\fBchar* tgoto_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIcapname\fP\fB, int \fP\fIcol\fP\fB, int \fP\fIrow\fP\fB);\fR
++\fBchar* tgoto_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIcapname\fP\fB, int \fP\fIcol\fP\fB, int \fP\fIrow\fP\fB);\fP
+ .br
+-\fBint tigetflag_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIcapname\fP\fB);\fR
++\fBint tigetflag_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIcapname\fP\fB);\fP
+ .br
+-\fBint tigetnum_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIcapname\fP\fB);\fR
++\fBint tigetnum_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIcapname\fP\fB);\fP
+ .br
+-\fBchar* tigetstr_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIcapname\fP\fB);\fR
++\fBchar* tigetstr_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIcapname\fP\fB);\fP
+ .br
+-/* may instead use 9 long parameters */
++\fR/* may instead use 9 long parameters */\fP
+ .br
+-\fBchar* tparm_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIstr\fP\fB, ...);\fR
++\fBchar* tparm_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIstr\fP\fB, ...);\fP
+ .br
+-\fBint tputs_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIstr\fP\fB, int \fP\fIaffcnt\fP\fB, NCURSES_SP_OUTC \fP\fIputc\fP\fB);\fR
++\fBint tputs_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIstr\fP\fB, int \fP\fIaffcnt\fP\fB, NCURSES_SP_OUTC \fP\fIputc\fP\fB);\fP
+ .sp
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBNCURSES_CONST char* unctrl_sp(SCREEN* \fP\fIsp\fP\fB, chtype \fP\fIc\fP\fB);\fR
++\fBNCURSES_CONST char* unctrl_sp(SCREEN* \fP\fIsp\fP\fB, chtype \fP\fIc\fP\fB);\fP
+ .ad
+ .br
+ .SH DESCRIPTION
+@@ -387,6 +387,6 @@
+ It is recommended that any code depending on ncurses extensions
+ be conditioned using \fINCURSES_SP_FUNCS\fP.
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBcurs_opaque\fR(3X),
+-\fBcurs_threads\fR(3X).
++\fBcurses\fP(3X),
++\fBcurs_opaque\fP(3X),
++\fBcurs_threads\fP(3X).
+Index: man/curs_termattrs.3x
+Prereq:  1.15 
+--- ncurses-6.3-20211219+/man/curs_termattrs.3x	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_termattrs.3x	2021-12-25 21:41:58.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018,2020 Thomas E. Dickey                                     *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,115 +27,115 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_termattrs.3x,v 1.15 2020/02/02 23:34:34 tom Exp $
++.\" $Id: curs_termattrs.3x,v 1.18 2021/12/25 21:41:58 tom Exp $
+ .TH curs_termattrs 3X ""
+ .SH NAME
+-\fBbaudrate\fR,
+-\fBerasechar\fR,
+-\fBerasewchar\fR,
+-\fBhas_ic\fR,
+-\fBhas_il\fR,
+-\fBkillchar\fR,
+-\fBkillwchar\fR,
+-\fBlongname\fR,
+-\fBterm_attrs\fR,
+-\fBtermattrs\fR,
+-\fBtermname\fR \- \fBcurses\fR environment query routines
++\fBbaudrate\fP,
++\fBerasechar\fP,
++\fBerasewchar\fP,
++\fBhas_ic\fP,
++\fBhas_il\fP,
++\fBkillchar\fP,
++\fBkillwchar\fP,
++\fBlongname\fP,
++\fBterm_attrs\fP,
++\fBtermattrs\fP,
++\fBtermname\fP \- \fBcurses\fP environment query routines
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .PP
+-\fBint baudrate(void);\fR
++\fBint baudrate(void);\fP
+ .br
+-\fBchar erasechar(void);\fR
++\fBchar erasechar(void);\fP
+ .br
+-\fBint erasewchar(wchar_t *\fR\fIch\fR\fB);\fR
++\fBint erasewchar(wchar_t *\fP\fIch\fP\fB);\fP
+ .br
+-\fBbool has_ic(void);\fR
++\fBbool has_ic(void);\fP
+ .br
+-\fBbool has_il(void);\fR
++\fBbool has_il(void);\fP
+ .br
+-\fBchar killchar(void);\fR
++\fBchar killchar(void);\fP
+ .br
+-\fBint killwchar(wchar_t *\fR\fIch\fR\fB);\fR
++\fBint killwchar(wchar_t *\fP\fIch\fP\fB);\fP
+ .br
+-\fBchar *longname(void);\fR
++\fBchar *longname(void);\fP
+ .br
+-\fBattr_t term_attrs(void);\fR
++\fBattr_t term_attrs(void);\fP
+ .br
+-\fBchtype termattrs(void);\fR
++\fBchtype termattrs(void);\fP
+ .br
+-\fBchar *termname(void);\fR
++\fBchar *termname(void);\fP
+ .br
+ .SH DESCRIPTION
+ .SS baudrate
+-The \fBbaudrate\fR routine returns the output speed of the terminal.
++The \fBbaudrate\fP routine returns the output speed of the terminal.
+ The
+-number returned is in bits per second, for example \fB9600\fR, and is an
++number returned is in bits per second, for example \fB9600\fP, and is an
+ integer.
+ .SS erasechar, erasewchar
+ .PP
+-The \fBerasechar\fR routine returns the user's current erase character.
++The \fBerasechar\fP routine returns the user's current erase character.
+ .PP
+-The \fBerasewchar\fR routine stores the current erase character
+-in the location referenced by \fIch\fR.
++The \fBerasewchar\fP routine stores the current erase character
++in the location referenced by \fIch\fP.
+ If no erase character has been defined, the routine fails
+-and the location referenced by \fIch\fR is not changed.
++and the location referenced by \fIch\fP is not changed.
+ .SS has_is, has_il
+ .PP
+-The \fBhas_ic\fR routine is true if the terminal has insert- and delete-
++The \fBhas_ic\fP routine is true if the terminal has insert- and delete-
+ character capabilities.
+ .PP
+-The \fBhas_il\fR routine is true if the terminal has insert- and delete-line
++The \fBhas_il\fP routine is true if the terminal has insert- and delete-line
+ capabilities, or can simulate them using scrolling regions.
+ This might
+ be used to determine if it would be appropriate to turn on physical
+-scrolling using \fBscrollok\fR.
++scrolling using \fBscrollok\fP.
+ .SS killchar, killwchar
+ .PP
+-The \fBkillchar\fR routine returns the user's current line kill character.
++The \fBkillchar\fP routine returns the user's current line kill character.
+ .PP
+-The \fBkillwchar\fR routine stores the current line-kill character
+-in the location referenced by \fIch\fR.
++The \fBkillwchar\fP routine stores the current line-kill character
++in the location referenced by \fIch\fP.
+ If no line-kill character has been defined,
+-the routine fails and the location referenced by \fIch\fR is not changed.
++the routine fails and the location referenced by \fIch\fP is not changed.
+ .SS longname
+ .PP
+-The \fBlongname\fR routine returns a pointer to a static area
++The \fBlongname\fP routine returns a pointer to a static area
+ containing a verbose description of the current terminal.
+ The maximum
+ length of a verbose description is 128 characters.
+ It is defined only
+-after the call to \fBinitscr\fR or \fBnewterm\fR.  The area is
+-overwritten by each call to \fBnewterm\fR and is not restored by
+-\fBset_term\fR, so the value should be saved between calls to
+-\fBnewterm\fR if \fBlongname\fR is going to be used with multiple
++after the call to \fBinitscr\fP or \fBnewterm\fP.  The area is
++overwritten by each call to \fBnewterm\fP and is not restored by
++\fBset_term\fP, so the value should be saved between calls to
++\fBnewterm\fP if \fBlongname\fP is going to be used with multiple
+ terminals.
+ .SS termattrs, term_attrs
+ .PP
+ If a given terminal does not support a video attribute that an
+-application program is trying to use, \fBcurses\fR may substitute a
++application program is trying to use, \fBcurses\fP may substitute a
+ different video attribute for it.
+-The \fBtermattrs\fR and \fBterm_attrs\fR functions
+-return a logical \fBOR\fR of all video attributes supported by the
+-terminal using \fIA_\fR and \fIWA_\fR constants respectively.
+-This information is useful when a \fBcurses\fR program
++The \fBtermattrs\fP and \fBterm_attrs\fP functions
++return a logical \fBOR\fP of all video attributes supported by the
++terminal using \fBA_\fP and \fBWA_\fP constants respectively.
++This information is useful when a \fBcurses\fP program
+ needs complete control over the appearance of the screen.
+ .SS termname
+ .PP
+-The \fBtermname\fR routine returns the terminal name used by \fBsetupterm\fR.
++The \fBtermname\fP routine returns the terminal name used by \fBsetupterm\fP.
+ .SH RETURN VALUE
+-\fBlongname\fR and \fBtermname\fR return \fBNULL\fR on error.
++\fBlongname\fP and \fBtermname\fP return \fBNULL\fP on error.
+ .PP
+-Routines that return an integer return \fBERR\fR upon failure and \fBOK\fR
+-(SVr4 only specifies "an integer value other than \fBERR\fR") upon successful
++Routines that return an integer return \fBERR\fP upon failure and \fBOK\fP
++(SVr4 only specifies "an integer value other than \fBERR\fP") upon successful
+ completion.
+ .SH NOTES
+-Note that \fBtermattrs\fR may be a macro.
++Note that \fBtermattrs\fP may be a macro.
+ .SH PORTABILITY
+ The XSI Curses standard, Issue 4 describes these functions.
+ It changes the
+-return type of \fBtermattrs\fR to the new type \fBattr_t\fR.
+-Most versions of curses truncate the result returned by \fBtermname\fR to
++return type of \fBtermattrs\fP to the new type \fBattr_t\fP.
++Most versions of curses truncate the result returned by \fBtermname\fP to
+ 14 characters.
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBcurs_initscr\fR(3X), \fBcurs_outopts\fR(3X)
++\fBcurses\fP(3X), \fBcurs_initscr\fP(3X), \fBcurs_outopts\fP(3X)
+Index: man/curs_termcap.3x
+Prereq:  1.49 
+--- ncurses-6.3-20211219+/man/curs_termcap.3x	2021-04-03 21:17:09.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_termcap.3x	2021-12-25 21:31:00.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_termcap.3x,v 1.49 2021/04/03 21:17:09 tom Exp $
++.\" $Id: curs_termcap.3x,v 1.52 2021/12/25 21:31:00 tom Exp $
+ .TH curs_termcap 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -41,54 +41,54 @@
+ .hy 0
+ .ds n 5
+ .SH NAME
+-\fBPC\fR,
+-\fBUP\fR,
+-\fBBC\fR,
+-\fBospeed\fR,
+-\fBtgetent\fR,
+-\fBtgetflag\fR,
+-\fBtgetnum\fR,
+-\fBtgetstr\fR,
+-\fBtgoto\fR,
+-\fBtputs\fR \- \fBcurses\fR emulation of termcap
++\fBPC\fP,
++\fBUP\fP,
++\fBBC\fP,
++\fBospeed\fP,
++\fBtgetent\fP,
++\fBtgetflag\fP,
++\fBtgetnum\fP,
++\fBtgetstr\fP,
++\fBtgoto\fP,
++\fBtputs\fP \- \fBcurses\fP emulation of termcap
+ .ad
+ .hy
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .br
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBextern char PC;\fR
++\fBextern char PC;\fP
+ .br
+-\fBextern char * UP;\fR
++\fBextern char * UP;\fP
+ .br
+-\fBextern char * BC;\fR
++\fBextern char * BC;\fP
+ .br
+-\fBextern @NCURSES_OSPEED@ ospeed;\fR
++\fBextern @NCURSES_OSPEED@ ospeed;\fP
+ .sp
+-\fBint tgetent(char *\fP\fIbp\fP\fB, const char *\fP\fIname\fP\fB);\fR
++\fBint tgetent(char *\fP\fIbp\fP\fB, const char *\fP\fIname\fP\fB);\fP
+ .br
+-\fBint tgetflag(const char *\fP\fIid\fP\fB);\fR
++\fBint tgetflag(const char *\fP\fIid\fP\fB);\fP
+ .br
+-\fBint tgetnum(const char *\fP\fIid\fP\fB);\fR
++\fBint tgetnum(const char *\fP\fIid\fP\fB);\fP
+ .br
+-\fBchar *tgetstr(const char *\fP\fIid\fP\fB, char **\fP\fIarea\fP\fB);\fR
++\fBchar *tgetstr(const char *\fP\fIid\fP\fB, char **\fP\fIarea\fP\fB);\fP
+ .br
+-\fBchar *tgoto(const char *\fP\fIcap\fP\fB, int \fP\fIcol\fP\fB, int \fP\fIrow\fP\fB);\fR
++\fBchar *tgoto(const char *\fP\fIcap\fP\fB, int \fP\fIcol\fP\fB, int \fP\fIrow\fP\fB);\fP
+ .br
+-\fBint tputs(const char *\fP\fIstr\fP\fB, int \fP\fIaffcnt\fP\fB, int (*\fP\fIputc\fP\fB)(int));\fR
++\fBint tputs(const char *\fP\fIstr\fP\fB, int \fP\fIaffcnt\fP\fB, int (*\fP\fIputc\fP\fB)(int));\fP
+ .br
+ .SH DESCRIPTION
+ These routines are included as a conversion aid for programs that use
+-the \fItermcap\fR library.
++the \fItermcap\fP library.
+ Their parameters are the same, but the
+-routines are emulated using the \fIterminfo\fR database.
++routines are emulated using the \fIterminfo\fP database.
+ Thus, they
+ can only be used to query the capabilities of entries for which a
+ terminfo entry has been compiled.
+ .SS INITIALIZATION
+ .PP
+-The \fBtgetent\fR routine loads the entry for \fIname\fR.
++The \fBtgetent\fP routine loads the entry for \fIname\fP.
+ It returns:
+ .RS 3
+ .TP 3
+@@ -107,7 +107,7 @@
+ This differs from the \fItermcap\fP library in two ways:
+ .RS 3
+ .bP
+-The emulation ignores the buffer pointer \fIbp\fR.
++The emulation ignores the buffer pointer \fIbp\fP.
+ The \fItermcap\fP library would store a copy of the terminal
+ description in the area referenced by this pointer.
+ However, ncurses stores its terminal descriptions in compiled
+@@ -120,15 +120,15 @@
+ .RE
+ .SS CAPABILITY VALUES
+ .PP
+-The \fBtgetflag\fR routine gets the boolean entry for \fIid\fR,
++The \fBtgetflag\fP routine gets the boolean entry for \fIid\fP,
+ or zero if it is not available.
+ .PP
+-The \fBtgetnum\fR routine gets the numeric entry for \fIid\fR,
++The \fBtgetnum\fP routine gets the numeric entry for \fIid\fP,
+ or \-1 if it is not available.
+ .PP
+-The \fBtgetstr\fR routine returns the string entry for \fIid\fR,
++The \fBtgetstr\fP routine returns the string entry for \fIid\fP,
+ or zero if it is not available.
+-Use \fBtputs\fR to output the returned string.
++Use \fBtputs\fP to output the returned string.
+ The \fIarea\fP parameter is used as follows:
+ .RS 3
+ .bP
+@@ -140,25 +140,25 @@
+ If either check fails, the \fIarea\fP parameter is ignored.
+ .bP
+ If the checks succeed, ncurses also copies the return value to
+-the buffer pointed to by \fIarea\fR,
+-and the \fIarea\fR value will be updated to point past the null ending
++the buffer pointed to by \fIarea\fP,
++and the \fIarea\fP value will be updated to point past the null ending
+ this value.
+ .bP
+ The return value itself is an address in the terminal description which
+ is loaded into memory.
+ .RE
+ .PP
+-Only the first two characters of the \fBid\fR parameter of
+-\fBtgetflag\fR,
+-\fBtgetnum\fR and
+-\fBtgetstr\fR are compared in lookups.
++Only the first two characters of the \fBid\fP parameter of
++\fBtgetflag\fP,
++\fBtgetnum\fP and
++\fBtgetstr\fP are compared in lookups.
+ .SS FORMATTING CAPABILITIES
+ .PP
+-The \fBtgoto\fR routine expands the given capability using the parameters.
++The \fBtgoto\fP routine expands the given capability using the parameters.
+ .bP
+ Because the capability may have padding characters,
+-the output of \fBtgoto\fP should be passed to \fBtputs\fR
+-rather than some other output function such as \fBprintf\fP.
++the output of \fBtgoto\fP should be passed to \fBtputs\fP
++rather than some other output function such as \fBprintf\fP(3).
+ .bP
+ While \fBtgoto\fP is assumed to be used for the two-parameter
+ cursor positioning capability,
+@@ -178,41 +178,41 @@
+ However, \fBtparm\fP is not a \fItermcap\fP feature,
+ and portable \fItermcap\fP applications should not rely upon its availability.
+ .PP
+-The \fBtputs\fR routine is described on the \fBcurs_terminfo\fR(3X) manual
++The \fBtputs\fP routine is described on the \fBcurs_terminfo\fP(3X) manual
+ page.
+ It can retrieve capabilities by either termcap or terminfo name.
+ .SS GLOBAL VARIABLES
+ .PP
+ The variables
+-\fBPC\fR,
+-\fBUP\fR and
+-\fBBC\fR
+-are set by \fBtgetent\fR to the terminfo entry's data for
+-\fBpad_char\fR,
+-\fBcursor_up\fR and
+-\fBbackspace_if_not_bs\fR,
++\fBPC\fP,
++\fBUP\fP and
++\fBBC\fP
++are set by \fBtgetent\fP to the terminfo entry's data for
++\fBpad_char\fP,
++\fBcursor_up\fP and
++\fBbackspace_if_not_bs\fP,
+ respectively.
+-\fBUP\fR is not used by ncurses.
+-\fBPC\fR is used in the \fBtdelay_output\fR function.
+-\fBBC\fR is used in the \fBtgoto\fR emulation.
+-The variable \fBospeed\fR is set by ncurses in a system-specific coding
++\fBUP\fP is not used by ncurses.
++\fBPC\fP is used in the \fBtdelay_output\fP function.
++\fBBC\fP is used in the \fBtgoto\fP emulation.
++The variable \fBospeed\fP is set by ncurses in a system-specific coding
+ to reflect the terminal speed.
+ .
+ .SH RETURN VALUE
+ Except where explicitly noted,
+-routines that return an integer return \fBERR\fR upon failure and \fBOK\fR
+-(SVr4 only specifies "an integer value other than \fBERR\fR") upon successful
++routines that return an integer return \fBERR\fP upon failure and \fBOK\fP
++(SVr4 only specifies "an integer value other than \fBERR\fP") upon successful
+ completion.
+ .PP
+-Routines that return pointers return \fBNULL\fR on error.
++Routines that return pointers return \fBNULL\fP on error.
+ .SH BUGS
+-If you call \fBtgetstr\fR to fetch \fBca\fR or any other parameterized string,
++If you call \fBtgetstr\fP to fetch \fBca\fP or any other parameterized string,
+ be aware that it will be returned in terminfo notation, not the older and
+ not-quite-compatible termcap notation.
+ This will not cause problems if all
+-you do with it is call \fBtgoto\fR or \fBtparm\fR, which both expand
++you do with it is call \fBtgoto\fP or \fBtparm\fP, which both expand
+ terminfo-style strings as terminfo.
+-(The \fBtgoto\fR function, if configured to support termcap, will check
++(The \fBtgoto\fP function, if configured to support termcap, will check
+ if the string is indeed terminfo-style by looking for "%p" parameters or
+ "$<..>" delays, and invoke a termcap-style parser if the string does not
+ appear to be terminfo).
+@@ -221,7 +221,7 @@
+ differ from termcap's,
+ users can be surprised:
+ .bP
+-\fBtputs("50")\fR in a terminfo system will put out a literal \*(``50\*(''
++\fBtputs("50")\fP in a terminfo system will put out a literal \*(``50\*(''
+ rather than busy-waiting for 50 milliseconds.
+ .bP
+ However, if ncurses is configured to support termcap,
+@@ -230,12 +230,12 @@
+ In that case, \fBtputs\fP inspects strings passed to it,
+ looking for digits at the beginning of the string.
+ .IP
+-\fBtputs("50")\fR in a termcap system may wait for 50 milliseconds
++\fBtputs("50")\fP in a termcap system may wait for 50 milliseconds
+ rather than put out a literal \*(``50\*(''
+ .PP
+-Note that termcap has nothing analogous to terminfo's \fBsgr\fR string.
+-One consequence of this is that termcap applications assume \fBme\fR
+-(terminfo \fBsgr0\fR) does not reset the alternate character set.
++Note that termcap has nothing analogous to terminfo's \fBsgr\fP string.
++One consequence of this is that termcap applications assume \fBme\fP
++(terminfo \fBsgr0\fP) does not reset the alternate character set.
+ This implementation checks for, and modifies the data shown to the
+ termcap interface to accommodate termcap's limitation in this respect.
+ .SH PORTABILITY
+@@ -251,12 +251,12 @@
+ (along with \fBvwprintw\fP and \fBvwscanw\fP) as withdrawn.
+ .PP
+ Neither the XSI Curses standard nor the SVr4 man pages documented the return
+-values of \fBtgetent\fR correctly, though all three were in fact returned ever
++values of \fBtgetent\fP correctly, though all three were in fact returned ever
+ since SVr1.
+ In particular, an omission in the XSI Curses documentation has been
+-misinterpreted to mean that \fBtgetent\fR returns \fBOK\fR or \fBERR\fR.
++misinterpreted to mean that \fBtgetent\fP returns \fBOK\fP or \fBERR\fP.
+ Because the purpose of these functions is to provide compatibility with
+-the \fItermcap\fR library, that is a defect in XCurses, Issue 4, Version 2
++the \fItermcap\fP library, that is a defect in XCurses, Issue 4, Version 2
+ rather than in ncurses.
+ .SS Compatibility with BSD Termcap
+ .PP
+@@ -264,9 +264,9 @@
+ However, termcap applications' use of those variables is poorly documented,
+ e.g., not distinguishing between input and output.
+ In particular, some applications are reported to declare and/or
+-modify \fBospeed\fR.
++modify \fBospeed\fP.
+ .PP
+-The comment that only the first two characters of the \fBid\fR parameter
++The comment that only the first two characters of the \fBid\fP parameter
+ are used escapes many application developers.
+ The original BSD 4.2 termcap library (and historical relics thereof)
+ did not require a trailing null NUL on the parameter name passed
+@@ -301,7 +301,7 @@
+ However, there were two different termcap.h header files in the BSD
+ sources:
+ .bP
+-One was used internally by the \fIjove\fP editor in 2BSD through 4.4BSD.
++One was used internally by the \fBjove\fP editor in 2BSD through 4.4BSD.
+ It defined global symbols for the termcap variables which it used.
+ .bP
+ The other appeared in 4.4BSD Lite Release 2 (mid-1993)
+@@ -324,13 +324,13 @@
+ but in that instance, it was \fIlibedit\fP which differed from BSD termcap.
+ .PP
+ A copy of GNU termcap 1.3 was bundled with \fIbash\fP in mid-1993,
+-to support the \fIreadline\fP library.
++to support the \fBreadline\fP(3) library.
+ .PP
+ A termcap.h file was provided in ncurses 1.8.1 (November 1993).
+-That reflected influence by \fIemacs\fP (rather than \fIjove\fP)
++That reflected influence by \fBemacs\fP(1) (rather than \fBjove\fP(1))
+ and GNU termcap:
+ .bP
+-it provided declarations for a few global symbols used by \fIemacs\fP
++it provided declarations for a few global symbols used by \fBemacs\fP
+ .bP
+ it provided function prototypes (using \fBconst\fP).
+ .bP
+@@ -341,9 +341,9 @@
+ which must be taken into account by programs which can work with all
+ termcap library interfaces.
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBputc\fR(3),
+-\fBterm_variables\fR(3X),
+-\fBterminfo\fR(\*n).
++\fBcurses\fP(3X),
++\fBputc\fP(3),
++\fBterm_variables\fP(3X),
++\fBterminfo\fP(\*n).
+ .sp
+ https://invisible-island.net/ncurses/tctest.html
+Index: man/curs_terminfo.3x
+Prereq:  1.76 
+--- ncurses-6.3-20211219+/man/curs_terminfo.3x	2021-09-04 19:58:03.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_terminfo.3x	2021-12-25 21:34:58.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_terminfo.3x,v 1.76 2021/09/04 19:58:03 tom Exp $
++.\" $Id: curs_terminfo.3x,v 1.79 2021/12/25 21:34:58 tom Exp $
+ .TH curs_terminfo 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -41,30 +41,30 @@
+ .na
+ .hy 0
+ .SH NAME
+-\fBdel_curterm\fR,
+-\fBmvcur\fR,
+-\fBputp\fR,
+-\fBrestartterm\fR,
+-\fBset_curterm\fR,
+-\fBsetupterm\fR,
+-\fBtigetflag\fR,
+-\fBtigetnum\fR,
+-\fBtigetstr\fR,
+-\fBtiparm\fR,
+-\fBtparm\fR,
+-\fBtputs\fR,
+-\fBvid_attr\fR,
+-\fBvid_puts\fR,
+-\fBvidattr\fR,
+-\fBvidputs\fR \- \fBcurses\fR interfaces to terminfo database
++\fBdel_curterm\fP,
++\fBmvcur\fP,
++\fBputp\fP,
++\fBrestartterm\fP,
++\fBset_curterm\fP,
++\fBsetupterm\fP,
++\fBtigetflag\fP,
++\fBtigetnum\fP,
++\fBtigetstr\fP,
++\fBtiparm\fP,
++\fBtparm\fP,
++\fBtputs\fP,
++\fBvid_attr\fP,
++\fBvid_puts\fP,
++\fBvidattr\fP,
++\fBvidputs\fP \- \fBcurses\fP interfaces to terminfo database
+ .ad
+ .hy
+ .SH SYNOPSIS
+ .nf
+-\fB#include \fR
+-\fB#include \fR
++\fB#include \fP
++\fB#include \fP
+ .sp
+-\fBTERMINAL *cur_term;\fR
++\fBTERMINAL *cur_term;\fP
+ .sp
+ \fBconst char * const boolnames[];\fP
+ \fBconst char * const boolcodes[];\fP
+@@ -76,45 +76,45 @@
+ \fBconst char * const strcodes[];\fP
+ \fBconst char * const strfnames[];\fP
+ .sp
+-\fBint setupterm(const char *\fR\fIterm\fR\fB, int \fR\fIfiledes\fR\fB, int *\fR\fIerrret\fR\fB);\fR
++\fBint setupterm(const char *\fP\fIterm\fP\fB, int \fP\fIfiledes\fP\fB, int *\fP\fIerrret\fP\fB);\fP
+ .br
+-\fBTERMINAL *set_curterm(TERMINAL *\fR\fInterm\fR\fB);\fR
++\fBTERMINAL *set_curterm(TERMINAL *\fP\fInterm\fP\fB);\fP
+ .br
+-\fBint del_curterm(TERMINAL *\fR\fIoterm\fR\fB);\fR
++\fBint del_curterm(TERMINAL *\fP\fIoterm\fP\fB);\fP
+ .br
+-\fBint restartterm(const char *\fR\fIterm\fR\fB, int \fR\fIfiledes\fR\fB, int *\fR\fIerrret\fR\fB);\fR
++\fBint restartterm(const char *\fP\fIterm\fP\fB, int \fP\fIfiledes\fP\fB, int *\fP\fIerrret\fP\fB);\fP
+ .sp
+-\fBchar *tparm(const char *\fR\fIstr\fR\fB, ...);\fR
++\fBchar *tparm(const char *\fP\fIstr\fP\fB, ...);\fP
+ .br
+-\fBint tputs(const char *\fR\fIstr\fR\fB, int \fR\fIaffcnt\fR\fB, int (*\fR\fIputc\fR\fB)(int));\fR
++\fBint tputs(const char *\fP\fIstr\fP\fB, int \fP\fIaffcnt\fP\fB, int (*\fP\fIputc\fP\fB)(int));\fP
+ .br
+-\fBint putp(const char *\fR\fIstr\fR\fB);\fR
++\fBint putp(const char *\fP\fIstr\fP\fB);\fP
+ .sp
+-\fBint vidputs(chtype \fR\fIattrs\fR\fB, int (*\fR\fIputc\fR\fB)(int));\fR
++\fBint vidputs(chtype \fP\fIattrs\fP\fB, int (*\fP\fIputc\fP\fB)(int));\fP
+ .br
+-\fBint vidattr(chtype \fR\fIattrs\fR\fB);\fR
++\fBint vidattr(chtype \fP\fIattrs\fP\fB);\fP
+ .br
+-\fBint vid_puts(attr_t \fR\fIattrs\fR\fB, short \fR\fIpair\fR\fB, void *\fR\fIopts\fR\fB, int (*\fR\fIputc\fR\fB)(int));\fR
++\fBint vid_puts(attr_t \fP\fIattrs\fP\fB, short \fP\fIpair\fP\fB, void *\fP\fIopts\fP\fB, int (*\fP\fIputc\fP\fB)(int));\fP
+ .br
+-\fBint vid_attr(attr_t \fR\fIattrs\fR\fB, short \fR\fIpair\fR\fB, void *\fR\fIopts\fR\fB);\fR
++\fBint vid_attr(attr_t \fP\fIattrs\fP\fB, short \fP\fIpair\fP\fB, void *\fP\fIopts\fP\fB);\fP
+ .sp
+-\fBint mvcur(int \fR\fIoldrow\fR\fB, int \fR\fIoldcol\fR\fB, int \fR\fInewrow\fR, int \fR\fInewcol\fR\fB);\fR
++\fBint mvcur(int \fP\fIoldrow\fP\fB, int \fP\fIoldcol\fP\fB, int \fP\fInewrow\fP, int \fP\fInewcol\fP\fB);\fP
+ .sp
+-\fBint tigetflag(const char *\fR\fIcapname\fR\fB);\fR
++\fBint tigetflag(const char *\fP\fIcapname\fP\fB);\fP
+ .br
+-\fBint tigetnum(const char *\fR\fIcapname\fR\fB);\fR
++\fBint tigetnum(const char *\fP\fIcapname\fP\fB);\fP
+ .br
+-\fBchar *tigetstr(const char *\fR\fIcapname\fR\fB);\fR
++\fBchar *tigetstr(const char *\fP\fIcapname\fP\fB);\fP
+ .sp
+-\fBchar *tiparm(const char *\fR\fIstr\fR\fB, ...);\fR
++\fBchar *tiparm(const char *\fP\fIstr\fP\fB, ...);\fP
+ .br
+ .fi
+ .SH DESCRIPTION
+ These low-level routines must be called by programs that have to deal
+-directly with the \fBterminfo\fR database to handle certain terminal
++directly with the \fBterminfo\fP database to handle certain terminal
+ capabilities, such as programming function keys.
+ For all other
+-functionality, \fBcurses\fR routines are more suitable and their use is
++functionality, \fBcurses\fP routines are more suitable and their use is
+ recommended.
+ .PP
+ None of these functions use (or are aware of) multibyte character strings
+@@ -126,67 +126,67 @@
+ they are strings of 8-bit characters.
+ .SS Initialization
+ .PP
+-Initially, \fBsetupterm\fR should be called.
+-The high-level curses functions \fBinitscr\fR and
+-\fBnewterm\fR call \fBsetupterm\fP to initialize the
++Initially, \fBsetupterm\fP should be called.
++The high-level curses functions \fBinitscr\fP and
++\fBnewterm\fP call \fBsetupterm\fP to initialize the
+ low-level set of terminal-dependent variables
+-[listed in \fBterminfo\fR(\*n)].
++[listed in \fBterminfo\fP(\*n)].
+ .PP
+ Applications can use the
+ terminal capabilities either directly (via header definitions),
+ or by special functions.
+-The header files \fBcurses.h\fR and \fBterm.h\fR should be included (in this
++The header files \fBcurses.h\fP and \fBterm.h\fP should be included (in this
+ order) to get the definitions for these strings, numbers, and flags.
+ .PP
+-The \fBterminfo\fR variables
+-\fBlines\fR and \fBcolumns\fR are initialized by \fBsetupterm\fR as
++The \fBterminfo\fP variables
++\fBlines\fP and \fBcolumns\fP are initialized by \fBsetupterm\fP as
+ follows:
+ .bP
+-If \fBuse_env(FALSE)\fR has been called, values for
+-\fBlines\fR and \fBcolumns\fR specified in \fBterminfo\fR are used.
++If \fBuse_env(FALSE)\fP has been called, values for
++\fBlines\fP and \fBcolumns\fP specified in \fBterminfo\fP are used.
+ .bP
+-Otherwise, if the environment variables \fBLINES\fR and \fBCOLUMNS\fR
++Otherwise, if the environment variables \fBLINES\fP and \fBCOLUMNS\fP
+ exist, their values are used.
+ If these environment variables do not
+ exist and the program is running in a window, the current window size
+ is used.
+ Otherwise, if the environment variables do not exist, the
+-values for \fBlines\fR and \fBcolumns\fR specified in the
+-\fBterminfo\fR database are used.
++values for \fBlines\fP and \fBcolumns\fP specified in the
++\fBterminfo\fP database are used.
+ .PP
+-Parameterized strings should be passed through \fBtparm\fR to instantiate them.
+-All \fBterminfo\fR strings
+-(including the output of \fBtparm\fR)
++Parameterized strings should be passed through \fBtparm\fP to instantiate them.
++All \fBterminfo\fP strings
++(including the output of \fBtparm\fP)
+ should be printed
+-with \fBtputs\fR or \fBputp\fR.
+-Call \fBreset_shell_mode\fR to restore the
+-tty modes before exiting [see \fBcurs_kernel\fR(3X)].
++with \fBtputs\fP or \fBputp\fP.
++Call \fBreset_shell_mode\fP to restore the
++tty modes before exiting [see \fBcurs_kernel\fP(3X)].
+ .PP
+ Programs which use
+ cursor addressing should
+ .bP
+-output \fBenter_ca_mode\fR upon startup and
++output \fBenter_ca_mode\fP upon startup and
+ .bP
+-output \fBexit_ca_mode\fR before exiting.
++output \fBexit_ca_mode\fP before exiting.
+ .PP
+ Programs which execute shell subprocesses should
+ .bP
+-call \fBreset_shell_mode\fR and
+-output \fBexit_ca_mode\fR before the shell
++call \fBreset_shell_mode\fP and
++output \fBexit_ca_mode\fP before the shell
+ is called and
+ .bP
+-output \fBenter_ca_mode\fR and
+-call \fBreset_prog_mode\fR after returning from the shell.
++output \fBenter_ca_mode\fP and
++call \fBreset_prog_mode\fP after returning from the shell.
+ .PP
+-The \fBsetupterm\fR routine reads in the \fBterminfo\fR database,
+-initializing the \fBterminfo\fR structures, but does not set up the
+-output virtualization structures used by \fBcurses\fR.
++The \fBsetupterm\fP routine reads in the \fBterminfo\fP database,
++initializing the \fBterminfo\fP structures, but does not set up the
++output virtualization structures used by \fBcurses\fP.
+ These are its parameters:
+ .RS 3
+ .TP 5
+ \fIterm\fP
+ is the terminal type, a character string.
+-If \fIterm\fR is null, the environment variable \fBTERM\fR is used.
++If \fIterm\fP is null, the environment variable \fBTERM\fP is used.
+ .TP 5
+ \fIfiledes\fP
+ is the file descriptor used for all output.
+@@ -194,14 +194,14 @@
+ \fIerrret\fP
+ points to an optional location where an error status can be returned to
+ the caller.
+-If \fIerrret\fR is not null,
+-then \fBsetupterm\fR returns \fBOK\fR or
+-\fBERR\fR and stores a status value in the integer pointed to by
+-\fIerrret\fR.
+-A return value of \fBOK\fR combined with status of \fB1\fR in \fIerrret\fR
++If \fIerrret\fP is not null,
++then \fBsetupterm\fP returns \fBOK\fP or
++\fBERR\fP and stores a status value in the integer pointed to by
++\fIerrret\fP.
++A return value of \fBOK\fP combined with status of \fB1\fP in \fIerrret\fP
+ is normal.
+ .IP
+-If \fBERR\fR is returned, examine \fIerrret\fR:
++If \fBERR\fP is returned, examine \fIerrret\fP:
+ .RS
+ .TP 5
+ .B 1
+@@ -219,22 +219,22 @@
+ checking the \fBgn\fP (\fBgeneric\fP) capability.
+ .TP 5
+ .B \-1
+-means that the \fBterminfo\fR database could not be found.
++means that the \fBterminfo\fP database could not be found.
+ .RE
+ .IP
+-If \fIerrret\fR is
+-null, \fBsetupterm\fR prints an error message upon finding an error
++If \fIerrret\fP is
++null, \fBsetupterm\fP prints an error message upon finding an error
+ and exits.
+ Thus, the simplest call is:
+ .sp
+-      \fBsetupterm((char *)0, 1, (int *)0);\fR,
++      \fBsetupterm((char *)0, 1, (int *)0);\fP,
+ .sp
+-which uses all the defaults and sends the output to \fBstdout\fR.
++which uses all the defaults and sends the output to \fBstdout\fP.
+ .RE
+ .\" ***************************************************************************
+ .SS The Terminal State
+ .PP
+-The \fBsetupterm\fR routine stores its information about the terminal
++The \fBsetupterm\fP routine stores its information about the terminal
+ in a \fBTERMINAL\fP structure pointed to by the global variable \fBcur_term\fP.
+ If it detects an error,
+ or decides that the terminal is unsuitable (hardcopy or generic),
+@@ -247,19 +247,19 @@
+ If it is called for different terminal types,
+ \fBsetupterm\fP allocates new storage for each set of terminal capabilities.
+ .PP
+-The \fBset_curterm\fR routine sets \fBcur_term\fR to
+-\fInterm\fR, and makes all of the \fBterminfo\fR boolean, numeric, and
+-string variables use the values from \fInterm\fR.
+-It returns the old value of \fBcur_term\fR.
+-.PP
+-The \fBdel_curterm\fR routine frees the space pointed to by
+-\fIoterm\fR and makes it available for further use.
+-If \fIoterm\fR is
+-the same as \fBcur_term\fR, references to any of the \fBterminfo\fR
++The \fBset_curterm\fP routine sets \fBcur_term\fP to
++\fInterm\fP, and makes all of the \fBterminfo\fP boolean, numeric, and
++string variables use the values from \fInterm\fP.
++It returns the old value of \fBcur_term\fP.
++.PP
++The \fBdel_curterm\fP routine frees the space pointed to by
++\fIoterm\fP and makes it available for further use.
++If \fIoterm\fP is
++the same as \fBcur_term\fP, references to any of the \fBterminfo\fP
+ boolean, numeric, and string variables thereafter may refer to invalid
+-memory locations until another \fBsetupterm\fR has been called.
++memory locations until another \fBsetupterm\fP has been called.
+ .PP
+-The \fBrestartterm\fR routine is similar to \fBsetupterm\fR and \fBinitscr\fR,
++The \fBrestartterm\fP routine is similar to \fBsetupterm\fP and \fBinitscr\fP,
+ except that it is called after restoring memory to a previous state (for
+ example, when reloading a game saved as a core image dump).
+ \fBrestartterm\fP assumes that the windows and the input and output options
+@@ -270,8 +270,8 @@
+ .\" ***************************************************************************
+ .SS Formatting Output
+ .PP
+-The \fBtparm\fR routine instantiates the string \fIstr\fR with
+-parameters \fIpi\fR.  A pointer is returned to the result of \fIstr\fR
++The \fBtparm\fP routine instantiates the string \fIstr\fP with
++parameters \fIpi\fP.  A pointer is returned to the result of \fIstr\fP
+ with the parameters applied.
+ Application developers should keep in mind these quirks of the interface:
+ .bP
+@@ -293,40 +293,40 @@
+ .\" ***************************************************************************
+ .SS Output Functions
+ .PP
+-The \fBtputs\fR routine applies padding information
++The \fBtputs\fP routine applies padding information
+ (i.e., by interpreting marker embedded in the terminfo capability
+ such as \*(``$<5>\*('' as 5 milliseconds)
+ to the string
+-\fIstr\fR and outputs it:
++\fIstr\fP and outputs it:
+ .bP
+-The \fIstr\fR parameter must be a terminfo string
++The \fIstr\fP parameter must be a terminfo string
+ variable or the return value from
+-\fBtparm\fR, \fBtiparm\fP, \fBtgetstr\fR, or \fBtgoto\fR.
++\fBtparm\fP, \fBtiparm\fP, \fBtgetstr\fP, or \fBtgoto\fP.
+ .IP
+ The \fBtgetstr\fP and \fBtgoto\fP functions are part of the \fItermcap\fP
+ interface,
+ which happens to share this function name with the \fIterminfo\fP interface.
+ .bP
+-\fIaffcnt\fR is the number of lines affected, or 1 if
++\fIaffcnt\fP is the number of lines affected, or 1 if
+ not applicable.
+ .bP
+-\fIputc\fR is a \fBputchar\fR-like routine to which
++\fIputc\fP is a \fBputchar\fP-like routine to which
+ the characters are passed, one at a time.
+ .PP
+-The \fBputp\fR routine calls \fBtputs(\fR\fIstr\fR\fB, 1, putchar)\fR.
+-The output of \fBputp\fR always goes to \fBstdout\fR, rather than
+-the \fIfiledes\fR specified in \fBsetupterm\fR.
+-.PP
+-The \fBvidputs\fR routine displays the string on the terminal in the
+-video attribute mode \fIattrs\fR, which is any combination of the
+-attributes listed in \fBcurses\fR(3X).
++The \fBputp\fP routine calls \fBtputs(\fP\fIstr\fP\fB, 1, putchar)\fP.
++The output of \fBputp\fP always goes to \fBstdout\fP, rather than
++the \fIfiledes\fP specified in \fBsetupterm\fP.
++.PP
++The \fBvidputs\fP routine displays the string on the terminal in the
++video attribute mode \fIattrs\fP, which is any combination of the
++attributes listed in \fBcurses\fP(3X).
+ The characters are passed to
+-the \fBputchar\fR-like routine \fIputc\fR.
++the \fBputchar\fP-like routine \fIputc\fP.
+ .PP
+-The \fBvidattr\fR routine is like the \fBvidputs\fR routine, except
+-that it outputs through \fBputchar\fR.
++The \fBvidattr\fP routine is like the \fBvidputs\fP routine, except
++that it outputs through \fBputchar\fP.
+ .PP
+-The \fBvid_attr\fR and \fBvid_puts\fR routines correspond
++The \fBvid_attr\fP and \fBvid_puts\fP routines correspond
+ to vidattr and vidputs, respectively.
+ They use a set of arguments for representing the video attributes plus color,
+ i.e.,
+@@ -335,8 +335,8 @@
+ .bP
+ \fIpair\fP of type \fBshort\fP for the color-pair number.
+ .PP
+-The \fBvid_attr\fR and \fBvid_puts\fR routines
+-are designed to use the attribute constants with the \fIWA_\fR prefix.
++The \fBvid_attr\fP and \fBvid_puts\fP routines
++are designed to use the attribute constants with the \fBWA_\fP prefix.
+ .PP
+ X/Open Curses reserves the \fIopts\fP argument for future use,
+ saying that applications must provide a null pointer for that argument.
+@@ -344,48 +344,48 @@
+ this implementation allows \fIopts\fP to be used as a pointer to \fBint\fP,
+ which overrides the \fIpair\fP (\fBshort\fP) argument.
+ .PP
+-The \fBmvcur\fR routine provides low-level cursor motion.
++The \fBmvcur\fP routine provides low-level cursor motion.
+ It takes effect immediately (rather than at the next refresh).
+ .PP
+-While \fBputp\fR and \fBmvcur\fP are low-level functions which
++While \fBputp\fP and \fBmvcur\fP are low-level functions which
+ do not use the high-level curses state,
+ they are declared in \fB\fP because SystemV did this
+-(see \fBHISTORY\fP).
++(see \fIHISTORY\fP).
+ .\" ***************************************************************************
+ .SS Terminal Capability Functions
+ .PP
+-The \fBtigetflag\fR, \fBtigetnum\fR and \fBtigetstr\fR routines return
+-the value of the capability corresponding to the \fBterminfo\fR
+-\fIcapname\fR passed to them, such as \fBxenl\fR.
+-The \fIcapname\fR for each capability is given in the table column entitled
+-\fIcapname\fR code in the capabilities section of \fBterminfo\fR(\*n).
++The \fBtigetflag\fP, \fBtigetnum\fP and \fBtigetstr\fP routines return
++the value of the capability corresponding to the \fBterminfo\fP
++\fIcapname\fP passed to them, such as \fBxenl\fP.
++The \fIcapname\fP for each capability is given in the table column entitled
++\fIcapname\fP code in the capabilities section of \fBterminfo\fP(\*n).
+ .PP
+ These routines return special values to denote errors.
+ .PP
+-The \fBtigetflag\fR routine returns
++The \fBtigetflag\fP routine returns
+ .TP
+-\fB\-1\fR
+-if \fIcapname\fR is not a boolean capability,
++\fB\-1\fP
++if \fIcapname\fP is not a boolean capability,
+ or
+ .TP
+-\fB0\fR
++\fB0\fP
+ if it is canceled or absent from the terminal description.
+ .PP
+-The \fBtigetnum\fR routine returns
++The \fBtigetnum\fP routine returns
+ .TP
+-\fB\-2\fR
+-if \fIcapname\fR is not a numeric capability, or
++\fB\-2\fP
++if \fIcapname\fP is not a numeric capability, or
+ .TP
+-\fB\-1\fR
++\fB\-1\fP
+ if it is canceled or absent from the terminal description.
+ .PP
+-The \fBtigetstr\fR routine returns
++The \fBtigetstr\fP routine returns
+ .TP
+-\fB(char *)\-1\fR
+-if \fIcapname\fR is not a string capability,
++\fB(char *)\-1\fP
++if \fIcapname\fP is not a string capability,
+ or
+ .TP
+-\fB0\fR
++\fB0\fP
+ if it is canceled or absent from the terminal description.
+ .\" ***************************************************************************
+ .SS Terminal Capability Names
+@@ -394,26 +394,26 @@
+ .bP
+ the short terminfo names (\*(``codes\*(''),
+ .bP
+-the \fBtermcap\fR names (\*(``names\*(''), and
++the \fBtermcap\fP names (\*(``names\*(''), and
+ .bP
+ the long terminfo names (\*(``fnames\*('')
+ .PP
+-for each of the predefined \fBterminfo\fR variables:
++for each of the predefined \fBterminfo\fP variables:
+ .sp
+ .RS
+-\fBconst char *boolnames[]\fR, \fB*boolcodes[]\fR, \fB*boolfnames[]\fR
++\fBconst char *boolnames[]\fP, \fB*boolcodes[]\fP, \fB*boolfnames[]\fP
+ .br
+-\fBconst char *numnames[]\fR, \fB*numcodes[]\fR, \fB*numfnames[]\fR
++\fBconst char *numnames[]\fP, \fB*numcodes[]\fP, \fB*numfnames[]\fP
+ .br
+-\fBconst char *strnames[]\fR, \fB*strcodes[]\fR, \fB*strfnames[]\fR
++\fBconst char *strnames[]\fP, \fB*strcodes[]\fP, \fB*strfnames[]\fP
+ .RE
+ .SH RETURN VALUE
+-Routines that return an integer return \fBERR\fR upon failure and \fBOK\fR
+-(SVr4 only specifies \*(``an integer value other than \fBERR\fR\*('')
++Routines that return an integer return \fBERR\fP upon failure and \fBOK\fP
++(SVr4 only specifies \*(``an integer value other than \fBERR\fP\*('')
+ upon successful completion,
+ unless otherwise noted in the preceding routine descriptions.
+ .PP
+-Routines that return pointers always return \fBNULL\fR on error.
++Routines that return pointers always return \fBNULL\fP on error.
+ .PP
+ X/Open defines no error conditions.
+ In this implementation
+@@ -445,7 +445,7 @@
+ .\" ***************************************************************************
+ .SS Compatibility macros
+ This implementation provides a few macros for compatibility with systems
+-before SVr4 (see \fBHISTORY\fP).
++before SVr4 (see \fIHISTORY\fP).
+ Those include
+ \fBcrmode\fP,
+ \fBfixterm\fP,
+@@ -456,14 +456,14 @@
+ \fBsetterm\fP.
+ .PP
+ In SVr4, those are found in \fB\fP,
+-but except for \fBsetterm\fR, are likewise macros.
+-The one function, \fBsetterm\fR, is mentioned in the manual page.
+-The manual page notes that the \fBsetterm\fR routine
+-was replaced by \fBsetupterm\fR, stating that the call:
++but except for \fBsetterm\fP, are likewise macros.
++The one function, \fBsetterm\fP, is mentioned in the manual page.
++The manual page notes that the \fBsetterm\fP routine
++was replaced by \fBsetupterm\fP, stating that the call:
+ .sp
+-      \fBsetupterm(\fR\fIterm\fR\fB, 1, (int *)0)\fR
++      \fBsetupterm(\fP\fIterm\fP\fB, 1, (int *)0)\fP
+ .sp
+-provides the same functionality as \fBsetterm(\fR\fIterm\fR\fB)\fR,
++provides the same functionality as \fBsetterm(\fP\fIterm\fP\fB)\fP,
+ and is not recommended for new programs.
+ This implementation provides each of those symbols
+ as macros for BSD compatibility,
+@@ -476,7 +476,7 @@
+ l l
+ _ _
+ l l.
+-\fBFunction\fR	\fBDescription\fR
++\fBFunction\fP	\fBDescription\fP
+ fixterm	restore tty to \*(``in curses\*('' state
+ gettmode	establish current tty modes
+ mvcur	low level cursor motion
+@@ -504,7 +504,7 @@
+ l l
+ _ _
+ l l.
+-\fBFunction\fR	\fBDescription\fR
++\fBFunction\fP	\fBDescription\fP
+ tgetent	look up termcap entry for given \fIname\fP
+ tgetflag	get boolean entry for given \fIid\fP
+ tgetnum	get numeric entry for given \fIid\fP
+@@ -516,7 +516,7 @@
+ .TE
+ .PP
+ Early terminfo programs obtained capability values from the
+-\fBTERMINAL\fP structure initialized by \fBsetupterm\fR.
++\fBTERMINAL\fP structure initialized by \fBsetupterm\fP.
+ .PP
+ SVr3 extended terminfo by adding functions to retrieve capability values
+ (like the termcap interface),
+@@ -525,7 +525,7 @@
+ l l
+ _ _
+ l l.
+-\fBFunction\fR	\fBDescription\fR
++\fBFunction\fP	\fBDescription\fP
+ tigetflag	get boolean entry for given \fIid\fP
+ tigetnum	get numeric entry for given \fIid\fP
+ tigetstr	get string entry for given \fIid\fP
+@@ -538,7 +538,7 @@
+ l l
+ _ _
+ l l.
+-\fBFunction\fR	\fBReplaced by\fP
++\fBFunction\fP	\fBReplaced by\fP
+ crmode	cbreak
+ fixterm	reset_prog_mode
+ gettmode	N/A
+@@ -571,13 +571,13 @@
+ on Unix systems,
+ but none were documented.
+ The functions marked \*(``obsolete\*('' remained in use
+-by the Unix \fBvi\fP editor.
++by the Unix \fBvi\fP(1) editor.
+ .SH PORTABILITY
+ .SS Legacy functions
+ .PP
+-X/Open notes that \fBvidattr\fR and \fBvidputs\fR may be macros.
++X/Open notes that \fBvidattr\fP and \fBvidputs\fP may be macros.
+ .PP
+-The function \fBsetterm\fR is not described by X/Open and must
++The function \fBsetterm\fP is not described by X/Open and must
+ be considered non-portable.
+ All other functions are as described by X/Open.
+ .SS Legacy data
+@@ -626,7 +626,7 @@
+ function prototypes to use the \fBconst\fP keyword.
+ The ncurses ABI 6 enables this feature by default.
+ .bP
+-X/Open Curses prototypes \fBtparm\fR with a fixed number of parameters,
++X/Open Curses prototypes \fBtparm\fP with a fixed number of parameters,
+ rather than a variable argument list.
+ .IP
+ This implementation uses a variable argument list, but can be
+@@ -649,34 +649,34 @@
+ \*(``#win32con\*('' or an abbreviation of that string.
+ .SS Other portability issues
+ .PP
+-In System V Release 4, \fBset_curterm\fR has an \fBint\fR return type and
+-returns \fBOK\fR or \fBERR\fR.  We have chosen to implement the X/Open Curses
++In System V Release 4, \fBset_curterm\fP has an \fBint\fP return type and
++returns \fBOK\fP or \fBERR\fP.  We have chosen to implement the X/Open Curses
+ semantics.
+ .PP
+-In System V Release 4, the third argument of \fBtputs\fR has the type
+-\fBint (*putc)(char)\fR.
++In System V Release 4, the third argument of \fBtputs\fP has the type
++\fBint (*putc)(char)\fP.
+ .PP
+ At least one implementation of X/Open Curses (Solaris) returns a value
+ other than \fBOK\fP/\fBERR\fP from \fBtputs\fP.
+ That returns the length of the string, and does no error-checking.
+ .PP
+-X/Open notes that after calling \fBmvcur\fR, the curses state may not match the
++X/Open notes that after calling \fBmvcur\fP, the curses state may not match the
+ actual terminal state, and that an application should touch and refresh
+ the window before resuming normal curses calls.
+-Both \fBncurses\fP and System V Release 4 curses implement \fBmvcur\fR using
+-the SCREEN data allocated in either \fBinitscr\fR or \fBnewterm\fR.
++Both \fBncurses\fP and System V Release 4 curses implement \fBmvcur\fP using
++the SCREEN data allocated in either \fBinitscr\fP or \fBnewterm\fP.
+ So though it is documented as a terminfo function,
+-\fBmvcur\fR is really a curses function which is not well specified.
++\fBmvcur\fP is really a curses function which is not well specified.
+ .PP
+ X/Open states that the old location must be given for \fBmvcur\fP.
+ This implementation allows the caller to use \-1's for the old ordinates.
+ In that case, the old location is unknown.
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBcurs_initscr\fR(3X),
+-\fBcurs_kernel\fR(3X),
+-\fBcurs_termcap\fR(3X),
+-\fBcurs_variables\fR(3X),
+-\fBterm_variables\fR(3X),
+-\fBputc\fR(3),
+-\fBterminfo\fR(\*n)
++\fBcurses\fP(3X),
++\fBcurs_initscr\fP(3X),
++\fBcurs_kernel\fP(3X),
++\fBcurs_termcap\fP(3X),
++\fBcurs_variables\fP(3X),
++\fBterm_variables\fP(3X),
++\fBputc\fP(3),
++\fBterminfo\fP(\*n)
+Index: man/curs_threads.3x
+Prereq:  1.27 
+--- ncurses-6.3-20211219+/man/curs_threads.3x	2020-12-30 18:28:51.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_threads.3x	2021-12-25 21:50:36.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2020 Thomas E. Dickey                                          *
++.\" Copyright 2020,2021 Thomas E. Dickey                                     *
+ .\" Copyright 2008-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_threads.3x,v 1.27 2020/12/30 18:28:51 tom Exp $
++.\" $Id: curs_threads.3x,v 1.30 2021/12/25 21:50:36 tom Exp $
+ .TH curs_threads 3X ""
+ .de bP
+ .ie n  .IP \(bu 4
+@@ -36,30 +36,30 @@
+ .na
+ .hy 0
+ .SH NAME
+-\fBcurs_threads\fR \- \fBcurses\fR thread support
++\fBcurs_threads\fP \- \fBcurses\fP thread support
+ .ad
+ .hy
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBtypedef int (*NCURSES_WINDOW_CB)(WINDOW *, void *);\fR
++\fBtypedef int (*NCURSES_WINDOW_CB)(WINDOW *, void *);\fP
+ .br
+-\fBtypedef int (*NCURSES_SCREEN_CB)(SCREEN *, void *);\fR
++\fBtypedef int (*NCURSES_SCREEN_CB)(SCREEN *, void *);\fP
+ .sp
+-\fBint get_escdelay(void);\fR
++\fBint get_escdelay(void);\fP
+ .br
+-\fBint set_escdelay(int \fP\fIms\fP\fB);\fR
++\fBint set_escdelay(int \fP\fIms\fP\fB);\fP
+ .br
+-\fBint set_tabsize(int \fP\fIcols\fP\fB);\fR
++\fBint set_tabsize(int \fP\fIcols\fP\fB);\fP
+ .sp
+-\fBint use_screen(SCREEN *\fP\fIscr\fP\fB, NCURSES_SCREEN_CB \fP\fIfunc\fP\fB, void *\fP\fIdata\fP\fB);\fR
++\fBint use_screen(SCREEN *\fP\fIscr\fP\fB, NCURSES_SCREEN_CB \fP\fIfunc\fP\fB, void *\fP\fIdata\fP\fB);\fP
+ .br
+-\fBint use_window(WINDOW *\fP\fIwin\fP\fB, NCURSES_WINDOW_CB \fP\fIfunc\fP\fB, void *\fP\fIdata\fP\fB);\fR
++\fBint use_window(WINDOW *\fP\fIwin\fP\fB, NCURSES_WINDOW_CB \fP\fIfunc\fP\fB, void *\fP\fIdata\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+ This implementation can be configured to provide rudimentary support
+ for multi-threaded applications.
+-This makes a different set of libraries, e.g., \fIlibncursest\fP since
++This makes a different set of libraries, e.g., \fBlibncursest\fP since
+ the binary interfaces are different.
+ .PP
+ Rather than modify the interfaces to pass a thread specifier to
+@@ -113,12 +113,12 @@
+ .bP
+ global data, e.g., used in the low-level terminfo or termcap interfaces.
+ .bP
+-terminal data, e.g., associated with a call to \fIset_curterm\fP.
++terminal data, e.g., associated with a call to \fBset_curterm\fP.
+ The terminal data are initialized when screens are created.
+ .bP
+-screen data, e.g., associated with a call to \fInewterm\fP or \fIinitscr\fP.
++screen data, e.g., associated with a call to \fBnewterm\fP or \fBinitscr\fP.
+ .bP
+-window data, e.g., associated with a call to \fInewwin\fP or \fIsubwin\fP.
++window data, e.g., associated with a call to \fBnewwin\fP or \fBsubwin\fP.
+ Windows are associated with screens.
+ Pads are not necessarily associated with a particular screen.
+ .IP
+@@ -140,7 +140,7 @@
+ COLOR_PAIR/reentrant
+ COLOR_PAIRS/screen (readonly)
+ COLS/screen (readonly)
+-ESCDELAY/screen (readonly, see \fIset_escdelay\fP)
++ESCDELAY/screen (readonly, see \fBset_escdelay\fP)
+ LINES/screen (readonly)
+ PAIR_NUMBER/reentrant
+ PC/global
+@@ -598,6 +598,6 @@
+ It is recommended that any code depending on ncurses extensions
+ be conditioned using NCURSES_VERSION.
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBcurs_opaque\fR(3X),
+-\fBcurs_variables\fR(3X).
++\fBcurses\fP(3X),
++\fBcurs_opaque\fP(3X),
++\fBcurs_variables\fP(3X).
+Index: man/curs_touch.3x
+Prereq:  1.24 
+--- ncurses-6.3-20211219+/man/curs_touch.3x	2021-06-17 21:26:02.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_touch.3x	2021-12-25 17:39:16.000000000 +0000
+@@ -27,36 +27,36 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_touch.3x,v 1.24 2021/06/17 21:26:02 tom Exp $
++.\" $Id: curs_touch.3x,v 1.25 2021/12/25 17:39:16 tom Exp $
+ .TH curs_touch 3X ""
+ .na
+ .hy 0
+ .SH NAME
+-\fBtouchwin\fR,
+-\fBtouchline\fR,
+-\fBuntouchwin\fR,
+-\fBwtouchln\fR,
+-\fBis_linetouched\fR,
+-\fBis_wintouched\fR \- \fBcurses\fR refresh control routines
++\fBtouchwin\fP,
++\fBtouchline\fP,
++\fBuntouchwin\fP,
++\fBwtouchln\fP,
++\fBis_linetouched\fP,
++\fBis_wintouched\fP \- \fBcurses\fP refresh control routines
+ .ad
+ .hy
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBint touchline(WINDOW *\fP\fIwin\fP\fB, int \fP\fIstart\fP\fB, int \fP\fIcount\fP\fB);\fR
++\fBint touchline(WINDOW *\fP\fIwin\fP\fB, int \fP\fIstart\fP\fB, int \fP\fIcount\fP\fB);\fP
+ .sp
+-\fBint touchwin(WINDOW *\fP\fIwin\fP\fB);\fR
++\fBint touchwin(WINDOW *\fP\fIwin\fP\fB);\fP
+ .br
+-\fBint wtouchln(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIn\fP\fB, int \fP\fIchanged\fP\fB);\fR
++\fBint wtouchln(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIn\fP\fB, int \fP\fIchanged\fP\fB);\fP
+ .sp
+-\fBint untouchwin(WINDOW *\fP\fIwin\fP\fB);\fR
++\fBint untouchwin(WINDOW *\fP\fIwin\fP\fB);\fP
+ .sp
+-\fBbool is_linetouched(WINDOW *\fP\fIwin\fP\fB, int \fP\fIline\fP\fB);\fR
++\fBbool is_linetouched(WINDOW *\fP\fIwin\fP\fB, int \fP\fIline\fP\fB);\fP
+ .br
+-\fBbool is_wintouched(WINDOW *\fP\fIwin\fP\fB);\fR
++\fBbool is_wintouched(WINDOW *\fP\fIwin\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-The \fBtouchwin\fR and \fBtouchline\fR routines throw away all
++The \fBtouchwin\fP and \fBtouchline\fP routines throw away all
+ optimization information about which parts of the window have been
+ touched, by pretending that the entire window has been drawn on.
+ This
+@@ -64,25 +64,25 @@
+ to one window affects the other window, but the records of which lines
+ have been changed in the other window do not reflect the change.
+ The
+-routine \fBtouchline\fR only pretends that \fIcount\fR lines have been
+-changed, beginning with line \fIstart\fR.
++routine \fBtouchline\fP only pretends that \fIcount\fP lines have been
++changed, beginning with line \fIstart\fP.
+ .PP
+-The \fBuntouchwin\fR routine marks all lines in the window as unchanged since
+-the last call to \fBwrefresh\fR.
++The \fBuntouchwin\fP routine marks all lines in the window as unchanged since
++the last call to \fBwrefresh\fP.
+ .PP
+-The \fBwtouchln\fR routine makes \fIn\fR lines in the window, starting
+-at line \fIy\fR, look as if they have (\fIchanged\fR\fB=1\fR) or have
+-not (\fIchanged\fR\fB=0\fR) been changed since the last call to
+-\fBwrefresh\fR.
+-.PP
+-The \fBis_linetouched\fR and \fBis_wintouched\fR routines return
+-\fBTRUE\fR if the specified line/window was modified since the last
+-call to \fBwrefresh\fR; otherwise they return \fBFALSE\fR.  In
+-addition, \fBis_linetouched\fR returns \fBERR\fR if \fIline\fR is not
++The \fBwtouchln\fP routine makes \fIn\fP lines in the window, starting
++at line \fIy\fP, look as if they have (\fIchanged\fP\fB=1\fP) or have
++not (\fIchanged\fP\fB=0\fP) been changed since the last call to
++\fBwrefresh\fP.
++.PP
++The \fBis_linetouched\fP and \fBis_wintouched\fP routines return
++\fBTRUE\fP if the specified line/window was modified since the last
++call to \fBwrefresh\fP; otherwise they return \fBFALSE\fP.  In
++addition, \fBis_linetouched\fP returns \fBERR\fP if \fIline\fP is not
+ valid for the given window.
+ .SH RETURN VALUE
+-All routines return the integer \fBERR\fR upon failure and an integer value
+-other than \fBERR\fR upon successful completion, unless otherwise noted in the
++All routines return the integer \fBERR\fP upon failure and an integer value
++other than \fBERR\fP upon successful completion, unless otherwise noted in the
+ preceding routine descriptions.
+ .PP
+ X/Open does not define any error conditions.
+@@ -122,8 +122,8 @@
+ The XSI Curses standard, Issue 4 describes these functions,
+ but defines no error conditions.
+ .SH NOTES
+-All of these routines except \fBwtouchln\fR may be macros.
++All of these routines except \fBwtouchln\fP may be macros.
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBcurs_refresh\fR(3X),
+-\fBcurs_variables\fR(3X).
++\fBcurses\fP(3X),
++\fBcurs_refresh\fP(3X),
++\fBcurs_variables\fP(3X).
+Index: man/curs_trace.3x
+Prereq:  1.21 
+--- ncurses-6.3-20211219+/man/curs_trace.3x	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_trace.3x	2021-12-25 21:41:58.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2019,2020 Thomas E. Dickey                                     *
++.\" Copyright 2019-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 2000-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_trace.3x,v 1.21 2020/02/02 23:34:34 tom Exp $
++.\" $Id: curs_trace.3x,v 1.24 2021/12/25 21:41:58 tom Exp $
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+ .ie \n(.g .ds '' \(rq
+@@ -40,71 +40,71 @@
+ .na
+ .hy 0
+ .SH NAME
+-\fBcurses_trace\fR,
+-\fBtrace\fR,
+-\fB_tracef\fR,
+-\fB_traceattr\fR,
+-\fB_traceattr2\fR,
+-\fB_tracecchar_t\fR,
+-\fB_tracecchar_t2\fR,
+-\fB_tracechar\fR,
+-\fB_tracechtype\fR,
+-\fB_tracechtype2\fR,
+-\fB_nc_tracebits\fR,
+-\fB_tracedump\fR,
+-\fB_tracemouse\fR \- \fBcurses\fR debugging routines
++\fBcurses_trace\fP,
++\fBtrace\fP,
++\fB_tracef\fP,
++\fB_traceattr\fP,
++\fB_traceattr2\fP,
++\fB_tracecchar_t\fP,
++\fB_tracecchar_t2\fP,
++\fB_tracechar\fP,
++\fB_tracechtype\fP,
++\fB_tracechtype2\fP,
++\fB_nc_tracebits\fP,
++\fB_tracedump\fP,
++\fB_tracemouse\fP \- \fBcurses\fP debugging routines
+ .ad
+ .hy
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBunsigned curses_trace(const unsigned \fP\fIparam\fP\fB);\fR
++\fBunsigned curses_trace(const unsigned \fP\fIparam\fP\fB);\fP
+ .sp
+-\fBvoid _tracef(const char *\fP\fIformat\fP\fB, ...);\fR
++\fBvoid _tracef(const char *\fP\fIformat\fP\fB, ...);\fP
+ .sp
+-\fBchar *_traceattr(attr_t \fP\fIattr\fP\fB);\fR
++\fBchar *_traceattr(attr_t \fP\fIattr\fP\fB);\fP
+ .br
+-\fBchar *_traceattr2(int \fP\fIbuffer\fP\fB, chtype \fP\fIch\fP\fB);\fR
++\fBchar *_traceattr2(int \fP\fIbuffer\fP\fB, chtype \fP\fIch\fP\fB);\fP
+ .br
+-\fBchar *_tracecchar_t(const cchar_t *\fP\fIstring\fP\fB);\fR
++\fBchar *_tracecchar_t(const cchar_t *\fP\fIstring\fP\fB);\fP
+ .br
+-\fBchar *_tracecchar_t2(int \fP\fIbuffer\fP\fB, const cchar_t *\fP\fIstring\fP\fB);\fR
++\fBchar *_tracecchar_t2(int \fP\fIbuffer\fP\fB, const cchar_t *\fP\fIstring\fP\fB);\fP
+ .br
+-\fBchar *_tracechar(int \fP\fIch\fP\fB);\fR
++\fBchar *_tracechar(int \fP\fIch\fP\fB);\fP
+ .br
+-\fBchar *_tracechtype(chtype \fP\fIch\fP\fB);\fR
++\fBchar *_tracechtype(chtype \fP\fIch\fP\fB);\fP
+ .br
+-\fBchar *_tracechtype2(int \fP\fIbuffer\fP\fB, chtype \fP\fIch\fP\fB);\fR
++\fBchar *_tracechtype2(int \fP\fIbuffer\fP\fB, chtype \fP\fIch\fP\fB);\fP
+ .sp
+-\fBvoid _tracedump(const char *\fP\fIlabel\fP\fB, WINDOW *\fP\fIwin\fP\fB);\fR
++\fBvoid _tracedump(const char *\fP\fIlabel\fP\fB, WINDOW *\fP\fIwin\fP\fB);\fP
+ .br
+-\fBchar *_nc_tracebits(void);\fR
++\fBchar *_nc_tracebits(void);\fP
+ .br
+-\fBchar *_tracemouse(const MEVENT *\fP\fIevent\fP\fB);\fR
++\fBchar *_tracemouse(const MEVENT *\fP\fIevent\fP\fB);\fP
+ .sp
+ /* deprecated */
+ .br
+-\fBvoid trace(const unsigned int \fP\fIparam\fP\fB);\fR
++\fBvoid trace(const unsigned int \fP\fIparam\fP\fB);\fP
+ .SH DESCRIPTION
+-The \fIcurses trace\fR routines are used for debugging the ncurses libraries,
++The \fIcurses trace\fP routines are used for debugging the ncurses libraries,
+ as well as applications which use the ncurses libraries.
+ Some limitations apply:
+ .bP
+ Aside from \fBcurses_trace\fP,
+ the other functions are normally available only with the debugging library
+-e.g., \fIlibncurses_g.a\fR.
++e.g., \fBlibncurses_g.a\fP.
+ .IP
+ All of the trace functions may be compiled into any model (shared, static,
+-profile) by defining the symbol \fBTRACE\fR.
++profile) by defining the symbol \fBTRACE\fP.
+ .bP
+ Additionally, the functions which use \fBcchar_t\fP
+ are only available with the wide-character configuration of the libraries.
+ .SS Functions
+ The principal parts of this interface are
+ .bP
+-\fBcurses_trace\fR, which selectively enables different tracing features, and
++\fBcurses_trace\fP, which selectively enables different tracing features, and
+ .bP
+-\fB_tracef\fR, which writes formatted data to the \fItrace\fR file.
++\fB_tracef\fP, which writes formatted data to the \fItrace\fP file.
+ .IP
+ The other functions either return a pointer to a string-area
+ (allocated by the corresponding function), or return no value
+@@ -116,11 +116,11 @@
+ some use a buffer-number parameter, telling the library to allocate
+ additional string-areas.
+ .PP
+-The \fBcurses_trace\fR function is always available,
++The \fBcurses_trace\fP function is always available,
+ whether or not the other trace functions are available:
+ .bP
+ If tracing is available,
+-calling \fBcurses_trace\fR with a nonzero parameter
++calling \fBcurses_trace\fP with a nonzero parameter
+ updates the trace mask,
+ and returns the previous trace mask.
+ .IP
+@@ -131,7 +131,7 @@
+ If tracing is not available, \fBcurses_trace\fP returns zero (0).
+ .SS Trace Parameter
+ The trace parameter is formed by OR'ing
+-values from the list of \fBTRACE_\fP\fIxxx\fR definitions in \fB\fR.
++values from the list of \fBTRACE_\fP\fIxxx\fP definitions in \fB\fP.
+ These include:
+ .TP 5
+ .B TRACE_DISABLE
+@@ -167,7 +167,7 @@
+ The parameters for each call are traced, as well as return values.
+ .TP 5
+ .B TRACE_VIRTPUT
+-trace virtual character puts, i.e., calls to \fBaddch\fR.
++trace virtual character puts, i.e., calls to \fBaddch\fP.
+ .TP 5
+ .B TRACE_IEVENT
+ trace low-level input processing, including timeouts.
+@@ -190,7 +190,7 @@
+ .B TRACE_MAXIMUM
+ maximum trace level, enables all of the separate trace features.
+ .PP
+-Some tracing features are enabled whenever the \fBcurses_trace\fR parameter
++Some tracing features are enabled whenever the \fBcurses_trace\fP parameter
+ is nonzero.
+ Some features overlap.
+ The specific names are used as a guideline.
+@@ -238,7 +238,7 @@
+ and fewer diagnostics are provided by the command-line utilities.
+ .SH RETURN VALUE
+ Routines which return a value are designed to be used as parameters
+-to the \fB_tracef\fR routine.
++to the \fB_tracef\fP routine.
+ .SH PORTABILITY
+ These functions are not part of the XSI interface.
+ Some other curses implementations are known to
+@@ -287,4 +287,4 @@
+ The original \fBtrace\fP routine was deprecated because
+ it often conflicted with application names.
+ .SH SEE ALSO
+-\fBcurses\fR(3X).
++\fBcurses\fP(3X).
+Index: man/curs_util.3x
+Prereq:  1.60 
+--- ncurses-6.3-20211219+/man/curs_util.3x	2020-12-19 22:44:46.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_util.3x	2021-12-25 22:05:53.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_util.3x,v 1.60 2020/12/19 22:44:46 tom Exp $
++.\" $Id: curs_util.3x,v 1.64 2021/12/25 22:05:53 tom Exp $
+ .TH curs_util 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -41,72 +41,72 @@
+ .na
+ .hy 0
+ .SH NAME
+-\fBdelay_output\fR,
+-\fBfilter\fR,
+-\fBflushinp\fR,
+-\fBgetwin\fR,
+-\fBkey_name\fR,
+-\fBkeyname\fR,
+-\fBnofilter\fR,
+-\fBputwin\fR,
+-\fBunctrl\fR,
+-\fBuse_env\fR,
+-\fBuse_tioctl\fR,
+-\fBwunctrl\fR \- miscellaneous \fBcurses\fR utility routines
++\fBdelay_output\fP,
++\fBfilter\fP,
++\fBflushinp\fP,
++\fBgetwin\fP,
++\fBkey_name\fP,
++\fBkeyname\fP,
++\fBnofilter\fP,
++\fBputwin\fP,
++\fBunctrl\fP,
++\fBuse_env\fP,
++\fBuse_tioctl\fP,
++\fBwunctrl\fP \- miscellaneous \fBcurses\fP utility routines
+ .ad
+ .hy
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBconst char *unctrl(chtype \fP\fIc\fP\fB);\fR
++\fBconst char *unctrl(chtype \fP\fIc\fP\fB);\fP
+ .br
+-\fBwchar_t *wunctrl(cchar_t *\fP\fIc\fP\fB);\fR
++\fBwchar_t *wunctrl(cchar_t *\fP\fIc\fP\fB);\fP
+ .sp
+-\fBconst char *keyname(int \fP\fIc\fP\fB);\fR
++\fBconst char *keyname(int \fP\fIc\fP\fB);\fP
+ .br
+-\fBconst char *key_name(wchar_t \fP\fIw\fP\fB);\fR
++\fBconst char *key_name(wchar_t \fP\fIw\fP\fB);\fP
+ .sp
+-\fBvoid filter(void);\fR
++\fBvoid filter(void);\fP
+ .br
+-\fBvoid nofilter(void);\fR
++\fBvoid nofilter(void);\fP
+ .sp
+-\fBvoid use_env(bool \fP\fIf\fP\fB);\fR
++\fBvoid use_env(bool \fP\fIf\fP\fB);\fP
+ .br
+-\fBvoid use_tioctl(bool \fP\fIf\fP\fB);\fR
++\fBvoid use_tioctl(bool \fP\fIf\fP\fB);\fP
+ .sp
+-\fBint putwin(WINDOW *\fP\fIwin\fP\fB, FILE *\fP\fIfilep\fP\fB);\fR
++\fBint putwin(WINDOW *\fP\fIwin\fP\fB, FILE *\fP\fIfilep\fP\fB);\fP
+ .br
+-\fBWINDOW *getwin(FILE *\fP\fIfilep\fP\fB);\fR
++\fBWINDOW *getwin(FILE *\fP\fIfilep\fP\fB);\fP
+ .sp
+-\fBint delay_output(int \fP\fIms\fP\fB);\fR
++\fBint delay_output(int \fP\fIms\fP\fB);\fP
+ .br
+-\fBint flushinp(void);\fR
++\fBint flushinp(void);\fP
+ .br
+ .SH DESCRIPTION
+ .SS unctrl
+ .PP
+-The \fBunctrl\fR routine returns a character string which is a printable
+-representation of the character \fIc\fR, ignoring attributes.
+-Control characters are displayed in the \fB^\fR\fIX\fR notation.
++The \fBunctrl\fP routine returns a character string which is a printable
++representation of the character \fIc\fP, ignoring attributes.
++Control characters are displayed in the \fB^\fP\fIX\fP notation.
+ Printing characters are displayed as is.
+-The corresponding \fBwunctrl\fR returns a printable representation of
++The corresponding \fBwunctrl\fP returns a printable representation of
+ a wide character.
+ .SS keyname/key_name
+ .PP
+-The \fBkeyname\fR routine returns a character string
+-corresponding to the key \fIc\fR:
++The \fBkeyname\fP routine returns a character string
++corresponding to the key \fIc\fP:
+ .bP
+ Printable characters are displayed as themselves,
+ e.g., a one-character string containing the key.
+ .bP
+-Control characters are displayed in the \fB^\fR\fIX\fR notation.
++Control characters are displayed in the \fB^\fP\fIX\fP notation.
+ .bP
+ DEL (character 127) is displayed as \fB^?\fP.
+ .bP
+ Values above 128 are either meta characters
+ (if the screen has not been initialized,
+ or if \fBmeta\fP(3X) has been called with a \fBTRUE\fP parameter),
+-shown in the \fBM\-\fR\fIX\fR notation,
++shown in the \fBM\-\fP\fIX\fP notation,
+ or are displayed as themselves.
+ In the latter case, the values may not be printable;
+ this follows the X/Open specification.
+@@ -118,31 +118,31 @@
+ X/Open also lists an \*(``UNKNOWN KEY\*('' return value,
+ which some implementations return rather than null.
+ .LP
+-The corresponding \fBkey_name\fR returns a character string corresponding
+-to the wide-character value \fIw\fR.
++The corresponding \fBkey_name\fP returns a character string corresponding
++to the wide-character value \fIw\fP.
+ The two functions do not return the same set of strings;
+ the latter returns null where the former would display a meta character.
+ .SS filter/nofilter
+ .PP
+-The \fBfilter\fR routine, if used, must be called before \fBinitscr\fR or
+-\fBnewterm\fR are called.
++The \fBfilter\fP routine, if used, must be called before \fBinitscr\fP or
++\fBnewterm\fP are called.
+ Calling \fBfilter\fP causes these changes in initialization:
+ .bP
+-\fBLINES\fR is set to 1;
++\fBLINES\fP is set to 1;
+ .bP
+ the capabilities
+-\fBclear\fR,
+-\fBcud1\fR,
+-\fBcud\fR,
+-\fBcup\fR,
+-\fBcuu1\fR,
+-\fBcuu\fR,
+-\fBvpa\fR
++\fBclear\fP,
++\fBcud1\fP,
++\fBcud\fP,
++\fBcup\fP,
++\fBcuu1\fP,
++\fBcuu\fP,
++\fBvpa\fP
+ are disabled;
+ .bP
+ the capability \fBed\fP is disabled if \fBbce\fP is set;
+ .bP
+-and the \fBhome\fR string is set to the value of \fBcr\fR.
++and the \fBhome\fP string is set to the value of \fBcr\fP.
+ .PP
+ The \fBnofilter\fP routine cancels the effect of a preceding \fBfilter\fP
+ call.
+@@ -152,9 +152,9 @@
+ in-memory copy of the terminal information.
+ .SS use_env
+ .PP
+-The \fBuse_env\fR routine, if used,
+-should be called before \fBinitscr\fR or
+-\fBnewterm\fR are called
++The \fBuse_env\fP routine, if used,
++should be called before \fBinitscr\fP or
++\fBnewterm\fP are called
+ (because those compute the screen size).
+ It modifies the way \fBncurses\fP treats environment variables
+ when determining the screen size.
+@@ -170,22 +170,22 @@
+ it overrides the values from the terminal database.
+ .bP
+ Finally (unless \fBuse_env\fP was called with \fBFALSE\fP parameter),
+-\fBncurses\fP examines the \fBLINES\fR or \fBCOLUMNS\fR environment variables,
++\fBncurses\fP examines the \fBLINES\fP or \fBCOLUMNS\fP environment variables,
+ using a value in those to override the results
+ from the operating system or terminal database.
+ .IP
+ \fBNcurses\fP also updates the screen size in response to \fBSIGWINCH\fP,
+-unless overridden by the \fBLINES\fR or \fBCOLUMNS\fR environment variables,
++unless overridden by the \fBLINES\fP or \fBCOLUMNS\fP environment variables,
+ .SS use_tioctl
+ .PP
+-The \fBuse_tioctl\fR routine, if used,
+-should be called before \fBinitscr\fR or \fBnewterm\fR are called
++The \fBuse_tioctl\fP routine, if used,
++should be called before \fBinitscr\fP or \fBnewterm\fP are called
+ (because those compute the screen size).
+-After \fBuse_tioctl\fR is called with \fBTRUE\fR as an argument,
++After \fBuse_tioctl\fP is called with \fBTRUE\fP as an argument,
+ \fBncurses\fP modifies the last step in its computation
+ of screen size as follows:
+ .bP
+-checks if the \fBLINES\fR and \fBCOLUMNS\fR environment variables
++checks if the \fBLINES\fP and \fBCOLUMNS\fP environment variables
+ are set to a number greater than zero.
+ .bP
+ for each, \fBncurses\fP updates the corresponding environment variable
+@@ -202,7 +202,7 @@
+ l l l
+ _ _ _
+ lw7 lw7 lw40.
+-\fIuse_env\fR/\fIuse_tioctl\fR/\fISummary\fR
++\fBuse_env\fP/\fBuse_tioctl\fP/\fBSummary\fP
+ TRUE/FALSE/T{
+ This is the default behavior.
+ \fBncurses\fP uses operating system calls
+@@ -221,14 +221,14 @@
+ .TE
+ .SS putwin/getwin
+ .PP
+-The \fBputwin\fR routine writes all data associated
+-with window (or pad) \fIwin\fR into
+-the file to which \fIfilep\fR points.
++The \fBputwin\fP routine writes all data associated
++with window (or pad) \fIwin\fP into
++the file to which \fIfilep\fP points.
+ This information can be later retrieved
+-using the \fBgetwin\fR function.
++using the \fBgetwin\fP function.
+ .PP
+-The \fBgetwin\fR routine reads window related data stored in the file by
+-\fBputwin\fR.
++The \fBgetwin\fP routine reads window related data stored in the file by
++\fBputwin\fP.
+ The routine then creates and initializes a new window using that
+ data.
+ It returns a pointer to the new window.
+@@ -250,28 +250,28 @@
+ they will not be colored when the window is refreshed.
+ .SS delay_output
+ .PP
+-The \fBdelay_output\fR routine inserts an \fIms\fR millisecond pause
++The \fBdelay_output\fP routine inserts an \fIms\fP millisecond pause
+ in output.
+ This routine should not be used extensively because
+ padding characters are used rather than a CPU pause.
+ If no padding character is specified,
+-this uses \fBnapms\fR to perform the delay.
++this uses \fBnapms\fP to perform the delay.
+ .SS flushinp
+ .PP
+-The \fBflushinp\fR routine throws away any typeahead that has been typed by the
++The \fBflushinp\fP routine throws away any typeahead that has been typed by the
+ user and has not yet been read by the program.
+ .SH RETURN VALUE
+-Except for \fBflushinp\fR, routines that return an integer return \fBERR\fR
+-upon failure and \fBOK\fR (SVr4 specifies only "an integer value other than
+-\fBERR\fR") upon successful completion.
++Except for \fBflushinp\fP, routines that return an integer return \fBERR\fP
++upon failure and \fBOK\fP (SVr4 specifies only "an integer value other than
++\fBERR\fP") upon successful completion.
+ .PP
+-Routines that return pointers return \fBNULL\fR on error.
++Routines that return pointers return \fBNULL\fP on error.
+ .PP
+ X/Open does not define any error conditions.
+ In this implementation
+ .RS 3
+ .TP 5
+-\fBflushinp\fR
++\fBflushinp\fP
+ returns an error if the terminal was not initialized.
+ .TP 5
+ \fBputwin\fP
+@@ -280,10 +280,10 @@
+ .SH PORTABILITY
+ .SS filter
+ .PP
+-The SVr4 documentation describes the action of \fBfilter\fR only in the vaguest
++The SVr4 documentation describes the action of \fBfilter\fP only in the vaguest
+ terms.
+ The description here is adapted from the XSI Curses standard (which
+-erroneously fails to describe the disabling of \fBcuu\fR).
++erroneously fails to describe the disabling of \fBcuu\fP).
+ .SS keyname
+ .PP
+ The \fBkeyname\fP function may return the names of user-defined
+@@ -302,7 +302,7 @@
+ They were not supported on Version 7, BSD or System V implementations.
+ It is recommended that any code depending on \fBncurses\fP extensions
+ be conditioned using NCURSES_VERSION.
+-.SS putwin/getwin
++.SS putwin/getwin file-format
+ .PP
+ The \fBputwin\fP and \fBgetwin\fP functions have several issues with
+ portability:
+@@ -336,7 +336,7 @@
+ .SS unctrl/wunctrl
+ .PP
+ The XSI Curses standard, Issue 4 describes these functions.
+-It states that \fBunctrl\fR and \fBwunctrl\fR will return a null pointer if
++It states that \fBunctrl\fP and \fBwunctrl\fP will return a null pointer if
+ unsuccessful, but does not define any error conditions.
+ This implementation checks for three cases:
+ .bP
+@@ -358,7 +358,7 @@
+ parameter values outside the 0 to 255 range.
+ \fBunctrl\fP returns a null pointer.
+ .PP
+-The strings returned by \fBunctrl\fR in this implementation are determined
++The strings returned by \fBunctrl\fP in this implementation are determined
+ at compile time,
+ showing C1 controls from the upper-128 codes
+ with a \*(``~\*('' prefix rather than \*(``^\*(''.
+@@ -393,15 +393,15 @@
+ If \fBncurses\fP is configured to provide the sp-functions extension,
+ the state of \fBuse_env\fP and \fBuse_tioctl\fP may be updated before
+ creating each \fIscreen\fP rather than once only
+-(\fBcurs_sp_funcs\fR(3X)).
++(\fBcurs_sp_funcs\fP(3X)).
+ This feature of \fBuse_env\fP
+ is not provided by other implementation of curses.
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBcurs_initscr\fR(3X),
+-\fBcurs_inopts\fR(3X),
+-\fBcurs_kernel\fR(3X),
+-\fBcurs_scr_dump\fR(3X),
+-\fBcurs_sp_funcs\fR(3X),
+-\fBcurs_variables\fR(3X),
+-\fBlegacy_coding\fR(3X).
++\fBcurses\fP(3X),
++\fBcurs_initscr\fP(3X),
++\fBcurs_inopts\fP(3X),
++\fBcurs_kernel\fP(3X),
++\fBcurs_scr_dump\fP(3X),
++\fBcurs_sp_funcs\fP(3X),
++\fBcurs_variables\fP(3X),
++\fBlegacy_coding\fP(3X).
+Index: man/curs_variables.3x
+Prereq:  1.15 
+--- ncurses-6.3-20211219+/man/curs_variables.3x	2020-04-18 14:29:07.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_variables.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 2010-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_variables.3x,v 1.15 2020/04/18 14:29:07 tom Exp $
++.\" $Id: curs_variables.3x,v 1.17 2021/12/25 21:49:32 tom Exp $
+ .TH curs_variables 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -41,46 +41,46 @@
+ .na
+ .hy 0
+ .SH NAME
+-\fBCOLORS\fR,
+-\fBCOLOR_PAIRS\fR,
+-\fBCOLS\fR,
+-\fBESCDELAY\fR,
+-\fBLINES\fR,
+-\fBTABSIZE\fR,
+-\fBcurscr\fR,
+-\fBnewscr\fR,
+-\fBstdscr\fR
+-\- \fBcurses\fR global variables
++\fBCOLORS\fP,
++\fBCOLOR_PAIRS\fP,
++\fBCOLS\fP,
++\fBESCDELAY\fP,
++\fBLINES\fP,
++\fBTABSIZE\fP,
++\fBcurscr\fP,
++\fBnewscr\fP,
++\fBstdscr\fP
++\- \fBcurses\fP global variables
+ .ad
+ .hy
+ .SH SYNOPSIS
+ .nf
+-\fB#include \fR
++\fB#include \fP
+ .PP
+-\fBint COLOR_PAIRS;\fR
++\fBint COLOR_PAIRS;\fP
+ .br
+-\fBint COLORS;\fR
++\fBint COLORS;\fP
+ .br
+-\fBint COLS;\fR
++\fBint COLS;\fP
+ .br
+-\fBint ESCDELAY;\fR
++\fBint ESCDELAY;\fP
+ .br
+-\fBint LINES;\fR
++\fBint LINES;\fP
+ .br
+-\fBint TABSIZE;\fR
++\fBint TABSIZE;\fP
+ .br
+-\fBWINDOW * curscr;\fR
++\fBWINDOW * curscr;\fP
+ .br
+-\fBWINDOW * newscr;\fR
++\fBWINDOW * newscr;\fP
+ .br
+-\fBWINDOW * stdscr;\fR
++\fBWINDOW * stdscr;\fP
+ .fi
+ .SH DESCRIPTION
+ This page summarizes variables provided by the \fBcurses\fP library.
+ A more complete description is given in the \fBcurses\fP(3X) manual page.
+ .PP
+ Depending on the configuration, these may be actual variables,
+-or macros (see \fBcurs_threads\fR(3X) and \fBcurs_opaque\fR(3X))
++or macros (see \fBcurs_threads\fP(3X) and \fBcurs_opaque\fP(3X))
+ which provide read-only access to \fIcurses\fP's state.
+ In either case, applications should treat them as read-only to avoid
+ confusing the library.
+@@ -118,24 +118,24 @@
+ record its updates to the terminal screen.
+ .PP
+ This is referred to as the \*(``physical screen\*('' in the
+-\fBcurs_refresh\fR(3X) and
+-\fBcurs_outopts\fR(3X) manual pages.
++\fBcurs_refresh\fP(3X) and
++\fBcurs_outopts\fP(3X) manual pages.
+ .SS The New Screen
+ This implementation of curses uses a special window \fBnewscr\fP to
+ hold updates to the terminal screen before applying them to \fBcurscr\fP.
+ .PP
+ This is referred to as the \*(``virtual screen\*('' in the
+-\fBcurs_kernel\fR(3X),
+-\fBcurs_refresh\fR(3X) and
+-\fBcurs_outopts\fR(3X) manual pages.
++\fBcurs_kernel\fP(3X),
++\fBcurs_refresh\fP(3X) and
++\fBcurs_outopts\fP(3X) manual pages.
+ .SS The Standard Screen
+ Upon initializing curses,
+ a default window called \fBstdscr\fP,
+ which is the size of the terminal screen, is created.
+ Many curses functions use this window.
+ .SH NOTES
+-The curses library is initialized using either \fBinitscr\fR(3X),
+-or \fBnewterm\fR(3X).
++The curses library is initialized using either \fBinitscr\fP(3X),
++or \fBnewterm\fP(3X).
+ .PP
+ If \fBcurses\fP is configured to use separate curses/terminfo libraries,
+ most of these variables reside in the curses library.
+@@ -180,9 +180,9 @@
+ Likewise, most users have either decided to override the value,
+ or rely upon its default value.
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBcurs_opaque\fR(3X),
+-\fBcurs_terminfo\fR(3X),
+-\fBcurs_threads\fR(3X),
+-\fBterm_variables\fR(3X),
+-\fBterminfo\fR(\*n).
++\fBcurses\fP(3X),
++\fBcurs_opaque\fP(3X),
++\fBcurs_terminfo\fP(3X),
++\fBcurs_threads\fP(3X),
++\fBterm_variables\fP(3X),
++\fBterminfo\fP(\*n).
+Index: man/curs_window.3x
+Prereq:  1.23 
+--- ncurses-6.3-20211219+/man/curs_window.3x	2021-06-17 21:11:08.000000000 +0000
++++ ncurses-6.3-20211225/man/curs_window.3x	2021-12-25 17:39:16.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_window.3x,v 1.23 2021/06/17 21:11:08 tom Exp $
++.\" $Id: curs_window.3x,v 1.24 2021/12/25 17:39:16 tom Exp $
+ .TH curs_window 3X ""
+ .de bP
+ .ie n  .IP \(bu 4
+@@ -36,71 +36,71 @@
+ .na
+ .hy 0
+ .SH NAME
+-\fBnewwin\fR,
+-\fBdelwin\fR,
+-\fBmvwin\fR,
+-\fBsubwin\fR,
+-\fBderwin\fR,
+-\fBmvderwin\fR,
+-\fBdupwin\fR,
+-\fBwsyncup\fR,
+-\fBsyncok\fR,
+-\fBwcursyncup\fR,
+-\fBwsyncdown\fR \- create \fBcurses\fR windows
++\fBnewwin\fP,
++\fBdelwin\fP,
++\fBmvwin\fP,
++\fBsubwin\fP,
++\fBderwin\fP,
++\fBmvderwin\fP,
++\fBdupwin\fP,
++\fBwsyncup\fP,
++\fBsyncok\fP,
++\fBwcursyncup\fP,
++\fBwsyncdown\fP \- create \fBcurses\fP windows
+ .ad
+ .hy
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBWINDOW *newwin(\fR
+-      \fBint \fP\fInlines\fP\fB, int \fP\fIncols\fP\fB,\fR
+-      \fBint \fP\fIbegin_y\fP\fB, int \fP\fIbegin_x\fP\fB);\fR
++\fBWINDOW *newwin(\fP
++      \fBint \fP\fInlines\fP\fB, int \fP\fIncols\fP\fB,\fP
++      \fBint \fP\fIbegin_y\fP\fB, int \fP\fIbegin_x\fP\fB);\fP
+ .br
+-\fBint delwin(WINDOW *\fP\fIwin\fP\fB);\fR
++\fBint delwin(WINDOW *\fP\fIwin\fP\fB);\fP
+ .br
+-\fBint mvwin(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fR
++\fBint mvwin(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fP
+ .br
+-\fBWINDOW *subwin(WINDOW *\fP\fIorig\fP\fB,\fR
+-      \fBint \fP\fInlines\fP\fB, int \fP\fIncols\fP\fB,\fR
+-      \fBint \fP\fIbegin_y\fP\fB, int \fP\fIbegin_x\fP\fB);\fR
++\fBWINDOW *subwin(WINDOW *\fP\fIorig\fP\fB,\fP
++      \fBint \fP\fInlines\fP\fB, int \fP\fIncols\fP\fB,\fP
++      \fBint \fP\fIbegin_y\fP\fB, int \fP\fIbegin_x\fP\fB);\fP
+ .br
+-\fBWINDOW *derwin(WINDOW *\fP\fIorig\fP\fB,\fR
+-      \fBint \fP\fInlines\fP\fB, int \fP\fIncols\fP\fB,\fR
+-      \fBint \fP\fIbegin_y\fP\fB, int \fP\fIbegin_x\fP\fB);\fR
++\fBWINDOW *derwin(WINDOW *\fP\fIorig\fP\fB,\fP
++      \fBint \fP\fInlines\fP\fB, int \fP\fIncols\fP\fB,\fP
++      \fBint \fP\fIbegin_y\fP\fB, int \fP\fIbegin_x\fP\fB);\fP
+ .br
+-\fBint mvderwin(WINDOW *\fP\fIwin\fP\fB, int \fP\fIpar_y\fP\fB, int \fP\fIpar_x\fP\fB);\fR
++\fBint mvderwin(WINDOW *\fP\fIwin\fP\fB, int \fP\fIpar_y\fP\fB, int \fP\fIpar_x\fP\fB);\fP
+ .br
+-\fBWINDOW *dupwin(WINDOW *\fP\fIwin\fP\fB);\fR
++\fBWINDOW *dupwin(WINDOW *\fP\fIwin\fP\fB);\fP
+ .br
+-\fBvoid wsyncup(WINDOW *\fP\fIwin\fP\fB);\fR
++\fBvoid wsyncup(WINDOW *\fP\fIwin\fP\fB);\fP
+ .br
+-\fBint syncok(WINDOW *\fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fR
++\fBint syncok(WINDOW *\fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fP
+ .br
+-\fBvoid wcursyncup(WINDOW *\fP\fIwin\fP\fB);\fR
++\fBvoid wcursyncup(WINDOW *\fP\fIwin\fP\fB);\fP
+ .br
+-\fBvoid wsyncdown(WINDOW *\fP\fIwin\fP\fB);\fR
++\fBvoid wsyncdown(WINDOW *\fP\fIwin\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+ .SS newwin
+-Calling \fBnewwin\fR creates and returns a pointer to a new window with the
++Calling \fBnewwin\fP creates and returns a pointer to a new window with the
+ given number of lines and columns.
+ The upper left-hand corner of the window is
+ at
+ .RS
+-line \fIbegin\fR_\fIy\fR,
++line \fIbegin\fR_\fIy\fP,
+ .br
+-column \fIbegin\fR_\fIx\fR
++column \fIbegin\fR_\fIx\fP
+ .RE
+ .PP
+ If either
+-\fInlines\fR or \fIncols\fR is zero, they default to
++\fInlines\fP or \fIncols\fP is zero, they default to
+ .RS
+-\fBLINES \-\fR \fIbegin\fR_\fIy\fR and
++\fBLINES \-\fP \fIbegin\fR_\fIy\fP and
+ .br
+-\fBCOLS \-\fR \fIbegin\fR_\fIx\fR.
++\fBCOLS \-\fP \fIbegin\fR_\fIx\fP.
+ .RE
+ .PP
+-A new full-screen window is created by calling \fBnewwin(0,0,0,0)\fR.
++A new full-screen window is created by calling \fBnewwin(0,0,0,0)\fP.
+ .PP
+ Regardless of the function used for creating a new window
+ (e.g., \fBnewwin\fP, \fBsubwin\fP, \fBderwin\fP, \fBnewpad\fP),
+@@ -126,37 +126,37 @@
+ .ad
+ .SS delwin
+ .PP
+-Calling \fBdelwin\fR deletes the named window, freeing all memory
++Calling \fBdelwin\fP deletes the named window, freeing all memory
+ associated with it (it does not actually erase the window's screen
+ image).
+ Subwindows must be deleted before the main window can be deleted.
+ .SS mvwin
+ .PP
+-Calling \fBmvwin\fR moves the window so that the upper left-hand
+-corner is at position (\fIx\fR, \fIy\fR).
++Calling \fBmvwin\fP moves the window so that the upper left-hand
++corner is at position (\fIx\fP, \fIy\fP).
+ If the move would cause the window to be off the screen,
+ it is an error and the window is not moved.
+ Moving subwindows is allowed, but should be avoided.
+ .SS subwin
+ .PP
+-Calling \fBsubwin\fR creates and returns a pointer to a new window
+-with the given number of lines, \fInlines\fR, and columns, \fIncols\fR.
+-The window is at position (\fIbegin\fR_\fIy\fR,
+-\fIbegin\fR_\fIx\fR) on the screen.
+-The subwindow shares memory with the window \fIorig\fR,
++Calling \fBsubwin\fP creates and returns a pointer to a new window
++with the given number of lines, \fInlines\fP, and columns, \fIncols\fP.
++The window is at position (\fIbegin\fR_\fIy\fP,
++\fIbegin\fR_\fIx\fP) on the screen.
++The subwindow shares memory with the window \fIorig\fP,
+ so that changes made to one window
+ will affect both windows.
+ When using this routine, it is necessary to call
+-\fBtouchwin\fR or \fBtouchline\fR on \fIorig\fR before calling
+-\fBwrefresh\fR on the subwindow.
++\fBtouchwin\fP or \fBtouchline\fP on \fIorig\fP before calling
++\fBwrefresh\fP on the subwindow.
+ .SS derwin
+ .PP
+-Calling \fBderwin\fR is the same as calling \fBsubwin,\fR except that
+-\fIbegin\fR_\fIy\fR and \fIbegin\fR_\fIx\fR are relative to the origin
+-of the window \fIorig\fR rather than the screen.
++Calling \fBderwin\fP is the same as calling \fBsubwin,\fP except that
++\fIbegin\fR_\fIy\fP and \fIbegin\fR_\fIx\fP are relative to the origin
++of the window \fIorig\fP rather than the screen.
+ There is no difference between the subwindows and the derived windows.
+ .PP
+-Calling \fBmvderwin\fR moves a derived window (or subwindow)
++Calling \fBmvderwin\fP moves a derived window (or subwindow)
+ inside its parent window.
+ The screen-relative parameters of the window are not changed.
+ This routine is used to display different
+@@ -164,36 +164,36 @@
+ screen.
+ .SS dupwin
+ .PP
+-Calling \fBdupwin\fR creates an exact duplicate of the window \fIwin\fR.
++Calling \fBdupwin\fP creates an exact duplicate of the window \fIwin\fP.
+ .SS wsyncup
+ .PP
+-Calling \fBwsyncup\fR touches all locations in ancestors of \fIwin\fR that are
+-changed in \fIwin\fR.
+-If \fBsyncok\fR is called with second argument
+-\fBTRUE\fR then \fBwsyncup\fR is called automatically whenever there is a
++Calling \fBwsyncup\fP touches all locations in ancestors of \fIwin\fP that are
++changed in \fIwin\fP.
++If \fBsyncok\fP is called with second argument
++\fBTRUE\fP then \fBwsyncup\fP is called automatically whenever there is a
+ change in the window.
+ .SS wsyncdown
+ .PP
+-The \fBwsyncdown\fR routine touches each location in \fIwin\fR that has been
++The \fBwsyncdown\fP routine touches each location in \fIwin\fP that has been
+ touched in any of its ancestor windows.
+ This routine is called by
+-\fBwrefresh\fR, so it should almost never be necessary to call it manually.
++\fBwrefresh\fP, so it should almost never be necessary to call it manually.
+ .SS wcursyncup
+ .PP
+-The routine \fBwcursyncup\fR updates the current cursor position of all the
++The routine \fBwcursyncup\fP updates the current cursor position of all the
+ ancestors of the window to reflect the current cursor position of the
+ window.
+ .SH RETURN VALUE
+-Routines that return an integer return the integer \fBERR\fR upon failure and
+-\fBOK\fR (SVr4 only specifies "an integer value other than \fBERR\fR") upon
++Routines that return an integer return the integer \fBERR\fP upon failure and
++\fBOK\fP (SVr4 only specifies "an integer value other than \fBERR\fP") upon
+ successful completion.
+ .PP
+-Routines that return pointers return \fBNULL\fR on error.
++Routines that return pointers return \fBNULL\fP on error.
+ .PP
+ X/Open defines no error conditions.
+ In this implementation
+ .TP 5
+-\fBdelwin\fR
++\fBdelwin\fP
+ returns an error if the window pointer is null, or
+ if the window is the parent of another window.
+ .TP 5
+@@ -238,26 +238,26 @@
+ Any of these functions will fail if the screen has not been initialized,
+ i.e., with \fBinitscr\fP or \fBnewterm\fP.
+ .SH NOTES
+-If many small changes are made to the window, the \fBwsyncup\fR option could
++If many small changes are made to the window, the \fBwsyncup\fP option could
+ degrade performance.
+ .PP
+-Note that \fBsyncok\fR may be a macro.
++Note that \fBsyncok\fP may be a macro.
+ .SH BUGS
+-The subwindow functions (\fBsubwin\fR, \fBderwin\fR, \fBmvderwin\fR,
+-\fBwsyncup\fR, \fBwsyncdown\fR, \fBwcursyncup\fR, \fBsyncok\fR) are flaky,
++The subwindow functions (\fBsubwin\fP, \fBderwin\fP, \fBmvderwin\fP,
++\fBwsyncup\fP, \fBwsyncdown\fP, \fBwcursyncup\fP, \fBsyncok\fP) are flaky,
+ incompletely implemented, and not well tested.
+ .PP
+-The System V curses documentation is very unclear about what \fBwsyncup\fR
+-and \fBwsyncdown\fR actually do.
++The System V curses documentation is very unclear about what \fBwsyncup\fP
++and \fBwsyncdown\fP actually do.
+ It seems to imply that they are only
+ supposed to touch exactly those lines that are affected by ancestor changes.
+-The language here, and the behavior of the \fBcurses\fR implementation,
++The language here, and the behavior of the \fBcurses\fP implementation,
+ is patterned on the XPG4 curses standard.
+ The weaker XPG4 spec may result in slower updates.
+ .SH PORTABILITY
+ The XSI Curses standard, Issue 4 describes these functions.
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBcurs_refresh\fR(3X),
+-\fBcurs_touch\fR(3X),
+-\fBcurs_variables\fR(3X)
++\fBcurses\fP(3X),
++\fBcurs_refresh\fP(3X),
++\fBcurs_touch\fP(3X),
++\fBcurs_variables\fP(3X)
+Index: man/default_colors.3x
+Prereq:  1.31 
+--- ncurses-6.3-20211219+/man/default_colors.3x	2020-12-19 21:38:37.000000000 +0000
++++ ncurses-6.3-20211225/man/default_colors.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 2000-2011,2016 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -29,15 +29,15 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1997,1999,2000,2005
+ .\"
+-.\" $Id: default_colors.3x,v 1.31 2020/12/19 21:38:37 tom Exp $
++.\" $Id: default_colors.3x,v 1.34 2021/12/25 21:49:32 tom Exp $
+ .TH default_colors 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+ .ie \n(.g .ds '' \(rq
+ .el       .ds '' ''
+ .SH NAME
+-\fBuse_default_colors\fR,
+-\fBassume_default_colors\fR \- use terminal's default colors
++\fBuse_default_colors\fP,
++\fBassume_default_colors\fP \- use terminal's default colors
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+@@ -107,10 +107,10 @@
+ If the \fBinitialize_pair\fP capability is not found, this causes an
+ error as well.
+ .SH NOTES
+-Associated with this extension, the \fBinit_pair\fR function accepts
++Associated with this extension, the \fBinit_pair\fP function accepts
+ negative arguments to specify default foreground or background colors.
+ .PP
+-The \fBuse_default_colors\fP function was added to support \fIded\fP.
++The \fBuse_default_colors\fP function was added to support \fBded\fP.
+ This is a full-screen application which uses curses to manage only part
+ of the screen.
+ The bottom portion of the screen, which is of adjustable
+@@ -138,7 +138,7 @@
+ any code depending on them be conditioned using NCURSES_VERSION.
+ .SH SEE ALSO
+ \fBded\fP(1),
+-\fBcurs_color\fR(3X).
++\fBcurs_color\fP(3X).
+ .SH AUTHOR
+ Thomas Dickey (from an analysis of the requirements for color xterm
+ for XFree86 3.1.2C, February 1996).
+Index: man/define_key.3x
+Prereq:  1.18 
+--- ncurses-6.3-20211219+/man/define_key.3x	2020-10-24 09:52:54.000000000 +0000
++++ ncurses-6.3-20211225/man/define_key.3x	2021-12-25 21:41:58.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018,2020 Thomas E. Dickey                                     *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -29,7 +29,7 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1997
+ .\"
+-.\" $Id: define_key.3x,v 1.18 2020/10/24 09:52:54 tom Exp $
++.\" $Id: define_key.3x,v 1.20 2021/12/25 21:41:58 tom Exp $
+ .TH define_key 3X ""
+ .SH NAME
+ \fBdefine_key\fP \- define a keycode
+@@ -60,7 +60,7 @@
+ It is recommended that
+ any code depending on them be conditioned using NCURSES_VERSION.
+ .SH SEE ALSO
+-\fBkeyok\fR(3X),
+-\fBkey_defined\fR(3X).
++\fBkeyok\fP(3X),
++\fBkey_defined\fP(3X).
+ .SH AUTHOR
+ Thomas Dickey.
+Index: man/form.3x
+Prereq:  1.36 
+--- ncurses-6.3-20211219+/man/form.3x	2020-12-12 16:34:33.000000000 +0000
++++ ncurses-6.3-20211225/man/form.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form.3x,v 1.36 2020/12/12 16:34:33 tom Exp $
++.\" $Id: form.3x,v 1.38 2021/12/25 21:49:32 tom Exp $
+ .TH form 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -39,21 +39,21 @@
+ .el    .IP \(bu 2
+ ..
+ .SH NAME
+-\fBform\fR \- curses extension for programming forms
++\fBform\fP \- curses extension for programming forms
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .br
+ .SH DESCRIPTION
+-The \fBform\fR library provides terminal-independent facilities for composing
++The \fBform\fP library provides terminal-independent facilities for composing
+ form screens on character-cell terminals.
+ The library includes: field
+ routines, which create and modify form fields; and form routines, which group
+ fields into forms, display forms on the screen, and handle interaction with the
+ user.
+ .PP
+-The \fBform\fR library uses the \fBcurses\fR libraries.
+-To use the \fBform\fR library, link with the options
+-\fB\-lform \-lcurses\fR.
++The \fBform\fP library uses the \fBcurses\fP libraries.
++To use the \fBform\fP library, link with the options
++\fB\-lform \-lcurses\fP.
+ .PP
+ Your program should set up the locale, e.g.,
+ .sp
+@@ -61,23 +61,23 @@
+ .sp
+ so that input/output processing will work.
+ .PP
+-A curses initialization routine such as \fBinitscr\fR must be called
++A curses initialization routine such as \fBinitscr\fP must be called
+ before using any of these functions.
+ .
+ .SS Current Default Values for Field Attributes
+ .
+-The \fBform\fR library maintains a default value for field attributes.
++The \fBform\fP library maintains a default value for field attributes.
+ You
+-can get or set this default by calling the appropriate \fBset_\fR
++can get or set this default by calling the appropriate \fBset_\fP
+ or retrieval
+-routine with a \fBNULL\fR field pointer.
++routine with a \fBNULL\fP field pointer.
+ Changing this default with a
+-\fBset_\fR function affects future field creations, but does not change the
++\fBset_\fP function affects future field creations, but does not change the
+ rendering of fields already created.
+ .
+ .SS Routine Name Index
+ .
+-The following table lists each \fBform\fR routine and the name of
++The following table lists each \fBform\fP routine and the name of
+ the manual page on which it is described.
+ Routines flagged with \*(``*\*(''
+ are ncurses-specific, not present in SVr4.
+@@ -85,86 +85,86 @@
+ .TS
+ l l
+ l l .
+-\fBcurses\fR Routine Name	Manual Page Name
++\fBcurses\fP Routine Name	Manual Page Name
+ =
+-current_field	\fBform_page\fR(3X)
+-data_ahead	\fBform_data\fR(3X)
+-data_behind	\fBform_data\fR(3X)
+-dup_field	\fBform_field_new\fR(3X)
+-dynamic_field_info	\fBform_field_info\fR(3X)
+-field_arg	\fBform_field_validation\fR(3X)
+-field_back	\fBform_field_attributes\fR(3X)
+-field_buffer	\fBform_field_buffer\fR(3X)
+-field_count	\fBform_field\fR(3X)
+-field_fore	\fBform_field_attributes\fR(3X)
+-field_index	\fBform_page\fR(3X)
+-field_info	\fBform_field_info\fR(3X)
+-field_init	\fBform_hook\fR(3X)
+-field_just	\fBform_field_just\fR(3X)
+-field_opts	\fBform_field_opts\fR(3X)
+-field_opts_off	\fBform_field_opts\fR(3X)
+-field_opts_on	\fBform_field_opts\fR(3X)
+-field_pad	\fBform_field_attributes\fR(3X)
+-field_status	\fBform_field_buffer\fR(3X)
+-field_term	\fBform_hook\fR(3X)
+-field_type	\fBform_field_validation\fR(3X)
+-field_userptr	\fBform_field_userptr\fR(3X)
+-form_driver	\fBform_driver\fR(3X)
+-form_driver_w	\fBform_driver\fR(3X)*
+-form_fields	\fBform_field\fR(3X)
+-form_init	\fBform_hook\fR(3X)
+-form_opts	\fBform_opts\fR(3X)
+-form_opts_off	\fBform_opts\fR(3X)
+-form_opts_on	\fBform_opts\fR(3X)
+-form_page	\fBform_page\fR(3X)
+-form_request_by_name	\fBform_requestname\fR(3X)*
+-form_request_name	\fBform_requestname\fR(3X)*
+-form_sub	\fBform_win\fR(3X)
+-form_term	\fBform_hook\fR(3X)
+-form_userptr	\fBform_userptr\fR(3X)
+-form_win	\fBform_win\fR(3X)
+-free_field	\fBform_field_new\fR(3X)
+-free_fieldtype	\fBform_fieldtype\fR(3X)
+-free_form	\fBform_new\fR(3X)
+-link_field	\fBform_field_new\fR(3X)
+-link_fieldtype	\fBform_fieldtype\fR(3X)
+-move_field	\fBform_field\fR(3X)
+-new_field	\fBform_field_new\fR(3X)
+-new_fieldtype	\fBform_fieldtype\fR(3X)
+-new_form	\fBform_new\fR(3X)
+-new_page	\fBform_new_page\fR(3X)
+-pos_form_cursor	\fBform_cursor\fR(3X)
+-post_form	\fBform_post\fR(3X)
+-scale_form	\fBform_win\fR(3X)
+-set_current_field	\fBform_page\fR(3X)
+-set_field_back	\fBform_field_attributes\fR(3X)
+-set_field_buffer	\fBform_field_buffer\fR(3X)
+-set_field_fore	\fBform_field_attributes\fR(3X)
+-set_field_init	\fBform_hook\fR(3X)
+-set_field_just	\fBform_field_just\fR(3X)
+-set_field_opts	\fBform_field_opts\fR(3X)
+-set_field_pad	\fBform_field_attributes\fR(3X)
+-set_field_status	\fBform_field_buffer\fR(3X)
+-set_field_term	\fBform_hook\fR(3X)
+-set_field_type	\fBform_field_validation\fR(3X)
+-set_field_userptr	\fBform_field_userptr\fR(3X)
+-set_fieldtype_arg	\fBform_fieldtype\fR(3X)
+-set_fieldtype_choice	\fBform_fieldtype\fR(3X)
+-set_form_fields	\fBform_field\fR(3X)
+-set_form_init	\fBform_hook\fR(3X)
+-set_form_opts	\fBform_field_opts\fR(3X)
+-set_form_page	\fBform_page\fR(3X)
+-set_form_sub	\fBform_win\fR(3X)
+-set_form_term	\fBform_hook\fR(3X)
+-set_form_userptr	\fBform_userptr\fR(3X)
+-set_form_win	\fBform_win\fR(3X)
+-set_max_field	\fBform_field_buffer\fR(3X)
+-set_new_page	\fBform_new_page\fR(3X)
+-unfocus_current_field	\fBform_page\fR(3X)*
+-unpost_form	\fBform_post\fR(3X)
++current_field	\fBform_page\fP(3X)
++data_ahead	\fBform_data\fP(3X)
++data_behind	\fBform_data\fP(3X)
++dup_field	\fBform_field_new\fP(3X)
++dynamic_field_info	\fBform_field_info\fP(3X)
++field_arg	\fBform_field_validation\fP(3X)
++field_back	\fBform_field_attributes\fP(3X)
++field_buffer	\fBform_field_buffer\fP(3X)
++field_count	\fBform_field\fP(3X)
++field_fore	\fBform_field_attributes\fP(3X)
++field_index	\fBform_page\fP(3X)
++field_info	\fBform_field_info\fP(3X)
++field_init	\fBform_hook\fP(3X)
++field_just	\fBform_field_just\fP(3X)
++field_opts	\fBform_field_opts\fP(3X)
++field_opts_off	\fBform_field_opts\fP(3X)
++field_opts_on	\fBform_field_opts\fP(3X)
++field_pad	\fBform_field_attributes\fP(3X)
++field_status	\fBform_field_buffer\fP(3X)
++field_term	\fBform_hook\fP(3X)
++field_type	\fBform_field_validation\fP(3X)
++field_userptr	\fBform_field_userptr\fP(3X)
++form_driver	\fBform_driver\fP(3X)
++form_driver_w	\fBform_driver\fP(3X)*
++form_fields	\fBform_field\fP(3X)
++form_init	\fBform_hook\fP(3X)
++form_opts	\fBform_opts\fP(3X)
++form_opts_off	\fBform_opts\fP(3X)
++form_opts_on	\fBform_opts\fP(3X)
++form_page	\fBform_page\fP(3X)
++form_request_by_name	\fBform_requestname\fP(3X)*
++form_request_name	\fBform_requestname\fP(3X)*
++form_sub	\fBform_win\fP(3X)
++form_term	\fBform_hook\fP(3X)
++form_userptr	\fBform_userptr\fP(3X)
++form_win	\fBform_win\fP(3X)
++free_field	\fBform_field_new\fP(3X)
++free_fieldtype	\fBform_fieldtype\fP(3X)
++free_form	\fBform_new\fP(3X)
++link_field	\fBform_field_new\fP(3X)
++link_fieldtype	\fBform_fieldtype\fP(3X)
++move_field	\fBform_field\fP(3X)
++new_field	\fBform_field_new\fP(3X)
++new_fieldtype	\fBform_fieldtype\fP(3X)
++new_form	\fBform_new\fP(3X)
++new_page	\fBform_new_page\fP(3X)
++pos_form_cursor	\fBform_cursor\fP(3X)
++post_form	\fBform_post\fP(3X)
++scale_form	\fBform_win\fP(3X)
++set_current_field	\fBform_page\fP(3X)
++set_field_back	\fBform_field_attributes\fP(3X)
++set_field_buffer	\fBform_field_buffer\fP(3X)
++set_field_fore	\fBform_field_attributes\fP(3X)
++set_field_init	\fBform_hook\fP(3X)
++set_field_just	\fBform_field_just\fP(3X)
++set_field_opts	\fBform_field_opts\fP(3X)
++set_field_pad	\fBform_field_attributes\fP(3X)
++set_field_status	\fBform_field_buffer\fP(3X)
++set_field_term	\fBform_hook\fP(3X)
++set_field_type	\fBform_field_validation\fP(3X)
++set_field_userptr	\fBform_field_userptr\fP(3X)
++set_fieldtype_arg	\fBform_fieldtype\fP(3X)
++set_fieldtype_choice	\fBform_fieldtype\fP(3X)
++set_form_fields	\fBform_field\fP(3X)
++set_form_init	\fBform_hook\fP(3X)
++set_form_opts	\fBform_field_opts\fP(3X)
++set_form_page	\fBform_page\fP(3X)
++set_form_sub	\fBform_win\fP(3X)
++set_form_term	\fBform_hook\fP(3X)
++set_form_userptr	\fBform_userptr\fP(3X)
++set_form_win	\fBform_win\fP(3X)
++set_max_field	\fBform_field_buffer\fP(3X)
++set_new_page	\fBform_new_page\fP(3X)
++unfocus_current_field	\fBform_page\fP(3X)*
++unpost_form	\fBform_post\fP(3X)
+ .TE
+ .SH RETURN VALUE
+-Routines that return pointers return \fBNULL\fR on error,
++Routines that return pointers return \fBNULL\fP on error,
+ and set \fBerrno\fP to the corresponding error-code returned by functions
+ returning an integer.
+ Routines that return
+@@ -201,13 +201,13 @@
+ The form driver could not process the request.
+ .TP 5
+ .B E_SYSTEM_ERROR
+-System error occurred (see \fBerrno\fR(3)).
++System error occurred (see \fBerrno\fP(3)).
+ .TP 5
+ .B E_UNKNOWN_COMMAND
+ The form driver code saw an unknown request code.
+ .SH NOTES
+-The header file \fB\fR automatically includes the header files
+-\fB\fR and \fB\fR.
++The header file \fB\fP automatically includes the header files
++\fB\fP and \fB\fP.
+ .PP
+ In your library list, libform.a should be before libncurses.a; that is,
+ you want to say \*(``\-lform \-lncurses\*('', not the other way around
+@@ -237,8 +237,8 @@
+ Manual pages and adaptation for ncurses by Eric
+ S. Raymond.
+ .SH SEE ALSO
+-\fBcurses\fR(3X) and related pages whose names begin \*(``form_\*('' for detailed
++\fBcurses\fP(3X) and related pages whose names begin \*(``form_\*('' for detailed
+ descriptions of the entry points.
+ .PP
+-This describes \fBncurses\fR
++This describes \fBncurses\fP
+ version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
+Index: man/form_cursor.3x
+Prereq:  1.14 
+--- ncurses-6.3-20211219+/man/form_cursor.3x	2020-10-18 00:15:29.000000000 +0000
++++ ncurses-6.3-20211225/man/form_cursor.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,20 +28,20 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_cursor.3x,v 1.14 2020/10/18 00:15:29 tom Exp $
++.\" $Id: form_cursor.3x,v 1.16 2021/12/25 21:49:32 tom Exp $
+ .TH form_cursor 3X ""
+ .SH NAME
+-\fBpos_form_cursor\fR \- position a form window cursor
++\fBpos_form_cursor\fP \- position a form window cursor
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBint pos_form_cursor(FORM *\fP\fIform\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-The function \fBpos_form_cursor\fR restores the cursor to the position required
++The function \fBpos_form_cursor\fP restores the cursor to the position required
+ for the forms driver to continue processing requests.
+ This is useful after
+-\fBcurses\fR routines have been called to do screen-painting in response to a
++\fBcurses\fP routines have been called to do screen-painting in response to a
+ form operation.
+ .SH RETURN VALUE
+ This routine returns one of the following:
+@@ -56,13 +56,13 @@
+ The form has not been posted.
+ .TP 5
+ .B E_SYSTEM_ERROR
+-System error occurred (see \fBerrno\fR(3)).
++System error occurred (see \fBerrno\fP(3)).
+ .
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBform\fR(3X).
++\fBcurses\fP(3X), \fBform\fP(3X).
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V forms library.
+ They were not supported on
+Index: man/form_data.3x
+Prereq:  1.15 
+--- ncurses-6.3-20211219+/man/form_data.3x	2020-10-18 00:15:00.000000000 +0000
++++ ncurses-6.3-20211225/man/form_data.3x	2021-12-25 21:41:58.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018,2020 Thomas E. Dickey                                     *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,31 +28,31 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_data.3x,v 1.15 2020/10/18 00:15:00 tom Exp $
++.\" $Id: form_data.3x,v 1.17 2021/12/25 21:41:58 tom Exp $
+ .TH form_data 3X ""
+ .SH NAME
+ \fBdata_ahead\fP,
+-\fBdata_behind\fR \- test for off-screen data in given forms
++\fBdata_behind\fP \- test for off-screen data in given forms
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBbool data_ahead(const FORM *\fP\fIform\fP\fB);\fP
+ .br
+ \fBbool data_behind(const FORM *\fP\fIform\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-The function \fBdata_ahead\fR tests whether there is off-screen data
++The function \fBdata_ahead\fP tests whether there is off-screen data
+ ahead in the given form.
+ It returns TRUE (1) or FALSE (0).
+ .PP
+-The function \fBdata_behind\fR tests whether there is off-screen data
++The function \fBdata_behind\fP tests whether there is off-screen data
+ behind in the given form.
+ It returns TRUE (1) or FALSE (0).
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBform\fR(3X).
++\fBcurses\fP(3X), \fBform\fP(3X).
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V forms library.
+ They were not supported on
+Index: man/form_driver.3x
+Prereq:  1.35 
+--- ncurses-6.3-20211219+/man/form_driver.3x	2020-12-19 21:34:15.000000000 +0000
++++ ncurses-6.3-20211225/man/form_driver.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,17 +27,17 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_driver.3x,v 1.35 2020/12/19 21:34:15 tom Exp $
++.\" $Id: form_driver.3x,v 1.38 2021/12/25 21:49:32 tom Exp $
+ .TH form_driver 3X ""
+ .de bP
+ .ie n  .IP \(bu 4
+ .el    .IP \(bu 2
+ ..
+ .SH NAME
+-\fBform_driver\fR,
+-\fBform_driver_w\fR \- command-processing loop of the form system
++\fBform_driver\fP,
++\fBform_driver_w\fP \- command-processing loop of the form system
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBint form_driver(FORM *\fP\fIform\fP\fB, int \fP\fIc\fP\fB);\fP
+ .br
+@@ -46,7 +46,7 @@
+ .SH DESCRIPTION
+ .SS form_driver
+ Once a form has been posted (displayed), you should funnel input events to it
+-through \fBform_driver\fR.  This routine has three major input cases:
++through \fBform_driver\fP.  This routine has three major input cases:
+ .bP
+ The input is a form navigation request.
+ Navigation request codes are constants defined in \fB\fP,
+@@ -73,7 +73,7 @@
+ l l
+ _ _
+ l l.
+-\fIName\fR	\fIDescription\fR
++\fBName\fP	\fBDescription\fP
+ REQ_BEG_FIELD	Move to the beginning of the field.
+ REQ_BEG_LINE	Move to the beginning of the line.
+ REQ_CLR_EOF	Clear to end of field from cursor.
+@@ -200,7 +200,7 @@
+ .bP
+ If you double-click a field,
+ the form cursor is positioned to that field
+-and \fBE_UNKNOWN_COMMAND\fR is returned.
++and \fBE_UNKNOWN_COMMAND\fP is returned.
+ This return value makes sense,
+ because a double click usually means that an field-specific action should
+ be returned.
+@@ -208,21 +208,21 @@
+ application specific command should be executed.
+ .bP
+ If a translation
+-into a request was done, \fBform_driver\fR returns the result of this request.
++into a request was done, \fBform_driver\fP returns the result of this request.
+ .RE
+ .PP
+ If you clicked outside the user window
+ or the mouse event could not be translated
+-into a form request an \fBE_REQUEST_DENIED\fR is returned.
++into a form request an \fBE_REQUEST_DENIED\fP is returned.
+ .SS Application-defined commands
+ .PP
+ If the second argument is neither printable nor one of the above
+ pre-defined form requests, the driver assumes it is an application-specific
+-command and returns \fBE_UNKNOWN_COMMAND\fR.  Application-defined commands
+-should be defined relative to \fBMAX_COMMAND\fR, the maximum value of these
++command and returns \fBE_UNKNOWN_COMMAND\fP.  Application-defined commands
++should be defined relative to \fBMAX_COMMAND\fP, the maximum value of these
+ pre-defined requests.
+ .SH RETURN VALUE
+-\fBform_driver\fR returns one of the following error codes:
++\fBform_driver\fP returns one of the following error codes:
+ .TP 5
+ .B E_OK
+ The routine succeeded.
+@@ -246,22 +246,22 @@
+ The form driver could not process the request.
+ .TP 5
+ .B E_SYSTEM_ERROR
+-System error occurred (see \fBerrno\fR(3)).
++System error occurred (see \fBerrno\fP(3)).
+ .TP 5
+ .B E_UNKNOWN_COMMAND
+ The form driver code saw an unknown request code.
+ .
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBform\fR(3X),
+-\fBform_fieldtype\fR(3X),
+-\fBform_field_buffer\fR(3X),
+-\fBform_field_validation\fR(3X),
+-\fBform_variables\fR(3X),
+-\fBgetch\fR(3X).
++\fBcurses\fP(3X),
++\fBform\fP(3X),
++\fBform_fieldtype\fP(3X),
++\fBform_field_buffer\fP(3X),
++\fBform_field_validation\fP(3X),
++\fBform_variables\fP(3X),
++\fBgetch\fP(3X).
+ .SH NOTES
+-The header file \fB\fR automatically includes the header files
+-\fB\fR.
++The header file \fB\fP automatically includes the header files
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V forms library.
+ They were not supported on
+Index: man/form_field.3x
+Prereq:  1.17 
+--- ncurses-6.3-20211219+/man/form_field.3x	2020-10-24 09:10:45.000000000 +0000
++++ ncurses-6.3-20211225/man/form_field.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2012 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,12 +28,12 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_field.3x,v 1.17 2020/10/24 09:10:45 tom Exp $
++.\" $Id: form_field.3x,v 1.19 2021/12/25 21:49:32 tom Exp $
+ .TH form_field 3X ""
+ .SH NAME
+-\fBform_field\fR \- make and break connections between fields and forms
++\fBform_field\fP \- make and break connections between fields and forms
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBint set_form_fields(FORM *\fP\fIform\fP\fB, FIELD **\fP\fIfields\fP\fB);\fP
+ .br
+@@ -44,23 +44,23 @@
+ \fBint move_field(FIELD *\fP\fIfield\fP\fB, int \fP\fIfrow\fP\fB, int \fP\fIfcol\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-The function \fBset_form_fields\fR changes the field pointer array of
+-the given \fIform\fR.  The array must be terminated by a \fBNULL\fR.
++The function \fBset_form_fields\fP changes the field pointer array of
++the given \fIform\fP.  The array must be terminated by a \fBNULL\fP.
+ .PP
+-The function \fBform_fields\fR returns the field array of the given form.
++The function \fBform_fields\fP returns the field array of the given form.
+ .PP
+-The function \fBfield_count\fR returns the count of fields in \fIform\fR.
++The function \fBfield_count\fP returns the count of fields in \fIform\fP.
+ .PP
+-The function \fBmove_field\fR moves the given field (which must be disconnected)
++The function \fBmove_field\fP moves the given field (which must be disconnected)
+ to a specified location on the screen.
+ .SH RETURN VALUE
+-The function \fBform_fields\fR returns a pointer (which may be \fBNULL\fR).
++The function \fBform_fields\fP returns a pointer (which may be \fBNULL\fP).
+ It does not set \fBerrno\fP.
+ .PP
+-The function \fBfield_count\fR returns \fBERR\fR if the \fIform\fP parameter
++The function \fBfield_count\fP returns \fBERR\fP if the \fIform\fP parameter
+ is \fBNULL\fP.
+ .PP
+-The functions \fBset_form_fields\fR and \fBmove_field\fR return one of
++The functions \fBset_form_fields\fP and \fBmove_field\fP return one of
+ the following codes on error:
+ .TP 5
+ .B E_OK
+@@ -76,19 +76,19 @@
+ The form is already posted.
+ .TP 5
+ .B E_SYSTEM_ERROR
+-System error occurred (see \fBerrno\fR(3)).
++System error occurred (see \fBerrno\fP(3)).
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBform\fR(3X).
++\fBcurses\fP(3X), \fBform\fP(3X).
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V forms library.
+ They were not supported on
+ Version 7 or BSD versions.
+ .PP
+-The SVr4 forms library documentation specifies the \fBfield_count\fR error value
+-as \-1 (which is the value of \fBERR\fR).
++The SVr4 forms library documentation specifies the \fBfield_count\fP error value
++as \-1 (which is the value of \fBERR\fP).
+ .SH AUTHORS
+ Juergen Pfeifer.
+ Manual pages and adaptation for new curses by Eric S. Raymond.
+Index: man/form_field_attributes.3x
+Prereq:  1.18 
+--- ncurses-6.3-20211219+/man/form_field_attributes.3x	2020-10-18 00:14:20.000000000 +0000
++++ ncurses-6.3-20211225/man/form_field_attributes.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,16 +28,16 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_field_attributes.3x,v 1.18 2020/10/18 00:14:20 tom Exp $
++.\" $Id: form_field_attributes.3x,v 1.20 2021/12/25 21:49:32 tom Exp $
+ .TH form_field_attributes 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+ .ie \n(.g .ds '' \(rq
+ .el       .ds '' ''
+ .SH NAME
+-\fBform_field_attributes\fR \- color and attribute control for form fields
++\fBform_field_attributes\fP \- color and attribute control for form fields
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBint set_field_fore(FIELD *\fP\fIfield\fP\fB, chtype \fP\fIattr\fP\fB);\fP
+ .br
+@@ -52,21 +52,21 @@
+ \fBint field_pad(const FIELD *\fP\fIfield\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-The function \fBset_field_fore\fR sets the foreground attribute of
+-\fIfield\fR. This is the highlight used to display the field contents.  The
+-function \fBfield_fore\fR returns the foreground attribute.
++The function \fBset_field_fore\fP sets the foreground attribute of
++\fIfield\fP. This is the highlight used to display the field contents.  The
++function \fBfield_fore\fP returns the foreground attribute.
+ The default is
+-\fBA_STANDOUT\fR.
++\fBA_STANDOUT\fP.
+ .PP
+-The function \fBset_field_back\fR sets the background attribute of
+-\fIform\fR. This is the highlight used to display the extent fields in the
++The function \fBset_field_back\fP sets the background attribute of
++\fIform\fP. This is the highlight used to display the extent fields in the
+ form.
+-The function \fBfield_back\fR returns the background attribute.
++The function \fBfield_back\fP returns the background attribute.
+ The
+-default is \fBA_NORMAL\fR.
++default is \fBA_NORMAL\fP.
+ .PP
+-The function \fBset_field_pad\fR sets the character used to fill the field.
+-The function \fBfield_pad\fR returns the given form's pad character.
++The function \fBset_field_pad\fP sets the character used to fill the field.
++The function \fBfield_pad\fP returns the given form's pad character.
+ The
+ default is a blank.
+ .SH RETURN VALUE
+@@ -79,14 +79,14 @@
+ Routine detected an incorrect or out-of-range argument.
+ .TP 5
+ .B E_SYSTEM_ERROR
+-System error occurred (see \fBerrno\fR(3)).
++System error occurred (see \fBerrno\fP(3)).
+ .
+ .SH SEE ALSO
+-\fBcurses\fR(3X) and related pages whose names begin \*(``form_\*('' for detailed
++\fBcurses\fP(3X) and related pages whose names begin \*(``form_\*('' for detailed
+ descriptions of the entry points.
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V forms library.
+ They were not supported on
+Index: man/form_field_buffer.3x
+Prereq:  1.27 
+--- ncurses-6.3-20211219+/man/form_field_buffer.3x	2020-10-24 09:27:17.000000000 +0000
++++ ncurses-6.3-20211225/man/form_field_buffer.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_field_buffer.3x,v 1.27 2020/10/24 09:27:17 tom Exp $
++.\" $Id: form_field_buffer.3x,v 1.29 2021/12/25 21:49:32 tom Exp $
+ .TH form_field_buffer 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -39,9 +39,9 @@
+ .el    .IP \(bu 2
+ ..
+ .SH NAME
+-\fBform_field_buffer\fR \- field buffer control
++\fBform_field_buffer\fP \- field buffer control
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBint set_field_buffer(FIELD *\fP\fIfield\fP\fB, int \fP\fIbuf\fP\fB, const char *\fP\fIvalue\fP\fB);\fP
+ .br
+@@ -54,18 +54,18 @@
+ \fBint set_max_field(FIELD *\fP\fIfield\fP\fB, int \fP\fImax\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-The function \fBset_field_buffer\fR sets the numbered buffer of the given field
++The function \fBset_field_buffer\fP sets the numbered buffer of the given field
+ to contain a given string:
+ .RS 3
+ .bP
+ Buffer 0 is the displayed value of the field.
+ .bP
+-Other numbered buffers may be allocated by applications through the \fBnbuf\fR
+-argument of (see \fBform_field_new\fR(3X))
++Other numbered buffers may be allocated by applications through the \fBnbuf\fP
++argument of (see \fBform_field_new\fP(3X))
+ but are not manipulated by the forms library.
+ .RE
+ .PP
+-The function \fBfield_buffer\fR returns a pointer to
++The function \fBfield_buffer\fP returns a pointer to
+ the contents of the given numbered buffer:
+ .RS 3
+ .bP
+@@ -90,15 +90,15 @@
+ for long-term storage of form data.
+ .RE
+ .PP
+-The function \fBset_field_status\fR sets the associated status flag of
+-\fIfield\fR; \fBfield_status\fR gets the current value.
++The function \fBset_field_status\fP sets the associated status flag of
++\fIfield\fP; \fBfield_status\fP gets the current value.
+ The status flag
+ is set to a nonzero value whenever the field changes.
+ .PP
+-The function \fBset_max_field\fR sets the maximum size for a dynamic field.
++The function \fBset_max_field\fP sets the maximum size for a dynamic field.
+ An argument of 0 turns off any maximum size threshold for that field.
+ .SH RETURN VALUE
+-The \fBfield_buffer\fR function returns NULL on error.
++The \fBfield_buffer\fP function returns NULL on error.
+ It sets \fBerrno\fP according to their success:
+ .TP 5
+ .B E_OK
+@@ -107,7 +107,7 @@
+ .B E_BAD_ARGUMENT
+ Routine detected an incorrect or out-of-range argument.
+ .PP
+-The \fBfield_status\fR function returns \fBTRUE\fR or \fBFALSE\fR.
++The \fBfield_status\fP function returns \fBTRUE\fP or \fBFALSE\fP.
+ .PP
+ The remaining routines return one of the following:
+ .TP 5
+@@ -115,22 +115,22 @@
+ The routine succeeded.
+ .TP 5
+ .B E_SYSTEM_ERROR
+-System error occurred (see \fBerrno\fR(3)).
++System error occurred (see \fBerrno\fP(3)).
+ .TP 5
+ .B E_BAD_ARGUMENT
+ Routine detected an incorrect or out-of-range argument.
+ .SH SEE ALSO
+-\fBcurses\fR(3X) and related pages whose names begin \*(``form_\*('' for detailed
++\fBcurses\fP(3X) and related pages whose names begin \*(``form_\*('' for detailed
+ descriptions of the entry points.
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
++The header file \fB\fP automatically includes the header file
+ .PP
+ When configured for wide characters, \fBfield_buffer\fP returns a pointer
+ to temporary storage (allocated and freed by the library).
+ The application should not attempt to modify the data.
+ It will be freed on the next call to \fBfield_buffer\fP to return the
+ same buffer.
+-\fB\fR.
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V forms library.
+ They were not supported on
+Index: man/form_field_info.3x
+Prereq:  1.18 
+--- ncurses-6.3-20211219+/man/form_field_info.3x	2020-10-17 23:35:05.000000000 +0000
++++ ncurses-6.3-20211225/man/form_field_info.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_field_info.3x,v 1.18 2020/10/17 23:35:05 tom Exp $
++.\" $Id: form_field_info.3x,v 1.20 2021/12/25 21:49:32 tom Exp $
+ .TH form_field_info 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -36,10 +36,10 @@
+ .el       .ds '' ''
+ .SH NAME
+ \fBdynamic_field_info\fP,
+-\fBfield_info\fR \- retrieve field characteristics
++\fBfield_info\fP \- retrieve field characteristics
+ .SH SYNOPSIS
+ .nf
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBint field_info(const FIELD *\fP\fIfield\fP\fB,\fP
+                \fBint *\fP\fIrows\fP\fB, int *\fP\fIcols\fP\fB,\fP
+@@ -50,18 +50,18 @@
+                        \fBint *\fP\fIrows\fP\fB, int *\fP\fIcols\fP\fB, int *\fImax\fB);\fP
+ .fi
+ .SH DESCRIPTION
+-The function \fBfield_info\fR returns the sizes and other attributes passed in
++The function \fBfield_info\fP returns the sizes and other attributes passed in
+ to the field at its creation time.
+ The attributes are: height, width, row of
+ upper-left corner, column of upper-left corner, number off-screen rows, and
+ number of working buffers.
+ .PP
+-The function \fBdynamic_field_info\fR returns the actual size of the field, and
++The function \fBdynamic_field_info\fP returns the actual size of the field, and
+ its maximum possible size.
+ If the field has no size limit, the location
+ addressed by the third argument will be set to 0.
+ A field can be made dynamic
+-by turning off the \fBO_STATIC\fR option with \fBfield_opts_off\fR.
++by turning off the \fBO_STATIC\fP option with \fBfield_opts_off\fP.
+ .SH RETURN VALUE
+ These routines return one of the following:
+ .TP 5
+@@ -69,16 +69,16 @@
+ The routine succeeded.
+ .TP 5
+ .B E_SYSTEM_ERROR
+-System error occurred (see \fBerrno\fR(3)).
++System error occurred (see \fBerrno\fP(3)).
+ .TP 5
+ .B E_BAD_ARGUMENT
+ Routine detected an incorrect or out-of-range argument.
+ .SH SEE ALSO
+-\fBcurses\fR(3X) and related pages whose names begin \*(``form_\*('' for detailed
++\fBcurses\fP(3X) and related pages whose names begin \*(``form_\*('' for detailed
+ descriptions of the entry points.
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V forms library.
+ They were not supported on
+Index: man/form_field_just.3x
+Prereq:  1.18 
+--- ncurses-6.3-20211219+/man/form_field_just.3x	2020-10-18 00:12:55.000000000 +0000
++++ ncurses-6.3-20211225/man/form_field_just.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,48 +28,48 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_field_just.3x,v 1.18 2020/10/18 00:12:55 tom Exp $
++.\" $Id: form_field_just.3x,v 1.20 2021/12/25 21:49:32 tom Exp $
+ .TH form_field_just 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+ .ie \n(.g .ds '' \(rq
+ .el       .ds '' ''
+ .SH NAME
+-\fBset_field_just\fR,
++\fBset_field_just\fP,
+ \fBfield_just\fP \- retrieve field characteristics
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBint set_field_just(FIELD *\fP\fIfield\fP\fB, int \fP\fIjustification\fP\fB);\fP
+ .br
+ \fBint field_just(const FIELD *\fP\fIfield\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-The function \fBset_field_just\fR sets the justification attribute of
+-a field; \fBfield_just\fR returns a field's justification attribute.
++The function \fBset_field_just\fP sets the justification attribute of
++a field; \fBfield_just\fP returns a field's justification attribute.
+ The attribute may be one of NO_JUSTIFICATION, JUSTIFY_RIGHT,
+ JUSTIFY_LEFT, or JUSTIFY_CENTER.
+ .
+ .SH RETURN VALUE
+-The function \fBfield_just\fR returns one of: NO_JUSTIFICATION,
++The function \fBfield_just\fP returns one of: NO_JUSTIFICATION,
+ JUSTIFY_RIGHT, JUSTIFY_LEFT, or JUSTIFY_CENTER.
+ .PP
+-The function \fBset_field_just\fR returns one of the following:
++The function \fBset_field_just\fP returns one of the following:
+ .TP 5
+ .B E_OK
+ The routine succeeded.
+ .TP 5
+ .B E_SYSTEM_ERROR
+-System error occurred (see \fBerrno\fR(3)).
++System error occurred (see \fBerrno\fP(3)).
+ .TP 5
+ .B E_BAD_ARGUMENT
+ Routine detected an incorrect or out-of-range argument.
+ .SH SEE ALSO
+-\fBcurses\fR(3X) and related pages whose names begin \*(``form_\*('' for detailed
++\fBcurses\fP(3X) and related pages whose names begin \*(``form_\*('' for detailed
+ descriptions of the entry points.
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V forms library.
+ They were not supported on
+Index: man/form_field_new.3x
+Prereq:  1.24 
+--- ncurses-6.3-20211219+/man/form_field_new.3x	2020-10-24 09:09:18.000000000 +0000
++++ ncurses-6.3-20211225/man/form_field_new.3x	2021-12-25 21:41:58.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018,2020 Thomas E. Dickey                                     *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,15 +28,15 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_field_new.3x,v 1.24 2020/10/24 09:09:18 tom Exp $
++.\" $Id: form_field_new.3x,v 1.26 2021/12/25 21:41:58 tom Exp $
+ .TH form_field_new 3X ""
+ .SH NAME
+-\fBnew_field\fR,
+-\fBdup_field\fR,
+-\fBlink_field\fR,
+-\fBfree_field\fR \- create and destroy form fields
++\fBnew_field\fP,
++\fBdup_field\fP,
++\fBlink_field\fP,
++\fBfree_field\fP \- create and destroy form fields
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBFIELD *new_field(int \fP\fIheight\fP\fB, int \fP\fIwidth\fP\fB,\fP
+                  \fBint \fP\fItoprow\fP\fB, int \fP\fIleftcol\fP\fB,\fP
+@@ -49,11 +49,11 @@
+ \fBint free_field(FIELD *\fP\fIfield\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-The function \fBnew_field\fR allocates a new field and initializes it from the
++The function \fBnew_field\fP allocates a new field and initializes it from the
+ parameters given: height, width, row of upper-left corner, column of upper-left
+ corner, number off-screen rows, and number of additional working buffers.
+ .PP
+-The function \fBdup_field\fR duplicates a field at a new location.
++The function \fBdup_field\fP duplicates a field at a new location.
+ Most
+ attributes (including current contents, size, validation type, buffer count,
+ growth threshold, justification, foreground, background, pad character,
+@@ -61,14 +61,14 @@
+ Field status and the field page bit are
+ not copied.
+ .PP
+-The function \fBlink_field\fR acts like \fBdup_field\fR, but the new field
++The function \fBlink_field\fP acts like \fBdup_field\fP, but the new field
+ shares buffers with its parent.
+ Attribute data is separate.
+ .PP
+-The function \fBfree_field\fR de-allocates storage associated with a field.
++The function \fBfree_field\fP de-allocates storage associated with a field.
+ .SH RETURN VALUE
+-The functions \fBnew_field\fR, \fBdup_field\fR, \fBlink_field\fR return
+-\fBNULL\fR on error.
++The functions \fBnew_field\fP, \fBdup_field\fP, \fBlink_field\fP return
++\fBNULL\fP on error.
+ They set \fBerrno\fP according to their success:
+ .TP 5
+ .B E_OK
+@@ -80,7 +80,7 @@
+ .B E_SYSTEM_ERROR
+ System error occurred, e.g., malloc failure.
+ .PP
+-The function \fBfree_field\fR returns one of the following:
++The function \fBfree_field\fP returns one of the following:
+ .TP 5
+ .B E_OK
+ The routine succeeded.
+@@ -91,17 +91,17 @@
+ .B E_CONNECTED
+ field is connected.
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBform\fR(3X).
++\fBcurses\fP(3X), \fBform\fP(3X).
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V forms library.
+ They were not supported on
+ Version 7 or BSD versions.
+ .PP
+ It may be unwise to count on the set of attributes copied by
+-\fBdup_field\fR being portable; the System V forms library documents are
++\fBdup_field\fP being portable; the System V forms library documents are
+ not very explicit about what gets copied and what does not.
+ .SH AUTHORS
+ Juergen Pfeifer.
+Index: man/form_field_opts.3x
+Prereq:  1.27 
+--- ncurses-6.3-20211219+/man/form_field_opts.3x	2020-10-18 00:11:45.000000000 +0000
++++ ncurses-6.3-20211225/man/form_field_opts.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2014,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_field_opts.3x,v 1.27 2020/10/18 00:11:45 tom Exp $
++.\" $Id: form_field_opts.3x,v 1.29 2021/12/25 21:49:32 tom Exp $
+ .TH form_field_opts 3X ""
+ .SH NAME
+ \fBset_field_opts\fP,
+@@ -36,7 +36,7 @@
+ \fBfield_opts_off\fP,
+ \fBfield_opts\fP \- set and get field options
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBint set_field_opts(FIELD *\fP\fIfield\fP\fB, Field_Options \fP\fIopts\fP\fB);\fP
+ .br
+@@ -47,16 +47,16 @@
+ \fBint field_opts_off(FIELD *\fP\fIfield\fP\fB, Field_Options \fP\fIopts\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-The function \fBset_field_opts\fR sets all the given field's option bits (field
++The function \fBset_field_opts\fP sets all the given field's option bits (field
+ option bits may be logically-OR'ed together).
+ .PP
+-The function \fBfield_opts_on\fR turns on the given option bits, and leaves
++The function \fBfield_opts_on\fP turns on the given option bits, and leaves
+ others alone.
+ .PP
+-The function \fBfield_opts_off\fR turns off the given option bits, and leaves
++The function \fBfield_opts_off\fP turns off the given option bits, and leaves
+ others alone.
+ .PP
+-The function \fBfield_opts\fR returns the field's current option bits.
++The function \fBfield_opts\fP returns the field's current option bits.
+ .PP
+ The following standard options are defined (all are on by default):
+ .TP 5
+@@ -121,7 +121,7 @@
+ which allows a dynamic field to shrink if the new
+ limit is smaller than the current field size.
+ .SH RETURN VALUE
+-Except for \fBfield_opts\fR, each routine returns one of the following:
++Except for \fBfield_opts\fP, each routine returns one of the following:
+ .TP 5
+ .B E_OK
+ The routine succeeded.
+@@ -133,14 +133,14 @@
+ The field is the current field.
+ .TP 5
+ .B E_SYSTEM_ERROR
+-System error occurred (see \fBerrno\fR(3)).
++System error occurred (see \fBerrno\fP(3)).
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBform\fR(3X).
+-\fBform_field_just\fR(3X).
++\fBcurses\fP(3X),
++\fBform\fP(3X).
++\fBform_field_just\fP(3X).
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V forms library.
+ They were not supported on
+Index: man/form_field_userptr.3x
+Prereq:  1.16 
+--- ncurses-6.3-20211219+/man/form_field_userptr.3x	2020-10-24 09:06:33.000000000 +0000
++++ ncurses-6.3-20211225/man/form_field_userptr.3x	2021-12-25 21:41:58.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018,2020 Thomas E. Dickey                                     *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,13 +28,13 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_field_userptr.3x,v 1.16 2020/10/24 09:06:33 tom Exp $
++.\" $Id: form_field_userptr.3x,v 1.18 2021/12/25 21:41:58 tom Exp $
+ .TH form_field_userptr 3X ""
+ .SH NAME
+-\fBset_field_userptr\fR,
+-\fBfield_userptr\fR \- associate application data with a form field
++\fBset_field_userptr\fP,
++\fBfield_userptr\fP \- associate application data with a form field
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBint set_field_userptr(FIELD *\fP\fIfield\fP\fB, void *\fP\fIuserptr\fP\fB);\fP
+ .br
+@@ -45,15 +45,15 @@
+ These functions get and set
+ that field.
+ .SH RETURN VALUE
+-The function \fBfield_userptr\fR returns a pointer (which may be \fBNULL\fR).
++The function \fBfield_userptr\fP returns a pointer (which may be \fBNULL\fP).
+ It does not set \fBerrno\fP.
+ .PP
+-The function \fBset_field_userptr\fR returns \fBE_OK\fP (success).
++The function \fBset_field_userptr\fP returns \fBE_OK\fP (success).
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBform\fR(3X).
++\fBcurses\fP(3X), \fBform\fP(3X).
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V forms library.
+ They were not supported on
+Index: man/form_field_validation.3x
+Prereq:  1.33 
+--- ncurses-6.3-20211219+/man/form_field_validation.3x	2020-12-12 19:57:55.000000000 +0000
++++ ncurses-6.3-20211225/man/form_field_validation.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_field_validation.3x,v 1.33 2020/12/12 19:57:55 tom Exp $
++.\" $Id: form_field_validation.3x,v 1.35 2021/12/25 21:49:32 tom Exp $
+ .TH form_field_validation 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -38,9 +38,9 @@
+ .el    .IP \(bu 2
+ ..
+ .SH NAME
+-\fBform_field_validation\fR \- data type validation for fields
++\fBform_field_validation\fP \- data type validation for fields
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBvoid *field_arg(const FIELD *\fP\fIfield\fP\fB);\fP
+ .br
+@@ -76,7 +76,7 @@
+ Returns a pointer to the \fIfield type\fP associated with the form field,
+ i.e., by calling \fBset_field_type\fP.
+ .SS set_field_type
+-The function \fBset_field_type\fR associates
++The function \fBset_field_type\fP associates
+ a field type with a given form field.
+ This is the type checked by validation functions.
+ Most field types are configurable,
+@@ -89,7 +89,7 @@
+ Field types are implemented via the \fBFIELDTYPE\fP data
+ structure, which contains several pointers to functions.
+ .PP
+-See the \fBform_fieldtype\fR(3X) manual page,
++See the \fBform_fieldtype\fP(3X) manual page,
+ which describes functions which can be used to construct
+ a field-type dynamically.
+ .PP
+@@ -100,7 +100,7 @@
+ Required parameter:
+ .RS
+ .bP
+-a third \fBint\fR argument, a minimum field width.
++a third \fBint\fP argument, a minimum field width.
+ .RE
+ .TP 5
+ TYPE_ALPHA
+@@ -108,7 +108,7 @@
+ Required parameter:
+ .RS
+ .bP
+-a third \fBint\fR argument, a minimum field width.
++a third \fBint\fP argument, a minimum field width.
+ .RE
+ .TP 5
+ TYPE_ENUM
+@@ -116,11 +116,11 @@
+ Required parameters:
+ .RS
+ .bP
+-a third \fB(char **)\fR argument pointing to a string list;
++a third \fB(char **)\fP argument pointing to a string list;
+ .bP
+-a fourth \fBint\fR flag argument to enable case-sensitivity;
++a fourth \fBint\fP flag argument to enable case-sensitivity;
+ .bP
+-a fifth \fBint\fR flag argument specifying whether a partial
++a fifth \fBint\fP flag argument specifying whether a partial
+ match must be a unique one.
+ If this flag is off, a prefix matches the first
+ of any set of more than one list elements with that prefix.
+@@ -134,31 +134,31 @@
+ Required parameters:
+ .RS
+ .bP
+-a third \fBint\fR argument controlling the precision,
++a third \fBint\fP argument controlling the precision,
+ .bP
+-a fourth \fBlong\fR argument constraining minimum value,
++a fourth \fBlong\fP argument constraining minimum value,
+ .bP
+-a fifth \fBlong\fR constraining maximum value.
++a fifth \fBlong\fP constraining maximum value.
+ If the maximum value is less than or equal to the minimum value, the range is
+ simply ignored.
+ .RE
+ .IP
+ On return, the field buffer is formatted according to the
+-\fBprintf\fR format specification \*(``.*ld\*('',
++\fBprintf\fP format specification \*(``.*ld\*('',
+ where the \*(``*\*('' is replaced by the precision argument.
+ .IP
+-For details of the precision handling see \fBprintf\fR(3).
++For details of the precision handling see \fBprintf\fP(3).
+ .TP 5
+ TYPE_NUMERIC
+ Numeric data (may have a decimal-point part).
+ Required parameters:
+ .RS
+ .bP
+-a third \fBint\fR argument controlling the precision,
++a third \fBint\fP argument controlling the precision,
+ .bP
+-a fourth \fBdouble\fR argument constraining minimum value,
++a fourth \fBdouble\fP argument constraining minimum value,
+ .bP
+-and a fifth \fBdouble\fR constraining maximum value.
++and a fifth \fBdouble\fP constraining maximum value.
+ If your system supports locales,
+ the decimal point character must be the one specified by your locale.
+ If the maximum value is less than or equal to the minimum value,
+@@ -166,22 +166,22 @@
+ .RE
+ .IP
+ On return, the field buffer is formatted according to the
+-\fBprintf\fR format specification \*(``.*f\*('',
++\fBprintf\fP format specification \*(``.*f\*('',
+ where the \*(``*\*('' is replaced by the precision argument.
+ .IP
+-For details of the precision handling see \fBprintf\fR(3).
++For details of the precision handling see \fBprintf\fP(3).
+ .TP 5
+ TYPE_REGEXP
+ Regular expression data.
+ Required parameter:
+ .RS
+ .bP
+-a third argument, a regular expression \fB(char *)\fR string.
++a third argument, a regular expression \fB(char *)\fP string.
+ The data is valid if the regular expression matches it.
+ .RE
+ .IP
+ Regular expressions
+-are in the format of \fBregcomp\fR and \fBregexec\fR.
++are in the format of \fBregcomp\fP and \fBregexec\fP.
+ .IP
+ The regular expression must match the whole field.
+ If you have for example, an eight character wide field,
+@@ -209,22 +209,22 @@
+ This is an ncurses extension;
+ this field type may not be available in other curses implementations.
+ .SH RETURN VALUE
+-The functions \fBfield_type\fR and \fBfield_arg\fR return \fBNULL\fR on error.
+-The function \fBset_field_type\fR returns one of the following:
++The functions \fBfield_type\fP and \fBfield_arg\fP return \fBNULL\fP on error.
++The function \fBset_field_type\fP returns one of the following:
+ .TP 5
+ .B E_OK
+ The routine succeeded.
+ .TP 5
+ .B E_SYSTEM_ERROR
+-System error occurred (see \fBerrno\fR(3)).
++System error occurred (see \fBerrno\fP(3)).
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBform\fR(3X),
+-\fBform_fieldtype\fR(3X),
+-\fBform_variables\fR(3X).
++\fBcurses\fP(3X),
++\fBform\fP(3X),
++\fBform_fieldtype\fP(3X),
++\fBform_variables\fP(3X).
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V forms library.
+ They were not supported on
+Index: man/form_fieldtype.3x
+Prereq:  1.28 
+--- ncurses-6.3-20211219+/man/form_fieldtype.3x	2020-12-12 17:11:21.000000000 +0000
++++ ncurses-6.3-20211225/man/form_fieldtype.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,16 +28,16 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_fieldtype.3x,v 1.28 2020/12/12 17:11:21 tom Exp $
++.\" $Id: form_fieldtype.3x,v 1.30 2021/12/25 21:49:32 tom Exp $
+ .de bP
+ .ie n  .IP \(bu 4
+ .el    .IP \(bu 2
+ ..
+ .TH form_fieldtype 3X ""
+ .SH NAME
+-\fBform_fieldtype\fR \- define validation-field types
++\fBform_fieldtype\fP \- define validation-field types
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBFIELDTYPE *new_fieldtype(\fP
+     \fBbool (* const \fP\fIfield_check\fP\fB)(FIELD *, const void *),\fP
+@@ -60,11 +60,11 @@
+                           \fBFIELDTYPE *\fP\fItype2\fP\fB);\fP
+ .SH DESCRIPTION
+ .SS new_fieldtype
+-The function \fBnew_fieldtype\fR creates a new field type usable for data
++The function \fBnew_fieldtype\fP creates a new field type usable for data
+ validation.
+ Its parameters are function pointers:
+ .TP 5
+-\fIfield_check\fR
++\fIfield_check\fP
+ This function checks the
+ validity of an entered data string whenever the user attempts to leave a field.
+ It has two arguments:
+@@ -77,51 +77,51 @@
+ argument-block structure, about which more below.
+ .RE
+ .TP 5
+-\fIchar_check\fR
++\fIchar_check\fP
+ This function validates input characters as they are entered.
+ The form library passes it the character to be checked
+ and a pointer to an argument-block structure.
+ .SS free_fieldtype
+ .PP
+-The \fBfree_fieldtype\fR function
++The \fBfree_fieldtype\fP function
+ frees the space allocated for a given validation type by \fBnew_fieldtype\fP.
+ .SS set_fieldtype_arg
+ .PP
+-The function \fBset_fieldtype_arg\fR associates
++The function \fBset_fieldtype_arg\fP associates
+ three storage-management functions with a field type:
+ .TP 5
+-\fImake_arg\fR
++\fImake_arg\fP
+ This function is automatically applied to the
+-list of arguments you give \fBset_field_type\fR when attaching validation
++list of arguments you give \fBset_field_type\fP when attaching validation
+ to a field.
+ It stores the arguments in an allocated argument-block
+ object which is used when validating input.
+ .TP 5
+-\fIcopy_arg\fR
++\fIcopy_arg\fP
+ This function may be used by applications to copy argument-blocks.
+ .TP 5
+-\fIfree_arg\fR
++\fIfree_arg\fP
+ Frees an argument-block structure.
+ .PP
+-You must supply the \fImake_arg\fR function.
++You must supply the \fImake_arg\fP function.
+ The other two are optional: you may supply NULL for them.
+ In this case, the form library assumes
+-that \fImake_arg\fR does not allocate memory but simply loads the
++that \fImake_arg\fP does not allocate memory but simply loads the
+ argument into a single scalar value.
+ .SS set_fieldtype_choice
+ .PP
+-The form driver requests \fBREQ_NEXT_CHOICE\fR and \fBREQ_PREV_CHOICE\fR assume
++The form driver requests \fBREQ_NEXT_CHOICE\fP and \fBREQ_PREV_CHOICE\fP assume
+ that the possible values of a field form an ordered set, and provide the forms
+ user with a way to move through the set.
+ .PP
+-The \fBset_fieldtype_choice\fR
++The \fBset_fieldtype_choice\fP
+ function allows forms programmers to define successor and predecessor functions
+ for the field type.
+ These functions take the field pointer and an
+ argument-block structure as arguments.
+ .SS link_fieldtype
+ .PP
+-The function \fBlink_fieldtype\fR creates
++The function \fBlink_fieldtype\fP creates
+ a new field type from the two given types.
+ They are connected by an logical 'OR'.
+ .SH RETURN VALUE
+@@ -153,14 +153,14 @@
+ The field is the current field.
+ .TP 5
+ .B E_SYSTEM_ERROR
+-System error occurred (see \fBerrno\fR(3)).
++System error occurred (see \fBerrno\fP(3)).
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBform\fR(3X),
+-\fBform_field_validation\fR(3X).
++\fBcurses\fP(3X),
++\fBform\fP(3X),
++\fBform_field_validation\fP(3X).
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V forms library.
+ They were not supported on
+Index: man/form_hook.3x
+Prereq:  1.16 
+--- ncurses-6.3-20211219+/man/form_hook.3x	2020-10-18 00:06:29.000000000 +0000
++++ ncurses-6.3-20211225/man/form_hook.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,12 +28,12 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_hook.3x,v 1.16 2020/10/18 00:06:29 tom Exp $
++.\" $Id: form_hook.3x,v 1.18 2021/12/25 21:49:32 tom Exp $
+ .TH form_hook 3X ""
+ .SH NAME
+-\fBform_hook\fR \- set hooks for automatic invocation by applications
++\fBform_hook\fP \- set hooks for automatic invocation by applications
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBint set_field_init(FORM *\fP\fIform\fP\fB, Form_Hook \fP\fIfunc\fP\fB);\fP
+ .br
+@@ -53,32 +53,32 @@
+ .br
+ .SH DESCRIPTION
+ These functions make it possible to set hook functions to be called at various
+-points in the automatic processing of input event codes by \fBform_driver\fR.
++points in the automatic processing of input event codes by \fBform_driver\fP.
+ .PP
+-The function \fBset_field_init\fR sets a hook to be called at form-post time
++The function \fBset_field_init\fP sets a hook to be called at form-post time
+ and each time the selected field changes (after the change).
+-\fBfield_init\fR
+-returns the current field init hook, if any (\fBNULL\fR if there is no such
++\fBfield_init\fP
++returns the current field init hook, if any (\fBNULL\fP if there is no such
+ hook).
+ .PP
+-The function \fBset_field_term\fR sets a hook to be called at form-unpost time
++The function \fBset_field_term\fP sets a hook to be called at form-unpost time
+ and each time the selected field changes (before the change).
+-\fBfield_term\fR
+-returns the current field term hook, if any (\fBNULL\fR if there is no such
++\fBfield_term\fP
++returns the current field term hook, if any (\fBNULL\fP if there is no such
+ hook).
+ .PP
+-The function \fBset_form_init\fR sets a hook to be called at form-post time and
++The function \fBset_form_init\fP sets a hook to be called at form-post time and
+ just after a page change once it is posted.
+-\fBform_init\fR returns the
+-current form init hook, if any (\fBNULL\fR if there is no such hook).
++\fBform_init\fP returns the
++current form init hook, if any (\fBNULL\fP if there is no such hook).
+ .PP
+-The function \fBset_form_term\fR sets a hook to be called at form-unpost time
++The function \fBset_form_term\fP sets a hook to be called at form-unpost time
+ and just before a page change once it is posted.
+-\fBform_init\fR
+-returns the current form term hook, if any (\fBNULL\fR if there is no such
++\fBform_init\fP
++returns the current form term hook, if any (\fBNULL\fP if there is no such
+ hook).
+ .SH RETURN VALUE
+-Routines that return pointers return \fBNULL\fR on error.
++Routines that return pointers return \fBNULL\fP on error.
+ Other routines
+ return one of the following:
+ .TP 5
+@@ -86,12 +86,12 @@
+ The routine succeeded.
+ .TP 5
+ .B E_SYSTEM_ERROR
+-System error occurred (see \fBerrno\fR(3)).
++System error occurred (see \fBerrno\fP(3)).
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBform\fR(3X).
++\fBcurses\fP(3X), \fBform\fP(3X).
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V forms library.
+ They were not supported on
+Index: man/form_new.3x
+Prereq:  1.15 
+--- ncurses-6.3-20211219+/man/form_new.3x	2020-10-24 09:02:26.000000000 +0000
++++ ncurses-6.3-20211225/man/form_new.3x	2021-12-25 21:41:58.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018,2020 Thomas E. Dickey                                     *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,26 +28,26 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_new.3x,v 1.15 2020/10/24 09:02:26 tom Exp $
++.\" $Id: form_new.3x,v 1.17 2021/12/25 21:41:58 tom Exp $
+ .TH form_new 3X ""
+ .SH NAME
+-\fBnew_form\fR,
++\fBnew_form\fP,
+ \fBfree_form\fP \- create and destroy forms
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBFORM *new_form(FIELD **\fP\fIfields\fP\fB);\fP
+ .br
+ \fBint free_form(FORM *\fP\fIform\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-The function \fBnew_form\fR creates a new form connected to a specified field
+-pointer array (which must be \fBNULL\fR-terminated).
++The function \fBnew_form\fP creates a new form connected to a specified field
++pointer array (which must be \fBNULL\fP-terminated).
+ .PP
+-The function \fBfree_form\fR disconnects \fIform\fR from its field array
++The function \fBfree_form\fP disconnects \fIform\fP from its field array
+ and frees the storage allocated for the form.
+ .SH RETURN VALUE
+-The function \fBnew_form\fR returns \fBNULL\fR on error.
++The function \fBnew_form\fP returns \fBNULL\fP on error.
+ It sets \fBerrno\fP according to the function's success:
+ .TP 5
+ .B E_OK
+@@ -62,7 +62,7 @@
+ .B E_SYSTEM_ERROR
+ System error occurred, e.g., malloc failure.
+ .PP
+-The function \fBfree_form\fR returns one of the following:
++The function \fBfree_form\fP returns one of the following:
+ .TP 5
+ .B E_OK
+ The routine succeeded.
+@@ -73,10 +73,10 @@
+ .B E_POSTED
+ The form has already been posted.
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBform\fR(3X).
++\fBcurses\fP(3X), \fBform\fP(3X).
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V forms library.
+ They were not supported on
+Index: man/form_new_page.3x
+Prereq:  1.17 
+--- ncurses-6.3-20211219+/man/form_new_page.3x	2020-10-18 00:04:36.000000000 +0000
++++ ncurses-6.3-20211225/man/form_new_page.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,32 +28,32 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_new_page.3x,v 1.17 2020/10/18 00:04:36 tom Exp $
++.\" $Id: form_new_page.3x,v 1.19 2021/12/25 21:49:32 tom Exp $
+ .TH form_new_page 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+ .ie \n(.g .ds '' \(rq
+ .el       .ds '' ''
+ .SH NAME
+-\fBset_new_page\fR,
+-\fBnew_page\fR \- form pagination functions
++\fBset_new_page\fP,
++\fBnew_page\fP \- form pagination functions
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBint set_new_page(FIELD *\fP\fIfield\fP\fB, bool \fP\fInew_page_flag\fP\fB);\fP
+ .br
+ \fBbool new_page(const FIELD *\fP\fIfield\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-The function \fBset_new_page\fR sets or resets a flag marking the given field
++The function \fBset_new_page\fP sets or resets a flag marking the given field
+ as the beginning of a new page on its form.
+ .PP
+-The function \fBnew_page\fR is a predicate which tests if a given field marks
++The function \fBnew_page\fP is a predicate which tests if a given field marks
+ a page beginning on its form.
+ .SH RETURN VALUE
+-The function \fBnew_page\fR returns \fBTRUE\fR or \fBFALSE\fR.
++The function \fBnew_page\fP returns \fBTRUE\fP or \fBFALSE\fP.
+ .PP
+-The function \fBset_new_page\fR returns one of the following:
++The function \fBset_new_page\fP returns one of the following:
+ .TP 5
+ .B E_OK
+ The routine succeeded.
+@@ -61,11 +61,11 @@
+ .B E_CONNECTED
+ The given field is already connected to a form.
+ .SH SEE ALSO
+-\fBcurses\fR(3X) and related pages whose names begin \*(``form_\*('' for detailed
++\fBcurses\fP(3X) and related pages whose names begin \*(``form_\*('' for detailed
+ descriptions of the entry points.
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V forms library.
+ They were not supported on
+Index: man/form_opts.3x
+Prereq:  1.17 
+--- ncurses-6.3-20211219+/man/form_opts.3x	2020-10-18 00:03:49.000000000 +0000
++++ ncurses-6.3-20211225/man/form_opts.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,15 +28,15 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_opts.3x,v 1.17 2020/10/18 00:03:49 tom Exp $
++.\" $Id: form_opts.3x,v 1.19 2021/12/25 21:49:32 tom Exp $
+ .TH form_opts 3X ""
+ .SH NAME
+ \fBset_form_opts\fP,
+ \fBform_opts_on\fP,
+ \fBform_opts_off\fP,
+-\fBform_opts\fR \- set and get form options
++\fBform_opts\fP \- set and get form options
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBint set_form_opts(FORM *\fP\fIform\fP\fB, Field_Options \fP\fIopts\fP\fB);\fP
+ .br
+@@ -47,39 +47,39 @@
+ \fBint form_opts_off(FORM *\fP\fIform\fP\fB, Field_Options \fP\fIopts\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-The function \fBset_form_opts\fR sets all the given form's option bits (form
++The function \fBset_form_opts\fP sets all the given form's option bits (form
+ option bits may be logically-OR'ed together).
+ .PP
+-The function \fBform_opts_on\fR turns on the given option bits, and leaves
++The function \fBform_opts_on\fP turns on the given option bits, and leaves
+ others alone.
+ .PP
+-The function \fBform_opts_off\fR turns off the given option bits, and leaves
++The function \fBform_opts_off\fP turns off the given option bits, and leaves
+ others alone.
+ .PP
+-The function \fBform_opts\fR returns the form's current option bits.
++The function \fBform_opts\fP returns the form's current option bits.
+ .PP
+ The following options are defined (all are on by default):
+ .TP 5
+ O_NL_OVERLOAD
+-Overload the \fBREQ_NEW_LINE\fR forms driver request so that calling it at the
++Overload the \fBREQ_NEW_LINE\fP forms driver request so that calling it at the
+ end of a field goes to the next field.
+ .TP 5
+ O_BS_OVERLOAD
+-Overload the \fBREQ_DEL_PREV\fR forms driver request so that calling it at the
++Overload the \fBREQ_DEL_PREV\fP forms driver request so that calling it at the
+ beginning of a field goes to the previous field.
+ .SH RETURN VALUE
+-Except for \fBform_opts\fR, each routine returns one of the following:
++Except for \fBform_opts\fP, each routine returns one of the following:
+ .TP 5
+ .B E_OK
+ The routine succeeded.
+ .TP 5
+ .B E_SYSTEM_ERROR
+-System error occurred (see \fBerrno\fR(3)).
++System error occurred (see \fBerrno\fP(3)).
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBform\fR(3X).
++\fBcurses\fP(3X), \fBform\fP(3X).
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V forms library.
+ They were not supported on
+Index: man/form_page.3x
+Prereq:  1.19 
+--- ncurses-6.3-20211219+/man/form_page.3x	2020-10-18 00:02:44.000000000 +0000
++++ ncurses-6.3-20211225/man/form_page.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2016 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,12 +28,12 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_page.3x,v 1.19 2020/10/18 00:02:44 tom Exp $
++.\" $Id: form_page.3x,v 1.21 2021/12/25 21:49:32 tom Exp $
+ .TH form_page 3X ""
+ .SH NAME
+-\fBform_page\fR \- set and get form page number
++\fBform_page\fP \- set and get form page number
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBint set_current_field(FORM *\fP\fIform\fP\fB, FIELD *\fP\fIfield\fP\fB);\fP
+ .br
+@@ -48,24 +48,24 @@
+ \fBint field_index(const FIELD *\fP\fIfield\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-The function \fBset_current_field\fR sets the current field of the given
+-form; \fBcurrent_field\fR returns the current field of the given form.
++The function \fBset_current_field\fP sets the current field of the given
++form; \fBcurrent_field\fP returns the current field of the given form.
+ .PP
+-The function \fBunfocus_current_field\fR removes the focus from the current
++The function \fBunfocus_current_field\fP removes the focus from the current
+ field of the form.
+-In such state, inquiries via \fBcurrent_field\fR shall return a NULL pointer.
++In such state, inquiries via \fBcurrent_field\fP shall return a NULL pointer.
+ .PP
+-The function \fBset_form_page\fR sets the form's page number (goes to page
+-\fIn\fR of the form).
++The function \fBset_form_page\fP sets the form's page number (goes to page
++\fIn\fP of the form).
+ .PP
+-The function \fBform_page\fR returns the form's current page number.
++The function \fBform_page\fP returns the form's current page number.
+ .PP
+-The function \fBfield_index\fR returns the index of the field in the
++The function \fBfield_index\fP returns the index of the field in the
+ field array of the form it is connected to.
+-It returns \fBERR\fR if
++It returns \fBERR\fP if
+ the argument is the null pointer or the field is not connected.
+ .SH RETURN VALUE
+-Except for \fBform_page\fR, each routine returns one of the following:
++Except for \fBform_page\fP, each routine returns one of the following:
+ .TP 5
+ .B E_OK
+ The routine succeeded.
+@@ -83,13 +83,13 @@
+ The form driver could not process the request.
+ .TP 5
+ .B E_SYSTEM_ERROR
+-System error occurred (see \fBerrno\fR(3)).
++System error occurred (see \fBerrno\fP(3)).
+ .
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBform\fR(3X).
++\fBcurses\fP(3X), \fBform\fP(3X).
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V forms library.
+ They were not supported on
+Index: man/form_post.3x
+Prereq:  1.16 
+--- ncurses-6.3-20211219+/man/form_post.3x	2020-10-18 00:01:05.000000000 +0000
++++ ncurses-6.3-20211225/man/form_post.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,26 +28,26 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_post.3x,v 1.16 2020/10/18 00:01:05 tom Exp $
++.\" $Id: form_post.3x,v 1.18 2021/12/25 21:49:32 tom Exp $
+ .TH form_post 3X ""
+ .SH NAME
+-\fBpost_form\fR,
+-\fBunpost_form\fR \- write or erase forms from associated subwindows
++\fBpost_form\fP,
++\fBunpost_form\fP \- write or erase forms from associated subwindows
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBint post_form(FORM *\fP\fIform\fP\fB);\fP
+ .br
+ \fBint unpost_form(FORM *\fP\fIform\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-The function \fBpost_form\fR displays a form to its associated subwindow.
++The function \fBpost_form\fP displays a form to its associated subwindow.
+ To trigger physical display of the subwindow,
+-use \fBrefresh\fR(3X) or some equivalent
+-\fBcurses\fR routine (the implicit \fBdoupdate\fR triggered by an \fBcurses\fR
++use \fBrefresh\fP(3X) or some equivalent
++\fBcurses\fP routine (the implicit \fBdoupdate\fP triggered by an \fBcurses\fP
+ input request will do).
+ .PP
+-The function \fBunpost_form\fR erases form from its associated subwindow.
++The function \fBunpost_form\fP erases form from its associated subwindow.
+ .SH RETURN VALUE
+ These routines return one of the following:
+ .TP 5
+@@ -73,13 +73,13 @@
+ The form has already been posted.
+ .TP 5
+ .B E_SYSTEM_ERROR
+-System error occurred (see \fBerrno\fR(3)).
++System error occurred (see \fBerrno\fP(3)).
+ .
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBform\fR(3X).
++\fBcurses\fP(3X), \fBform\fP(3X).
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V forms library.
+ They were not supported on
+Index: man/form_requestname.3x
+Prereq:  1.16 
+--- ncurses-6.3-20211219+/man/form_requestname.3x	2020-12-12 16:37:14.000000000 +0000
++++ ncurses-6.3-20211225/man/form_requestname.3x	2021-12-25 21:41:58.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018,2020 Thomas E. Dickey                                     *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,13 +28,13 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_requestname.3x,v 1.16 2020/12/12 16:37:14 tom Exp $
++.\" $Id: form_requestname.3x,v 1.18 2021/12/25 21:41:58 tom Exp $
+ .TH form_requestname 3X ""
+ .SH NAME
+ \fBform_request_by_name\fP,
+-\fBform_request_name\fR \- handle printable form request names
++\fBform_request_name\fP \- handle printable form request names
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBconst char *form_request_name(int \fP\fIrequest\fP\fB);\fP
+ .br
+@@ -42,23 +42,23 @@
+ .br
+ .SH DESCRIPTION
+ .SS form_request_name
+-The function \fBform_request_name\fR returns the printable name of a form
++The function \fBform_request_name\fP returns the printable name of a form
+ request code.
+ .SS form_request_name_by_name
+-The function \fBform_request_by_name\fR searches in the name-table for a request
++The function \fBform_request_by_name\fP searches in the name-table for a request
+ with the given name and returns its request code.
+ Otherwise E_NO_MATCH is returned.
+ .SH RETURN VALUE
+-\fBform_request_name\fR returns \fBNULL\fR on error and sets \fBerrno\fP
+-to \fBE_BAD_ARGUMENT\fR.
++\fBform_request_name\fP returns \fBNULL\fP on error and sets \fBerrno\fP
++to \fBE_BAD_ARGUMENT\fP.
+ .PP
+-\fBform_request_by_name\fR returns \fBE_NO_MATCH\fR on error.
++\fBform_request_by_name\fP returns \fBE_NO_MATCH\fP on error.
+ It does not set \fBerrno\fP.
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBform\fR(3X).
++\fBcurses\fP(3X), \fBform\fP(3X).
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines are specific to ncurses.
+ They were not supported on
+Index: man/form_userptr.3x
+Prereq:  1.19 
+--- ncurses-6.3-20211219+/man/form_userptr.3x	2020-10-24 09:00:52.000000000 +0000
++++ ncurses-6.3-20211225/man/form_userptr.3x	2021-12-25 21:41:58.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018,2020 Thomas E. Dickey                                     *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,13 +28,13 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_userptr.3x,v 1.19 2020/10/24 09:00:52 tom Exp $
++.\" $Id: form_userptr.3x,v 1.21 2021/12/25 21:41:58 tom Exp $
+ .TH form_userptr 3X ""
+ .SH NAME
+ \fBset_form_userptr\fP,
+-\fBform_userptr\fR \- associate application data with a form item
++\fBform_userptr\fP \- associate application data with a form item
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBint set_form_userptr(FORM *\fP\fIform\fP\fB, void *\fP\fIuserptr\fP\fB);\fP
+ .br
+@@ -45,15 +45,15 @@
+ application-specific data (that is, the form-driver code leaves it alone).
+ These functions get and set the form user pointer field.
+ .SH RETURN VALUE
+-The function \fBform_userptr\fR returns a pointer (which may be \fBNULL\fR).
++The function \fBform_userptr\fP returns a pointer (which may be \fBNULL\fP).
+ It does not set \fBerrno\fP.
+ .PP
+-The function \fBset_form_userptr\fR returns \fBE_OK\fP (success).
++The function \fBset_form_userptr\fP returns \fBE_OK\fP (success).
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBform\fR(3X).
++\fBcurses\fP(3X), \fBform\fP(3X).
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V forms library.
+ They were not supported on
+Index: man/form_variables.3x
+Prereq:  1.7 
+--- ncurses-6.3-20211219+/man/form_variables.3x	2020-12-12 14:45:16.000000000 +0000
++++ ncurses-6.3-20211225/man/form_variables.3x	2021-12-25 21:50:36.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2020 Thomas E. Dickey                                          *
++.\" Copyright 2020,2021 Thomas E. Dickey                                     *
+ .\" Copyright 2010-2013,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,32 +27,32 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_variables.3x,v 1.7 2020/12/12 14:45:16 tom Exp $
++.\" $Id: form_variables.3x,v 1.9 2021/12/25 21:50:36 tom Exp $
+ .TH form_variables 3X ""
+ .na
+ .hy 0
+ .SH NAME
+-\fBTYPE_ALNUM\fR,
+-\fBTYPE_ALPHA\fR,
+-\fBTYPE_ENUM\fR,
+-\fBTYPE_INTEGER\fR,
+-\fBTYPE_IPV4\fR,
+-\fBTYPE_NUMERIC\fR,
+-\fBTYPE_REGEXP\fR
++\fBTYPE_ALNUM\fP,
++\fBTYPE_ALPHA\fP,
++\fBTYPE_ENUM\fP,
++\fBTYPE_INTEGER\fP,
++\fBTYPE_IPV4\fP,
++\fBTYPE_NUMERIC\fP,
++\fBTYPE_REGEXP\fP
+ \- form system global variables
+ .ad
+ .hy
+ .SH SYNOPSIS
+ .nf
+-\fB#include \fR
++\fB#include \fP
+ .PP
+-\fBFIELDTYPE * TYPE_ALNUM;\fR
+-\fBFIELDTYPE * TYPE_ALPHA;\fR
+-\fBFIELDTYPE * TYPE_ENUM;\fR
+-\fBFIELDTYPE * TYPE_INTEGER;\fR
+-\fBFIELDTYPE * TYPE_IPV4;\fR
+-\fBFIELDTYPE * TYPE_NUMERIC;\fR
+-\fBFIELDTYPE * TYPE_REGEXP;\fR
++\fBFIELDTYPE * TYPE_ALNUM;\fP
++\fBFIELDTYPE * TYPE_ALPHA;\fP
++\fBFIELDTYPE * TYPE_ENUM;\fP
++\fBFIELDTYPE * TYPE_INTEGER;\fP
++\fBFIELDTYPE * TYPE_IPV4;\fP
++\fBFIELDTYPE * TYPE_NUMERIC;\fP
++\fBFIELDTYPE * TYPE_REGEXP;\fP
+ .fi
+ .SH DESCRIPTION
+ These are building blocks for the form library,
+@@ -78,4 +78,4 @@
+ The \fBTYPE_IPV4\fP variable is an extension not provided by older
+ implementations of the form library.
+ .SH SEE ALSO
+-\fBform\fR(3X).
++\fBform\fP(3X).
+Index: man/form_win.3x
+Prereq:  1.18 
+--- ncurses-6.3-20211219+/man/form_win.3x	2020-10-18 00:00:32.000000000 +0000
++++ ncurses-6.3-20211225/man/form_win.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,12 +28,12 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_win.3x,v 1.18 2020/10/18 00:00:32 tom Exp $
++.\" $Id: form_win.3x,v 1.20 2021/12/25 21:49:32 tom Exp $
+ .TH form_win 3X ""
+ .SH NAME
+-\fBform_win\fR \- make and break form window and subwindow associations
++\fBform_win\fP \- make and break form window and subwindow associations
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBint set_form_win(FORM *\fP\fIform\fP\fB, WINDOW *\fP\fIwin\fP\fB);\fP
+ .br
+@@ -46,23 +46,23 @@
+ \fBint scale_form(const FORM *\fP\fIform\fP\fB, int *\fP\fIrows\fP\fB, int *\fP\fIcolumns\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-Every form has an associated pair of \fBcurses\fR windows.
++Every form has an associated pair of \fBcurses\fP windows.
+ The form window
+ displays any title and border associated with the window; the form subwindow
+ displays the items of the form that are currently available for selection.
+ .PP
+ The first four functions get and set those windows.
+ It is not necessary to set
+-either window; by default, the driver code uses \fBstdscr\fR for both.
++either window; by default, the driver code uses \fBstdscr\fP for both.
+ .PP
+-In the \fBset_\fR functions, window argument of \fBNULL\fR is treated as though
+-it were \fBstsdcr\fR.  A form argument of \fBNULL\fR is treated as a request
++In the \fBset_\fP functions, window argument of \fBNULL\fP is treated as though
++it were \fBstsdcr\fP.  A form argument of \fBNULL\fP is treated as a request
+ to change the system default form window or subwindow.
+ .PP
+-The function \fBscale_form\fR returns the minimum size required for the
+-subwindow of \fIform\fR.
++The function \fBscale_form\fP returns the minimum size required for the
++subwindow of \fIform\fP.
+ .SH RETURN VALUE
+-Routines that return pointers return \fBNULL\fR on error.
++Routines that return pointers return \fBNULL\fP on error.
+ Routines that return
+ an integer return one of the following error codes:
+ .TP 5
+@@ -70,7 +70,7 @@
+ The routine succeeded.
+ .TP 5
+ .B E_SYSTEM_ERROR
+-System error occurred (see \fBerrno\fR(3)).
++System error occurred (see \fBerrno\fP(3)).
+ .TP 5
+ .B E_BAD_ARGUMENT
+ Routine detected an incorrect or out-of-range argument.
+@@ -81,12 +81,12 @@
+ .B E_NOT_CONNECTED
+ No items are connected to the form.
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBcurs_variables\fR(3X),
+-\fBform\fR(3X).
++\fBcurses\fP(3X),
++\fBcurs_variables\fP(3X),
++\fBform\fP(3X).
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V forms library.
+ They were not supported on
+Index: man/infocmp.1m
+Prereq:  1.79 
+--- ncurses-6.3-20211219+/man/infocmp.1m	2021-08-15 20:01:31.000000000 +0000
++++ ncurses-6.3-20211225/man/infocmp.1m	2021-12-25 18:55:27.000000000 +0000
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: infocmp.1m,v 1.79 2021/08/15 20:01:31 tom Exp $
++.\" $Id: infocmp.1m,v 1.80 2021/12/25 18:55:27 tom Exp $
+ .TH @INFOCMP@ 1M ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -55,9 +55,9 @@
+ ..
+ .ds d @TERMINFO@
+ .SH NAME
+-\fB@INFOCMP@\fR \- compare or print out \fIterminfo\fR descriptions
++\fB@INFOCMP@\fP \- compare or print out \fIterminfo\fP descriptions
+ .SH SYNOPSIS
+-\fB@INFOCMP@\fR [\fB\-\
++\fB@INFOCMP@\fP [\fB\-\
+ 1\
+ C\
+ D\
+@@ -84,36 +84,36 @@
+ t\
+ u\
+ x\
+-\fR]
++\fP]
+ .br
+-      [\fB\-v\fR \fIn\fR] [\fB\-s d\fR| \fBi\fR| \fBl\fR| \fBc\fR] [\fB\-Q\fR \fIn\fR] [\fB\-R \fR\fBsubset\fR]
++      [\fB\-v\fP \fIn\fP] [\fB\-s d\fP| \fBi\fP| \fBl\fP| \fBc\fP] [\fB\-Q\fP \fIn\fP] [\fB\-R \fP\fBsubset\fP]
+ .br
+-      [\fB\-w\fR\ \fIwidth\fR] [\fB\-A\fR\ \fIdirectory\fR] [\fB\-B\fR\ \fIdirectory\fR]
++      [\fB\-w\fP\ \fIwidth\fP] [\fB\-A\fP\ \fIdirectory\fP] [\fB\-B\fP\ \fIdirectory\fP]
+ .br
+-      [\fItermname\fR...]
++      [\fItermname\fP...]
+ .SH DESCRIPTION
+-\fB@INFOCMP@\fR can be used to compare a binary \fBterminfo\fR entry with other
+-terminfo entries, rewrite a \fBterminfo\fR description to take advantage of the
+-\fBuse=\fR terminfo field, or print out a \fBterminfo\fR description from the
+-binary file (\fBterm\fR) in a variety of formats.
++\fB@INFOCMP@\fP can be used to compare a binary \fBterminfo\fP entry with other
++terminfo entries, rewrite a \fBterminfo\fP description to take advantage of the
++\fBuse=\fP terminfo field, or print out a \fBterminfo\fP description from the
++binary file (\fBterm\fP) in a variety of formats.
+ In all cases, the boolean
+ fields will be printed first, followed by the numeric fields, followed by the
+ string fields.
+ .SS Default Options
+-If no options are specified and zero or one \fItermnames\fR are specified, the
+-\fB\-I\fR option will be assumed.
+-If more than one \fItermname\fR is specified,
+-the \fB\-d\fR option will be assumed.
++If no options are specified and zero or one \fItermnames\fP are specified, the
++\fB\-I\fP option will be assumed.
++If more than one \fItermname\fP is specified,
++the \fB\-d\fP option will be assumed.
+ .SS Comparison Options [\-d] [\-c] [\-n]
+-\fB@INFOCMP@\fR compares the \fBterminfo\fR description of the first terminal
+-\fItermname\fR with each of the descriptions given by the entries for the other
+-terminal's \fItermnames\fR.
++\fB@INFOCMP@\fP compares the \fBterminfo\fP description of the first terminal
++\fItermname\fP with each of the descriptions given by the entries for the other
++terminal's \fItermnames\fP.
+ If a capability is defined for only one of the
+ terminals, the value returned depends on the type of the capability:
+ .bP
+-\fBF\fR for missing boolean variables
++\fBF\fP for missing boolean variables
+ .bP
+-\fBNULL\fR for missing integer or string variables
++\fBNULL\fP for missing integer or string variables
+ .PP
+ Use the \fB\-q\fP option to show the distinction between
+ \fIabsent\fP and \fIcancelled\fP capabilities.
+@@ -121,24 +121,24 @@
+ These options produce a list which you can use to compare two
+ or more terminal descriptions:
+ .TP 5
+-\fB\-d\fR
++\fB\-d\fP
+ produces a list of each capability that is \fIdifferent\fP
+ between two entries.
+ Each item in the list shows \*(``:\*('' after the capability name,
+ followed by the capability values, separated by a comma.
+ .TP
+-\fB\-c\fR
++\fB\-c\fP
+ produces a list of each capability that is \fIcommon\fP between
+ two or more entries.
+ Missing capabilities are ignored.
+ Each item in the list shows \*(``=\*('' after the capability name,
+ followed by the capability value.
+ .IP
+-The \fB\-u\fR option provides a related output,
++The \fB\-u\fP option provides a related output,
+ showing the first terminal description rewritten to use the second
+ as a building block via the \*(``use=\*('' clause.
+ .TP
+-\fB\-n\fR
++\fB\-n\fP
+ produces a list of each capability that is in \fInone\fP of the given entries.
+ Each item in the list shows \*(``!\*('' before the capability name.
+ .IP
+@@ -146,30 +146,30 @@
+ Use the \fB\-x\fP option to add the BSD-compatibility
+ capabilities (names prefixed with \*(``OT\*('').
+ .IP
+-If no \fItermnames\fR are given,
+-\fB@INFOCMP@\fR uses the environment variable \fBTERM\fR
+-for each of the \fItermnames\fR.
++If no \fItermnames\fP are given,
++\fB@INFOCMP@\fP uses the environment variable \fBTERM\fP
++for each of the \fItermnames\fP.
+ .SS Source Listing Options [\-I] [\-L] [\-C] [\-r]
+-The \fB\-I\fR, \fB\-L\fR, and \fB\-C\fR options will produce
++The \fB\-I\fP, \fB\-L\fP, and \fB\-C\fP options will produce
+ a source listing for each terminal named.
+ .
+ .TS
+ center tab(/) ;
+ l l .
+-\fB\-I\fR/use the \fBterminfo\fR names
+-\fB\-L\fR/use the long C variable name listed in <\fBterm.h\fR>
+-\fB\-C\fR/use the \fBtermcap\fR names
+-\fB\-r\fR/when using \fB\-C\fR, put out all capabilities in \fBtermcap\fR form
+-\fB\-K\fR/modifies the \fB\-C\fP option, improving BSD-compatibility.
++\fB\-I\fP/use the \fBterminfo\fP names
++\fB\-L\fP/use the long C variable name listed in <\fBterm.h\fP>
++\fB\-C\fP/use the \fBtermcap\fP names
++\fB\-r\fP/when using \fB\-C\fP, put out all capabilities in \fBtermcap\fP form
++\fB\-K\fP/modifies the \fB\-C\fP option, improving BSD-compatibility.
+ .TE
+ .PP
+-If no \fItermnames\fR are given, the environment variable \fBTERM\fR will be
++If no \fItermnames\fP are given, the environment variable \fBTERM\fP will be
+ used for the terminal name.
+ .PP
+-The source produced by the \fB\-C\fR option may be used directly as a
+-\fBtermcap\fR entry, but not all parameterized strings can be changed to
+-the \fBtermcap\fR format.
+-\fB@INFOCMP@\fR will attempt to convert most of the
++The source produced by the \fB\-C\fP option may be used directly as a
++\fBtermcap\fP entry, but not all parameterized strings can be changed to
++the \fBtermcap\fP format.
++\fB@INFOCMP@\fP will attempt to convert most of the
+ parameterized information, and anything not converted will be plainly marked in
+ the output and commented out.
+ These should be edited by hand.
+@@ -185,93 +185,93 @@
+ and trim excess whitespace (use the \fB\-0\fP option for that).
+ .PP
+ All padding information for strings will be collected together and placed
+-at the beginning of the string where \fBtermcap\fR expects it.
++at the beginning of the string where \fBtermcap\fP expects it.
+ Mandatory
+ padding (padding information with a trailing \*(``/\*('') will become optional.
+ .PP
+-All \fBtermcap\fR variables no longer supported by \fBterminfo\fR, but which
+-are derivable from other \fBterminfo\fR variables, will be output.
++All \fBtermcap\fP variables no longer supported by \fBterminfo\fP, but which
++are derivable from other \fBterminfo\fP variables, will be output.
+ Not all
+-\fBterminfo\fR capabilities will be translated; only those variables which were
+-part of \fBtermcap\fR will normally be output.
+-Specifying the \fB\-r\fR option
++\fBterminfo\fP capabilities will be translated; only those variables which were
++part of \fBtermcap\fP will normally be output.
++Specifying the \fB\-r\fP option
+ will take off this restriction, allowing all capabilities to be output in
+-\fItermcap\fR form.
++\fItermcap\fP form.
+ Normally you would use both the \fB\-C\fP and \fB\-r\fP options.
+ The actual format used incorporates some improvements for escaped characters
+ from terminfo format.
+-For a stricter BSD-compatible translation, use the \fB\-K\fR option
++For a stricter BSD-compatible translation, use the \fB\-K\fP option
+ rather than \fB\-C\fP.
+ .PP
+ Note that because padding is collected to the beginning of the capability, not
+ all capabilities are output.
+ Mandatory padding is not supported.
+ Because
+-\fBtermcap\fR strings are not as flexible, it is not always possible to convert
+-a \fBterminfo\fR string capability into an equivalent \fBtermcap\fR format.
+-A subsequent conversion of the \fBtermcap\fR file
+-back into \fBterminfo\fR format
+-will not necessarily reproduce the original \fBterminfo\fR source.
++\fBtermcap\fP strings are not as flexible, it is not always possible to convert
++a \fBterminfo\fP string capability into an equivalent \fBtermcap\fP format.
++A subsequent conversion of the \fBtermcap\fP file
++back into \fBterminfo\fP format
++will not necessarily reproduce the original \fBterminfo\fP source.
+ .PP
+-Some common \fBterminfo\fR parameter sequences, their \fBtermcap\fR
++Some common \fBterminfo\fP parameter sequences, their \fBtermcap\fP
+ equivalents, and some terminal types which commonly have such sequences, are:
+ .
+ .TS
+ center tab(/) ;
+ l c l
+ l l l.
+-\fBterminfo/termcap\fR/Representative Terminals
++\fBterminfo/termcap\fP/Representative Terminals
+ =
+-\fB%p1%c/%.\fR/adm
+-\fB%p1%d/%d\fR/hp, ANSI standard, vt100
+-\fB%p1%'x'%+%c/%+x\fR/concept
+-\fB%i/%i\fRq/ANSI standard, vt100
+-\fB%p1%?%'x'%>%t%p1%'y'%+%;/%>xy\fR/concept
+-\fB%p2\fR is printed before \fB%p1/%r\fR/hp
++\fB%p1%c/%.\fP/adm
++\fB%p1%d/%d\fP/hp, ANSI standard, vt100
++\fB%p1%'x'%+%c/%+x\fP/concept
++\fB%i/%i\fPq/ANSI standard, vt100
++\fB%p1%?%'x'%>%t%p1%'y'%+%;/%>xy\fP/concept
++\fB%p2\fP is printed before \fB%p1/%r\fP/hp
+ .TE
+ .SS Use= Option [\-u]
+-The \fB\-u\fR option produces a \fBterminfo\fR source description of the first
+-terminal \fItermname\fR which is relative to the sum of the descriptions given
+-by the entries for the other terminals \fItermnames\fR.
++The \fB\-u\fP option produces a \fBterminfo\fP source description of the first
++terminal \fItermname\fP which is relative to the sum of the descriptions given
++by the entries for the other terminals \fItermnames\fP.
+ It does this by
+-analyzing the differences between the first \fItermname\fR and the other
+-\fItermnames\fR and producing a description with \fBuse=\fR fields for the
++analyzing the differences between the first \fItermname\fP and the other
++\fItermnames\fP and producing a description with \fBuse=\fP fields for the
+ other terminals.
+ In this manner, it is possible to retrofit generic terminfo
+ entries into a terminal's description.
+ Or, if two similar terminals exist, but
+ were coded at different times or by different people so that each description
+-is a full description, using \fB@INFOCMP@\fR
++is a full description, using \fB@INFOCMP@\fP
+ will show what can be done to change
+ one description to be relative to the other.
+ .PP
+ A capability will be printed with an at-sign (@) if it no longer exists in the
+-first \fItermname\fR, but one of the other \fItermname\fR entries contains a
++first \fItermname\fP, but one of the other \fItermname\fP entries contains a
+ value for it.
+ A capability's value will be printed if the value in the first
+-\fItermname\fR is not found in any of the other \fItermname\fR entries, or if
+-the first of the other \fItermname\fR entries that has this capability gives a
+-different value for the capability than that in the first \fItermname\fR.
++\fItermname\fP is not found in any of the other \fItermname\fP entries, or if
++the first of the other \fItermname\fP entries that has this capability gives a
++different value for the capability than that in the first \fItermname\fP.
+ .PP
+-The order of the other \fItermname\fR entries is significant.
++The order of the other \fItermname\fP entries is significant.
+ Since the
+-terminfo compiler \fB@TIC@\fR does a left-to-right scan of the capabilities,
+-specifying two \fBuse=\fR entries that contain differing entries for the same
++terminfo compiler \fB@TIC@\fP does a left-to-right scan of the capabilities,
++specifying two \fBuse=\fP entries that contain differing entries for the same
+ capabilities will produce different results depending on the order that the
+ entries are given in.
+-\fB@INFOCMP@\fR will flag any such inconsistencies between
+-the other \fItermname\fR entries as they are found.
++\fB@INFOCMP@\fP will flag any such inconsistencies between
++the other \fItermname\fP entries as they are found.
+ .PP
+-Alternatively, specifying a capability \fIafter\fR a \fBuse=\fR entry that
++Alternatively, specifying a capability \fIafter\fP a \fBuse=\fP entry that
+ contains that capability will cause the second specification to be ignored.
+-Using \fB@INFOCMP@\fR to recreate a description can be a useful check to make
++Using \fB@INFOCMP@\fP to recreate a description can be a useful check to make
+ sure that everything was specified correctly in the original source
+ description.
+ .PP
+ Another error that does not cause incorrect compiled files, but will slow down
+-the compilation time, is specifying extra \fBuse=\fR fields that are
++the compilation time, is specifying extra \fBuse=\fP fields that are
+ superfluous.
+-\fB@INFOCMP@\fR will flag any other \fItermname use=\fR fields that
++\fB@INFOCMP@\fP will flag any other \fItermname use=\fP fields that
+ were not needed.
+ .SS Changing Databases [\-A \fIdirectory\fR] [\-B \fIdirectory\fR]
+ Like other \fBncurses\fP utilities,
+@@ -280,13 +280,13 @@
+ to override the compiled-in default list of places to search
+ (see \fBcurses\fP(3X) for details).
+ .PP
+-You can also use the options \fB\-A\fR
+-and \fB\-B\fR to override the list of places to search
++You can also use the options \fB\-A\fP
++and \fB\-B\fP to override the list of places to search
+ when comparing terminal descriptions:
+ .bP
+-The \fB\-A\fR option sets the location for the first \fItermname\fR
++The \fB\-A\fP option sets the location for the first \fItermname\fP
+ .bP
+-The \fB\-B\fR option sets the location for the other \fItermnames\fR.
++The \fB\-B\fP option sets the location for the other \fItermnames\fP.
+ .PP
+ Using these options, it is possible to
+ compare descriptions for a terminal with the same name located in two different
+@@ -296,28 +296,28 @@
+ created by different people.
+ .SS Other Options
+ .TP 5
+-\fB\-0\fR
++\fB\-0\fP
+ causes the fields to be printed on one line, without wrapping.
+ .TP 5
+-\fB\-1\fR
++\fB\-1\fP
+ causes the fields to be printed out one to a line.
+ Otherwise,
+ the fields will be printed several to a line to a maximum width
+ of 60 characters.
+ .TP
+-\fB\-a\fR
++\fB\-a\fP
+ tells \fB@INFOCMP@\fP to retain commented-out capabilities
+ rather than discarding them.
+ Capabilities are commented by prefixing them with a period.
+ .TP
+-\fB\-D\fR
++\fB\-D\fP
+ tells \fB@INFOCMP@\fP to print the database locations that it knows about,
+ and exit.
+ .TP 5
+-\fB\-E\fR
++\fB\-E\fP
+ Dump the capabilities of the given terminal as tables, needed in
+ the C initializer for a
+-TERMTYPE structure (the terminal capability structure in the \fB\fR).
++TERMTYPE structure (the terminal capability structure in the \fB\fP).
+ This option is useful for preparing versions of the curses library hardwired
+ for a given terminal type.
+ The tables are all declared static, and are named according to the type
+@@ -327,13 +327,13 @@
+ options was not needed; but support for extended names required making
+ the arrays of terminal capabilities separate from the TERMTYPE structure.
+ .TP 5
+-\fB\-e\fR
++\fB\-e\fP
+ Dump the capabilities of the given terminal as a C initializer for a
+-TERMTYPE structure (the terminal capability structure in the \fB\fR).
++TERMTYPE structure (the terminal capability structure in the \fB\fP).
+ This option is useful for preparing versions of the curses library hardwired
+ for a given terminal type.
+ .TP 5
+-\fB\-F\fR
++\fB\-F\fP
+ compare terminfo files.
+ This assumes that two following arguments are filenames.
+ The files are searched for pairwise matches between
+@@ -345,23 +345,23 @@
+ Normally,
+ to reduce the volume of the report, use references are
+ not resolved before looking for differences, but resolution can be forced
+-by also specifying \fB\-r\fR.
++by also specifying \fB\-r\fP.
+ .TP 5
+-\fB\-f\fR
++\fB\-f\fP
+ Display complex terminfo strings which contain if/then/else/endif expressions
+ indented for readability.
+ .TP 5
+-\fB\-G\fR
++\fB\-G\fP
+ Display constant literals in decimal form
+ rather than their character equivalents.
+ .TP 5
+-\fB\-g\fR
++\fB\-g\fP
+ Display constant character literals in quoted form
+ rather than their decimal equivalents.
+ .TP 5
+-\fB\-i\fR
+-Analyze the initialization (\fBis1\fR, \fBis2\fR, \fBis3\fR), and reset
+-(\fBrs1\fR, \fBrs2\fR, \fBrs3\fR), strings in the entry,
++\fB\-i\fP
++Analyze the initialization (\fBis1\fP, \fBis2\fP, \fBis3\fP), and reset
++(\fBrs1\fP, \fBrs2\fP, \fBrs3\fP), strings in the entry,
+ as well as those used for starting/stopping cursor-positioning mode
+ (\fBsmcup\fP, \fBrmcup\fP) as well as starting/stopping keymap mode
+ (\fBsmkx\fP, \fBrmkx\fP).
+@@ -432,13 +432,13 @@
+ .IP
+ An SGR0 designates an empty highlight sequence (equivalent to {SGR:NORMAL}).
+ .TP 5
+-\fB\-l\fR
++\fB\-l\fP
+ Set output format to terminfo.
+ .TP 5
+-\fB\-p\fR
++\fB\-p\fP
+ Ignore padding specifications when comparing strings.
+ .TP 5
+-\fB\-Q\fR \fIn\fR
++\fB\-Q\fP \fIn\fP
+ Rather than show source in terminfo (text) format,
+ print the compiled (binary) format in hexadecimal or base64 form,
+ depending on the option's value:
+@@ -460,7 +460,7 @@
+ @INFOCMP@ -0 -q -Q2
+ .NE
+ .TP 5
+-\fB\-q\fR
++\fB\-q\fP
+ This makes the output a little shorter:
+ .RS
+ .bP
+@@ -473,7 +473,7 @@
+ Omit the \*(``Reconstructed from\*('' comment for source listings.
+ .RE
+ .TP 5
+-\fB\-R\fR\fIsubset\fR
++\fB\-R\fP\fIsubset\fP
+ Restrict output to a given subset.
+ This option is for use with archaic
+ versions of terminfo like those on SVr1, Ultrix, or HP-UX that do not support
+@@ -483,7 +483,7 @@
+ .bP
+ Available terminfo
+ subsets are \*(``SVr1\*('', \*(``Ultrix\*('', \*(``HP\*('', and \*(``AIX\*('';
+-see \fBterminfo\fR(\*n) for details.
++see \fBterminfo\fP(\*n) for details.
+ .bP
+ You can also choose the subset \*(``BSD\*('' which selects only capabilities
+ with termcap equivalents recognized by 4.4BSD.
+@@ -494,69 +494,69 @@
+ The \fB\-I\fP option likewise selects no subset as a side-effect.
+ .RE
+ .TP
+-\fB\-s \fR\fI[d|i|l|c]\fR
+-The \fB\-s\fR option sorts the fields within each type according to the argument
++\fB\-s \fP\fI[d|i|l|c]\fP
++The \fB\-s\fP option sorts the fields within each type according to the argument
+ below:
+ .br
+ .RS 5
+ .TP 5
+-\fBd\fR
+-leave fields in the order that they are stored in the \fIterminfo\fR database.
++\fBd\fP
++leave fields in the order that they are stored in the \fIterminfo\fP database.
+ .TP 5
+-\fBi\fR
+-sort by \fIterminfo\fR name.
++\fBi\fP
++sort by \fIterminfo\fP name.
+ .TP 5
+-\fBl\fR
++\fBl\fP
+ sort by the long C variable name.
+ .TP 5
+-\fBc\fR
+-sort by the \fItermcap\fR name.
++\fBc\fP
++sort by the \fItermcap\fP name.
+ .RE
+ .IP
+-If the \fB\-s\fR option is not given, the fields printed out will be
+-sorted alphabetically by the \fBterminfo\fR name within each type,
+-except in the case of the \fB\-C\fR or the \fB\-L\fR options, which cause the
+-sorting to be done by the \fBtermcap\fR name or the long C variable
++If the \fB\-s\fP option is not given, the fields printed out will be
++sorted alphabetically by the \fBterminfo\fP name within each type,
++except in the case of the \fB\-C\fP or the \fB\-L\fP options, which cause the
++sorting to be done by the \fBtermcap\fP name or the long C variable
+ name, respectively.
+ .TP 5
+-\fB\-T\fR
++\fB\-T\fP
+ eliminates size-restrictions on the generated text.
+ This is mainly useful for testing and analysis, since the compiled
+ descriptions are limited (e.g., 1023 for termcap, 4096 for terminfo).
+ .TP
+-\fB\-t\fR
++\fB\-t\fP
+ tells \fB@TIC@\fP to discard commented-out capabilities.
+ Normally when translating from terminfo to termcap,
+ untranslatable capabilities are commented-out.
+ .TP 5
+-\fB\-U\fR
++\fB\-U\fP
+ tells \fB@INFOCMP@\fP to not post-process the data
+ after parsing the source file.
+ This feature helps when comparing the actual contents of two source files,
+ since it excludes the inferences that \fB@INFOCMP@\fP makes to fill in missing
+ data.
+ .TP 5
+-\fB\-V\fR
++\fB\-V\fP
+ reports the version of ncurses which was used in this program, and exits.
+ .TP 5
+-\fB\-v\fR \fIn\fR
++\fB\-v\fP \fIn\fP
+ prints out tracing information on standard error as the program runs.
+ .IP
+-The optional parameter \fIn\fR is a number from 1 to 10, inclusive,
++The optional parameter \fIn\fP is a number from 1 to 10, inclusive,
+ indicating the desired level of detail of information.
+ If ncurses is built without tracing support, the optional parameter is ignored.
+ .TP
+-\fB\-W\fR
++\fB\-W\fP
+ By itself, the \fB\-w\fP option will not force long strings to be wrapped.
+ Use the \fB\-W\fP option to do this.
+ .TP 5
+-\fB\-w\fR \fIwidth\fR
+-changes the output to \fIwidth\fR characters.
++\fB\-w\fP \fIwidth\fP
++changes the output to \fIwidth\fP characters.
+ .TP
+-\fB\-x\fR
++\fB\-x\fP
+ print information for user-defined capabilities (see \fBuser_caps(\*n)\fP.
+ These are extensions to the terminfo repertoire which can be loaded
+-using the \fB\-x\fR option of \fB@TIC@\fP.
++using the \fB\-x\fP option of \fB@TIC@\fP.
+ .SH FILES
+ .TP 20
+ \*d
+@@ -591,24 +591,24 @@
+ It does not mention the options used for converting to termcap format.
+ .SH EXTENSIONS
+ The
+-\fB\-0\fR,
+-\fB\-1\fR,
+-\fB\-E\fR,
+-\fB\-F\fR,
+-\fB\-G\fR,
+-\fB\-Q\fR,
+-\fB\-R\fR,
+-\fB\-T\fR,
+-\fB\-V\fR,
+-\fB\-a\fR,
+-\fB\-e\fR,
+-\fB\-f\fR,
+-\fB\-g\fR,
+-\fB\-i\fR,
+-\fB\-l\fR,
+-\fB\-p\fR,
+-\fB\-q\fR and
+-\fB\-t\fR
++\fB\-0\fP,
++\fB\-1\fP,
++\fB\-E\fP,
++\fB\-F\fP,
++\fB\-G\fP,
++\fB\-Q\fP,
++\fB\-R\fP,
++\fB\-T\fP,
++\fB\-V\fP,
++\fB\-a\fP,
++\fB\-e\fP,
++\fB\-f\fP,
++\fB\-g\fP,
++\fB\-i\fP,
++\fB\-l\fP,
++\fB\-p\fP,
++\fB\-q\fP and
++\fB\-t\fP
+ options are not supported in SVr4 curses.
+ .PP
+ SVr4 infocmp does not distinguish between absent and cancelled capabilities.
+@@ -617,25 +617,25 @@
+ This implementation shows those as \*(``NULL\*('',
+ for consistency with missing strings.
+ .PP
+-The \fB\-r\fR option's notion of \*(``termcap\*('' capabilities
++The \fB\-r\fP option's notion of \*(``termcap\*('' capabilities
+ is System V Release 4's.
+ Actual BSD curses versions will have a more restricted set.
+ To see only the
+-4.4BSD set, use \fB\-r\fR \fB\-RBSD\fR.
++4.4BSD set, use \fB\-r\fP \fB\-RBSD\fP.
+ .SH BUGS
+-The \fB\-F\fR option of \fB@INFOCMP@\fR(1M) should be a \fB@TOE@\fR(1M) mode.
++The \fB\-F\fP option of \fB@INFOCMP@\fP(1M) should be a \fB@TOE@\fP(1M) mode.
+ .SH SEE ALSO
+-\fB@CAPTOINFO@\fR(1M),
+-\fB@INFOTOCAP@\fR(1M),
+-\fB@TIC@\fR(1M),
+-\fB@TOE@\fR(1M),
+-\fBcurses\fR(3X),
+-\fBterminfo\fR(\*n).
+-\fBuser_caps\fR(\*n).
++\fB@CAPTOINFO@\fP(1M),
++\fB@INFOTOCAP@\fP(1M),
++\fB@TIC@\fP(1M),
++\fB@TOE@\fP(1M),
++\fBcurses\fP(3X),
++\fBterminfo\fP(\*n).
++\fBuser_caps\fP(\*n).
+ .sp
+ https://invisible-island.net/ncurses/tctest.html
+ .PP
+-This describes \fBncurses\fR
++This describes \fBncurses\fP
+ version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
+ .SH AUTHOR
+ Eric S. Raymond 
+Index: man/infotocap.1m
+Prereq:  1.17 
+--- ncurses-6.3-20211219+/man/infotocap.1m	2020-12-19 21:49:52.000000000 +0000
++++ ncurses-6.3-20211225/man/infotocap.1m	2021-12-25 21:49:32.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1999-2010,2016 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,51 +28,51 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: infotocap.1m,v 1.17 2020/12/19 21:49:52 tom Exp $
++.\" $Id: infotocap.1m,v 1.19 2021/12/25 21:49:32 tom Exp $
+ .TH @INFOTOCAP@ 1M ""
+ .ds n 5
+ .ds d @TERMINFO@
+ .SH NAME
+-\fB@INFOTOCAP@\fR \- convert a \fIterminfo\fR description into a \fItermcap\fR description
++\fB@INFOTOCAP@\fP \- convert a \fIterminfo\fP description into a \fItermcap\fP description
+ .SH SYNOPSIS
+-\fB@INFOTOCAP@\fR [\fB\-v\fR\fIn\fR \fIwidth\fR]  [\fB\-V\fR] [\fB\-1\fR] [\fB\-w\fR \fIwidth\fR] \fIfile\fR ...
++\fB@INFOTOCAP@\fP [\fB\-v\fP\fIn\fP \fIwidth\fP]  [\fB\-V\fP] [\fB\-1\fP] [\fB\-w\fP \fIwidth\fP] \fIfile\fP ...
+ .SH DESCRIPTION
+-\fB@INFOTOCAP@\fR looks in each given text
+-\fIfile\fR for \fBterminfo\fR descriptions.
++\fB@INFOTOCAP@\fP looks in each given text
++\fIfile\fP for \fBterminfo\fP descriptions.
+ For each terminfo description found,
+-an equivalent \fBtermcap\fR description is written to standard output.
+-Terminfo \fBuse\fR capabilities are translated directly to termcap
+-\fBtc\fR capabilities.
++an equivalent \fBtermcap\fP description is written to standard output.
++Terminfo \fBuse\fP capabilities are translated directly to termcap
++\fBtc\fP capabilities.
+ .TP 5
+-\fB\-v\fR
++\fB\-v\fP
+ print out tracing information on standard error as the program runs.
+ .TP 5
+-\fB\-V\fR
++\fB\-V\fP
+ print out the version of the program in use on standard error and exit.
+ .TP 5
+-\fB\-1\fR
++\fB\-1\fP
+ cause the fields to print out one to a line.
+ Otherwise, the fields
+ will be printed several to a line to a maximum width of 60 characters.
+ .TP 5
+-\fB\-w\fR
+-change the output to \fIwidth\fR characters.
++\fB\-w\fP
++change the output to \fIwidth\fP characters.
+ .SH FILES
+ .TP 20
+ \*d
+ Compiled terminal description database.
+ .SH NOTES
+-This utility is actually a link to \fB@TIC@\fR, running in \fI\-C\fR mode.
+-You can use other \fB@TIC@\fR options such as \fB\-f\fR and  \fB\-x\fR.
++This utility is actually a link to \fB@TIC@\fP, running in \fI\-C\fP mode.
++You can use other \fB@TIC@\fP options such as \fB\-f\fP and  \fB\-x\fP.
+ .SH PORTABILITY
+ None of X/Open Curses, Issue 7 (2009), SVr4 or NetBSD document this application.
+ .SH SEE ALSO
+-\fB@INFOCMP@\fR(1M),
+-\fB@TIC@\fR(1M),
+-\fBcurses\fR(3X),
+-\fBterminfo\fR(\*n)
++\fB@INFOCMP@\fP(1M),
++\fB@TIC@\fP(1M),
++\fBcurses\fP(3X),
++\fBterminfo\fP(\*n)
+ .PP
+-This describes \fBncurses\fR
++This describes \fBncurses\fP
+ version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
+ .SH AUTHOR
+ Eric S. Raymond 
+Index: man/key_defined.3x
+Prereq:  1.10 
+--- ncurses-6.3-20211219+/man/key_defined.3x	2020-10-17 23:39:03.000000000 +0000
++++ ncurses-6.3-20211225/man/key_defined.3x	2021-12-25 21:41:58.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018,2020 Thomas E. Dickey                                     *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 2003-2006,2010 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -29,7 +29,7 @@
+ .\"
+ .\" Author: Thomas E. Dickey 2003
+ .\"
+-.\" $Id: key_defined.3x,v 1.10 2020/10/17 23:39:03 tom Exp $
++.\" $Id: key_defined.3x,v 1.12 2021/12/25 21:41:58 tom Exp $
+ .TH key_defined 3X ""
+ .SH NAME
+ \fBkey_defined\fP \- check if a keycode is defined
+@@ -53,6 +53,6 @@
+ It is recommended that
+ any code depending on them be conditioned using NCURSES_VERSION.
+ .SH SEE ALSO
+-\fBdefine_key\fR(3X).
++\fBdefine_key\fP(3X).
+ .SH AUTHOR
+ Thomas Dickey.
+Index: man/keybound.3x
+Prereq:  1.11 
+--- ncurses-6.3-20211219+/man/keybound.3x	2020-10-17 23:39:30.000000000 +0000
++++ ncurses-6.3-20211225/man/keybound.3x	2021-12-25 21:41:58.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018,2020 Thomas E. Dickey                                     *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1999-2008,2010 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -29,7 +29,7 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1999
+ .\"
+-.\" $Id: keybound.3x,v 1.11 2020/10/17 23:39:30 tom Exp $
++.\" $Id: keybound.3x,v 1.13 2021/12/25 21:41:58 tom Exp $
+ .TH keybound 3X ""
+ .SH NAME
+ \fBkeybound\fP \- return definition of keycode
+@@ -55,7 +55,7 @@
+ It is recommended that
+ any code depending on them be conditioned using NCURSES_VERSION.
+ .SH SEE ALSO
+-\fBdefine_key\fR(3X),
+-\fBkeyok\fR(3X).
++\fBdefine_key\fP(3X),
++\fBkeyok\fP(3X).
+ .SH AUTHOR
+ Thomas Dickey.
+Index: man/keyok.3x
+Prereq:  1.15 
+--- ncurses-6.3-20211219+/man/keyok.3x	2020-10-17 23:39:59.000000000 +0000
++++ ncurses-6.3-20211225/man/keyok.3x	2021-12-25 21:41:58.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018,2020 Thomas E. Dickey                                     *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -29,7 +29,7 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1997
+ .\"
+-.\" $Id: keyok.3x,v 1.15 2020/10/17 23:39:59 tom Exp $
++.\" $Id: keyok.3x,v 1.18 2021/12/25 21:41:58 tom Exp $
+ .TH keyok 3X ""
+ .SH NAME
+ \fBkeyok\fP \- enable or disable a keycode
+@@ -40,7 +40,7 @@
+ .SH DESCRIPTION
+ This is an extension to the curses library.
+ It permits an application to disable specific keycodes, rather than
+-use the \fIkeypad\fP function to disable all keycodes.
++use the \fBkeypad\fP function to disable all keycodes.
+ Keys that have been disabled can be re-enabled.
+ .SH RETURN VALUE
+ The keycode must be greater than zero, else \fBERR\fP is returned.
+@@ -55,6 +55,6 @@
+ It is recommended that
+ any code depending on them be conditioned using NCURSES_VERSION.
+ .SH SEE ALSO
+-\fBdefine_key\fR(3X).
++\fBdefine_key\fP(3X).
+ .SH AUTHOR
+ Thomas Dickey.
+Index: man/legacy_coding.3x
+Prereq:  1.9 
+--- ncurses-6.3-20211219+/man/legacy_coding.3x	2021-08-15 19:32:05.000000000 +0000
++++ ncurses-6.3-20211225/man/legacy_coding.3x	2021-12-25 17:39:16.000000000 +0000
+@@ -29,10 +29,10 @@
+ .\"
+ .\" Author: Thomas E. Dickey
+ .\"
+-.\" $Id: legacy_coding.3x,v 1.9 2021/08/15 19:32:05 tom Exp $
++.\" $Id: legacy_coding.3x,v 1.10 2021/12/25 17:39:16 tom Exp $
+ .TH legacy_coding 3X ""
+ .SH NAME
+-\fBuse_legacy_coding\fR \- override locale-encoding checks
++\fBuse_legacy_coding\fP \- override locale-encoding checks
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+@@ -70,6 +70,6 @@
+ It is recommended that any code depending on ncurses extensions
+ be conditioned using NCURSES_VERSION.
+ .SH SEE ALSO
+-\fBunctrl\fR(3X).
++\fBunctrl\fP(3X).
+ .SH AUTHOR
+ Thomas Dickey (to support lynx's font-switching feature).
+Index: man/make_sed.sh
+Prereq:  1.12 
+--- ncurses-6.3-20211219+/man/make_sed.sh	2021-06-17 21:20:30.000000000 +0000
++++ ncurses-6.3-20211225/man/make_sed.sh	2021-12-25 17:39:16.000000000 +0000
+@@ -1,5 +1,5 @@
+ #!/bin/sh
+-# $Id: make_sed.sh,v 1.12 2021/06/17 21:20:30 tom Exp $
++# $Id: make_sed.sh,v 1.13 2021/12/25 17:39:16 tom Exp $
+ ##############################################################################
+ # Copyright 2020,2021 Thomas E. Dickey                                       #
+ # Copyright 1998-2005,2017 Free Software Foundation, Inc.                    #
+@@ -74,16 +74,16 @@
+ 
+ echo "# Do the embedded references" >>$RESULT
+ sed	-e 's/>$RESULT
+ 
+-echo "# Do the \fBxxx\fR references in the .NAME section" >>$RESULT
++echo "# Do the \fBxxx\fP references in the .NAME section" >>$RESULT
+ sed	-e 's/\\>$RESULT
+ 
+ # Finally, send the result to standard output
+Index: man/manhtml.externs
+Prereq:  1.14 
+--- ncurses-6.3-20211219+/man/manhtml.externs	2020-04-18 09:48:50.000000000 +0000
++++ ncurses-6.3-20211225/man/manhtml.externs	2021-12-26 00:02:52.000000000 +0000
+@@ -1,7 +1,7 @@
+-# $Id: manhtml.externs,v 1.14 2020/04/18 09:48:50 tom Exp $
++# $Id: manhtml.externs,v 1.15 2021/12/26 00:02:52 tom Exp $
+ # Items in this list will not be linked by man2html
+ #***************************************************************************
+-# Copyright 2019,2020 Thomas E. Dickey                                     *
++# Copyright 2019-2020,2021 Thomas E. Dickey                                *
+ # Copyright 2013,2017 Free Software Foundation, Inc.                       *
+ #                                                                          *
+ # Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -34,12 +34,15 @@
+ COLOR_PAIR(3)
+ atoi(3)
+ conflict(1)
++cron(1)
+ csh(1)
+ ded(1)
++emacs(1)
+ environ(7)
+ errno(3)
+ file(1)
+ getty(1)
++jove(1)
+ lynx(1)
+ nvi(1)
+ mutt(1)
+@@ -50,8 +53,11 @@
+ putchar(3)
+ putwc(3)
+ read(2)
++readline(3)
++resize(1)
+ scanf(3)
+ screen(1)
++setlocale(3)
+ sh(1)
+ sscanf(3)
+ stdio(3)
+@@ -61,7 +67,9 @@
+ tmux(1)
+ tty(4)
+ ttys(5)
++vi(1)
+ vprintf(3)
+ vscanf(3)
+ wcwidth(3)
+ write(2)
++xterm(1)
+Index: man/menu.3x
+Prereq:  1.27 
+--- ncurses-6.3-20211219+/man/menu.3x	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.3-20211225/man/menu.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2014,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu.3x,v 1.27 2020/02/02 23:34:34 tom Exp $
++.\" $Id: menu.3x,v 1.29 2021/12/25 21:49:32 tom Exp $
+ .TH menu 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -39,109 +39,109 @@
+ .el    .IP \(bu 2
+ ..
+ .SH NAME
+-\fBmenu\fR \- curses extension for programming menus
++\fBmenu\fP \- curses extension for programming menus
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .br
+ .SH DESCRIPTION
+-The \fBmenu\fR library provides terminal-independent facilities for composing
++The \fBmenu\fP library provides terminal-independent facilities for composing
+ menu systems on character-cell terminals.
+ The library includes: item routines,
+ which create and modify menu items; and menu routines, which group items into
+ menus, display menus on the screen, and handle interaction with the user.
+ .PP
+-The \fBmenu\fR library uses the \fBcurses\fR libraries, and a curses
+-initialization routine such as \fBinitscr\fR must be called before using any of
++The \fBmenu\fP library uses the \fBcurses\fP libraries, and a curses
++initialization routine such as \fBinitscr\fP must be called before using any of
+ these functions.
+-To use the \fBmenu\fR library, link with the options
+-\fB\-lmenu \-lcurses\fR.
++To use the \fBmenu\fP library, link with the options
++\fB\-lmenu \-lcurses\fP.
+ .
+ .SS Current Default Values for Item Attributes
+ .
+-The \fBmenu\fR library maintains a default value for item attributes.
++The \fBmenu\fP library maintains a default value for item attributes.
+ You can
+-get or set this default by calling the appropriate \fBget_\fR or \fBset_\fR
+-routine with a \fBNULL\fR item pointer.
++get or set this default by calling the appropriate \fBget_\fP or \fBset_\fP
++routine with a \fBNULL\fP item pointer.
+ Changing this default with a
+-\fBset_\fR function affects future item creations, but does not change the
++\fBset_\fP function affects future item creations, but does not change the
+ rendering of items already created.
+ .
+ .SS Routine Name Index
+ .
+-The following table lists each \fBmenu\fR routine and the name of
++The following table lists each \fBmenu\fP routine and the name of
+ the manual page on which it is described.
+ .
+ .TS
+ l l .
+-\fBcurses\fR Routine Name	Manual Page Name
++\fBcurses\fP Routine Name	Manual Page Name
+ =
+-current_item	\fBmitem_current\fR(3X)
+-free_item 	\fBmitem_new\fR(3X)
+-free_menu 	\fBmenu_new\fR(3X)
+-item_count	\fBmenu_items\fR(3X)
+-item_description	\fBmitem_name\fR(3X)
+-item_index	\fBmitem_current\fR(3X)
+-item_init 	\fBmenu_hook\fR(3X)
+-item_name 	\fBmitem_name\fR(3X)
+-item_opts 	\fBmitem_opts\fR(3X)
+-item_opts_off	\fBmitem_opts\fR(3X)
+-item_opts_on	\fBmitem_opts\fR(3X)
+-item_term 	\fBmenu_hook\fR(3X)
+-item_userptr	\fBmitem_userptr\fR(3X)
+-item_value	\fBmitem_value\fR(3X)
+-item_visible	\fBmitem_visible\fR(3X)
+-menu_back 	\fBmenu_attributes\fR(3X)
+-menu_driver	\fBmenu_driver\fR(3X)
+-menu_fore 	\fBmenu_attributes\fR(3X)
+-menu_format	\fBmenu_format\fR(3X)
+-menu_grey 	\fBmenu_attributes\fR(3X)
+-menu_init 	\fBmenu_hook\fR(3X)
+-menu_items	\fBmenu_items\fR(3X)
+-menu_mark 	\fBmenu_mark\fR(3X)
+-menu_opts 	\fBmenu_opts\fR(3X)
+-menu_opts_off	\fBmenu_opts\fR(3X)
+-menu_opts_on	\fBmenu_opts\fR(3X)
+-menu_pad  	\fBmenu_attributes\fR(3X)
+-menu_pattern	\fBmenu_pattern\fR(3X)
+-menu_request_by_name	\fBmenu_requestname\fR(3X)
+-menu_request_name	\fBmenu_requestname\fR(3X)
+-menu_spacing	\fBmenu_spacing\fR(3X)
+-menu_sub  	\fBmenu_win\fR(3X)
+-menu_term 	\fBmenu_hook\fR(3X)
+-menu_userptr	\fBmenu_userptr\fR(3X)
+-menu_win  	\fBmenu_win\fR(3X)
+-new_item  	\fBmitem_new\fR(3X)
+-new_menu  	\fBmenu_new\fR(3X)
+-pos_menu_cursor	\fBmenu_cursor\fR(3X)
+-post_menu 	\fBmenu_post\fR(3X)
+-scale_menu	\fBmenu_win\fR(3X)
+-set_current_item	\fBmitem_current\fR(3X)
+-set_item_init	\fBmenu_hook\fR(3X)
+-set_item_opts	\fBmitem_opts\fR(3X)
+-set_item_term	\fBmenu_hook\fR(3X)
+-set_item_userptr	\fBmitem_userptr\fR(3X)
+-set_item_value	\fBmitem_value\fR(3X)
+-set_menu_back	\fBmenu_attributes\fR(3X)
+-set_menu_fore	\fBmenu_attributes\fR(3X)
+-set_menu_format	\fBmenu_format\fR(3X)
+-set_menu_grey	\fBmenu_attributes\fR(3X)
+-set_menu_init	\fBmenu_hook\fR(3X)
+-set_menu_items	\fBmenu_items\fR(3X)
+-set_menu_mark	\fBmenu_mark\fR(3X)
+-set_menu_opts	\fBmitem_opts\fR(3X)
+-set_menu_pad	\fBmenu_attributes\fR(3X)
+-set_menu_pattern	\fBmenu_pattern\fR(3X)
+-set_menu_spacing	\fBmenu_spacing\fR(3X)
+-set_menu_sub	\fBmenu_win\fR(3X)
+-set_menu_term	\fBmenu_hook\fR(3X)
+-set_menu_userptr	\fBmenu_userptr\fR(3X)
+-set_menu_win	\fBmenu_win\fR(3X)
+-set_top_row	\fBmitem_current\fR(3X)
+-top_row   	\fBmitem_current\fR(3X)
+-unpost_menu	\fBmenu_post\fR(3X)
++current_item	\fBmitem_current\fP(3X)
++free_item 	\fBmitem_new\fP(3X)
++free_menu 	\fBmenu_new\fP(3X)
++item_count	\fBmenu_items\fP(3X)
++item_description	\fBmitem_name\fP(3X)
++item_index	\fBmitem_current\fP(3X)
++item_init 	\fBmenu_hook\fP(3X)
++item_name 	\fBmitem_name\fP(3X)
++item_opts 	\fBmitem_opts\fP(3X)
++item_opts_off	\fBmitem_opts\fP(3X)
++item_opts_on	\fBmitem_opts\fP(3X)
++item_term 	\fBmenu_hook\fP(3X)
++item_userptr	\fBmitem_userptr\fP(3X)
++item_value	\fBmitem_value\fP(3X)
++item_visible	\fBmitem_visible\fP(3X)
++menu_back 	\fBmenu_attributes\fP(3X)
++menu_driver	\fBmenu_driver\fP(3X)
++menu_fore 	\fBmenu_attributes\fP(3X)
++menu_format	\fBmenu_format\fP(3X)
++menu_grey 	\fBmenu_attributes\fP(3X)
++menu_init 	\fBmenu_hook\fP(3X)
++menu_items	\fBmenu_items\fP(3X)
++menu_mark 	\fBmenu_mark\fP(3X)
++menu_opts 	\fBmenu_opts\fP(3X)
++menu_opts_off	\fBmenu_opts\fP(3X)
++menu_opts_on	\fBmenu_opts\fP(3X)
++menu_pad  	\fBmenu_attributes\fP(3X)
++menu_pattern	\fBmenu_pattern\fP(3X)
++menu_request_by_name	\fBmenu_requestname\fP(3X)
++menu_request_name	\fBmenu_requestname\fP(3X)
++menu_spacing	\fBmenu_spacing\fP(3X)
++menu_sub  	\fBmenu_win\fP(3X)
++menu_term 	\fBmenu_hook\fP(3X)
++menu_userptr	\fBmenu_userptr\fP(3X)
++menu_win  	\fBmenu_win\fP(3X)
++new_item  	\fBmitem_new\fP(3X)
++new_menu  	\fBmenu_new\fP(3X)
++pos_menu_cursor	\fBmenu_cursor\fP(3X)
++post_menu 	\fBmenu_post\fP(3X)
++scale_menu	\fBmenu_win\fP(3X)
++set_current_item	\fBmitem_current\fP(3X)
++set_item_init	\fBmenu_hook\fP(3X)
++set_item_opts	\fBmitem_opts\fP(3X)
++set_item_term	\fBmenu_hook\fP(3X)
++set_item_userptr	\fBmitem_userptr\fP(3X)
++set_item_value	\fBmitem_value\fP(3X)
++set_menu_back	\fBmenu_attributes\fP(3X)
++set_menu_fore	\fBmenu_attributes\fP(3X)
++set_menu_format	\fBmenu_format\fP(3X)
++set_menu_grey	\fBmenu_attributes\fP(3X)
++set_menu_init	\fBmenu_hook\fP(3X)
++set_menu_items	\fBmenu_items\fP(3X)
++set_menu_mark	\fBmenu_mark\fP(3X)
++set_menu_opts	\fBmitem_opts\fP(3X)
++set_menu_pad	\fBmenu_attributes\fP(3X)
++set_menu_pattern	\fBmenu_pattern\fP(3X)
++set_menu_spacing	\fBmenu_spacing\fP(3X)
++set_menu_sub	\fBmenu_win\fP(3X)
++set_menu_term	\fBmenu_hook\fP(3X)
++set_menu_userptr	\fBmenu_userptr\fP(3X)
++set_menu_win	\fBmenu_win\fP(3X)
++set_top_row	\fBmitem_current\fP(3X)
++top_row   	\fBmitem_current\fP(3X)
++unpost_menu	\fBmenu_post\fP(3X)
+ .TE
+ .SH RETURN VALUE
+-Routines that return pointers return \fBNULL\fR on error.
++Routines that return pointers return \fBNULL\fP on error.
+ Routines that return
+ an integer return one of the following error codes:
+ .TP 5
+@@ -176,13 +176,13 @@
+ The menu driver could not process the request.
+ .TP 5
+ .B E_SYSTEM_ERROR
+-System error occurred (see \fBerrno\fR(3)).
++System error occurred (see \fBerrno\fP(3)).
+ .TP 5
+ .B E_UNKNOWN_COMMAND
+ The menu driver code saw an unknown request code.
+ .SH NOTES
+-The header file \fB\fR automatically includes the header files
+-\fB\fR and \fB\fR.
++The header file \fB\fP automatically includes the header files
++\fB\fP and \fB\fP.
+ .PP
+ In your library list, libmenu.a should be before libncurses.a; that is,
+ you should say \*(``\-lmenu \-lncurses\*('', not the other way around
+@@ -206,8 +206,8 @@
+ Juergen Pfeifer.
+ Manual pages and adaptation for ncurses by Eric S. Raymond.
+ .SH SEE ALSO
+-\fBcurses\fR(3X) and related pages whose names begin \*(``menu_\*(''
++\fBcurses\fP(3X) and related pages whose names begin \*(``menu_\*(''
+ for detailed descriptions of the entry points.
+ .PP
+-This describes \fBncurses\fR
++This describes \fBncurses\fP
+ version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
+Index: man/menu_attributes.3x
+Prereq:  1.19 
+--- ncurses-6.3-20211219+/man/menu_attributes.3x	2020-10-17 23:58:58.000000000 +0000
++++ ncurses-6.3-20211225/man/menu_attributes.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,23 +28,23 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_attributes.3x,v 1.19 2020/10/17 23:58:58 tom Exp $
++.\" $Id: menu_attributes.3x,v 1.21 2021/12/25 21:49:32 tom Exp $
+ .TH menu_attributes 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+ .ie \n(.g .ds '' \(rq
+ .el       .ds '' ''
+ .SH NAME
+-\fBmenu_back\fR,
+-\fBmenu_fore\fR,
+-\fBmenu_grey\fR,
+-\fBmenu_pad\fR,
+-\fBset_menu_back\fR,
+-\fBset_menu_fore\fR,
+-\fBset_menu_grey\fR,
+-\fBset_menu_pad\fR \- color and attribute control for menus
++\fBmenu_back\fP,
++\fBmenu_fore\fP,
++\fBmenu_grey\fP,
++\fBmenu_pad\fP,
++\fBset_menu_back\fP,
++\fBset_menu_fore\fP,
++\fBset_menu_grey\fP,
++\fBset_menu_pad\fP \- color and attribute control for menus
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBint set_menu_fore(MENU *\fP\fImenu\fP\fB, chtype \fP\fIattr\fP\fB);\fP
+ .br
+@@ -63,28 +63,28 @@
+ \fBint menu_pad(const MENU *\fP\fImenu\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-The function \fBset_menu_fore\fR sets the foreground attribute of
+-\fImenu\fR. This is the highlight used for selected menu items.
+-\fBmenu_fore\fR returns the foreground attribute.
++The function \fBset_menu_fore\fP sets the foreground attribute of
++\fImenu\fP. This is the highlight used for selected menu items.
++\fBmenu_fore\fP returns the foreground attribute.
+ The default
+-is \fBA_REVERSE\fR.
++is \fBA_REVERSE\fP.
+ .PP
+-The function \fBset_menu_back\fR sets the background attribute of
+-\fImenu\fR. This is the highlight used for selectable (but not currently
++The function \fBset_menu_back\fP sets the background attribute of
++\fImenu\fP. This is the highlight used for selectable (but not currently
+ selected) menu items.
+-The function \fBmenu_back\fR returns the background
++The function \fBmenu_back\fP returns the background
+ attribute.
+-The default is \fBA_NORMAL\fR.
++The default is \fBA_NORMAL\fP.
+ .PP
+-The function \fBset_menu_grey\fR sets the grey attribute of \fImenu\fR. This is
++The function \fBset_menu_grey\fP sets the grey attribute of \fImenu\fP. This is
+ the highlight used for un-selectable menu items in menus that permit more than
+ one selection.
+-The function \fBmenu_grey\fR returns the grey attribute.
+-The default is \fBA_UNDERLINE\fR.
++The function \fBmenu_grey\fP returns the grey attribute.
++The default is \fBA_UNDERLINE\fP.
+ .PP
+-The function \fBset_menu_pad\fR sets the character used to fill the space
++The function \fBset_menu_pad\fP sets the character used to fill the space
+ between the name and description parts of a menu item.
+-\fBmenu_pad\fR returns
++\fBmenu_pad\fP returns
+ the given menu's pad character.
+ The default is a blank.
+ .SH RETURN VALUE
+@@ -94,16 +94,16 @@
+ The routine succeeded.
+ .TP 5
+ .B E_SYSTEM_ERROR
+-System error occurred (see \fBerrno\fR(3)).
++System error occurred (see \fBerrno\fP(3)).
+ .TP 5
+ .B E_BAD_ARGUMENT
+ Routine detected an incorrect or out-of-range argument.
+ .SH SEE ALSO
+-\fBcurses\fR(3X) and related pages whose names begin \*(``menu_\*('' for detailed
++\fBcurses\fP(3X) and related pages whose names begin \*(``menu_\*('' for detailed
+ descriptions of the entry points.
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V menu library.
+ They were not supported on
+Index: man/menu_cursor.3x
+Prereq:  1.13 
+--- ncurses-6.3-20211219+/man/menu_cursor.3x	2020-10-17 23:41:31.000000000 +0000
++++ ncurses-6.3-20211225/man/menu_cursor.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,19 +28,19 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_cursor.3x,v 1.13 2020/10/17 23:41:31 tom Exp $
++.\" $Id: menu_cursor.3x,v 1.15 2021/12/25 21:49:32 tom Exp $
+ .TH menu_cursor 3X ""
+ .SH NAME
+-\fBpos_menu_cursor\fR \- position a menu's cursor
++\fBpos_menu_cursor\fP \- position a menu's cursor
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBint pos_menu_cursor(const MENU *\fP\fImenu\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-The function \fBpos_menu_cursor\fR restores the cursor to the current position
++The function \fBpos_menu_cursor\fP restores the cursor to the current position
+ associated with the menu's selected item.
+-This is useful after \fBcurses\fR
++This is useful after \fBcurses\fP
+ routines have been called to do screen-painting in response to a menu select.
+ .SH RETURN VALUE
+ This routine returns one of the following:
+@@ -49,7 +49,7 @@
+ The routine succeeded.
+ .TP 5
+ .B E_SYSTEM_ERROR
+-System error occurred (see \fBerrno\fR(3)).
++System error occurred (see \fBerrno\fP(3)).
+ .TP 5
+ .B E_BAD_ARGUMENT
+ Routine detected an incorrect or out-of-range argument.
+@@ -57,10 +57,10 @@
+ .B E_NOT_POSTED
+ The menu has not been posted.
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBmenu\fR(3X).
++\fBcurses\fP(3X), \fBmenu\fP(3X).
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V menu library.
+ They were not supported on
+Index: man/menu_driver.3x
+Prereq:  1.28 
+--- ncurses-6.3-20211219+/man/menu_driver.3x	2020-12-19 21:33:37.000000000 +0000
++++ ncurses-6.3-20211225/man/menu_driver.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,22 +27,22 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_driver.3x,v 1.28 2020/12/19 21:33:37 tom Exp $
++.\" $Id: menu_driver.3x,v 1.30 2021/12/25 21:49:32 tom Exp $
+ .TH menu_driver 3X ""
+ .de bP
+ .ie n  .IP \(bu 4
+ .el    .IP \(bu 2
+ ..
+ .SH NAME
+-\fBmenu_driver\fR \- command-processing loop of the menu system
++\fBmenu_driver\fP \- command-processing loop of the menu system
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBint menu_driver(MENU *\fP\fImenu\fP\fB, int \fP\fIc\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+ Once a menu has been posted (displayed), you should funnel input events to it
+-through \fBmenu_driver\fR.  This routine has three major input cases:
++through \fBmenu_driver\fP.  This routine has three major input cases:
+ .bP
+ The input is a form navigation request.
+ Navigation request codes are constants defined in \fB\fP,
+@@ -111,8 +111,8 @@
+ If the second argument is a printable character, the code appends
+ it to the pattern buffer and attempts to move to the next item matching
+ the new pattern.
+-If there is no such match, \fBmenu_driver\fR returns
+-\fBE_NO_MATCH\fR and deletes the appended character from the buffer.
++If there is no such match, \fBmenu_driver\fP returns
++\fBE_NO_MATCH\fP and deletes the appended character from the buffer.
+ .PP
+ If the second argument is one of the above pre-defined requests, the
+ corresponding action is performed.
+@@ -144,7 +144,7 @@
+ the menu cursor is positioned to that item.
+ .bP
+ If you double-click an item a REQ_TOGGLE_ITEM
+-is generated and \fBE_UNKNOWN_COMMAND\fR is returned.
++is generated and \fBE_UNKNOWN_COMMAND\fP is returned.
+ This return value makes sense,
+ because a double click usually means that an item-specific action should
+ be returned.
+@@ -152,27 +152,27 @@
+ application specific command should be executed.
+ .bP
+ If a translation
+-into a request was done, \fBmenu_driver\fR returns the result of this request.
++into a request was done, \fBmenu_driver\fP returns the result of this request.
+ .PP
+ If you clicked outside the user window
+ or the mouse event could not be translated
+-into a menu request an \fBE_REQUEST_DENIED\fR is returned.
++into a menu request an \fBE_REQUEST_DENIED\fP is returned.
+ .SS APPLICATION-DEFINED COMMANDS
+ .PP
+ If the second argument is neither printable nor one of the above
+ pre-defined menu requests or KEY_MOUSE,
+ the drive assumes it is an application-specific
+-command and returns \fBE_UNKNOWN_COMMAND\fR.  Application-defined commands
+-should be defined relative to \fBMAX_COMMAND\fR, the maximum value of these
++command and returns \fBE_UNKNOWN_COMMAND\fP.  Application-defined commands
++should be defined relative to \fBMAX_COMMAND\fP, the maximum value of these
+ pre-defined requests.
+ .SH RETURN VALUE
+-\fBmenu_driver\fR return one of the following error codes:
++\fBmenu_driver\fP return one of the following error codes:
+ .TP 5
+ .B E_OK
+ The routine succeeded.
+ .TP 5
+ .B E_SYSTEM_ERROR
+-System error occurred (see \fBerrno\fR(3)).
++System error occurred (see \fBerrno\fP(3)).
+ .TP 5
+ .B E_BAD_ARGUMENT
+ Routine detected an incorrect or out-of-range argument.
+@@ -192,12 +192,12 @@
+ .B E_REQUEST_DENIED
+ The menu driver could not process the request.
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBgetch\fR(3X),
+-\fBmenu\fR(3X).
++\fBcurses\fP(3X),
++\fBgetch\fP(3X),
++\fBmenu\fP(3X).
+ .SH NOTES
+-The header file \fB\fR automatically includes the header files
+-\fB\fR.
++The header file \fB\fP automatically includes the header files
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V menu library.
+ They were not supported on
+Index: man/menu_format.3x
+Prereq:  1.18 
+--- ncurses-6.3-20211219+/man/menu_format.3x	2020-10-17 23:43:11.000000000 +0000
++++ ncurses-6.3-20211225/man/menu_format.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,35 +28,35 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_format.3x,v 1.18 2020/10/17 23:43:11 tom Exp $
++.\" $Id: menu_format.3x,v 1.20 2021/12/25 21:49:32 tom Exp $
+ .TH menu_format 3X ""
+ .SH NAME
+ \fBset_menu_format\fP,
+ \fBmenu_format\fP \- set and get menu sizes
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBint set_menu_format(MENU *\fP\fImenu\fP\fB, int \fP\fIrows\fP\fB, int \fP\fIcols\fP\fB);\fP
+ .br
+ \fBvoid menu_format(const MENU *\fP\fImenu\fP\fB, int *\fP\fIrows\fP\fB, int *\fP\fIcols\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-The function \fBset_menu_format\fR sets the maximum display size of the given
++The function \fBset_menu_format\fP sets the maximum display size of the given
+ menu.
+ If this size is too small to display all menu items, the menu will be
+ made scrollable.
+ If this size is larger than the menus subwindow and the
+-subwindow is too small to display all menu items, \fBpost_menu\fR will fail.
++subwindow is too small to display all menu items, \fBpost_menu\fP will fail.
+ .PP
+ The default format is 16 rows, 1 column.
+-Calling \fBset_menu_format\fR with a
++Calling \fBset_menu_format\fP with a
+ null menu pointer will change this default.
+ A zero row or column argument to
+-\fBset_menu_format\fR is interpreted as a request not to change the current
++\fBset_menu_format\fP is interpreted as a request not to change the current
+ value.
+ .PP
+-The function \fBmenu_format\fR returns the maximum-size constraints for the
+-given menu into the storage addressed by \fBrows\fR and \fBcols\fR.
++The function \fBmenu_format\fP returns the maximum-size constraints for the
++given menu into the storage addressed by \fBrows\fP and \fBcols\fP.
+ .SH RETURN VALUE
+ These routines returns one of the following:
+ .TP 5
+@@ -64,7 +64,7 @@
+ The routine succeeded.
+ .TP 5
+ .B E_SYSTEM_ERROR
+-System error occurred (see \fBerrno\fR(3)).
++System error occurred (see \fBerrno\fP(3)).
+ .TP 5
+ .B E_BAD_ARGUMENT
+ Routine detected an incorrect or out-of-range argument.
+@@ -75,10 +75,10 @@
+ .B E_NOT_CONNECTED
+ No items are connected to the menu.
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBmenu\fR(3X).
++\fBcurses\fP(3X), \fBmenu\fP(3X).
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V menu library.
+ They were not supported on
+Index: man/menu_hook.3x
+Prereq:  1.15 
+--- ncurses-6.3-20211219+/man/menu_hook.3x	2020-10-17 23:44:57.000000000 +0000
++++ ncurses-6.3-20211225/man/menu_hook.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,12 +28,12 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_hook.3x,v 1.15 2020/10/17 23:44:57 tom Exp $
++.\" $Id: menu_hook.3x,v 1.17 2021/12/25 21:49:32 tom Exp $
+ .TH menu_hook 3X ""
+ .SH NAME
+-\fBmenu_hook\fR \- set hooks for automatic invocation by applications
++\fBmenu_hook\fP \- set hooks for automatic invocation by applications
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBint set_item_init(MENU *\fP\fImenu\fP\fB, Menu_Hook \fP\fIfunc);\fP
+ .br
+@@ -53,32 +53,32 @@
+ .br
+ .SH DESCRIPTION
+ These functions make it possible to set hook functions to be called at various
+-points in the automatic processing of input event codes by \fBmenu_driver\fR.
++points in the automatic processing of input event codes by \fBmenu_driver\fP.
+ .PP
+-The function \fBset_item_init\fR sets a hook to be called at menu-post time and
++The function \fBset_item_init\fP sets a hook to be called at menu-post time and
+ each time the selected item changes (after the change).
+-\fBitem_init\fR
+-returns the current item init hook, if any (\fBNULL\fR if there is no such
++\fBitem_init\fP
++returns the current item init hook, if any (\fBNULL\fP if there is no such
+ hook).
+ .PP
+-The function \fBset_item_term\fR sets a hook to be called at menu-unpost time
++The function \fBset_item_term\fP sets a hook to be called at menu-unpost time
+ and each time the selected item changes (before the change).
+-\fBitem_term\fR
+-returns the current item term hook, if any (\fBNULL\fR if there is no such
++\fBitem_term\fP
++returns the current item term hook, if any (\fBNULL\fP if there is no such
+ hook).
+ .PP
+-The function \fBset_menu_init\fR sets a hook to be called at menu-post time and
++The function \fBset_menu_init\fP sets a hook to be called at menu-post time and
+ just after the top row on the menu changes once it is posted.
+-\fBmenu_init\fR
+-returns the current menu init hook, if any (\fBNULL\fR if there is no such
++\fBmenu_init\fP
++returns the current menu init hook, if any (\fBNULL\fP if there is no such
+ hook).
+ .PP
+-The function \fBset_menu_term\fR sets a hook to be called at menu-unpost time
++The function \fBset_menu_term\fP sets a hook to be called at menu-unpost time
+ and just before the top row on the menu changes once it is posted.
+-\fBmenu_term\fR returns the current menu term hook, if any (\fBNULL\fR if there
++\fBmenu_term\fP returns the current menu term hook, if any (\fBNULL\fP if there
+ is no such hook).
+ .SH RETURN VALUE
+-Routines that return pointers return \fBNULL\fR on error.
++Routines that return pointers return \fBNULL\fP on error.
+ Other routines
+ return one of the following:
+ .TP 5
+@@ -86,12 +86,12 @@
+ The routine succeeded.
+ .TP 5
+ .B E_SYSTEM_ERROR
+-System error occurred (see \fBerrno\fR(3)).
++System error occurred (see \fBerrno\fP(3)).
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBmenu\fR(3X).
++\fBcurses\fP(3X), \fBmenu\fP(3X).
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V menu library.
+ They were not supported on
+Index: man/menu_items.3x
+Prereq:  1.17 
+--- ncurses-6.3-20211219+/man/menu_items.3x	2020-10-24 09:00:06.000000000 +0000
++++ ncurses-6.3-20211225/man/menu_items.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2012,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,14 +28,14 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_items.3x,v 1.17 2020/10/24 09:00:06 tom Exp $
++.\" $Id: menu_items.3x,v 1.19 2021/12/25 21:49:32 tom Exp $
+ .TH menu_items 3X ""
+ .SH NAME
+-\fBset_menu_items\fR,
+-\fBmenu_items\fR,
++\fBset_menu_items\fP,
++\fBmenu_items\fP,
+ \fBitem_count\fP \- make and break connections between items and menus
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBint set_menu_items(MENU *\fP\fImenu\fP\fB, ITEM **\fP\fIitems\fP\fB);\fP
+ .br
+@@ -44,20 +44,20 @@
+ \fBint item_count(const MENU *\fP\fImenu\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-The function \fBset_menu_items\fR changes the item pointer array of the given
+-\fImenu\fR.  The array must be terminated by a \fBNULL\fR.
++The function \fBset_menu_items\fP changes the item pointer array of the given
++\fImenu\fP.  The array must be terminated by a \fBNULL\fP.
+ .PP
+-The function \fBmenu_items\fR returns the item array of the given menu.
++The function \fBmenu_items\fP returns the item array of the given menu.
+ .PP
+-The function \fBitem_count\fR returns the count of items in \fImenu\fR.
++The function \fBitem_count\fP returns the count of items in \fImenu\fP.
+ .SH RETURN VALUE
+-The function \fBmenu_items\fR returns a pointer (which may be \fBNULL\fR).
++The function \fBmenu_items\fP returns a pointer (which may be \fBNULL\fP).
+ It does not set \fBerrno\fP.
+ .PP
+-The function \fBitem_count\fR returns \fBERR\fR (the general \fBcurses\fR error
++The function \fBitem_count\fP returns \fBERR\fP (the general \fBcurses\fP error
+ return value) if its \fImenu\fP parameter is \fBNULL\fP.
+ .PP
+-The function \fBset_menu_items\fR returns one of the following codes on error:
++The function \fBset_menu_items\fP returns one of the following codes on error:
+ .TP 5
+ .B E_OK
+ The routine succeeded.
+@@ -72,20 +72,20 @@
+ The menu is already posted.
+ .TP 5
+ .B E_SYSTEM_ERROR
+-System error occurred (see \fBerrno\fR(3)).
++System error occurred (see \fBerrno\fP(3)).
+ .
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBmenu\fR(3X).
++\fBcurses\fP(3X), \fBmenu\fP(3X).
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V menu library.
+ They were not supported on
+ Version 7 or BSD versions.
+ .PP
+-The SVr4 menu library documentation specifies the \fBitem_count\fR error value
+-as \-1 (which is the value of \fBERR\fR).
++The SVr4 menu library documentation specifies the \fBitem_count\fP error value
++as \-1 (which is the value of \fBERR\fP).
+ .SH AUTHORS
+ Juergen Pfeifer.
+ Manual pages and adaptation for new curses by Eric S. Raymond.
+Index: man/menu_mark.3x
+Prereq:  1.18 
+--- ncurses-6.3-20211219+/man/menu_mark.3x	2020-10-24 08:59:04.000000000 +0000
++++ ncurses-6.3-20211225/man/menu_mark.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,13 +28,13 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_mark.3x,v 1.18 2020/10/24 08:59:04 tom Exp $
++.\" $Id: menu_mark.3x,v 1.20 2021/12/25 21:49:32 tom Exp $
+ .TH menu_mark 3X ""
+ .SH NAME
+ \fBset_menu_mark\fP,
+-\fBmenu_mark\fR \- get and set the menu mark string
++\fBmenu_mark\fP \- get and set the menu mark string
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBint set_menu_mark(MENU *\fP\fImenu\fP\fB, const char *\fP\fImark\fP\fB);\fP
+ .br
+@@ -45,22 +45,22 @@
+ highlighting or color capability, the menu library marks selected items
+ in a menu with a prefix string.
+ .PP
+-The function \fBset_menu_mark\fR sets the mark string for the given menu.
+-Calling \fBset_menu_mark\fR with a null menu item will abolish the mark string.
++The function \fBset_menu_mark\fP sets the mark string for the given menu.
++Calling \fBset_menu_mark\fP with a null menu item will abolish the mark string.
+ Note that changing the length of the mark string for a menu while the
+ menu is posted is likely to produce unhelpful behavior.
+ .PP
+ The default string is "\-" (a dash).
+-Calling \fBset_menu_mark\fR with
+-a non-\fBNULL\fR menu argument will change this default.
++Calling \fBset_menu_mark\fP with
++a non-\fBNULL\fP menu argument will change this default.
+ .PP
+-The function \fBmenu_mark\fR returns the menu's mark string (or \fBNULL\fR if
++The function \fBmenu_mark\fP returns the menu's mark string (or \fBNULL\fP if
+ there is none).
+ .SH RETURN VALUE
+-The function \fBmenu_mark\fR returns a pointer (which may be \fBNULL\fR).
++The function \fBmenu_mark\fP returns a pointer (which may be \fBNULL\fP).
+ It does not set \fBerrno\fP.
+ .PP
+-The function \fBset_menu_mark\fR may return the following error codes:
++The function \fBset_menu_mark\fP may return the following error codes:
+ .TP 5
+ .B E_OK
+ The routine succeeded.
+@@ -69,12 +69,12 @@
+ Routine detected an incorrect or out-of-range argument.
+ .TP 5
+ .B E_SYSTEM_ERROR
+-System error occurred (see \fBerrno\fR(3)).
++System error occurred (see \fBerrno\fP(3)).
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBmenu\fR(3X).
++\fBcurses\fP(3X), \fBmenu\fP(3X).
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V menu library.
+ They were not supported on
+Index: man/menu_new.3x
+Prereq:  1.18 
+--- ncurses-6.3-20211219+/man/menu_new.3x	2020-10-24 08:57:51.000000000 +0000
++++ ncurses-6.3-20211225/man/menu_new.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,26 +28,26 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_new.3x,v 1.18 2020/10/24 08:57:51 tom Exp $
++.\" $Id: menu_new.3x,v 1.20 2021/12/25 21:49:32 tom Exp $
+ .TH menu_new 3X ""
+ .SH NAME
+ \fBnew_menu\fP,
+-\fBfree_menu\fR \- create and destroy menus
++\fBfree_menu\fP \- create and destroy menus
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBMENU *new_menu(ITEM **\fP\fIitems\fP\fB);\fP
+ .br
+ \fBint free_menu(MENU *\fP\fImenu\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-The function \fBnew_menu\fR creates a new menu connected to a specified item
+-pointer array (which must be \fBNULL\fR-terminated).
++The function \fBnew_menu\fP creates a new menu connected to a specified item
++pointer array (which must be \fBNULL\fP-terminated).
+ .PP
+-The function \fBfree_menu\fR disconnects \fImenu\fR from its item array
++The function \fBfree_menu\fP disconnects \fImenu\fP from its item array
+ and frees the storage allocated for the menu.
+ .SH RETURN VALUE
+-The function \fBnew_menu\fR returns \fBNULL\fR on error.
++The function \fBnew_menu\fP returns \fBNULL\fP on error.
+ It sets \fBerrno\fP according to the function's failure:
+ .TP 5
+ .B E_NOT_CONNECTED
+@@ -56,13 +56,13 @@
+ .B E_SYSTEM_ERROR
+ System error occurred, e.g., malloc failure.
+ .PP
+-The function \fBfree_menu\fR returns one of the following:
++The function \fBfree_menu\fP returns one of the following:
+ .TP 5
+ .B E_OK
+ The routine succeeded.
+ .TP 5
+ .B E_SYSTEM_ERROR
+-System error occurred (see \fBerrno\fR(3)).
++System error occurred (see \fBerrno\fP(3)).
+ .TP 5
+ .B E_BAD_ARGUMENT
+ Routine detected an incorrect or out-of-range argument.
+@@ -70,10 +70,10 @@
+ .B E_POSTED
+ The menu has already been posted.
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBmenu\fR(3X).
++\fBcurses\fP(3X), \fBmenu\fP(3X).
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V menu library.
+ They were not supported on
+Index: man/menu_opts.3x
+Prereq:  1.18 
+--- ncurses-6.3-20211219+/man/menu_opts.3x	2020-10-17 23:46:35.000000000 +0000
++++ ncurses-6.3-20211225/man/menu_opts.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,15 +28,15 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_opts.3x,v 1.18 2020/10/17 23:46:35 tom Exp $
++.\" $Id: menu_opts.3x,v 1.20 2021/12/25 21:49:32 tom Exp $
+ .TH menu_opts 3X ""
+ .SH NAME
+ \fBset_menu_opts\fP,
+ \fBmenu_opts_on\fP,
+ \fBmenu_opts_off\fP,
+-\fBmenu_opts\fR \- set and get menu options
++\fBmenu_opts\fP \- set and get menu options
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBint set_menu_opts(MENU *\fP\fImenu\fP\fB, Menu_Options \fP\fIopts\fP\fB);\fP
+ .br
+@@ -47,16 +47,16 @@
+ \fBint menu_opts_off(MENU *\fP\fImenu\fP\fB, Menu_Options \fP\fIopts\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-The function \fBset_menu_opts\fR sets all the given menu's option bits (menu
++The function \fBset_menu_opts\fP sets all the given menu's option bits (menu
+ option bits may be logically-OR'ed together).
+ .PP
+-The function \fBmenu_opts_on\fR turns on the given option bits, and leaves
++The function \fBmenu_opts_on\fP turns on the given option bits, and leaves
+ others alone.
+ .PP
+-The function \fBmenu_opts_off\fR turns off the given option bits, and leaves
++The function \fBmenu_opts_off\fP turns off the given option bits, and leaves
+ others alone.
+ .PP
+-The function \fBmenu_opts\fR returns the menu's current option bits.
++The function \fBmenu_opts\fP returns the menu's current option bits.
+ .PP
+ The following options are defined (all are on by default):
+ .TP 5
+@@ -85,21 +85,21 @@
+ push \fBKEY_MOUSE\fP and the \fBMEVENT\fP data
+ back on the queue to allow processing in another part of the calling program.
+ .SH RETURN VALUE
+-Except for \fBmenu_opts\fR, each routine returns one of the following:
++Except for \fBmenu_opts\fP, each routine returns one of the following:
+ .TP 5
+ .B E_OK
+ The routine succeeded.
+ .TP 5
+ .B E_SYSTEM_ERROR
+-System error occurred (see \fBerrno\fR(3)).
++System error occurred (see \fBerrno\fP(3)).
+ .TP 5
+ .B E_POSTED
+ The menu is already posted.
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBmenu\fR(3X).
++\fBcurses\fP(3X), \fBmenu\fP(3X).
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V menu library.
+ They were not supported on
+Index: man/menu_pattern.3x
+Prereq:  1.21 
+--- ncurses-6.3-20211219+/man/menu_pattern.3x	2020-10-18 00:41:14.000000000 +0000
++++ ncurses-6.3-20211225/man/menu_pattern.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,13 +27,13 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_pattern.3x,v 1.21 2020/10/18 00:41:14 tom Exp $
++.\" $Id: menu_pattern.3x,v 1.23 2021/12/25 21:49:32 tom Exp $
+ .TH menu_pattern 3X ""
+ .SH NAME
+ \fBset_menu_pattern\fP,
+-\fBmenu_pattern\fR \- set and get a menu's pattern buffer
++\fBmenu_pattern\fP \- set and get a menu's pattern buffer
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBint set_menu_pattern(MENU *\fP\fImenu\fP\fB, const char *\fP\fIpattern\fP\fB);\fP
+ .br
+@@ -43,23 +43,23 @@
+ Every menu has an associated pattern match buffer.
+ As input events that are
+ printable characters come in, they are appended to this match buffer
+-and tested for a match, as described in \fBmenu_driver\fR(3X).
++and tested for a match, as described in \fBmenu_driver\fP(3X).
+ .PP
+-The function \fBset_menu_pattern\fR sets the pattern buffer for the given menu
++The function \fBset_menu_pattern\fP sets the pattern buffer for the given menu
+ and tries to find the first matching item.
+ If it succeeds, that item becomes
+ current; if not, the current item does not change.
+ .PP
+-The function \fBmenu_pattern\fR returns the pattern buffer of the given
+-\fImenu\fR.
++The function \fBmenu_pattern\fP returns the pattern buffer of the given
++\fImenu\fP.
+ .SH RETURN VALUE
+-The function \fBmenu_pattern\fR returns a pointer,
+-which is \fBNULL\fR if the \fImenu\fP parameter is \fBNULL\fP.
++The function \fBmenu_pattern\fP returns a pointer,
++which is \fBNULL\fP if the \fImenu\fP parameter is \fBNULL\fP.
+ Otherwise, it is a pointer to a string which is empty
+ if no pattern has been set.
+ It does not set \fBerrno\fP.
+ .PP
+-The function \fBset_menu_pattern\fR may return the following error codes:
++The function \fBset_menu_pattern\fP may return the following error codes:
+ .TP 5
+ .B E_OK
+ The routine succeeded.
+@@ -77,12 +77,12 @@
+ Character failed to match.
+ .TP 5
+ .B E_SYSTEM_ERROR
+-System error occurred (see \fBerrno\fR(3)).
++System error occurred (see \fBerrno\fP(3)).
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBmenu\fR(3X).
++\fBcurses\fP(3X), \fBmenu\fP(3X).
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V menu library.
+ They were not supported on
+Index: man/menu_post.3x
+Prereq:  1.19 
+--- ncurses-6.3-20211219+/man/menu_post.3x	2020-10-17 23:47:21.000000000 +0000
++++ ncurses-6.3-20211225/man/menu_post.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,28 +28,28 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_post.3x,v 1.19 2020/10/17 23:47:21 tom Exp $
++.\" $Id: menu_post.3x,v 1.21 2021/12/25 21:49:32 tom Exp $
+ .TH menu_post 3X ""
+ .SH NAME
+-\fBpost_menu\fR,
+-\fBunpost_menu\fR \- write or erase menus from associated subwindows
++\fBpost_menu\fP,
++\fBunpost_menu\fP \- write or erase menus from associated subwindows
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBint post_menu(MENU *\fP\fImenu\fP\fB);\fP
+ .br
+ \fBint unpost_menu(MENU *\fP\fImenu\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-The function \fBpost_menu\fR displays a menu to its associated subwindow.
++The function \fBpost_menu\fP displays a menu to its associated subwindow.
+ To
+ trigger physical display of the subwindow,
+-use \fBrefresh\fR(3X) or some equivalent
+-\fBcurses\fR routine (the implicit \fBdoupdate\fR triggered by an \fBcurses\fR
++use \fBrefresh\fP(3X) or some equivalent
++\fBcurses\fP routine (the implicit \fBdoupdate\fP triggered by an \fBcurses\fP
+ input request will do).
+-\fBpost_menu\fR resets the selection status of all items.
++\fBpost_menu\fP resets the selection status of all items.
+ .PP
+-The function \fBunpost_menu\fR erases menu from its associated subwindow.
++The function \fBunpost_menu\fP erases menu from its associated subwindow.
+ .SH RETURN VALUE
+ These routines return one of the following:
+ .TP 5
+@@ -57,7 +57,7 @@
+ The routine succeeded.
+ .TP 5
+ .B E_SYSTEM_ERROR
+-System error occurred (see \fBerrno\fR(3)).
++System error occurred (see \fBerrno\fP(3)).
+ .TP 5
+ .B E_BAD_ARGUMENT
+ Routine detected an incorrect or out-of-range argument.
+@@ -70,7 +70,7 @@
+ .TP 5
+ .B E_NO_ROOM
+ Menu is too large for its window.
+-You should consider using \fBset_menu_format\fR to solve the problem.
++You should consider using \fBset_menu_format\fP to solve the problem.
+ .TP 5
+ .B E_NOT_POSTED
+ The menu has not been posted.
+@@ -78,10 +78,10 @@
+ .B E_NOT_CONNECTED
+ No items are connected to the menu.
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBmenu\fR(3X).
++\fBcurses\fP(3X), \fBmenu\fP(3X).
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V menu library.
+ They were not supported on
+Index: man/menu_requestname.3x
+Prereq:  1.15 
+--- ncurses-6.3-20211219+/man/menu_requestname.3x	2020-10-18 00:40:34.000000000 +0000
++++ ncurses-6.3-20211225/man/menu_requestname.3x	2021-12-25 21:42:57.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018,2020 Thomas E. Dickey                                     *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,36 +28,36 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_requestname.3x,v 1.15 2020/10/18 00:40:34 tom Exp $
++.\" $Id: menu_requestname.3x,v 1.17 2021/12/25 21:42:57 tom Exp $
+ .TH menu_requestname 3X ""
+ .SH NAME
+ \fBmenu_request_by_name\fP,
+-\fBmenu_request_name\fR \- handle printable menu request names
++\fBmenu_request_name\fP \- handle printable menu request names
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBconst char *menu_request_name(int \fP\fIrequest\fP\fB);\fP
+ .br
+ \fBint menu_request_by_name(const char *\fP\fIname\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-The function \fBmenu_request_name\fR returns the printable name of a menu
++The function \fBmenu_request_name\fP returns the printable name of a menu
+ request code.
+ .br
+-The function \fBmenu_request_by_name\fR searches in the name-table for a request
++The function \fBmenu_request_by_name\fP searches in the name-table for a request
+ with the given name and returns its request code.
+ Otherwise E_NO_MATCH is returned.
+ .SH RETURN VALUE
+-\fBmenu_request_name\fR returns \fBNULL\fR on error
+-and sets \fBerrno\fP to \fBE_BAD_ARGUMENT\fR.
++\fBmenu_request_name\fP returns \fBNULL\fP on error
++and sets \fBerrno\fP to \fBE_BAD_ARGUMENT\fP.
+ .br
+-\fBmenu_request_by_name\fR returns \fBE_NO_MATCH\fR on error.
++\fBmenu_request_by_name\fP returns \fBE_NO_MATCH\fP on error.
+ It does not set \fBerrno\fP.
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBmenu\fR(3X).
++\fBcurses\fP(3X), \fBmenu\fP(3X).
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines are specific to ncurses.
+ They were not supported on
+Index: man/menu_spacing.3x
+Prereq:  1.17 
+--- ncurses-6.3-20211219+/man/menu_spacing.3x	2020-10-17 23:48:53.000000000 +0000
++++ ncurses-6.3-20211225/man/menu_spacing.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,13 +28,13 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_spacing.3x,v 1.17 2020/10/17 23:48:53 tom Exp $
++.\" $Id: menu_spacing.3x,v 1.19 2021/12/25 21:49:32 tom Exp $
+ .TH menu_spacing 3X ""
+ .SH NAME
+ \fBset_menu_spacing\fP,
+-\fBmenu_spacing\fR \- set and get spacing between menu items.
++\fBmenu_spacing\fP \- set and get spacing between menu items.
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBint set_menu_spacing(MENU *\fP\fImenu\fP\fB,\fP
+                      \fBint \fP\fIspc_description\fP\fB,\fP
+@@ -47,40 +47,40 @@
+                  \fBint* \fP\fIspc_columns\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-The function \fBset_menu_spacing\fR sets the spacing information for the menu.
+-Its parameter \fBspc_description\fR controls the number of spaces
++The function \fBset_menu_spacing\fP sets the spacing information for the menu.
++Its parameter \fBspc_description\fP controls the number of spaces
+ between an item name and an item description.
+-It must not be larger than \fBTABSIZE\fR.
++It must not be larger than \fBTABSIZE\fP.
+ The menu system puts in the
+ middle of this spacing area the pad character.
+ The remaining parts are filled with
+ spaces.
+-The \fBspc_rows\fR parameter controls the number of rows
++The \fBspc_rows\fP parameter controls the number of rows
+ that are used for an item.
+ It must not be larger than 3.
+ The menu system inserts the blank lines between item rows, these lines
+ will contain the pad character in the appropriate positions.
+-The \fBspc_columns\fR parameter controls
++The \fBspc_columns\fP parameter controls
+ the number of blanks between columns of items.
+ It must not be larger than \fBTABSIZE\fP.
+ A value of 0 for all the spacing values resets them to the default,
+ which is 1 for all of them.
+ .br
+-The function \fBmenu_spacing\fR passes back the spacing info for the menu.
++The function \fBmenu_spacing\fP passes back the spacing info for the menu.
+ If a
+ pointer is NULL, this specific info is simply not returned.
+ .SH RETURN VALUE
+-Both routines return \fBE_OK\fR on success.
+-\fBset_menu_spacing\fR may return
+-\fBE_POSTED\fR if the menu is posted, or \fBE_BAD_ARGUMENT\fR if one of the
++Both routines return \fBE_OK\fP on success.
++\fBset_menu_spacing\fP may return
++\fBE_POSTED\fP if the menu is posted, or \fBE_BAD_ARGUMENT\fP if one of the
+ spacing values is out of range.
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBcurs_variables\fR(3X),
+-\fBmenu\fR(3X).
++\fBcurses\fP(3X),
++\fBcurs_variables\fP(3X),
++\fBmenu\fP(3X).
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines are specific to ncurses.
+ They were not supported on
+Index: man/menu_userptr.3x
+Prereq:  1.16 
+--- ncurses-6.3-20211219+/man/menu_userptr.3x	2020-10-18 00:39:49.000000000 +0000
++++ ncurses-6.3-20211225/man/menu_userptr.3x	2021-12-25 21:42:57.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018,2020 Thomas E. Dickey                                     *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,13 +28,13 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_userptr.3x,v 1.16 2020/10/18 00:39:49 tom Exp $
++.\" $Id: menu_userptr.3x,v 1.18 2021/12/25 21:42:57 tom Exp $
+ .TH menu_userptr 3X ""
+ .SH NAME
+ \fBset_menu_userptr\fP,
+-\fBmenu_userptr\fR \- associate application data with a menu item
++\fBmenu_userptr\fP \- associate application data with a menu item
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBint set_menu_userptr(MENU *\fP\fImenu\fP\fB, void *\fP\fIuserptr\fP\fB);\fP
+ .br
+@@ -45,15 +45,15 @@
+ application-specific data (that is, the menu-driver code leaves it alone).
+ These functions get and set the menu user pointer field.
+ .SH RETURN VALUE
+-\fBmenu_userptr\fR returns a pointer (which may be \fBNULL\fR).
++\fBmenu_userptr\fP returns a pointer (which may be \fBNULL\fP).
+ It does not set \fBerrno\fP.
+ .PP
+ \fBset_menu_userptr\fP returns \fBE_OK\fP (success).
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBmenu\fR(3X).
++\fBcurses\fP(3X), \fBmenu\fP(3X).
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V menu library.
+ They were not supported on
+Index: man/menu_win.3x
+Prereq:  1.15 
+--- ncurses-6.3-20211219+/man/menu_win.3x	2020-10-17 23:50:51.000000000 +0000
++++ ncurses-6.3-20211225/man/menu_win.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,12 +28,12 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_win.3x,v 1.15 2020/10/17 23:50:51 tom Exp $
++.\" $Id: menu_win.3x,v 1.17 2021/12/25 21:49:32 tom Exp $
+ .TH menu_win 3X ""
+ .SH NAME
+-\fBmenu_win\fR \- make and break menu window and subwindow associations
++\fBmenu_win\fP \- make and break menu window and subwindow associations
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBint set_menu_win(MENU *\fP\fImenu\fP\fB, WINDOW *\fP\fIwin\fP\fB);\fP
+ .br
+@@ -46,23 +46,23 @@
+ \fBint scale_menu(const MENU *\fP\fImenu, int *\fP\fIrows\fP\fB, int *\fP\fIcolumns);\fP
+ .br
+ .SH DESCRIPTION
+-Every menu has an associated pair of \fBcurses\fR windows.
++Every menu has an associated pair of \fBcurses\fP windows.
+ The menu window
+ displays any title and border associated with the window; the menu subwindow
+ displays the items of the menu that are currently available for selection.
+ .PP
+ The first four functions get and set those windows.
+ It is not necessary to set
+-either window; by default, the driver code uses \fBstdscr\fR for both.
++either window; by default, the driver code uses \fBstdscr\fP for both.
+ .PP
+-In the \fBset_\fR functions, window argument of \fBNULL\fR is treated as though
+-it were \fBstsdcr\fR.  A menu argument of \fBNULL\fR is treated as a request
++In the \fBset_\fP functions, window argument of \fBNULL\fP is treated as though
++it were \fBstsdcr\fP.  A menu argument of \fBNULL\fP is treated as a request
+ to change the system default menu window or subwindow.
+ .PP
+-The function \fBscale_menu\fR returns the minimum size required for the
+-subwindow of \fImenu\fR.
++The function \fBscale_menu\fP returns the minimum size required for the
++subwindow of \fImenu\fP.
+ .SH RETURN VALUE
+-Routines that return pointers return \fBNULL\fR on error.
++Routines that return pointers return \fBNULL\fP on error.
+ Routines that return
+ an integer return one of the following error codes:
+ .TP 5
+@@ -70,7 +70,7 @@
+ The routine succeeded.
+ .TP 5
+ .B E_SYSTEM_ERROR
+-System error occurred (see \fBerrno\fR(3)).
++System error occurred (see \fBerrno\fP(3)).
+ .TP 5
+ .B E_BAD_ARGUMENT
+ Routine detected an incorrect or out-of-range argument.
+@@ -81,12 +81,12 @@
+ .B E_NOT_CONNECTED
+ No items are connected to the menu.
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBcurs_variables\fR(3X),
+-\fBmenu\fR(3X).
++\fBcurses\fP(3X),
++\fBcurs_variables\fP(3X),
++\fBmenu\fP(3X).
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V menu library.
+ They were not supported on
+Index: man/mitem_current.3x
+Prereq:  1.20 
+--- ncurses-6.3-20211219+/man/mitem_current.3x	2020-10-18 00:39:06.000000000 +0000
++++ ncurses-6.3-20211225/man/mitem_current.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,12 +28,12 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: mitem_current.3x,v 1.20 2020/10/18 00:39:06 tom Exp $
++.\" $Id: mitem_current.3x,v 1.22 2021/12/25 21:49:32 tom Exp $
+ .TH mitem_current 3X ""
+ .SH NAME
+-\fBmitem_current\fR \- set and get current_menu_item
++\fBmitem_current\fP \- set and get current_menu_item
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBint set_current_item(MENU *\fP\fImenu\fP\fB, ITEM *\fP\fIitem\fP\fB);\fP
+ .br
+@@ -46,29 +46,29 @@
+ \fBint item_index(const ITEM *\fP\fIitem\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-The function \fBset_current_item\fR sets the current item (the item on which
++The function \fBset_current_item\fP sets the current item (the item on which
+ the menu cursor is positioned).
+-\fBcurrent_item\fR returns a pointer to the
++\fBcurrent_item\fP returns a pointer to the
+ current item in the given menu.
+ .PP
+-The function \fBset_top_row\fR sets the top row of the menu to show the given
++The function \fBset_top_row\fP sets the top row of the menu to show the given
+ row (the top row is initially 0, and is reset to this value whenever the
+-\fBO_ROWMAJOR\fR option is toggled).
++\fBO_ROWMAJOR\fP option is toggled).
+ The item leftmost on the given row
+ becomes current.
+-The function \fBtop_row\fR returns the number of the top menu
++The function \fBtop_row\fP returns the number of the top menu
+ row being displayed.
+ .PP
+-The function \fBitem_index\fR returns the (zero-origin) index of \fIitem\fR in
++The function \fBitem_index\fP returns the (zero-origin) index of \fIitem\fP in
+ the menu's item pointer list.
+ .SH RETURN VALUE
+-\fBcurrent_item\fR returns a pointer (which may be \fBNULL\fR).
++\fBcurrent_item\fP returns a pointer (which may be \fBNULL\fP).
+ It does not set \fBerrno\fP.
+ .PP
+-\fBtop_row\fR and \fBitem_index\fR return \fBERR\fR (the general \fBcurses\fR
++\fBtop_row\fP and \fBitem_index\fP return \fBERR\fP (the general \fBcurses\fP
+ error value) if their \fImenu\fP parameter is \fBNULL\fP.
+ .PP
+-\fBset_current_item\fR and \fBset_top_row\fR return one of the following:
++\fBset_current_item\fP and \fBset_top_row\fP return one of the following:
+ .TP 5
+ .B E_OK
+ The routine succeeded.
+@@ -83,19 +83,19 @@
+ No items are connected to the menu.
+ .TP 5
+ .B E_SYSTEM_ERROR
+-System error occurred (see \fBerrno\fR(3)).
++System error occurred (see \fBerrno\fP(3)).
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBmenu\fR(3X).
++\fBcurses\fP(3X), \fBmenu\fP(3X).
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V menu library.
+ They were not supported on
+ Version 7 or BSD versions.
+ .PP
+-The SVr4 menu library documentation specifies the \fBtop_row\fR and
+-\fBindex_item\fR error value as \-1 (which is the value of \fBERR\fR).
++The SVr4 menu library documentation specifies the \fBtop_row\fP and
++\fBindex_item\fP error value as \-1 (which is the value of \fBERR\fP).
+ .SH AUTHORS
+ Juergen Pfeifer.
+ Manual pages and adaptation for new curses by Eric S. Raymond.
+Index: man/mitem_name.3x
+Prereq:  1.14 
+--- ncurses-6.3-20211219+/man/mitem_name.3x	2020-10-18 00:37:48.000000000 +0000
++++ ncurses-6.3-20211225/man/mitem_name.3x	2021-12-25 21:42:57.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018,2020 Thomas E. Dickey                                     *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,31 +28,31 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: mitem_name.3x,v 1.14 2020/10/18 00:37:48 tom Exp $
++.\" $Id: mitem_name.3x,v 1.16 2021/12/25 21:42:57 tom Exp $
+ .TH mitem_name 3X ""
+ .SH NAME
+-\fBitem_name\fR,
+-\fBitem_description\fR \- get menu item name and description fields
++\fBitem_name\fP,
++\fBitem_description\fP \- get menu item name and description fields
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBconst char *item_name(const ITEM *\fP\fIitem\fP\fB);\fP
+ .br
+ \fBconst char *item_description(const ITEM *\fP\fIitem\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-The function \fBitem_name\fR returns the name part of the given item.
++The function \fBitem_name\fP returns the name part of the given item.
+ .br
+-The function \fBitem_description\fR returns the description part of the given
++The function \fBitem_description\fP returns the description part of the given
+ item.
+ .SH RETURN VALUE
+-These routines return a pointer (which may be \fBNULL\fR).
++These routines return a pointer (which may be \fBNULL\fP).
+ They do not set \fBerrno\fP.
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBmenu\fR(3X).
++\fBcurses\fP(3X), \fBmenu\fP(3X).
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V menu library.
+ They were not supported on Version 7 or BSD versions.
+Index: man/mitem_new.3x
+Prereq:  1.19 
+--- ncurses-6.3-20211219+/man/mitem_new.3x	2020-10-18 00:37:03.000000000 +0000
++++ ncurses-6.3-20211225/man/mitem_new.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,21 +28,21 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: mitem_new.3x,v 1.19 2020/10/18 00:37:03 tom Exp $
++.\" $Id: mitem_new.3x,v 1.21 2021/12/25 21:49:32 tom Exp $
+ .TH mitem_new 3X ""
+ .SH NAME
+ \fBnew_item\fP,
+-\fBfree_item\fR \- create and destroy menu items
++\fBfree_item\fP \- create and destroy menu items
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBITEM *new_item(const char *\fP\fIname\fP\fB, const char *\fP\fIdescription\fP\fB);\fP
+ .br
+ \fBint free_item(ITEM *\fP\fIitem\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-The function \fBnew_item\fR allocates a new item and initializes it from the
+-\fBname\fR and \fBdescription\fR pointers.
++The function \fBnew_item\fP allocates a new item and initializes it from the
++\fBname\fP and \fBdescription\fP pointers.
+ Please notice that the item stores
+ only the pointers to the name and description.
+ Those pointers must be valid
+@@ -50,12 +50,12 @@
+ So you should be very careful with names
+ or descriptions allocated on the stack of some routines.
+ .br
+-The function \fBfree_item\fR de-allocates an item.
++The function \fBfree_item\fP de-allocates an item.
+ Please notice that it
+ is the responsibility of the application to release the memory for the
+ name or the description of the item.
+ .SH RETURN VALUE
+-The function \fBnew_item\fR returns \fBNULL\fR on error.
++The function \fBnew_item\fP returns \fBNULL\fP on error.
+ It sets \fBerrno\fP according to the function's failure:
+ .TP 5
+ .B E_BAD_ARGUMENT
+@@ -64,7 +64,7 @@
+ .B E_SYSTEM_ERROR
+ System error occurred, e.g., malloc failure.
+ .PP
+-The function \fBfree_item\fR returns one of the following:
++The function \fBfree_item\fP returns one of the following:
+ .TP 5
+ .B E_OK
+ The routine succeeded.
+@@ -76,12 +76,12 @@
+ Item is connected to a menu.
+ .TP 5
+ .B E_SYSTEM_ERROR
+-System error occurred (see \fBerrno\fR(3)).
++System error occurred (see \fBerrno\fP(3)).
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBmenu\fR(3X).
++\fBcurses\fP(3X), \fBmenu\fP(3X).
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V menu library.
+ They were not supported on
+Index: man/mitem_opts.3x
+Prereq:  1.16 
+--- ncurses-6.3-20211219+/man/mitem_opts.3x	2020-10-17 23:52:26.000000000 +0000
++++ ncurses-6.3-20211225/man/mitem_opts.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,15 +28,15 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: mitem_opts.3x,v 1.16 2020/10/17 23:52:26 tom Exp $
++.\" $Id: mitem_opts.3x,v 1.18 2021/12/25 21:49:32 tom Exp $
+ .TH mitem_opts 3X ""
+ .SH NAME
+ \fBset_item_opts\fP,
+ \fBitem_opts_on\fP,
+ \fBitem_opts_off\fP,
+-\fBitem_opts\fR \- set and get menu item options
++\fBitem_opts\fP \- set and get menu item options
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBint set_item_opts(ITEM *\fP\fIitem\fP\fB, Item_Options \fP\fIopts\fP\fB);\fP
+ .br
+@@ -47,34 +47,34 @@
+ \fBint item_opts_off(ITEM *\fP\fIitem\fP\fB, Item_Options \fP\fIopts\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-The function \fBset_item_opts\fR sets all the given item's option bits (menu
++The function \fBset_item_opts\fP sets all the given item's option bits (menu
+ option bits may be logically-OR'ed together).
+ .PP
+-The function \fBitem_opts_on\fR turns on the given option bits, and leaves
++The function \fBitem_opts_on\fP turns on the given option bits, and leaves
+ others alone.
+ .PP
+-The function \fBitem_opts_off\fR turns off the given option bits, and leaves
++The function \fBitem_opts_off\fP turns off the given option bits, and leaves
+ others alone.
+ .PP
+-The function \fBitem_opts\fR returns the item's current option bits.
++The function \fBitem_opts\fP returns the item's current option bits.
+ .PP
+-There is only one defined option bit mask, \fBO_SELECTABLE\fR.  When this is
++There is only one defined option bit mask, \fBO_SELECTABLE\fP.  When this is
+ on, the item may be selected during menu processing.
+ This option defaults
+ to on.
+ .SH RETURN VALUE
+-Except for \fBitem_opts\fR, each routine returns one of the following:
++Except for \fBitem_opts\fP, each routine returns one of the following:
+ .TP 5
+ .B E_OK
+ The routine succeeded.
+ .TP 5
+ .B E_SYSTEM_ERROR
+-System error occurred (see \fBerrno\fR(3)).
++System error occurred (see \fBerrno\fP(3)).
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBmenu\fR(3X).
++\fBcurses\fP(3X), \fBmenu\fP(3X).
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V menu library.
+ They were not supported on
+Index: man/mitem_userptr.3x
+Prereq:  1.17 
+--- ncurses-6.3-20211219+/man/mitem_userptr.3x	2020-10-18 00:36:16.000000000 +0000
++++ ncurses-6.3-20211225/man/mitem_userptr.3x	2021-12-25 21:42:57.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018,2020 Thomas E. Dickey                                     *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,13 +28,13 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: mitem_userptr.3x,v 1.17 2020/10/18 00:36:16 tom Exp $
++.\" $Id: mitem_userptr.3x,v 1.19 2021/12/25 21:42:57 tom Exp $
+ .TH mitem_userptr 3X ""
+ .SH NAME
+ \fBset_item_userptr\fP,
+-\fBitem_userptr\fR \- associate application data with a menu item
++\fBitem_userptr\fP \- associate application data with a menu item
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBint set_item_userptr(ITEM *\fP\fIitem\fP\fB, void *\fP\fIuserptr\fP\fB);\fP
+ .br
+@@ -46,16 +46,16 @@
+ These functions get and set
+ that field.
+ .SH RETURN VALUE
+-The function \fBitem_userptr\fR returns a pointer (possibly \fBNULL\fR).
++The function \fBitem_userptr\fP returns a pointer (possibly \fBNULL\fP).
+ It does not set \fBerrno\fP.
+ .PP
+ The \fBset_item_userptr\fP always returns \fBE_OK\fP (success).
+ .
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBmenu\fR(3X).
++\fBcurses\fP(3X), \fBmenu\fP(3X).
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V menu library.
+ They were not supported on
+Index: man/mitem_value.3x
+Prereq:  1.15 
+--- ncurses-6.3-20211219+/man/mitem_value.3x	2020-10-17 23:53:24.000000000 +0000
++++ ncurses-6.3-20211225/man/mitem_value.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,43 +27,43 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: mitem_value.3x,v 1.15 2020/10/17 23:53:24 tom Exp $
++.\" $Id: mitem_value.3x,v 1.17 2021/12/25 21:49:32 tom Exp $
+ .TH mitem_value 3X ""
+ .SH NAME
+ \fBset_item_value\fP,
+ \fBitem_value\fP \- set and get menu item values
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBint set_item_value(ITEM *\fP\fIitem\fP\fB, bool \fP\fIvalue\fP\fB);\fP
+ .br
+ \fBbool item_value(const ITEM *\fP\fIitem\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-If you turn off the menu option \fBO_ONEVALUE\fR (e.g., with
+-\fBset_menu_opts\fR or \fBmenu_opts_off\fR; see \fBmenu_opts\fR(3X)), the menu
++If you turn off the menu option \fBO_ONEVALUE\fP (e.g., with
++\fBset_menu_opts\fP or \fBmenu_opts_off\fP; see \fBmenu_opts\fP(3X)), the menu
+ becomes multi-valued; that is, more than one item may simultaneously be
+ selected.
+ .PP
+-In a multi_valued menu, you can used \fBset_item_value\fR to select the
+-given menu item (second argument \fBTRUE\fR) or deselect it (second argument
+-\fBFALSE\fR).
++In a multi_valued menu, you can used \fBset_item_value\fP to select the
++given menu item (second argument \fBTRUE\fP) or deselect it (second argument
++\fBFALSE\fP).
+ .SH RETURN VALUE
+-The function \fBset_item_value\fR returns one of the following:
++The function \fBset_item_value\fP returns one of the following:
+ .TP 5
+ .B E_OK
+ The routine succeeded.
+ .TP 5
+ .B E_SYSTEM_ERROR
+-System error occurred (see \fBerrno\fR(3)).
++System error occurred (see \fBerrno\fP(3)).
+ .TP 5
+ .B E_REQUEST_DENIED
+ The menu driver could not process the request.
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBmenu\fR(3X).
++\fBcurses\fP(3X), \fBmenu\fP(3X).
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V menu library.
+ They were not supported on
+Index: man/mitem_visible.3x
+Prereq:  1.10 
+--- ncurses-6.3-20211219+/man/mitem_visible.3x	2020-10-17 23:53:55.000000000 +0000
++++ ncurses-6.3-20211225/man/mitem_visible.3x	2021-12-25 21:42:57.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018,2020 Thomas E. Dickey                                     *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998,2010 Free Software Foundation, Inc.                       *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,12 +28,12 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: mitem_visible.3x,v 1.10 2020/10/17 23:53:55 tom Exp $
++.\" $Id: mitem_visible.3x,v 1.12 2021/12/25 21:42:57 tom Exp $
+ .TH mitem_visible 3X ""
+ .SH NAME
+-\fBmitem_visible\fR \- check visibility of a menu item
++\fBmitem_visible\fP \- check visibility of a menu item
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+ \fBbool item_visible(const ITEM *\fP\fIitem\fP\fB);\fP
+ .br
+@@ -42,10 +42,10 @@
+ is mapped onto the screen (if the menu is scrollable, in particular, this
+ portion will be smaller than the whole menu).
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBmenu\fR(3X).
++\fBcurses\fP(3X), \fBmenu\fP(3X).
+ .SH NOTES
+-The header file \fB\fR automatically includes the header file
+-\fB\fR.
++The header file \fB\fP automatically includes the header file
++\fB\fP.
+ .SH PORTABILITY
+ These routines emulate the System V menu library.
+ They were not supported on
+Index: man/ncurses.3x
+Prereq:  1.153 
+--- ncurses-6.3-20211219+/man/ncurses.3x	2021-08-22 17:17:16.000000000 +0000
++++ ncurses-6.3-20211225/man/ncurses.3x	2021-12-25 21:19:26.000000000 +0000
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: ncurses.3x,v 1.153 2021/08/22 17:17:16 tom Exp $
++.\" $Id: ncurses.3x,v 1.156 2021/12/25 21:19:26 tom Exp $
+ .hy 0
+ .TH ncurses 3X ""
+ .ie \n(.g .ds `` \(lq
+@@ -56,52 +56,52 @@
+ .ds n 5
+ .ds d @TERMINFO@
+ .SH NAME
+-\fBncurses\fR \- CRT screen handling and optimization package
++\fBncurses\fP \- CRT screen handling and optimization package
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .br
+ .SH DESCRIPTION
+-The \fBncurses\fR library routines give the user a terminal-independent method
++The \fBncurses\fP library routines give the user a terminal-independent method
+ of updating character screens with reasonable optimization.
+ This implementation is \*(``new curses\*('' (ncurses) and
+ is the approved replacement for
+ 4.4BSD classic curses, which has been discontinued.
+-This describes \fBncurses\fR
++This describes \fBncurses\fP
+ version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
+ .PP
+-The \fBncurses\fR library emulates the curses library of
++The \fBncurses\fP library emulates the curses library of
+ System V Release 4 UNIX,
+ and XPG4 (X/Open Portability Guide) curses (also known as XSI curses).
+ XSI stands for X/Open System Interfaces Extension.
+-The \fBncurses\fR library is freely redistributable in source form.
++The \fBncurses\fP library is freely redistributable in source form.
+ Differences from the SVr4
+ curses are summarized under the
+-\fBEXTENSIONS\fP and \fBPORTABILITY\fP sections below and
++\fIEXTENSIONS\fP and \fIPORTABILITY\fP sections below and
+ described in detail in the respective
+-\fBEXTENSIONS\fP, \fBPORTABILITY\fP and \fBBUGS\fP sections
++\fIEXTENSIONS\fP, \fIPORTABILITY\fP and \fIBUGS\fP sections
+ of individual man pages.
+ .PP
+-The \fBncurses\fR library also provides many useful extensions,
++The \fBncurses\fP library also provides many useful extensions,
+ i.e., features which cannot be implemented by a simple add-on library
+ but which require access to the internals of the library.
+ .PP
+-A program using these routines must be linked with the \fB\-lncurses\fR option,
+-or (if it has been generated) with the debugging library \fB\-lncurses_g\fR.
++A program using these routines must be linked with the \fB\-lncurses\fP option,
++or (if it has been generated) with the debugging library \fB\-lncurses_g\fP.
+ (Your system integrator may also have installed these libraries under
+-the names \fB\-lcurses\fR and \fB\-lcurses_g\fR.)
++the names \fB\-lcurses\fP and \fB\-lcurses_g\fP.)
+ The ncurses_g library generates trace logs (in a file called \*(``trace\*('' in the
+ current directory) that describe curses actions.
+ See also the section on \fBALTERNATE CONFIGURATIONS\fP.
+ .PP
+-The \fBncurses\fR package supports: overall screen, window and pad
++The \fBncurses\fP package supports: overall screen, window and pad
+ manipulation; output to windows and pads; reading terminal input; control over
+-terminal and \fBcurses\fR input and output options; environment query
++terminal and \fBcurses\fP input and output options; environment query
+ routines; color manipulation; use of soft label keys; terminfo capabilities;
+ and access to low-level terminal-manipulation routines.
+ .SS Initialization
+ .PP
+ The library uses the locale which the calling program has initialized.
+-That is normally done with \fBsetlocale\fP:
++That is normally done with \fBsetlocale\fP(3):
+ .NS
+ \fBsetlocale(LC_ALL, "");\fP
+ .NE
+@@ -112,154 +112,154 @@
+ You should initialize the locale and not rely on specific details of
+ the library when the locale has not been setup.
+ .PP
+-The function \fBinitscr\fR or \fBnewterm\fR
++The function \fBinitscr\fP or \fBnewterm\fP
+ must be called to initialize the library
+ before any of the other routines that deal with windows
+ and screens are used.
+-The routine \fBendwin\fR(3X) must be called before exiting.
++The routine \fBendwin\fP(3X) must be called before exiting.
+ .PP
+ To get character-at-a-time input without echoing (most
+ interactive, screen oriented programs want this), the following
+ sequence should be used:
+ .NS
+-\fBinitscr(); cbreak(); noecho();\fR
++\fBinitscr(); cbreak(); noecho();\fP
+ .NE
+ .PP
+ Most programs would additionally use the sequence:
+ .NS
+-\fBintrflush(stdscr, FALSE);\fR
+-\fBkeypad(stdscr, TRUE);\fR
++\fBintrflush(stdscr, FALSE);\fP
++\fBkeypad(stdscr, TRUE);\fP
+ .NE
+ .PP
+-Before a \fBcurses\fR program is run, the tab stops of the terminal
++Before a \fBcurses\fP program is run, the tab stops of the terminal
+ should be set and its initialization strings, if defined, must be output.
+-This can be done by executing the \fB@TPUT@ init\fR command
+-after the shell environment variable \fBTERM\fR has been exported.
+-\fB@TSET@(1)\fR is usually responsible for doing this.
+-[See \fBterminfo\fR(\*n) for further details.]
++This can be done by executing the \fB@TPUT@ init\fP command
++after the shell environment variable \fBTERM\fP has been exported.
++\fB@TSET@(1)\fP is usually responsible for doing this.
++[See \fBterminfo\fP(\*n) for further details.]
+ .SS Datatypes
+ .PP
+-The \fBncurses\fR library permits manipulation of data structures,
+-called \fIwindows\fR, which can be thought of as two-dimensional
++The \fBncurses\fP library permits manipulation of data structures,
++called \fIwindows\fP, which can be thought of as two-dimensional
+ arrays of characters representing all or part of a CRT screen.
+-A default window called \fBstdscr\fR, which is the size of the terminal
++A default window called \fBstdscr\fP, which is the size of the terminal
+ screen, is supplied.
+-Others may be created with \fBnewwin\fR.
++Others may be created with \fBnewwin\fP.
+ .PP
+-Note that \fBcurses\fR does not handle overlapping windows, that's done by
+-the \fBpanel\fR(3X) library.
++Note that \fBcurses\fP does not handle overlapping windows, that's done by
++the \fBpanel\fP(3X) library.
+ This means that you can either use
+-\fBstdscr\fR or divide the screen into tiled windows and not using
+-\fBstdscr\fR at all.
++\fBstdscr\fP or divide the screen into tiled windows and not using
++\fBstdscr\fP at all.
+ Mixing the two will result in unpredictable, and undesired, effects.
+ .PP
+-Windows are referred to by variables declared as \fBWINDOW *\fR.
++Windows are referred to by variables declared as \fBWINDOW *\fP.
+ These data structures are manipulated with routines described here and
+-elsewhere in the \fBncurses\fR manual pages.
++elsewhere in the \fBncurses\fP manual pages.
+ Among those, the most basic
+-routines are \fBmove\fR and \fBaddch\fR.
++routines are \fBmove\fP and \fBaddch\fP.
+ More general versions of
+-these routines are included with names beginning with \fBw\fR,
++these routines are included with names beginning with \fBw\fP,
+ allowing the user to specify a window.
+ The routines not beginning
+-with \fBw\fR affect \fBstdscr\fR.
++with \fBw\fP affect \fBstdscr\fP.
+ .PP
+-After using routines to manipulate a window, \fBrefresh\fR(3X) is called,
+-telling \fBcurses\fR to make the user's CRT screen look like
+-\fBstdscr\fR.
++After using routines to manipulate a window, \fBrefresh\fP(3X) is called,
++telling \fBcurses\fP to make the user's CRT screen look like
++\fBstdscr\fP.
+ The characters in a window are actually of type
+-\fBchtype\fR, (character and attribute data) so that other information
++\fBchtype\fP, (character and attribute data) so that other information
+ about the character may also be stored with each character.
+ .PP
+-Special windows called \fIpads\fR may also be manipulated.
++Special windows called \fIpads\fP may also be manipulated.
+ These are windows
+ which are not constrained to the size of the screen and whose contents need not
+ be completely displayed.
+-See \fBcurs_pad\fR(3X) for more information.
++See \fBcurs_pad\fP(3X) for more information.
+ .PP
+ In addition to drawing characters on the screen, video attributes and colors
+ may be supported, causing the characters to show up in such modes as
+ underlined, in reverse video, or in color on terminals that support such
+ display enhancements.
+ Line drawing characters may be specified to be output.
+-On input, \fBcurses\fR is also able to translate arrow and function keys that
++On input, \fBcurses\fP is also able to translate arrow and function keys that
+ transmit escape sequences into single values.
+ The video attributes, line
+-drawing characters, and input values use names, defined in \fB\fR,
+-such as \fBA_REVERSE\fR, \fBACS_HLINE\fR, and \fBKEY_LEFT\fR.
++drawing characters, and input values use names, defined in \fB\fP,
++such as \fBA_REVERSE\fP, \fBACS_HLINE\fP, and \fBKEY_LEFT\fP.
+ .SS Environment variables
+ .PP
+-If the environment variables \fBLINES\fR and \fBCOLUMNS\fR are set, or if the
++If the environment variables \fBLINES\fP and \fBCOLUMNS\fP are set, or if the
+ program is executing in a window environment, line and column information in
+-the environment will override information read by \fIterminfo\fR.
++the environment will override information read by \fIterminfo\fP.
+ This would affect a program running in an AT&T 630 layer,
+ for example, where the size of a
+-screen is changeable (see \fBENVIRONMENT\fR).
++screen is changeable (see \fBENVIRONMENT\fP).
+ .PP
+-If the environment variable \fBTERMINFO\fR is defined, any program using
+-\fBcurses\fR checks for a local terminal definition before checking in the
++If the environment variable \fBTERMINFO\fP is defined, any program using
++\fBcurses\fP checks for a local terminal definition before checking in the
+ standard place.
+-For example, if \fBTERM\fR is set to \fBatt4424\fR, then the
++For example, if \fBTERM\fP is set to \fBatt4424\fP, then the
+ compiled terminal definition is found in
+ .NS
+-\fB\*d/a/att4424\fR.
++\fB\*d/a/att4424\fP.
+ .NE
+ .PP
+-(The \fBa\fR is copied from the first letter of \fBatt4424\fR to avoid
+-creation of huge directories.)  However, if \fBTERMINFO\fR is set to
+-\fB$HOME/myterms\fR, \fBcurses\fR first checks
++(The \fBa\fP is copied from the first letter of \fBatt4424\fP to avoid
++creation of huge directories.)  However, if \fBTERMINFO\fP is set to
++\fB$HOME/myterms\fP, \fBcurses\fP first checks
+ .NS
+-\fB$HOME/myterms/a/att4424\fR,
++\fB$HOME/myterms/a/att4424\fP,
+ .NE
+ .PP
+ and if that fails, it then checks
+ .NS
+-\fB\*d/a/att4424\fR.
++\fB\*d/a/att4424\fP.
+ .NE
+ .PP
+ This is useful for developing experimental definitions or when write
+-permission in \fB\*d\fR is not available.
++permission in \fB\*d\fP is not available.
+ .PP
+-The integer variables \fBLINES\fR and \fBCOLS\fR are defined in
+-\fB\fR and will be filled in by \fBinitscr\fR with the size of the
++The integer variables \fBLINES\fP and \fBCOLS\fP are defined in
++\fB\fP and will be filled in by \fBinitscr\fP with the size of the
+ screen.
+-The constants \fBTRUE\fR and \fBFALSE\fR have the values \fB1\fR and
+-\fB0\fR, respectively.
++The constants \fBTRUE\fP and \fBFALSE\fP have the values \fB1\fP and
++\fB0\fP, respectively.
+ .PP
+-The \fBcurses\fR routines also define the \fBWINDOW *\fR variable \fBcurscr\fR
++The \fBcurses\fP routines also define the \fBWINDOW *\fP variable \fBcurscr\fP
+ which is used for certain low-level operations like clearing and redrawing a
+ screen containing garbage.
+-The \fBcurscr\fR can be used in only a few routines.
++The \fBcurscr\fP can be used in only a few routines.
+ .\"
+ .SS Routine and Argument Names
+-Many \fBcurses\fR routines have two or more versions.
+-The routines prefixed with \fBw\fR require a window argument.
+-The routines prefixed with \fBp\fR require a pad argument.
+-Those without a prefix generally use \fBstdscr\fR.
++Many \fBcurses\fP routines have two or more versions.
++The routines prefixed with \fIw\fP require a window argument.
++The routines prefixed with \fIp\fP require a pad argument.
++Those without a prefix generally use \fBstdscr\fP.
+ .PP
+-The routines prefixed with \fBmv\fR require a \fIy\fR and \fIx\fR
++The routines prefixed with \fBmv\fP require a \fIy\fP and \fIx\fP
+ coordinate to move to before performing the appropriate action.
+-The \fBmv\fR routines imply a call to \fBmove\fR before the call to the
++The \fBmv\fP routines imply a call to \fBmove\fP before the call to the
+ other routine.
+-The coordinate \fIy\fR always refers to the row (of
+-the window), and \fIx\fR always refers to the column.
++The coordinate \fIy\fP always refers to the row (of
++the window), and \fIx\fP always refers to the column.
+ The upper left-hand corner is always (0,0), not (1,1).
+ .PP
+-The routines prefixed with \fBmvw\fR take both a window argument and
+-\fIx\fR and \fIy\fR coordinates.
++The routines prefixed with \fBmvw\fP take both a window argument and
++\fIx\fP and \fIy\fP coordinates.
+ The window argument is always specified before the coordinates.
+ .PP
+-In each case, \fIwin\fR is the window affected, and \fIpad\fR is the
+-pad affected; \fIwin\fR and \fIpad\fR are always pointers to type
+-\fBWINDOW\fR.
++In each case, \fIwin\fP is the window affected, and \fIpad\fP is the
++pad affected; \fIwin\fP and \fIpad\fP are always pointers to type
++\fBWINDOW\fP.
+ .PP
+-Option setting routines require a Boolean flag \fIbf\fR with the value
+-\fBTRUE\fR or \fBFALSE\fR; \fIbf\fR is always of type \fBbool\fR.
++Option setting routines require a Boolean flag \fIbf\fP with the value
++\fBTRUE\fP or \fBFALSE\fP; \fIbf\fP is always of type \fBbool\fP.
+ Most of the data types used in the library routines,
+-such as \fBWINDOW\fR, \fBSCREEN\fR, \fBbool\fR, and \fBchtype\fR
+-are defined in \fB\fR.
++such as \fBWINDOW\fP, \fBSCREEN\fP, \fBbool\fP, and \fBchtype\fP
++are defined in \fB\fP.
+ Types used for the terminfo routines such as
+-\fBTERMINAL\fR are defined in \fB\fR.
++\fBTERMINAL\fP are defined in \fB\fP.
+ .PP
+ This manual page describes functions which may appear in any configuration
+ of the library.
+@@ -318,7 +318,7 @@
+ .PP
+ .\"
+ .SS Routine Name Index
+-The following table lists the \fBcurses\fR routines provided in
++The following table lists the \fBcurses\fP routines provided in
+ the \*(``normal\*('' and \*(``wide\*('' libraries and the names of
+ the manual pages on which they are described.
+ Routines flagged with \*(``*\*(''
+@@ -328,453 +328,453 @@
+ center tab(/);
+ l l
+ l l .
+-\fBcurses\fR Routine Name/Manual Page Name
++\fBcurses\fP Routine Name/Manual Page Name
+ =
+-COLOR_PAIR/\fBcurs_color\fR(3X)
+-PAIR_NUMBER/\fBcurs_attr\fR(3X)
+-add_wch/\fBcurs_add_wch\fR(3X)
+-add_wchnstr/\fBcurs_add_wchstr\fR(3X)
+-add_wchstr/\fBcurs_add_wchstr\fR(3X)
+-addch/\fBcurs_addch\fR(3X)
+-addchnstr/\fBcurs_addchstr\fR(3X)
+-addchstr/\fBcurs_addchstr\fR(3X)
+-addnstr/\fBcurs_addstr\fR(3X)
+-addnwstr/\fBcurs_addwstr\fR(3X)
+-addstr/\fBcurs_addstr\fR(3X)
+-addwstr/\fBcurs_addwstr\fR(3X)
+-alloc_pair/\fBnew_pair\fR(3X)*
+-assume_default_colors/\fBdefault_colors\fR(3X)*
+-attr_get/\fBcurs_attr\fR(3X)
+-attr_off/\fBcurs_attr\fR(3X)
+-attr_on/\fBcurs_attr\fR(3X)
+-attr_set/\fBcurs_attr\fR(3X)
+-attroff/\fBcurs_attr\fR(3X)
+-attron/\fBcurs_attr\fR(3X)
+-attrset/\fBcurs_attr\fR(3X)
+-baudrate/\fBcurs_termattrs\fR(3X)
+-beep/\fBcurs_beep\fR(3X)
+-bkgd/\fBcurs_bkgd\fR(3X)
+-bkgdset/\fBcurs_bkgd\fR(3X)
+-bkgrnd/\fBcurs_bkgrnd\fR(3X)
+-bkgrndset/\fBcurs_bkgrnd\fR(3X)
+-border/\fBcurs_border\fR(3X)
+-border_set/\fBcurs_border_set\fR(3X)
+-box/\fBcurs_border\fR(3X)
+-box_set/\fBcurs_border_set\fR(3X)
+-can_change_color/\fBcurs_color\fR(3X)
+-cbreak/\fBcurs_inopts\fR(3X)
+-chgat/\fBcurs_attr\fR(3X)
+-clear/\fBcurs_clear\fR(3X)
+-clearok/\fBcurs_outopts\fR(3X)
+-clrtobot/\fBcurs_clear\fR(3X)
+-clrtoeol/\fBcurs_clear\fR(3X)
+-color_content/\fBcurs_color\fR(3X)
+-color_set/\fBcurs_attr\fR(3X)
+-copywin/\fBcurs_overlay\fR(3X)
+-curs_set/\fBcurs_kernel\fR(3X)
+-curses_trace/\fBcurs_trace\fR(3X)*
+-curses_version/\fBcurs_extend\fR(3X)*
+-def_prog_mode/\fBcurs_kernel\fR(3X)
+-def_shell_mode/\fBcurs_kernel\fR(3X)
+-define_key/\fBdefine_key\fR(3X)*
+-del_curterm/\fBcurs_terminfo\fR(3X)
+-delay_output/\fBcurs_util\fR(3X)
+-delch/\fBcurs_delch\fR(3X)
+-deleteln/\fBcurs_deleteln\fR(3X)
+-delscreen/\fBcurs_initscr\fR(3X)
+-delwin/\fBcurs_window\fR(3X)
+-derwin/\fBcurs_window\fR(3X)
+-doupdate/\fBcurs_refresh\fR(3X)
+-dupwin/\fBcurs_window\fR(3X)
+-echo/\fBcurs_inopts\fR(3X)
+-echo_wchar/\fBcurs_add_wch\fR(3X)
+-echochar/\fBcurs_addch\fR(3X)
+-endwin/\fBcurs_initscr\fR(3X)
+-erase/\fBcurs_clear\fR(3X)
+-erasechar/\fBcurs_termattrs\fR(3X)
+-erasewchar/\fBcurs_termattrs\fR(3X)
+-exit_curses/\fBcurs_memleaks\fR(3X)*
+-exit_terminfo/\fBcurs_memleaks\fR(3X)*
+-extended_color_content/\fBcurs_color\fR(3X)*
+-extended_pair_content/\fBcurs_color\fR(3X)*
+-extended_slk_color/\fBcurs_slk\fR(3X)*
+-filter/\fBcurs_util\fR(3X)
+-find_pair/\fBnew_pair\fR(3X)*
+-flash/\fBcurs_beep\fR(3X)
+-flushinp/\fBcurs_util\fR(3X)
+-free_pair/\fBnew_pair\fR(3X)*
+-get_wch/\fBcurs_get_wch\fR(3X)
+-get_wstr/\fBcurs_get_wstr\fR(3X)
+-getattrs/\fBcurs_attr\fR(3X)
+-getbegx/\fBcurs_legacy\fR(3X)*
+-getbegy/\fBcurs_legacy\fR(3X)*
+-getbegyx/\fBcurs_getyx\fR(3X)
+-getbkgd/\fBcurs_bkgd\fR(3X)
+-getbkgrnd/\fBcurs_bkgrnd\fR(3X)
+-getcchar/\fBcurs_getcchar\fR(3X)
+-getch/\fBcurs_getch\fR(3X)
+-getcurx/\fBcurs_legacy\fR(3X)*
+-getcury/\fBcurs_legacy\fR(3X)*
+-getmaxx/\fBcurs_legacy\fR(3X)*
+-getmaxy/\fBcurs_legacy\fR(3X)*
+-getmaxyx/\fBcurs_getyx\fR(3X)
+-getmouse/\fBcurs_mouse\fR(3X)*
+-getn_wstr/\fBcurs_get_wstr\fR(3X)
+-getnstr/\fBcurs_getstr\fR(3X)
+-getparx/\fBcurs_legacy\fR(3X)*
+-getpary/\fBcurs_legacy\fR(3X)*
+-getparyx/\fBcurs_getyx\fR(3X)
+-getstr/\fBcurs_getstr\fR(3X)
+-getsyx/\fBcurs_kernel\fR(3X)
+-getwin/\fBcurs_util\fR(3X)
+-getyx/\fBcurs_getyx\fR(3X)
+-halfdelay/\fBcurs_inopts\fR(3X)
+-has_colors/\fBcurs_color\fR(3X)
+-has_ic/\fBcurs_termattrs\fR(3X)
+-has_il/\fBcurs_termattrs\fR(3X)
+-has_key/\fBcurs_getch\fR(3X)*
+-has_mouse/\fBcurs_mouse\fR(3X)*
+-hline/\fBcurs_border\fR(3X)
+-hline_set/\fBcurs_border_set\fR(3X)
+-idcok/\fBcurs_outopts\fR(3X)
+-idlok/\fBcurs_outopts\fR(3X)
+-immedok/\fBcurs_outopts\fR(3X)
+-in_wch/\fBcurs_in_wch\fR(3X)
+-in_wchnstr/\fBcurs_in_wchstr\fR(3X)
+-in_wchstr/\fBcurs_in_wchstr\fR(3X)
+-inch/\fBcurs_inch\fR(3X)
+-inchnstr/\fBcurs_inchstr\fR(3X)
+-inchstr/\fBcurs_inchstr\fR(3X)
+-init_color/\fBcurs_color\fR(3X)
+-init_extended_color/\fBcurs_color\fR(3X)*
+-init_extended_pair/\fBcurs_color\fR(3X)*
+-init_pair/\fBcurs_color\fR(3X)
+-initscr/\fBcurs_initscr\fR(3X)
+-innstr/\fBcurs_instr\fR(3X)
+-innwstr/\fBcurs_inwstr\fR(3X)
+-ins_nwstr/\fBcurs_ins_wstr\fR(3X)
+-ins_wch/\fBcurs_ins_wch\fR(3X)
+-ins_wstr/\fBcurs_ins_wstr\fR(3X)
+-insch/\fBcurs_insch\fR(3X)
+-insdelln/\fBcurs_deleteln\fR(3X)
+-insertln/\fBcurs_deleteln\fR(3X)
+-insnstr/\fBcurs_insstr\fR(3X)
+-insstr/\fBcurs_insstr\fR(3X)
+-instr/\fBcurs_instr\fR(3X)
+-intrflush/\fBcurs_inopts\fR(3X)
+-inwstr/\fBcurs_inwstr\fR(3X)
+-is_cleared/\fBcurs_opaque\fR(3X)*
+-is_idcok/\fBcurs_opaque\fR(3X)*
+-is_idlok/\fBcurs_opaque\fR(3X)*
+-is_immedok/\fBcurs_opaque\fR(3X)*
+-is_keypad/\fBcurs_opaque\fR(3X)*
+-is_leaveok/\fBcurs_opaque\fR(3X)*
+-is_linetouched/\fBcurs_touch\fR(3X)
+-is_nodelay/\fBcurs_opaque\fR(3X)*
+-is_notimeout/\fBcurs_opaque\fR(3X)*
+-is_pad/\fBcurs_opaque\fR(3X)*
+-is_scrollok/\fBcurs_opaque\fR(3X)*
+-is_subwin/\fBcurs_opaque\fR(3X)*
+-is_syncok/\fBcurs_opaque\fR(3X)*
+-is_term_resized/\fBresizeterm\fR(3X)*
+-is_wintouched/\fBcurs_touch\fR(3X)
+-isendwin/\fBcurs_initscr\fR(3X)
+-key_defined/\fBkey_defined\fR(3X)*
+-key_name/\fBcurs_util\fR(3X)
+-keybound/\fBkeybound\fR(3X)*
+-keyname/\fBcurs_util\fR(3X)
+-keyok/\fBkeyok\fR(3X)*
+-keypad/\fBcurs_inopts\fR(3X)
+-killchar/\fBcurs_termattrs\fR(3X)
+-killwchar/\fBcurs_termattrs\fR(3X)
+-leaveok/\fBcurs_outopts\fR(3X)
+-longname/\fBcurs_termattrs\fR(3X)
+-mcprint/\fBcurs_print\fR(3X)*
+-meta/\fBcurs_inopts\fR(3X)
+-mouse_trafo/\fBcurs_mouse\fR(3X)*
+-mouseinterval/\fBcurs_mouse\fR(3X)*
+-mousemask/\fBcurs_mouse\fR(3X)*
+-move/\fBcurs_move\fR(3X)
+-mvadd_wch/\fBcurs_add_wch\fR(3X)
+-mvadd_wchnstr/\fBcurs_add_wchstr\fR(3X)
+-mvadd_wchstr/\fBcurs_add_wchstr\fR(3X)
+-mvaddch/\fBcurs_addch\fR(3X)
+-mvaddchnstr/\fBcurs_addchstr\fR(3X)
+-mvaddchstr/\fBcurs_addchstr\fR(3X)
+-mvaddnstr/\fBcurs_addstr\fR(3X)
+-mvaddnwstr/\fBcurs_addwstr\fR(3X)
+-mvaddstr/\fBcurs_addstr\fR(3X)
+-mvaddwstr/\fBcurs_addwstr\fR(3X)
+-mvchgat/\fBcurs_attr\fR(3X)
+-mvcur/\fBcurs_terminfo\fR(3X)
+-mvdelch/\fBcurs_delch\fR(3X)
+-mvderwin/\fBcurs_window\fR(3X)
+-mvget_wch/\fBcurs_get_wch\fR(3X)
+-mvget_wstr/\fBcurs_get_wstr\fR(3X)
+-mvgetch/\fBcurs_getch\fR(3X)
+-mvgetn_wstr/\fBcurs_get_wstr\fR(3X)
+-mvgetnstr/\fBcurs_getstr\fR(3X)
+-mvgetstr/\fBcurs_getstr\fR(3X)
+-mvhline/\fBcurs_border\fR(3X)
+-mvhline_set/\fBcurs_border_set\fR(3X)
+-mvin_wch/\fBcurs_in_wch\fR(3X)
+-mvin_wchnstr/\fBcurs_in_wchstr\fR(3X)
+-mvin_wchstr/\fBcurs_in_wchstr\fR(3X)
+-mvinch/\fBcurs_inch\fR(3X)
+-mvinchnstr/\fBcurs_inchstr\fR(3X)
+-mvinchstr/\fBcurs_inchstr\fR(3X)
+-mvinnstr/\fBcurs_instr\fR(3X)
+-mvinnwstr/\fBcurs_inwstr\fR(3X)
+-mvins_nwstr/\fBcurs_ins_wstr\fR(3X)
+-mvins_wch/\fBcurs_ins_wch\fR(3X)
+-mvins_wstr/\fBcurs_ins_wstr\fR(3X)
+-mvinsch/\fBcurs_insch\fR(3X)
+-mvinsnstr/\fBcurs_insstr\fR(3X)
+-mvinsstr/\fBcurs_insstr\fR(3X)
+-mvinstr/\fBcurs_instr\fR(3X)
+-mvinwstr/\fBcurs_inwstr\fR(3X)
+-mvprintw/\fBcurs_printw\fR(3X)
+-mvscanw/\fBcurs_scanw\fR(3X)
+-mvvline/\fBcurs_border\fR(3X)
+-mvvline_set/\fBcurs_border_set\fR(3X)
+-mvwadd_wch/\fBcurs_add_wch\fR(3X)
+-mvwadd_wchnstr/\fBcurs_add_wchstr\fR(3X)
+-mvwadd_wchstr/\fBcurs_add_wchstr\fR(3X)
+-mvwaddch/\fBcurs_addch\fR(3X)
+-mvwaddchnstr/\fBcurs_addchstr\fR(3X)
+-mvwaddchstr/\fBcurs_addchstr\fR(3X)
+-mvwaddnstr/\fBcurs_addstr\fR(3X)
+-mvwaddnwstr/\fBcurs_addwstr\fR(3X)
+-mvwaddstr/\fBcurs_addstr\fR(3X)
+-mvwaddwstr/\fBcurs_addwstr\fR(3X)
+-mvwchgat/\fBcurs_attr\fR(3X)
+-mvwdelch/\fBcurs_delch\fR(3X)
+-mvwget_wch/\fBcurs_get_wch\fR(3X)
+-mvwget_wstr/\fBcurs_get_wstr\fR(3X)
+-mvwgetch/\fBcurs_getch\fR(3X)
+-mvwgetn_wstr/\fBcurs_get_wstr\fR(3X)
+-mvwgetnstr/\fBcurs_getstr\fR(3X)
+-mvwgetstr/\fBcurs_getstr\fR(3X)
+-mvwhline/\fBcurs_border\fR(3X)
+-mvwhline_set/\fBcurs_border_set\fR(3X)
+-mvwin/\fBcurs_window\fR(3X)
+-mvwin_wch/\fBcurs_in_wch\fR(3X)
+-mvwin_wchnstr/\fBcurs_in_wchstr\fR(3X)
+-mvwin_wchstr/\fBcurs_in_wchstr\fR(3X)
+-mvwinch/\fBcurs_inch\fR(3X)
+-mvwinchnstr/\fBcurs_inchstr\fR(3X)
+-mvwinchstr/\fBcurs_inchstr\fR(3X)
+-mvwinnstr/\fBcurs_instr\fR(3X)
+-mvwinnwstr/\fBcurs_inwstr\fR(3X)
+-mvwins_nwstr/\fBcurs_ins_wstr\fR(3X)
+-mvwins_wch/\fBcurs_ins_wch\fR(3X)
+-mvwins_wstr/\fBcurs_ins_wstr\fR(3X)
+-mvwinsch/\fBcurs_insch\fR(3X)
+-mvwinsnstr/\fBcurs_insstr\fR(3X)
+-mvwinsstr/\fBcurs_insstr\fR(3X)
+-mvwinstr/\fBcurs_instr\fR(3X)
+-mvwinwstr/\fBcurs_inwstr\fR(3X)
+-mvwprintw/\fBcurs_printw\fR(3X)
+-mvwscanw/\fBcurs_scanw\fR(3X)
+-mvwvline/\fBcurs_border\fR(3X)
+-mvwvline_set/\fBcurs_border_set\fR(3X)
+-napms/\fBcurs_kernel\fR(3X)
+-newpad/\fBcurs_pad\fR(3X)
+-newterm/\fBcurs_initscr\fR(3X)
+-newwin/\fBcurs_window\fR(3X)
+-nl/\fBcurs_inopts\fR(3X)
+-nocbreak/\fBcurs_inopts\fR(3X)
+-nodelay/\fBcurs_inopts\fR(3X)
+-noecho/\fBcurs_inopts\fR(3X)
+-nofilter/\fBcurs_util\fR(3X)*
+-nonl/\fBcurs_inopts\fR(3X)
+-noqiflush/\fBcurs_inopts\fR(3X)
+-noraw/\fBcurs_inopts\fR(3X)
+-notimeout/\fBcurs_inopts\fR(3X)
+-overlay/\fBcurs_overlay\fR(3X)
+-overwrite/\fBcurs_overlay\fR(3X)
+-pair_content/\fBcurs_color\fR(3X)
+-pecho_wchar/\fBcurs_pad\fR(3X)*
+-pechochar/\fBcurs_pad\fR(3X)
+-pnoutrefresh/\fBcurs_pad\fR(3X)
+-prefresh/\fBcurs_pad\fR(3X)
+-printw/\fBcurs_printw\fR(3X)
+-putp/\fBcurs_terminfo\fR(3X)
+-putwin/\fBcurs_util\fR(3X)
+-qiflush/\fBcurs_inopts\fR(3X)
+-raw/\fBcurs_inopts\fR(3X)
+-redrawwin/\fBcurs_refresh\fR(3X)
+-refresh/\fBcurs_refresh\fR(3X)
+-reset_color_pairs/\fBcurs_color\fR(3X)*
+-reset_prog_mode/\fBcurs_kernel\fR(3X)
+-reset_shell_mode/\fBcurs_kernel\fR(3X)
+-resetty/\fBcurs_kernel\fR(3X)
+-resize_term/\fBresizeterm\fR(3X)*
+-resizeterm/\fBresizeterm\fR(3X)*
+-restartterm/\fBcurs_terminfo\fR(3X)
+-ripoffline/\fBcurs_kernel\fR(3X)
+-savetty/\fBcurs_kernel\fR(3X)
+-scanw/\fBcurs_scanw\fR(3X)
+-scr_dump/\fBcurs_scr_dump\fR(3X)
+-scr_init/\fBcurs_scr_dump\fR(3X)
+-scr_restore/\fBcurs_scr_dump\fR(3X)
+-scr_set/\fBcurs_scr_dump\fR(3X)
+-scrl/\fBcurs_scroll\fR(3X)
+-scroll/\fBcurs_scroll\fR(3X)
+-scrollok/\fBcurs_outopts\fR(3X)
+-set_curterm/\fBcurs_terminfo\fR(3X)
+-set_term/\fBcurs_initscr\fR(3X)
+-setcchar/\fBcurs_getcchar\fR(3X)
+-setscrreg/\fBcurs_outopts\fR(3X)
+-setsyx/\fBcurs_kernel\fR(3X)
+-setupterm/\fBcurs_terminfo\fR(3X)
+-slk_attr/\fBcurs_slk\fR(3X)*
+-slk_attr_off/\fBcurs_slk\fR(3X)
+-slk_attr_on/\fBcurs_slk\fR(3X)
+-slk_attr_set/\fBcurs_slk\fR(3X)
+-slk_attroff/\fBcurs_slk\fR(3X)
+-slk_attron/\fBcurs_slk\fR(3X)
+-slk_attrset/\fBcurs_slk\fR(3X)
+-slk_clear/\fBcurs_slk\fR(3X)
+-slk_color/\fBcurs_slk\fR(3X)
+-slk_init/\fBcurs_slk\fR(3X)
+-slk_label/\fBcurs_slk\fR(3X)
+-slk_noutrefresh/\fBcurs_slk\fR(3X)
+-slk_refresh/\fBcurs_slk\fR(3X)
+-slk_restore/\fBcurs_slk\fR(3X)
+-slk_set/\fBcurs_slk\fR(3X)
+-slk_touch/\fBcurs_slk\fR(3X)
+-slk_wset/\fBcurs_slk\fR(3X)*
+-standend/\fBcurs_attr\fR(3X)
+-standout/\fBcurs_attr\fR(3X)
+-start_color/\fBcurs_color\fR(3X)
+-subpad/\fBcurs_pad\fR(3X)
+-subwin/\fBcurs_window\fR(3X)
+-syncok/\fBcurs_window\fR(3X)
+-term_attrs/\fBcurs_termattrs\fR(3X)
+-termattrs/\fBcurs_termattrs\fR(3X)
+-termname/\fBcurs_termattrs\fR(3X)
+-tgetent/\fBcurs_termcap\fR(3X)
+-tgetflag/\fBcurs_termcap\fR(3X)
+-tgetnum/\fBcurs_termcap\fR(3X)
+-tgetstr/\fBcurs_termcap\fR(3X)
+-tgoto/\fBcurs_termcap\fR(3X)
+-tigetflag/\fBcurs_terminfo\fR(3X)
+-tigetnum/\fBcurs_terminfo\fR(3X)
+-tigetstr/\fBcurs_terminfo\fR(3X)
+-timeout/\fBcurs_inopts\fR(3X)
+-tiparm/\fBcurs_terminfo\fR(3X)*
+-touchline/\fBcurs_touch\fR(3X)
+-touchwin/\fBcurs_touch\fR(3X)
+-tparm/\fBcurs_terminfo\fR(3X)
+-tputs/\fBcurs_termcap\fR(3X)
+-tputs/\fBcurs_terminfo\fR(3X)
+-trace/\fBcurs_trace\fR(3X)*
+-typeahead/\fBcurs_inopts\fR(3X)
+-unctrl/\fBcurs_util\fR(3X)
+-unget_wch/\fBcurs_get_wch\fR(3X)
+-ungetch/\fBcurs_getch\fR(3X)
+-ungetmouse/\fBcurs_mouse\fR(3X)*
+-untouchwin/\fBcurs_touch\fR(3X)
+-use_default_colors/\fBdefault_colors\fR(3X)*
+-use_env/\fBcurs_util\fR(3X)
+-use_extended_names/\fBcurs_extend\fR(3X)*
+-use_legacy_coding/\fBlegacy_coding\fR(3X)*
+-use_tioctl/\fBcurs_util\fR(3X)*
+-vid_attr/\fBcurs_terminfo\fR(3X)
+-vid_puts/\fBcurs_terminfo\fR(3X)
+-vidattr/\fBcurs_terminfo\fR(3X)
+-vidputs/\fBcurs_terminfo\fR(3X)
+-vline/\fBcurs_border\fR(3X)
+-vline_set/\fBcurs_border_set\fR(3X)
+-vw_printw/\fBcurs_printw\fR(3X)
+-vw_scanw/\fBcurs_scanw\fR(3X)
+-vwprintw/\fBcurs_printw\fR(3X)
+-vwscanw/\fBcurs_scanw\fR(3X)
+-wadd_wch/\fBcurs_add_wch\fR(3X)
+-wadd_wchnstr/\fBcurs_add_wchstr\fR(3X)
+-wadd_wchstr/\fBcurs_add_wchstr\fR(3X)
+-waddch/\fBcurs_addch\fR(3X)
+-waddchnstr/\fBcurs_addchstr\fR(3X)
+-waddchstr/\fBcurs_addchstr\fR(3X)
+-waddnstr/\fBcurs_addstr\fR(3X)
+-waddnwstr/\fBcurs_addwstr\fR(3X)
+-waddstr/\fBcurs_addstr\fR(3X)
+-waddwstr/\fBcurs_addwstr\fR(3X)
+-wattr_get/\fBcurs_attr\fR(3X)
+-wattr_off/\fBcurs_attr\fR(3X)
+-wattr_on/\fBcurs_attr\fR(3X)
+-wattr_set/\fBcurs_attr\fR(3X)
+-wattroff/\fBcurs_attr\fR(3X)
+-wattron/\fBcurs_attr\fR(3X)
+-wattrset/\fBcurs_attr\fR(3X)
+-wbkgd/\fBcurs_bkgd\fR(3X)
+-wbkgdset/\fBcurs_bkgd\fR(3X)
+-wbkgrnd/\fBcurs_bkgrnd\fR(3X)
+-wbkgrndset/\fBcurs_bkgrnd\fR(3X)
+-wborder/\fBcurs_border\fR(3X)
+-wborder_set/\fBcurs_border_set\fR(3X)
+-wchgat/\fBcurs_attr\fR(3X)
+-wclear/\fBcurs_clear\fR(3X)
+-wclrtobot/\fBcurs_clear\fR(3X)
+-wclrtoeol/\fBcurs_clear\fR(3X)
+-wcolor_set/\fBcurs_attr\fR(3X)
+-wcursyncup/\fBcurs_window\fR(3X)
+-wdelch/\fBcurs_delch\fR(3X)
+-wdeleteln/\fBcurs_deleteln\fR(3X)
+-wecho_wchar/\fBcurs_add_wch\fR(3X)
+-wechochar/\fBcurs_addch\fR(3X)
+-wenclose/\fBcurs_mouse\fR(3X)*
+-werase/\fBcurs_clear\fR(3X)
+-wget_wch/\fBcurs_get_wch\fR(3X)
+-wget_wstr/\fBcurs_get_wstr\fR(3X)
+-wgetbkgrnd/\fBcurs_bkgrnd\fR(3X)
+-wgetch/\fBcurs_getch\fR(3X)
+-wgetdelay/\fBcurs_opaque\fR(3X)*
+-wgetn_wstr/\fBcurs_get_wstr\fR(3X)
+-wgetnstr/\fBcurs_getstr\fR(3X)
+-wgetparent/\fBcurs_opaque\fR(3X)*
+-wgetscrreg/\fBcurs_opaque\fR(3X)*
+-wgetstr/\fBcurs_getstr\fR(3X)
+-whline/\fBcurs_border\fR(3X)
+-whline_set/\fBcurs_border_set\fR(3X)
+-win_wch/\fBcurs_in_wch\fR(3X)
+-win_wchnstr/\fBcurs_in_wchstr\fR(3X)
+-win_wchstr/\fBcurs_in_wchstr\fR(3X)
+-winch/\fBcurs_inch\fR(3X)
+-winchnstr/\fBcurs_inchstr\fR(3X)
+-winchstr/\fBcurs_inchstr\fR(3X)
+-winnstr/\fBcurs_instr\fR(3X)
+-winnwstr/\fBcurs_inwstr\fR(3X)
+-wins_nwstr/\fBcurs_ins_wstr\fR(3X)
+-wins_wch/\fBcurs_ins_wch\fR(3X)
+-wins_wstr/\fBcurs_ins_wstr\fR(3X)
+-winsch/\fBcurs_insch\fR(3X)
+-winsdelln/\fBcurs_deleteln\fR(3X)
+-winsertln/\fBcurs_deleteln\fR(3X)
+-winsnstr/\fBcurs_insstr\fR(3X)
+-winsstr/\fBcurs_insstr\fR(3X)
+-winstr/\fBcurs_instr\fR(3X)
+-winwstr/\fBcurs_inwstr\fR(3X)
+-wmouse_trafo/\fBcurs_mouse\fR(3X)*
+-wmove/\fBcurs_move\fR(3X)
+-wnoutrefresh/\fBcurs_refresh\fR(3X)
+-wprintw/\fBcurs_printw\fR(3X)
+-wredrawln/\fBcurs_refresh\fR(3X)
+-wrefresh/\fBcurs_refresh\fR(3X)
+-wresize/\fBwresize\fR(3X)*
+-wscanw/\fBcurs_scanw\fR(3X)
+-wscrl/\fBcurs_scroll\fR(3X)
+-wsetscrreg/\fBcurs_outopts\fR(3X)
+-wstandend/\fBcurs_attr\fR(3X)
+-wstandout/\fBcurs_attr\fR(3X)
+-wsyncdown/\fBcurs_window\fR(3X)
+-wsyncup/\fBcurs_window\fR(3X)
+-wtimeout/\fBcurs_inopts\fR(3X)
+-wtouchln/\fBcurs_touch\fR(3X)
+-wunctrl/\fBcurs_util\fR(3X)
+-wvline/\fBcurs_border\fR(3X)
+-wvline_set/\fBcurs_border_set\fR(3X)
++COLOR_PAIR/\fBcurs_color\fP(3X)
++PAIR_NUMBER/\fBcurs_attr\fP(3X)
++add_wch/\fBcurs_add_wch\fP(3X)
++add_wchnstr/\fBcurs_add_wchstr\fP(3X)
++add_wchstr/\fBcurs_add_wchstr\fP(3X)
++addch/\fBcurs_addch\fP(3X)
++addchnstr/\fBcurs_addchstr\fP(3X)
++addchstr/\fBcurs_addchstr\fP(3X)
++addnstr/\fBcurs_addstr\fP(3X)
++addnwstr/\fBcurs_addwstr\fP(3X)
++addstr/\fBcurs_addstr\fP(3X)
++addwstr/\fBcurs_addwstr\fP(3X)
++alloc_pair/\fBnew_pair\fP(3X)*
++assume_default_colors/\fBdefault_colors\fP(3X)*
++attr_get/\fBcurs_attr\fP(3X)
++attr_off/\fBcurs_attr\fP(3X)
++attr_on/\fBcurs_attr\fP(3X)
++attr_set/\fBcurs_attr\fP(3X)
++attroff/\fBcurs_attr\fP(3X)
++attron/\fBcurs_attr\fP(3X)
++attrset/\fBcurs_attr\fP(3X)
++baudrate/\fBcurs_termattrs\fP(3X)
++beep/\fBcurs_beep\fP(3X)
++bkgd/\fBcurs_bkgd\fP(3X)
++bkgdset/\fBcurs_bkgd\fP(3X)
++bkgrnd/\fBcurs_bkgrnd\fP(3X)
++bkgrndset/\fBcurs_bkgrnd\fP(3X)
++border/\fBcurs_border\fP(3X)
++border_set/\fBcurs_border_set\fP(3X)
++box/\fBcurs_border\fP(3X)
++box_set/\fBcurs_border_set\fP(3X)
++can_change_color/\fBcurs_color\fP(3X)
++cbreak/\fBcurs_inopts\fP(3X)
++chgat/\fBcurs_attr\fP(3X)
++clear/\fBcurs_clear\fP(3X)
++clearok/\fBcurs_outopts\fP(3X)
++clrtobot/\fBcurs_clear\fP(3X)
++clrtoeol/\fBcurs_clear\fP(3X)
++color_content/\fBcurs_color\fP(3X)
++color_set/\fBcurs_attr\fP(3X)
++copywin/\fBcurs_overlay\fP(3X)
++curs_set/\fBcurs_kernel\fP(3X)
++curses_trace/\fBcurs_trace\fP(3X)*
++curses_version/\fBcurs_extend\fP(3X)*
++def_prog_mode/\fBcurs_kernel\fP(3X)
++def_shell_mode/\fBcurs_kernel\fP(3X)
++define_key/\fBdefine_key\fP(3X)*
++del_curterm/\fBcurs_terminfo\fP(3X)
++delay_output/\fBcurs_util\fP(3X)
++delch/\fBcurs_delch\fP(3X)
++deleteln/\fBcurs_deleteln\fP(3X)
++delscreen/\fBcurs_initscr\fP(3X)
++delwin/\fBcurs_window\fP(3X)
++derwin/\fBcurs_window\fP(3X)
++doupdate/\fBcurs_refresh\fP(3X)
++dupwin/\fBcurs_window\fP(3X)
++echo/\fBcurs_inopts\fP(3X)
++echo_wchar/\fBcurs_add_wch\fP(3X)
++echochar/\fBcurs_addch\fP(3X)
++endwin/\fBcurs_initscr\fP(3X)
++erase/\fBcurs_clear\fP(3X)
++erasechar/\fBcurs_termattrs\fP(3X)
++erasewchar/\fBcurs_termattrs\fP(3X)
++exit_curses/\fBcurs_memleaks\fP(3X)*
++exit_terminfo/\fBcurs_memleaks\fP(3X)*
++extended_color_content/\fBcurs_color\fP(3X)*
++extended_pair_content/\fBcurs_color\fP(3X)*
++extended_slk_color/\fBcurs_slk\fP(3X)*
++filter/\fBcurs_util\fP(3X)
++find_pair/\fBnew_pair\fP(3X)*
++flash/\fBcurs_beep\fP(3X)
++flushinp/\fBcurs_util\fP(3X)
++free_pair/\fBnew_pair\fP(3X)*
++get_wch/\fBcurs_get_wch\fP(3X)
++get_wstr/\fBcurs_get_wstr\fP(3X)
++getattrs/\fBcurs_attr\fP(3X)
++getbegx/\fBcurs_legacy\fP(3X)*
++getbegy/\fBcurs_legacy\fP(3X)*
++getbegyx/\fBcurs_getyx\fP(3X)
++getbkgd/\fBcurs_bkgd\fP(3X)
++getbkgrnd/\fBcurs_bkgrnd\fP(3X)
++getcchar/\fBcurs_getcchar\fP(3X)
++getch/\fBcurs_getch\fP(3X)
++getcurx/\fBcurs_legacy\fP(3X)*
++getcury/\fBcurs_legacy\fP(3X)*
++getmaxx/\fBcurs_legacy\fP(3X)*
++getmaxy/\fBcurs_legacy\fP(3X)*
++getmaxyx/\fBcurs_getyx\fP(3X)
++getmouse/\fBcurs_mouse\fP(3X)*
++getn_wstr/\fBcurs_get_wstr\fP(3X)
++getnstr/\fBcurs_getstr\fP(3X)
++getparx/\fBcurs_legacy\fP(3X)*
++getpary/\fBcurs_legacy\fP(3X)*
++getparyx/\fBcurs_getyx\fP(3X)
++getstr/\fBcurs_getstr\fP(3X)
++getsyx/\fBcurs_kernel\fP(3X)
++getwin/\fBcurs_util\fP(3X)
++getyx/\fBcurs_getyx\fP(3X)
++halfdelay/\fBcurs_inopts\fP(3X)
++has_colors/\fBcurs_color\fP(3X)
++has_ic/\fBcurs_termattrs\fP(3X)
++has_il/\fBcurs_termattrs\fP(3X)
++has_key/\fBcurs_getch\fP(3X)*
++has_mouse/\fBcurs_mouse\fP(3X)*
++hline/\fBcurs_border\fP(3X)
++hline_set/\fBcurs_border_set\fP(3X)
++idcok/\fBcurs_outopts\fP(3X)
++idlok/\fBcurs_outopts\fP(3X)
++immedok/\fBcurs_outopts\fP(3X)
++in_wch/\fBcurs_in_wch\fP(3X)
++in_wchnstr/\fBcurs_in_wchstr\fP(3X)
++in_wchstr/\fBcurs_in_wchstr\fP(3X)
++inch/\fBcurs_inch\fP(3X)
++inchnstr/\fBcurs_inchstr\fP(3X)
++inchstr/\fBcurs_inchstr\fP(3X)
++init_color/\fBcurs_color\fP(3X)
++init_extended_color/\fBcurs_color\fP(3X)*
++init_extended_pair/\fBcurs_color\fP(3X)*
++init_pair/\fBcurs_color\fP(3X)
++initscr/\fBcurs_initscr\fP(3X)
++innstr/\fBcurs_instr\fP(3X)
++innwstr/\fBcurs_inwstr\fP(3X)
++ins_nwstr/\fBcurs_ins_wstr\fP(3X)
++ins_wch/\fBcurs_ins_wch\fP(3X)
++ins_wstr/\fBcurs_ins_wstr\fP(3X)
++insch/\fBcurs_insch\fP(3X)
++insdelln/\fBcurs_deleteln\fP(3X)
++insertln/\fBcurs_deleteln\fP(3X)
++insnstr/\fBcurs_insstr\fP(3X)
++insstr/\fBcurs_insstr\fP(3X)
++instr/\fBcurs_instr\fP(3X)
++intrflush/\fBcurs_inopts\fP(3X)
++inwstr/\fBcurs_inwstr\fP(3X)
++is_cleared/\fBcurs_opaque\fP(3X)*
++is_idcok/\fBcurs_opaque\fP(3X)*
++is_idlok/\fBcurs_opaque\fP(3X)*
++is_immedok/\fBcurs_opaque\fP(3X)*
++is_keypad/\fBcurs_opaque\fP(3X)*
++is_leaveok/\fBcurs_opaque\fP(3X)*
++is_linetouched/\fBcurs_touch\fP(3X)
++is_nodelay/\fBcurs_opaque\fP(3X)*
++is_notimeout/\fBcurs_opaque\fP(3X)*
++is_pad/\fBcurs_opaque\fP(3X)*
++is_scrollok/\fBcurs_opaque\fP(3X)*
++is_subwin/\fBcurs_opaque\fP(3X)*
++is_syncok/\fBcurs_opaque\fP(3X)*
++is_term_resized/\fBresizeterm\fP(3X)*
++is_wintouched/\fBcurs_touch\fP(3X)
++isendwin/\fBcurs_initscr\fP(3X)
++key_defined/\fBkey_defined\fP(3X)*
++key_name/\fBcurs_util\fP(3X)
++keybound/\fBkeybound\fP(3X)*
++keyname/\fBcurs_util\fP(3X)
++keyok/\fBkeyok\fP(3X)*
++keypad/\fBcurs_inopts\fP(3X)
++killchar/\fBcurs_termattrs\fP(3X)
++killwchar/\fBcurs_termattrs\fP(3X)
++leaveok/\fBcurs_outopts\fP(3X)
++longname/\fBcurs_termattrs\fP(3X)
++mcprint/\fBcurs_print\fP(3X)*
++meta/\fBcurs_inopts\fP(3X)
++mouse_trafo/\fBcurs_mouse\fP(3X)*
++mouseinterval/\fBcurs_mouse\fP(3X)*
++mousemask/\fBcurs_mouse\fP(3X)*
++move/\fBcurs_move\fP(3X)
++mvadd_wch/\fBcurs_add_wch\fP(3X)
++mvadd_wchnstr/\fBcurs_add_wchstr\fP(3X)
++mvadd_wchstr/\fBcurs_add_wchstr\fP(3X)
++mvaddch/\fBcurs_addch\fP(3X)
++mvaddchnstr/\fBcurs_addchstr\fP(3X)
++mvaddchstr/\fBcurs_addchstr\fP(3X)
++mvaddnstr/\fBcurs_addstr\fP(3X)
++mvaddnwstr/\fBcurs_addwstr\fP(3X)
++mvaddstr/\fBcurs_addstr\fP(3X)
++mvaddwstr/\fBcurs_addwstr\fP(3X)
++mvchgat/\fBcurs_attr\fP(3X)
++mvcur/\fBcurs_terminfo\fP(3X)
++mvdelch/\fBcurs_delch\fP(3X)
++mvderwin/\fBcurs_window\fP(3X)
++mvget_wch/\fBcurs_get_wch\fP(3X)
++mvget_wstr/\fBcurs_get_wstr\fP(3X)
++mvgetch/\fBcurs_getch\fP(3X)
++mvgetn_wstr/\fBcurs_get_wstr\fP(3X)
++mvgetnstr/\fBcurs_getstr\fP(3X)
++mvgetstr/\fBcurs_getstr\fP(3X)
++mvhline/\fBcurs_border\fP(3X)
++mvhline_set/\fBcurs_border_set\fP(3X)
++mvin_wch/\fBcurs_in_wch\fP(3X)
++mvin_wchnstr/\fBcurs_in_wchstr\fP(3X)
++mvin_wchstr/\fBcurs_in_wchstr\fP(3X)
++mvinch/\fBcurs_inch\fP(3X)
++mvinchnstr/\fBcurs_inchstr\fP(3X)
++mvinchstr/\fBcurs_inchstr\fP(3X)
++mvinnstr/\fBcurs_instr\fP(3X)
++mvinnwstr/\fBcurs_inwstr\fP(3X)
++mvins_nwstr/\fBcurs_ins_wstr\fP(3X)
++mvins_wch/\fBcurs_ins_wch\fP(3X)
++mvins_wstr/\fBcurs_ins_wstr\fP(3X)
++mvinsch/\fBcurs_insch\fP(3X)
++mvinsnstr/\fBcurs_insstr\fP(3X)
++mvinsstr/\fBcurs_insstr\fP(3X)
++mvinstr/\fBcurs_instr\fP(3X)
++mvinwstr/\fBcurs_inwstr\fP(3X)
++mvprintw/\fBcurs_printw\fP(3X)
++mvscanw/\fBcurs_scanw\fP(3X)
++mvvline/\fBcurs_border\fP(3X)
++mvvline_set/\fBcurs_border_set\fP(3X)
++mvwadd_wch/\fBcurs_add_wch\fP(3X)
++mvwadd_wchnstr/\fBcurs_add_wchstr\fP(3X)
++mvwadd_wchstr/\fBcurs_add_wchstr\fP(3X)
++mvwaddch/\fBcurs_addch\fP(3X)
++mvwaddchnstr/\fBcurs_addchstr\fP(3X)
++mvwaddchstr/\fBcurs_addchstr\fP(3X)
++mvwaddnstr/\fBcurs_addstr\fP(3X)
++mvwaddnwstr/\fBcurs_addwstr\fP(3X)
++mvwaddstr/\fBcurs_addstr\fP(3X)
++mvwaddwstr/\fBcurs_addwstr\fP(3X)
++mvwchgat/\fBcurs_attr\fP(3X)
++mvwdelch/\fBcurs_delch\fP(3X)
++mvwget_wch/\fBcurs_get_wch\fP(3X)
++mvwget_wstr/\fBcurs_get_wstr\fP(3X)
++mvwgetch/\fBcurs_getch\fP(3X)
++mvwgetn_wstr/\fBcurs_get_wstr\fP(3X)
++mvwgetnstr/\fBcurs_getstr\fP(3X)
++mvwgetstr/\fBcurs_getstr\fP(3X)
++mvwhline/\fBcurs_border\fP(3X)
++mvwhline_set/\fBcurs_border_set\fP(3X)
++mvwin/\fBcurs_window\fP(3X)
++mvwin_wch/\fBcurs_in_wch\fP(3X)
++mvwin_wchnstr/\fBcurs_in_wchstr\fP(3X)
++mvwin_wchstr/\fBcurs_in_wchstr\fP(3X)
++mvwinch/\fBcurs_inch\fP(3X)
++mvwinchnstr/\fBcurs_inchstr\fP(3X)
++mvwinchstr/\fBcurs_inchstr\fP(3X)
++mvwinnstr/\fBcurs_instr\fP(3X)
++mvwinnwstr/\fBcurs_inwstr\fP(3X)
++mvwins_nwstr/\fBcurs_ins_wstr\fP(3X)
++mvwins_wch/\fBcurs_ins_wch\fP(3X)
++mvwins_wstr/\fBcurs_ins_wstr\fP(3X)
++mvwinsch/\fBcurs_insch\fP(3X)
++mvwinsnstr/\fBcurs_insstr\fP(3X)
++mvwinsstr/\fBcurs_insstr\fP(3X)
++mvwinstr/\fBcurs_instr\fP(3X)
++mvwinwstr/\fBcurs_inwstr\fP(3X)
++mvwprintw/\fBcurs_printw\fP(3X)
++mvwscanw/\fBcurs_scanw\fP(3X)
++mvwvline/\fBcurs_border\fP(3X)
++mvwvline_set/\fBcurs_border_set\fP(3X)
++napms/\fBcurs_kernel\fP(3X)
++newpad/\fBcurs_pad\fP(3X)
++newterm/\fBcurs_initscr\fP(3X)
++newwin/\fBcurs_window\fP(3X)
++nl/\fBcurs_inopts\fP(3X)
++nocbreak/\fBcurs_inopts\fP(3X)
++nodelay/\fBcurs_inopts\fP(3X)
++noecho/\fBcurs_inopts\fP(3X)
++nofilter/\fBcurs_util\fP(3X)*
++nonl/\fBcurs_inopts\fP(3X)
++noqiflush/\fBcurs_inopts\fP(3X)
++noraw/\fBcurs_inopts\fP(3X)
++notimeout/\fBcurs_inopts\fP(3X)
++overlay/\fBcurs_overlay\fP(3X)
++overwrite/\fBcurs_overlay\fP(3X)
++pair_content/\fBcurs_color\fP(3X)
++pecho_wchar/\fBcurs_pad\fP(3X)*
++pechochar/\fBcurs_pad\fP(3X)
++pnoutrefresh/\fBcurs_pad\fP(3X)
++prefresh/\fBcurs_pad\fP(3X)
++printw/\fBcurs_printw\fP(3X)
++putp/\fBcurs_terminfo\fP(3X)
++putwin/\fBcurs_util\fP(3X)
++qiflush/\fBcurs_inopts\fP(3X)
++raw/\fBcurs_inopts\fP(3X)
++redrawwin/\fBcurs_refresh\fP(3X)
++refresh/\fBcurs_refresh\fP(3X)
++reset_color_pairs/\fBcurs_color\fP(3X)*
++reset_prog_mode/\fBcurs_kernel\fP(3X)
++reset_shell_mode/\fBcurs_kernel\fP(3X)
++resetty/\fBcurs_kernel\fP(3X)
++resize_term/\fBresizeterm\fP(3X)*
++resizeterm/\fBresizeterm\fP(3X)*
++restartterm/\fBcurs_terminfo\fP(3X)
++ripoffline/\fBcurs_kernel\fP(3X)
++savetty/\fBcurs_kernel\fP(3X)
++scanw/\fBcurs_scanw\fP(3X)
++scr_dump/\fBcurs_scr_dump\fP(3X)
++scr_init/\fBcurs_scr_dump\fP(3X)
++scr_restore/\fBcurs_scr_dump\fP(3X)
++scr_set/\fBcurs_scr_dump\fP(3X)
++scrl/\fBcurs_scroll\fP(3X)
++scroll/\fBcurs_scroll\fP(3X)
++scrollok/\fBcurs_outopts\fP(3X)
++set_curterm/\fBcurs_terminfo\fP(3X)
++set_term/\fBcurs_initscr\fP(3X)
++setcchar/\fBcurs_getcchar\fP(3X)
++setscrreg/\fBcurs_outopts\fP(3X)
++setsyx/\fBcurs_kernel\fP(3X)
++setupterm/\fBcurs_terminfo\fP(3X)
++slk_attr/\fBcurs_slk\fP(3X)*
++slk_attr_off/\fBcurs_slk\fP(3X)
++slk_attr_on/\fBcurs_slk\fP(3X)
++slk_attr_set/\fBcurs_slk\fP(3X)
++slk_attroff/\fBcurs_slk\fP(3X)
++slk_attron/\fBcurs_slk\fP(3X)
++slk_attrset/\fBcurs_slk\fP(3X)
++slk_clear/\fBcurs_slk\fP(3X)
++slk_color/\fBcurs_slk\fP(3X)
++slk_init/\fBcurs_slk\fP(3X)
++slk_label/\fBcurs_slk\fP(3X)
++slk_noutrefresh/\fBcurs_slk\fP(3X)
++slk_refresh/\fBcurs_slk\fP(3X)
++slk_restore/\fBcurs_slk\fP(3X)
++slk_set/\fBcurs_slk\fP(3X)
++slk_touch/\fBcurs_slk\fP(3X)
++slk_wset/\fBcurs_slk\fP(3X)*
++standend/\fBcurs_attr\fP(3X)
++standout/\fBcurs_attr\fP(3X)
++start_color/\fBcurs_color\fP(3X)
++subpad/\fBcurs_pad\fP(3X)
++subwin/\fBcurs_window\fP(3X)
++syncok/\fBcurs_window\fP(3X)
++term_attrs/\fBcurs_termattrs\fP(3X)
++termattrs/\fBcurs_termattrs\fP(3X)
++termname/\fBcurs_termattrs\fP(3X)
++tgetent/\fBcurs_termcap\fP(3X)
++tgetflag/\fBcurs_termcap\fP(3X)
++tgetnum/\fBcurs_termcap\fP(3X)
++tgetstr/\fBcurs_termcap\fP(3X)
++tgoto/\fBcurs_termcap\fP(3X)
++tigetflag/\fBcurs_terminfo\fP(3X)
++tigetnum/\fBcurs_terminfo\fP(3X)
++tigetstr/\fBcurs_terminfo\fP(3X)
++timeout/\fBcurs_inopts\fP(3X)
++tiparm/\fBcurs_terminfo\fP(3X)*
++touchline/\fBcurs_touch\fP(3X)
++touchwin/\fBcurs_touch\fP(3X)
++tparm/\fBcurs_terminfo\fP(3X)
++tputs/\fBcurs_termcap\fP(3X)
++tputs/\fBcurs_terminfo\fP(3X)
++trace/\fBcurs_trace\fP(3X)*
++typeahead/\fBcurs_inopts\fP(3X)
++unctrl/\fBcurs_util\fP(3X)
++unget_wch/\fBcurs_get_wch\fP(3X)
++ungetch/\fBcurs_getch\fP(3X)
++ungetmouse/\fBcurs_mouse\fP(3X)*
++untouchwin/\fBcurs_touch\fP(3X)
++use_default_colors/\fBdefault_colors\fP(3X)*
++use_env/\fBcurs_util\fP(3X)
++use_extended_names/\fBcurs_extend\fP(3X)*
++use_legacy_coding/\fBlegacy_coding\fP(3X)*
++use_tioctl/\fBcurs_util\fP(3X)*
++vid_attr/\fBcurs_terminfo\fP(3X)
++vid_puts/\fBcurs_terminfo\fP(3X)
++vidattr/\fBcurs_terminfo\fP(3X)
++vidputs/\fBcurs_terminfo\fP(3X)
++vline/\fBcurs_border\fP(3X)
++vline_set/\fBcurs_border_set\fP(3X)
++vw_printw/\fBcurs_printw\fP(3X)
++vw_scanw/\fBcurs_scanw\fP(3X)
++vwprintw/\fBcurs_printw\fP(3X)
++vwscanw/\fBcurs_scanw\fP(3X)
++wadd_wch/\fBcurs_add_wch\fP(3X)
++wadd_wchnstr/\fBcurs_add_wchstr\fP(3X)
++wadd_wchstr/\fBcurs_add_wchstr\fP(3X)
++waddch/\fBcurs_addch\fP(3X)
++waddchnstr/\fBcurs_addchstr\fP(3X)
++waddchstr/\fBcurs_addchstr\fP(3X)
++waddnstr/\fBcurs_addstr\fP(3X)
++waddnwstr/\fBcurs_addwstr\fP(3X)
++waddstr/\fBcurs_addstr\fP(3X)
++waddwstr/\fBcurs_addwstr\fP(3X)
++wattr_get/\fBcurs_attr\fP(3X)
++wattr_off/\fBcurs_attr\fP(3X)
++wattr_on/\fBcurs_attr\fP(3X)
++wattr_set/\fBcurs_attr\fP(3X)
++wattroff/\fBcurs_attr\fP(3X)
++wattron/\fBcurs_attr\fP(3X)
++wattrset/\fBcurs_attr\fP(3X)
++wbkgd/\fBcurs_bkgd\fP(3X)
++wbkgdset/\fBcurs_bkgd\fP(3X)
++wbkgrnd/\fBcurs_bkgrnd\fP(3X)
++wbkgrndset/\fBcurs_bkgrnd\fP(3X)
++wborder/\fBcurs_border\fP(3X)
++wborder_set/\fBcurs_border_set\fP(3X)
++wchgat/\fBcurs_attr\fP(3X)
++wclear/\fBcurs_clear\fP(3X)
++wclrtobot/\fBcurs_clear\fP(3X)
++wclrtoeol/\fBcurs_clear\fP(3X)
++wcolor_set/\fBcurs_attr\fP(3X)
++wcursyncup/\fBcurs_window\fP(3X)
++wdelch/\fBcurs_delch\fP(3X)
++wdeleteln/\fBcurs_deleteln\fP(3X)
++wecho_wchar/\fBcurs_add_wch\fP(3X)
++wechochar/\fBcurs_addch\fP(3X)
++wenclose/\fBcurs_mouse\fP(3X)*
++werase/\fBcurs_clear\fP(3X)
++wget_wch/\fBcurs_get_wch\fP(3X)
++wget_wstr/\fBcurs_get_wstr\fP(3X)
++wgetbkgrnd/\fBcurs_bkgrnd\fP(3X)
++wgetch/\fBcurs_getch\fP(3X)
++wgetdelay/\fBcurs_opaque\fP(3X)*
++wgetn_wstr/\fBcurs_get_wstr\fP(3X)
++wgetnstr/\fBcurs_getstr\fP(3X)
++wgetparent/\fBcurs_opaque\fP(3X)*
++wgetscrreg/\fBcurs_opaque\fP(3X)*
++wgetstr/\fBcurs_getstr\fP(3X)
++whline/\fBcurs_border\fP(3X)
++whline_set/\fBcurs_border_set\fP(3X)
++win_wch/\fBcurs_in_wch\fP(3X)
++win_wchnstr/\fBcurs_in_wchstr\fP(3X)
++win_wchstr/\fBcurs_in_wchstr\fP(3X)
++winch/\fBcurs_inch\fP(3X)
++winchnstr/\fBcurs_inchstr\fP(3X)
++winchstr/\fBcurs_inchstr\fP(3X)
++winnstr/\fBcurs_instr\fP(3X)
++winnwstr/\fBcurs_inwstr\fP(3X)
++wins_nwstr/\fBcurs_ins_wstr\fP(3X)
++wins_wch/\fBcurs_ins_wch\fP(3X)
++wins_wstr/\fBcurs_ins_wstr\fP(3X)
++winsch/\fBcurs_insch\fP(3X)
++winsdelln/\fBcurs_deleteln\fP(3X)
++winsertln/\fBcurs_deleteln\fP(3X)
++winsnstr/\fBcurs_insstr\fP(3X)
++winsstr/\fBcurs_insstr\fP(3X)
++winstr/\fBcurs_instr\fP(3X)
++winwstr/\fBcurs_inwstr\fP(3X)
++wmouse_trafo/\fBcurs_mouse\fP(3X)*
++wmove/\fBcurs_move\fP(3X)
++wnoutrefresh/\fBcurs_refresh\fP(3X)
++wprintw/\fBcurs_printw\fP(3X)
++wredrawln/\fBcurs_refresh\fP(3X)
++wrefresh/\fBcurs_refresh\fP(3X)
++wresize/\fBwresize\fP(3X)*
++wscanw/\fBcurs_scanw\fP(3X)
++wscrl/\fBcurs_scroll\fP(3X)
++wsetscrreg/\fBcurs_outopts\fP(3X)
++wstandend/\fBcurs_attr\fP(3X)
++wstandout/\fBcurs_attr\fP(3X)
++wsyncdown/\fBcurs_window\fP(3X)
++wsyncup/\fBcurs_window\fP(3X)
++wtimeout/\fBcurs_inopts\fP(3X)
++wtouchln/\fBcurs_touch\fP(3X)
++wunctrl/\fBcurs_util\fP(3X)
++wvline/\fBcurs_border\fP(3X)
++wvline_set/\fBcurs_border_set\fP(3X)
+ .TE
+ .PP
+ Depending on the configuration,
+@@ -790,21 +790,21 @@
+ \fBcurs_trace\fP(3X) - curses debugging routines
+ .RE
+ .SH RETURN VALUE
+-Routines that return an integer return \fBERR\fR upon failure and an
+-integer value other than \fBERR\fR upon successful completion, unless
++Routines that return an integer return \fBERR\fP upon failure and an
++integer value other than \fBERR\fP upon successful completion, unless
+ otherwise noted in the routine descriptions.
+ .PP
+ As a general rule, routines check for null pointers passed as parameters,
+ and handle this as an error.
+ .PP
+-All macros return the value of the \fBw\fR version, except \fBsetscrreg\fR,
+-\fBwsetscrreg\fR, \fBgetyx\fR, \fBgetbegyx\fR, and \fBgetmaxyx\fR.
++All macros return the value of the \fBw\fP version, except \fBsetscrreg\fP,
++\fBwsetscrreg\fP, \fBgetyx\fP, \fBgetbegyx\fP, and \fBgetmaxyx\fP.
+ The return values of
+-\fBsetscrreg\fR,
+-\fBwsetscrreg\fR,
+-\fBgetyx\fR,
+-\fBgetbegyx\fR, and
+-\fBgetmaxyx\fR are undefined (i.e., these should not be used as the
++\fBsetscrreg\fP,
++\fBwsetscrreg\fP,
++\fBgetyx\fP,
++\fBgetbegyx\fP, and
++\fBgetmaxyx\fP are undefined (i.e., these should not be used as the
+ right-hand side of assignment statements).
+ .PP
+ Functions with a \*(``mv\*('' prefix first perform a cursor movement using
+@@ -814,11 +814,11 @@
+ (except variadic functions such as \fBmvprintw\fP)
+ are provided both as macros and functions.
+ .PP
+-Routines that return pointers return \fBNULL\fR on error.
++Routines that return pointers return \fBNULL\fP on error.
+ .SH ENVIRONMENT
+ .PP
+ The following environment symbols are useful for customizing the
+-runtime behavior of the \fBncurses\fR library.
++runtime behavior of the \fBncurses\fP library.
+ The most important ones have been already discussed in detail.
+ .SS CC command-character
+ .PP
+@@ -828,14 +828,14 @@
+ Very few terminfo entries provide this feature.
+ .PP
+ Because this name is also used in development environments to represent
+-the C compiler's name, \fBncurses\fR ignores it if it does not happen to
++the C compiler's name, \fBncurses\fP ignores it if it does not happen to
+ be a single character.
+ .SS BAUDRATE
+ .PP
+ The debugging library checks this environment variable when the application
+ has redirected output to a file.
+ The variable's numeric value is used for the baudrate.
+-If no value is found, \fBncurses\fR uses 9600.
++If no value is found, \fBncurses\fP uses 9600.
+ This allows testers to construct repeatable test-cases
+ that take into account costs that depend on baudrate.
+ .SS COLUMNS
+@@ -844,8 +844,8 @@
+ Applications running in a windowing environment usually are able to
+ obtain the width of the window in which they are executing.
+ If neither the \fBCOLUMNS\fP value nor the terminal's screen size is available,
+-\fBncurses\fR uses the size which may be specified in the terminfo database
+-(i.e., the \fBcols\fR capability).
++\fBncurses\fP uses the size which may be specified in the terminfo database
++(i.e., the \fBcols\fP capability).
+ .PP
+ It is important that your application use a correct size for the screen.
+ This is not always possible because your application may be
+@@ -857,12 +857,12 @@
+ Either \fBCOLUMNS\fP or \fBLINES\fP symbols may be specified independently.
+ This is mainly useful to circumvent legacy misfeatures of terminal descriptions,
+ e.g., xterm which commonly specifies a 65 line screen.
+-For best results, \fBlines\fR and \fBcols\fR should not be specified in
++For best results, \fBlines\fP and \fBcols\fP should not be specified in
+ a terminal description for terminals which are run as emulations.
+ .PP
+-Use the \fBuse_env\fR function to disable all use of external environment
++Use the \fBuse_env\fP function to disable all use of external environment
+ (but not including system calls) to determine the screen size.
+-Use the \fBuse_tioctl\fR function to update \fBCOLUMNS\fP or \fBLINES\fP
++Use the \fBuse_tioctl\fP function to update \fBCOLUMNS\fP or \fBLINES\fP
+ to match the screen size obtained from system calls or the terminal database.
+ .SS ESCDELAY
+ .PP
+@@ -890,7 +890,7 @@
+ but setting the environment variable rather than the global variable
+ does not create problems when compiling an application.
+ .SS HOME
+-Tells \fBncurses\fR where your home directory is.
++Tells \fBncurses\fP where your home directory is.
+ That is where it may read and write auxiliary terminal descriptions:
+ .NS
+ $HOME/.termcap
+@@ -916,18 +916,18 @@
+ .PP
+ This variable lets you customize the mouse.
+ The variable must be three numeric digits 1\-3 in any order, e.g., 123 or 321.
+-If it is not specified, \fBncurses\fR uses 132.
++If it is not specified, \fBncurses\fP uses 132.
+ .SS NCURSES_ASSUMED_COLORS
+ .PP
+ Override the compiled-in assumption that the
+ terminal's default colors are white-on-black
+-(see \fBdefault_colors\fR(3X)).
++(see \fBdefault_colors\fP(3X)).
+ You may set the foreground and background color values with this environment
+ variable by proving a 2-element list: foreground,background.
+ For example, to tell ncurses to not assume anything
+ about the colors, set this to "\-1,\-1".
+ To make it green-on-black, set it to "2,0".
+-Any positive value from zero to the terminfo \fBmax_colors\fR value is allowed.
++Any positive value from zero to the terminfo \fBmax_colors\fP value is allowed.
+ .SS NCURSES_CONSOLE2
+ This applies only to the MinGW port of ncurses.
+ .PP
+@@ -956,7 +956,7 @@
+ In some cases,
+ your terminal driver may not handle these properly.
+ Set this environment variable to disable the feature.
+-You can also adjust your \fBstty\fP settings to avoid the problem.
++You can also adjust your \fBstty\fP(1) settings to avoid the problem.
+ .SS NCURSES_NO_MAGIC_COOKIE
+ .PP
+ Some terminals use a magic-cookie feature which requires special handling
+@@ -989,7 +989,7 @@
+ Set the NCURSES_NO_PADDING environment variable to disable all but mandatory
+ padding.
+ Mandatory padding is used as a part of special control
+-sequences such as \fIflash\fR.
++sequences such as \fBflash\fP.
+ .SS NCURSES_NO_SETBUF
+ This setting is obsolete.
+ Before changes
+@@ -1002,9 +1002,9 @@
+ though 5.9 patch 20130126
+ .RE
+ .PP
+-\fBncurses\fR enabled buffered output during terminal initialization.
++\fBncurses\fP enabled buffered output during terminal initialization.
+ This was done (as in SVr4 curses) for performance reasons.
+-For testing purposes, both of \fBncurses\fR and certain applications,
++For testing purposes, both of \fBncurses\fP and certain applications,
+ this feature was made optional.
+ Setting the NCURSES_NO_SETBUF variable
+ disabled output buffering, leaving the output in the original (usually
+@@ -1025,7 +1025,7 @@
+ But high-level curses calls do not.
+ .SS NCURSES_NO_UTF8_ACS
+ .PP
+-During initialization, the \fBncurses\fR library
++During initialization, the \fBncurses\fP library
+ checks for special cases where VT100 line-drawing (and the corresponding
+ alternate character set capabilities) described in the terminfo are known
+ to be missing.
+@@ -1067,15 +1067,15 @@
+ termcap interface.
+ .SS NCURSES_TRACE
+ .PP
+-During initialization, the \fBncurses\fR debugging library
++During initialization, the \fBncurses\fP debugging library
+ checks the NCURSES_TRACE environment variable.
+-If it is defined, to a numeric value, \fBncurses\fR calls the \fBtrace\fR
++If it is defined, to a numeric value, \fBncurses\fP calls the \fBtrace\fP
+ function, using that value as the argument.
+ .PP
+-The argument values, which are defined in \fBcurses.h\fR, provide several
++The argument values, which are defined in \fBcurses.h\fP, provide several
+ types of information.
+ When running with traces enabled, your application will write the
+-file \fBtrace\fR to the current directory.
++file \fBtrace\fP to the current directory.
+ .PP
+ See \fBcurs_trace\fP(3X) for more information.
+ .SS TERM
+@@ -1093,20 +1093,20 @@
+ If you set \fBTERM\fP in your environment,
+ it has no effect on the operation of the terminal emulator.
+ It only affects the way applications work within the terminal.
+-Likewise, as a general rule (\fBxterm\fP being a rare exception),
++Likewise, as a general rule (\fBxterm\fP(1) being a rare exception),
+ terminal emulators which allow you to
+ specify \fBTERM\fP as a parameter or configuration value do
+ not change their behavior to match that setting.
+ .SS TERMCAP
+-If the \fBncurses\fR library has been configured with \fItermcap\fR
+-support, \fBncurses\fR will check for a terminal's description in
++If the \fBncurses\fP library has been configured with \fItermcap\fP
++support, \fBncurses\fP will check for a terminal's description in
+ termcap form if it is not available in the terminfo database.
+ .PP
+ The \fBTERMCAP\fP environment variable contains
+ either a terminal description (with newlines stripped out),
+ or a file name telling where the information denoted by
+ the \fBTERM\fP environment variable exists.
+-In either case, setting it directs \fBncurses\fR to ignore
++In either case, setting it directs \fBncurses\fP to ignore
+ the usual place for this information, e.g., /etc/termcap.
+ .SS TERMINFO
+ .PP
+@@ -1161,7 +1161,7 @@
+ The complete list of database locations in order follows:
+ .RS 3
+ .bP
+-the last terminal database to which \fBncurses\fR wrote,
++the last terminal database to which \fBncurses\fP wrote,
+ if any, is searched first
+ .bP
+ the location specified by the TERMINFO environment variable
+@@ -1191,13 +1191,13 @@
+ it is an extension developed for \fBncurses\fP.
+ .SS TERMPATH
+ .PP
+-If \fBTERMCAP\fP does not hold a file name then \fBncurses\fR checks
++If \fBTERMCAP\fP does not hold a file name then \fBncurses\fP checks
+ the \fBTERMPATH\fP environment variable.
+ This is a list of filenames separated by spaces or colons (i.e., ":") on Unix,
+ semicolons on OS/2 EMX.
+ .PP
+ If the \fBTERMPATH\fP environment variable is not set,
+-\fBncurses\fR looks in the files
++\fBncurses\fP looks in the files
+ .NS
+ /etc/termcap, /usr/share/misc/termcap and $HOME/.termcap,
+ .NE
+@@ -1220,7 +1220,7 @@
+ \-\-disable\-overwrite
+ The standard include for \fBncurses\fP is as noted in \fBSYNOPSIS\fP:
+ .NS
+-\fB#include \fR
++\fB#include \fP
+ .NE
+ .IP
+ This option is used to avoid filename conflicts when \fBncurses\fP
+@@ -1228,7 +1228,7 @@
+ If \fBncurses\fP is installed disabling overwrite, it puts its headers in
+ a subdirectory, e.g.,
+ .NS
+-\fB#include \fR
++\fB#include \fP
+ .NE
+ .IP
+ It also omits a symbolic link which would allow you to use \fB\-lcurses\fP
+@@ -1241,12 +1241,12 @@
+ All of the library names have a \*(``w\*('' appended to them,
+ i.e., instead of
+ .NS
+-\fB\-lncurses\fR
++\fB\-lncurses\fP
+ .NE
+ .IP
+ you link with
+ .NS
+-\fB\-lncursesw\fR
++\fB\-lncursesw\fP
+ .NE
+ .IP
+ You must also enable the wide-character features in the header file
+@@ -1318,17 +1318,17 @@
+ .bP
+ \fBcurs_extend\fP(3X) \- miscellaneous curses extensions
+ .bP
+-\fBcurs_inopts\fR(3X) \- \fBcurses\fR input options
++\fBcurs_inopts\fP(3X) \- \fBcurses\fP input options
+ .bP
+-\fBcurs_kernel\fR(3X) \- low-level \fBcurses\fR routines
++\fBcurs_kernel\fP(3X) \- low-level \fBcurses\fP routines
+ .bP
+-\fBcurs_termattrs\fR(3X) \- \fBcurses\fR environment query routines
++\fBcurs_termattrs\fP(3X) \- \fBcurses\fP environment query routines
+ .bP
+-\fBcurs_termcap\fR(3X) \- \fBcurses\fR emulation of termcap
++\fBcurs_termcap\fP(3X) \- \fBcurses\fP emulation of termcap
+ .bP
+-\fBcurs_terminfo\fR(3X) \- \fBcurses\fR interfaces to terminfo database
++\fBcurs_terminfo\fP(3X) \- \fBcurses\fP interfaces to terminfo database
+ .bP
+-\fBcurs_util\fR(3X) \- miscellaneous \fBcurses\fR utility routines
++\fBcurs_util\fP(3X) \- miscellaneous \fBcurses\fP utility routines
+ .RE
+ .TP 5
+ \-\-with\-trace
+@@ -1343,57 +1343,57 @@
+ @TERMINFO@
+ terminal capability database
+ .SH SEE ALSO
+-\fBterminfo\fR(\*n) and related pages whose names begin
++\fBterminfo\fP(\*n) and related pages whose names begin
+ \*(``curs_\*('' for detailed routine descriptions.
+ .br
+-\fBcurs_variables\fR(3X)
++\fBcurs_variables\fP(3X)
+ .br
+ \fBuser_caps\fP(5) for user-defined capabilities
+ .SH EXTENSIONS
+-The \fBncurses\fR library can be compiled with an option (\fB\-DUSE_GETCAP\fR)
++The \fBncurses\fP library can be compiled with an option (\fB\-DUSE_GETCAP\fP)
+ that falls back to the old-style /etc/termcap file if the terminal setup code
+-cannot find a terminfo entry corresponding to \fBTERM\fR.
++cannot find a terminfo entry corresponding to \fBTERM\fP.
+ Use of this feature
+ is not recommended, as it essentially includes an entire termcap compiler in
+-the \fBncurses\fR startup code, at significant cost in core and startup cycles.
++the \fBncurses\fP startup code, at significant cost in core and startup cycles.
+ .PP
+-The \fBncurses\fR library includes facilities for capturing mouse events on
++The \fBncurses\fP library includes facilities for capturing mouse events on
+ certain terminals (including xterm).
+-See the \fBcurs_mouse\fR(3X)
++See the \fBcurs_mouse\fP(3X)
+ manual page for details.
+ .PP
+-The \fBncurses\fR library includes facilities for responding to window
++The \fBncurses\fP library includes facilities for responding to window
+ resizing events, e.g., when running in an xterm.
+-See the \fBresizeterm\fR(3X)
+-and \fBwresize\fR(3X) manual pages for details.
++See the \fBresizeterm\fP(3X)
++and \fBwresize\fP(3X) manual pages for details.
+ In addition, the library may be configured with a \fBSIGWINCH\fP handler.
+ .PP
+-The \fBncurses\fR library extends the fixed set of function key capabilities
++The \fBncurses\fP library extends the fixed set of function key capabilities
+ of terminals by allowing the application designer to define additional
+ key sequences at runtime.
+-See the \fBdefine_key\fR(3X)
+-\fBkey_defined\fR(3X),
+-and \fBkeyok\fR(3X) manual pages for details.
++See the \fBdefine_key\fP(3X)
++\fBkey_defined\fP(3X),
++and \fBkeyok\fP(3X) manual pages for details.
+ .PP
+-The \fBncurses\fR library can exploit the capabilities of terminals which
++The \fBncurses\fP library can exploit the capabilities of terminals which
+ implement the ISO\-6429 SGR 39 and SGR 49 controls, which allow an application
+ to reset the terminal to its original foreground and background colors.
+ From the users' perspective, the application is able to draw colored
+ text on a background whose color is set independently, providing better
+ control over color contrasts.
+-See the \fBdefault_colors\fR(3X) manual page for details.
++See the \fBdefault_colors\fP(3X) manual page for details.
+ .PP
+-The \fBncurses\fR library includes a function for directing application output
++The \fBncurses\fP library includes a function for directing application output
+ to a printer attached to the terminal device.
+-See the \fBcurs_print\fR(3X) manual page for details.
++See the \fBcurs_print\fP(3X) manual page for details.
+ .SH PORTABILITY
+-The \fBncurses\fR library is intended to be BASE-level conformant with XSI
++The \fBncurses\fP library is intended to be BASE-level conformant with XSI
+ Curses.
+ The EXTENDED XSI Curses functionality
+ (including color support) is supported.
+ .PP
+ A small number of local differences (that is, individual differences between
+-the XSI Curses and \fBncurses\fR calls) are described in \fBPORTABILITY\fR
++the XSI Curses and \fBncurses\fP calls) are described in \fBPORTABILITY\fP
+ sections of the library man pages.
+ .SS Error checking
+ .PP
+@@ -1415,46 +1415,46 @@
+ PDCurses or NetBSD curses.
+ Here are a few to consider:
+ .bP
+-The routine \fBhas_key\fR is not part of XPG4, nor is it present in SVr4.
+-See the \fBcurs_getch\fR(3X) manual page for details.
++The routine \fBhas_key\fP is not part of XPG4, nor is it present in SVr4.
++See the \fBcurs_getch\fP(3X) manual page for details.
+ .bP
+-The routine \fBslk_attr\fR is not part of XPG4, nor is it present in SVr4.
+-See the \fBcurs_slk\fR(3X) manual page for details.
++The routine \fBslk_attr\fP is not part of XPG4, nor is it present in SVr4.
++See the \fBcurs_slk\fP(3X) manual page for details.
+ .bP
+-The routines \fBgetmouse\fR, \fBmousemask\fR, \fBungetmouse\fR,
+-\fBmouseinterval\fR, and \fBwenclose\fR relating to mouse interfacing are not
++The routines \fBgetmouse\fP, \fBmousemask\fP, \fBungetmouse\fP,
++\fBmouseinterval\fP, and \fBwenclose\fP relating to mouse interfacing are not
+ part of XPG4, nor are they present in SVr4.
+-See the \fBcurs_mouse\fR(3X) manual page for details.
++See the \fBcurs_mouse\fP(3X) manual page for details.
+ .bP
+-The routine \fBmcprint\fR was not present in any previous curses implementation.
+-See the \fBcurs_print\fR(3X) manual page for details.
++The routine \fBmcprint\fP was not present in any previous curses implementation.
++See the \fBcurs_print\fP(3X) manual page for details.
+ .bP
+-The routine \fBwresize\fR is not part of XPG4, nor is it present in SVr4.
+-See the \fBwresize\fR(3X) manual page for details.
++The routine \fBwresize\fP is not part of XPG4, nor is it present in SVr4.
++See the \fBwresize\fP(3X) manual page for details.
+ .bP
+ The WINDOW structure's internal details can be hidden from application
+ programs.
+-See \fBcurs_opaque\fR(3X) for the discussion of \fBis_scrollok\fR, etc.
++See \fBcurs_opaque\fP(3X) for the discussion of \fBis_scrollok\fP, etc.
+ .bP
+ This implementation can be configured to provide rudimentary support
+ for multi-threaded applications.
+-See \fBcurs_threads\fR(3X) for details.
++See \fBcurs_threads\fP(3X) for details.
+ .bP
+ This implementation can also be configured to provide a set of functions which
+ improve the ability to manage multiple screens.
+-See \fBcurs_sp_funcs\fR(3X) for details.
++See \fBcurs_sp_funcs\fP(3X) for details.
+ .SS Padding differences
+ .PP
+-In historic curses versions, delays embedded in the capabilities \fBcr\fR,
+-\fBind\fR, \fBcub1\fR, \fBff\fR and \fBtab\fR activated corresponding delay
++In historic curses versions, delays embedded in the capabilities \fBcr\fP,
++\fBind\fP, \fBcub1\fP, \fBff\fP and \fBtab\fP activated corresponding delay
+ bits in the UNIX tty driver.
+ In this implementation, all padding is done by sending NUL bytes.
+ This method is slightly more expensive, but narrows the interface
+ to the UNIX kernel significantly and increases the package's portability
+ correspondingly.
+ .SS Header files
+-The header file \fB\fR automatically includes the header files
+-\fB\fR and \fB\fR.
++The header file \fB\fP automatically includes the header files
++\fB\fP and \fB\fP.
+ .PP
+ X/Open Curses has more to say,
+ but does not finish the story:
+@@ -1549,9 +1549,9 @@
+ directly to provide a portable interface.
+ .SH NOTES
+ .PP
+-If standard output from a \fBncurses\fR program is re-directed to something
++If standard output from a \fBncurses\fP program is re-directed to something
+ which is not a tty, screen updates will be directed to standard error.
+ This was an undocumented feature of AT&T System V Release 3 curses.
+ .SH AUTHORS
+ Zeyd M. Ben-Halim, Eric S. Raymond, Thomas E. Dickey.
+-Based on pcurses by Pavel Curtis.
++Based on \fIpcurses\fP by Pavel Curtis.
+Index: man/new_pair.3x
+Prereq:  1.16 
+--- ncurses-6.3-20211219+/man/new_pair.3x	2021-06-17 21:26:02.000000000 +0000
++++ ncurses-6.3-20211225/man/new_pair.3x	2021-12-25 20:10:40.000000000 +0000
+@@ -29,7 +29,7 @@
+ .\"
+ .\" Author: Thomas E. Dickey
+ .\"
+-.\" $Id: new_pair.3x,v 1.16 2021/06/17 21:26:02 tom Exp $
++.\" $Id: new_pair.3x,v 1.18 2021/12/25 20:10:40 tom Exp $
+ .TH new_pair 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -127,7 +127,7 @@
+ allocated entry using \fBfree_pair\fP and allocates a new color pair.
+ .PP
+ All of the color pairs are allocated from a table of possible color pairs.
+-The size of the table is determined by the terminfo \fIpairs\fP capability.
++The size of the table is determined by the terminfo \fBpairs\fP capability.
+ The table is shared with \fBinit_pair\fP;
+ in fact \fBalloc_pair\fP calls \fBinit_pair\fP after
+ updating the ncurses library's fast index to the colors versus color pairs.
+@@ -161,6 +161,6 @@
+ It is recommended that
+ any code depending on them be conditioned using NCURSES_VERSION.
+ .SH SEE ALSO
+-\fBcurs_color\fR(3X).
++\fBcurs_color\fP(3X).
+ .SH AUTHOR
+ Thomas Dickey.
+Index: man/panel.3x
+Prereq:  1.39 
+--- ncurses-6.3-20211219+/man/panel.3x	2020-02-15 21:06:40.000000000 +0000
++++ ncurses-6.3-20211225/man/panel.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: panel.3x,v 1.39 2020/02/15 21:06:40 tom Exp $
++.\" $Id: panel.3x,v 1.41 2021/12/25 21:49:32 tom Exp $
+ .TH panel 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -40,55 +40,55 @@
+ .SH NAME
+ panel \- panel stack extension for curses
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .P
+-\fBcc [flags] sourcefiles \-lpanel \-lncurses\fR
++\fBcc [flags] sourcefiles \-lpanel \-lncurses\fP
+ .P
+-\fBPANEL *new_panel(WINDOW *\fIwin\fB);\fR
++\fBPANEL *new_panel(WINDOW *\fIwin\fP\fB);\fP
+ .sp
+-\fBint bottom_panel(PANEL *\fIpan\fB);\fR
++\fBint bottom_panel(PANEL *\fP\fIpan\fP\fB);\fP
+ .br
+-\fBint top_panel(PANEL *\fIpan\fB);\fR
++\fBint top_panel(PANEL *\fP\fIpan\fP\fB);\fP
+ .br
+-\fBint show_panel(PANEL *\fIpan\fB);\fR
++\fBint show_panel(PANEL *\fP\fIpan\fP\fB);\fP
+ .br
+-\fBvoid update_panels(void);\fR
++\fBvoid update_panels(void);\fP
+ .br
+-\fBint hide_panel(PANEL *\fIpan\fB);\fR
++\fBint hide_panel(PANEL *\fP\fIpan\fP\fB);\fP
+ .sp
+-\fBWINDOW *panel_window(const PANEL *\fIpan\fB);\fR
++\fBWINDOW *panel_window(const PANEL *\fIpan\fP\fB);\fP
+ .br
+-\fBint replace_panel(PANEL *\fIpan\fB, WINDOW *\fIwindow\fB);\fR
++\fBint replace_panel(PANEL *\fIpan\fP\fB, WINDOW *\fIwindow\fP\fB);\fP
+ .br
+-\fBint move_panel(PANEL *\fIpan\fB, int \fIstarty\fB, int \fIstartx\fB);\fR
++\fBint move_panel(PANEL *\fIpan\fP\fB, int \fIstarty\fP\fB, int \fIstartx\fP\fB);\fP
+ .br
+-\fBint panel_hidden(const PANEL *\fIpan\fB);\fR
++\fBint panel_hidden(const PANEL *\fIpan\fP\fB);\fP
+ .sp
+-\fBPANEL *panel_above(const PANEL *\fIpan\fB);\fR
++\fBPANEL *panel_above(const PANEL *\fIpan\fP\fB);\fP
+ .br
+-\fBPANEL *panel_below(const PANEL *\fIpan\fB);\fR
++\fBPANEL *panel_below(const PANEL *\fIpan\fP\fB);\fP
+ .sp
+-\fBint set_panel_userptr(PANEL *\fIpan\fB, const void *\fIptr\fB);\fR
++\fBint set_panel_userptr(PANEL *\fIpan\fP\fB, const void *\fIptr\fP\fB);\fP
+ .br
+-\fBconst void *panel_userptr(const PANEL *\fIpan\fB);\fR
++\fBconst void *panel_userptr(const PANEL *\fIpan\fP\fB);\fP
+ .sp
+-\fBint del_panel(PANEL *\fIpan\fB);\fR
++\fBint del_panel(PANEL *\fIpan\fP\fB);\fP
+ .sp
+-/* ncurses-extensions */
++\fR/* ncurses-extensions */\fP
+ .br
+-\fBPANEL *ground_panel(SCREEN *\fIsp\fB);\fR
++\fBPANEL *ground_panel(SCREEN *\fIsp\fP\fB);\fP
+ .br
+-\fBPANEL *ceiling_panel(SCREEN *\fIsp\fB);\fR
++\fBPANEL *ceiling_panel(SCREEN *\fIsp\fP\fB);\fP
+ .br
+ .SH DESCRIPTION
+-Panels are \fBcurses\fR(3X) windows with the added feature of
++Panels are \fBcurses\fP(3X) windows with the added feature of
+ depth.
+ Panel functions allow the use of stacked windows and ensure
+-the proper portions of each window and the curses \fBstdscr\fR window are
++the proper portions of each window and the curses \fBstdscr\fP window are
+ hidden or displayed when panels are added, moved, modified or removed.
+ The set of currently visible panels is the stack of panels.
+ The
+-\fBstdscr\fR window is beneath all panels, and is not considered part
++\fBstdscr\fP window is beneath all panels, and is not considered part
+ of the stack.
+ .P
+ A window is associated with every panel.
+@@ -96,92 +96,92 @@
+ you to create, move, hide, and show panels, as well as position a
+ panel at any desired location in the stack.
+ .P
+-Panel routines are a functional layer added to \fBcurses\fR(3X), make only
++Panel routines are a functional layer added to \fBcurses\fP(3X), make only
+ high-level curses calls, and work anywhere terminfo curses does.
+ .SH FUNCTIONS
+ .\" ---------
+ .SS bottom_panel
+-\fBbottom_panel(\fIpan\fB)\fR
++\fBbottom_panel(\fIpan\fP\fB)\fR
+ puts panel \fIpan\fP at the bottom of all panels.
+ .\" ---------
+ .SS ceiling_panel
+-\fBceiling_panel(\fIsp\fB)\fR
++\fBceiling_panel(\fIsp\fP\fB)\fR
+ acts like \fBpanel_below(NULL)\fP, for the given \fBSCREEN\fP \fIsp\fP.
+ .\" ---------
+ .SS del_panel
+-\fBdel_panel(\fIpan\fB)\fR
++\fBdel_panel(\fIpan\fP\fB)\fR
+ removes the given panel \fIpan\fP from the  stack and deallocates the
+-\fBPANEL\fR structure (but not its associated window).
++\fBPANEL\fP structure (but not its associated window).
+ .\" ---------
+ .SS ground_panel
+-\fBground_panel(\fIsp\fB)\fR
++\fBground_panel(\fIsp\fP\fB)\fR
+ acts like \fBpanel_above(NULL)\fP, for the given \fBSCREEN\fP \fIsp\fP.
+ .\" ---------
+ .SS hide_panel
+-\fBhide_panel(\fIpan\fB)\fR
++\fBhide_panel(\fIpan\fP\fB)\fR
+ removes the given panel \fIpan\fP from the panel stack
+ and thus hides it from view.
+-The \fBPANEL\fR structure is not lost, merely removed from the stack.
++The \fBPANEL\fP structure is not lost, merely removed from the stack.
+ .\" ---------
+ .SS move_panel
+-\fBmove_panel(\fIpan\fB,\fIstarty\fB,\fIstartx\fB)\fR
++\fBmove_panel(\fIpan\fP\fB,\fIstarty\fP\fB,\fIstartx\fP\fB)\fR
+ moves the given panel \fIpan\fP's window so that its upper-left corner is at
+-\fIstarty\fR, \fIstartx\fR.
++\fIstarty\fP, \fIstartx\fP.
+ It does not change the position of the panel in the stack.
+-Be sure to use this function, not \fBmvwin\fR(3X), to move a panel window.
++Be sure to use this function, not \fBmvwin\fP(3X), to move a panel window.
+ .\" ---------
+ .SS new_panel
+-\fBnew_panel(\fIwin\fB)\fR allocates  a  \fBPANEL\fR structure,
+-associates it with \fIwin\fR, places the panel on the top of the stack
++\fBnew_panel(\fIwin\fP\fB)\fR allocates a \fBPANEL\fP structure,
++associates it with \fIwin\fP, places the panel on the top of the stack
+ (causes  it to  be  displayed above any other panel) and returns a
+ pointer to the new panel.
+ .\" ---------
+ .SS panel_above
+-\fBpanel_above(\fIpan\fB)\fR
++\fBpanel_above(\fIpan\fP\fB)\fR
+ returns a pointer to the panel above \fIpan\fP.
+ If the panel argument is
+-\fB(PANEL *)0\fR, it returns a pointer to the bottom panel in the stack.
++\fB(PANEL *)0\fP, it returns a pointer to the bottom panel in the stack.
+ .\" ---------
+ .SS panel_below
+-\fBpanel_below(\fIpan\fB)\fR
++\fBpanel_below(\fIpan\fP\fB)\fR
+ returns a pointer to the panel just below \fIpan\fP.
+ If the panel argument
+-is \fB(PANEL *)0\fR, it returns a pointer to the top panel in the stack.
++is \fB(PANEL *)0\fP, it returns a pointer to the top panel in the stack.
+ .\" ---------
+ .SS panel_hidden
+-\fBpanel_hidden(\fIpan\fB)\fR
++\fBpanel_hidden(\fIpan\fP\fB)\fR
+ returns \fBTRUE\fP if the panel \fIpan\fP is in the panel stack,
+ \fBFALSE\fP if it is not.
+ If the panel is a null pointer, return \fBERR\fP.
+ .\" ---------
+ .SS panel_userptr
+-\fBpanel_userptr(\fIpan\fB)\fR
++\fBpanel_userptr(\fIpan\fP\fB)\fR
+ returns the user pointer for a given panel \fIpan\fP.
+ .\" ---------
+ .SS panel_window
+-\fBpanel_window(\fIpan\fB)\fR
++\fBpanel_window(\fIpan\fP\fB)\fR
+ returns a pointer to the window of the given panel \fIpan\fP.
+ .\" ---------
+ .SS replace_panel
+-\fBreplace_panel(\fIpan\fB,\fIwindow\fB)\fR
+-replaces the current window of panel \fIpan\fP with \fIwindow\fR
++\fBreplace_panel(\fIpan\fP\fB,\fIwindow\fP\fB)\fR
++replaces the current window of panel \fIpan\fP with \fIwindow\fP
+ This is useful, for example if you want to resize a panel.
+-In \fBncurses\fR, you can call \fBreplace_panel\fR
+-to resize a panel using a window resized with \fBwresize\fR(3X).
++In \fBncurses\fP, you can call \fBreplace_panel\fP
++to resize a panel using a window resized with \fBwresize\fP(3X).
+ It does not change the position of the panel in the stack.
+ .\" ---------
+ .SS set_panel_userptr
+-\fBset_panel_userptr(\fIpan\fB,\fIptr\fB)\fR
++\fBset_panel_userptr(\fIpan\fP\fB,\fIptr\fP\fB)\fR
+ sets the panel's user pointer.
+ .\" ---------
+ .SS show_panel
+-\fBshow_panel(\fIpan\fB)\fR
++\fBshow_panel(\fIpan\fP\fB)\fR
+ makes a hidden panel visible by placing it on top of the panels in the
+ panel stack.
+ See \fBCOMPATIBILITY\fP below.
+ .\" ---------
+ .SS top_panel
+-\fBtop_panel(\fIpan\fB)\fR
++\fBtop_panel(\fIpan\fP\fB)\fR
+ puts the given visible panel \fIpan\fP on top of all panels in the stack.
+ See \fBCOMPATIBILITY\fP below.
+ .\" ---------
+@@ -196,10 +196,10 @@
+ \fBdoupdate\fP, but \fBdoupdate\fP is the function responsible for updating
+ the \fIphysical screen\fP.
+ .SH DIAGNOSTICS
+-Each routine that returns a pointer returns \fBNULL\fR if an error
++Each routine that returns a pointer returns \fBNULL\fP if an error
+ occurs.
+-Each routine that returns an int value returns \fBOK\fR if it
+-executes successfully and \fBERR\fR if not.
++Each routine that returns an int value returns \fBOK\fP if it
++executes successfully and \fBERR\fP if not.
+ .PP
+ Except as noted, the \fIpan\fP and \fIwindow\fP parameters must be non-null.
+ If those are null, an error is returned.
+@@ -210,16 +210,16 @@
+ Reasonable care has been taken to  ensure  compatibility
+ with  the  native  panel facility introduced in System V (inspection of
+ the SVr4 manual pages suggests the programming interface is unchanged).
+-The \fBPANEL\fR data structures are merely  similar.
++The \fBPANEL\fP data structures are merely  similar.
+ The  programmer
+-is cautioned not to directly use \fBPANEL\fR fields.
++is cautioned not to directly use \fBPANEL\fP fields.
+ .P
+-The functions \fBshow_panel\fR and \fBtop_panel\fR are identical
++The functions \fBshow_panel\fP and \fBtop_panel\fP are identical
+ in this implementation, and work equally well with displayed or hidden
+ panels.
+-In the native System V implementation, \fBshow_panel\fR is
++In the native System V implementation, \fBshow_panel\fP is
+ intended for making a hidden panel visible (at the top of the stack)
+-and \fBtop_panel\fR is intended for making an already-visible panel
++and \fBtop_panel\fP is intended for making an already-visible panel
+ move to the top of the stack.
+ You are cautioned to use the correct
+ function to ensure compatibility with native panel libraries.
+@@ -263,10 +263,10 @@
+ libpanel.a
+ the panels library itself
+ .SH SEE ALSO
+-\fBcurses\fR(3X),
+-\fBcurs_variables\fR(3X),
++\fBcurses\fP(3X),
++\fBcurs_variables\fP(3X),
+ .PP
+-This describes \fBncurses\fR
++This describes \fBncurses\fP
+ version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
+ .SH AUTHOR
+ .PP
+Index: man/resizeterm.3x
+Prereq:  1.28 
+--- ncurses-6.3-20211219+/man/resizeterm.3x	2020-10-17 23:55:41.000000000 +0000
++++ ncurses-6.3-20211225/man/resizeterm.3x	2021-12-25 21:49:32.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -29,72 +29,72 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1996-on
+ .\"
+-.\" $Id: resizeterm.3x,v 1.28 2020/10/17 23:55:41 tom Exp $
++.\" $Id: resizeterm.3x,v 1.30 2021/12/25 21:49:32 tom Exp $
+ .TH resizeterm 3X ""
+ .de bP
+ .ie n  .IP \(bu 4
+ .el    .IP \(bu 2
+ ..
+ .SH NAME
+-\fBis_term_resized\fR,
+-\fBresize_term\fR,
+-\fBresizeterm\fR \- change the curses terminal size
++\fBis_term_resized\fP,
++\fBresize_term\fP,
++\fBresizeterm\fP \- change the curses terminal size
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBbool is_term_resized(int \fP\fIlines\fP\fB, int \fP\fIcolumns\fP\fB);\fR
++\fBbool is_term_resized(int \fP\fIlines\fP\fB, int \fP\fIcolumns\fP\fB);\fP
+ .br
+-\fBint resize_term(int \fP\fIlines\fP\fB, int \fP\fIcolumns\fP\fB);\fR
++\fBint resize_term(int \fP\fIlines\fP\fB, int \fP\fIcolumns\fP\fB);\fP
+ .br
+-\fBint resizeterm(int \fP\fIlines\fP\fB, int \fP\fIcolumns\fP\fB);\fR
++\fBint resizeterm(int \fP\fIlines\fP\fB, int \fP\fIcolumns\fP\fB);\fP
+ .SH DESCRIPTION
+ .PP
+ This is an extension to the curses library.
+-It provides callers with a hook into the \fBncurses\fR data to resize windows,
++It provides callers with a hook into the \fBncurses\fP data to resize windows,
+ primarily for use by programs running in an X Window terminal (e.g., xterm).
+ .SS resizeterm
+ .PP
+-The function \fBresizeterm\fR resizes the standard and current windows
++The function \fBresizeterm\fP resizes the standard and current windows
+ to the specified dimensions, and adjusts other bookkeeping data used by
+-the \fBncurses\fR library that record the window dimensions
++the \fBncurses\fP library that record the window dimensions
+ such as the \fBLINES\fP and \fBCOLS\fP variables.
+ .SS resize_term
+ .PP
+-Most of the work is done by the inner function \fBresize_term\fR.
+-The outer function \fBresizeterm\fR adds bookkeeping
++Most of the work is done by the inner function \fBresize_term\fP.
++The outer function \fBresizeterm\fP adds bookkeeping
+ for the \fBSIGWINCH\fP handler,
+ as well as repainting the soft-key area (see \fBslk_touch\fP(3X)).
+ .PP
+ When resizing the windows,
+-\fBresize_term\fR blank-fills the areas that are extended.
++\fBresize_term\fP blank-fills the areas that are extended.
+ The calling application should fill in these areas with appropriate data.
+ .PP
+-The \fBresize_term\fR function attempts to resize all windows.
++The \fBresize_term\fP function attempts to resize all windows.
+ However, due to the calling convention of pads,
+ it is not possible to resize these
+ without additional interaction with the application.
+ .PP
+-When resizing windows, \fBresize_term\fR recursively adjusts subwindows,
++When resizing windows, \fBresize_term\fP recursively adjusts subwindows,
+ keeping them within the updated parent window's limits.
+ If a top-level window happens to extend to the screen's limits,
+-then on resizing the window, \fBresize_term\fR will keep the window
++then on resizing the window, \fBresize_term\fP will keep the window
+ extending to the corresponding limit, regardless of whether the
+ screen has shrunk or grown.
+ .SS is_term_resized
+ .PP
+-A support function \fBis_term_resized\fR is provided so that applications
+-can check if the \fBresize_term\fR function would modify the window structures.
++A support function \fBis_term_resized\fP is provided so that applications
++can check if the \fBresize_term\fP function would modify the window structures.
+ It returns \fBTRUE\fP if the windows would be modified,
+ and \fBFALSE\fP otherwise.
+ .SH RETURN VALUE
+ Except as noted, these functions return
+-the integer \fBERR\fR upon failure and \fBOK\fR on success.
++the integer \fBERR\fP upon failure and \fBOK\fP on success.
+ They will fail if either of the dimensions are less than or equal to zero,
+ or if an error occurs while (re)allocating memory for the windows.
+ .SH NOTES
+ While these functions are intended to be used to support a signal handler
+ (i.e., for \fBSIGWINCH\fP), care should be taken to avoid invoking them in a
+-context where \fBmalloc\fR or \fBrealloc\fR may have been interrupted,
++context where \fBmalloc\fP or \fBrealloc\fP may have been interrupted,
+ since it uses those functions.
+ .PP
+ If ncurses is configured to supply its own \fBSIGWINCH\fP handler,
+@@ -103,10 +103,10 @@
+ .bP
+ which is tested in \fBwgetch\fP(3X) and \fBdoupdate\fP,
+ .bP
+-in turn, calling the \fBresizeterm\fR function,
++in turn, calling the \fBresizeterm\fP function,
+ .bP
+-which \fBungetch\fP's a \fBKEY_RESIZE\fR which
+-will be read on the next call to \fBwgetch\fR.
++which \fBungetch\fP's a \fBKEY_RESIZE\fP which
++will be read on the next call to \fBwgetch\fP.
+ .IP
+ The \fBKEY_RESIZE\fP alerts an application that the screen size has changed,
+ and that it should repaint special features such as pads that cannot
+@@ -136,8 +136,8 @@
+ This extension of ncurses was introduced in mid-1995.
+ It was adopted in NetBSD curses (2001) and PDCurses (2003).
+ .SH SEE ALSO
+-\fBcurs_getch\fR(3X),
+-\fBcurs_variables\fR(3X),
+-\fBwresize\fR(3X).
++\fBcurs_getch\fP(3X),
++\fBcurs_variables\fP(3X),
++\fBwresize\fP(3X).
+ .SH AUTHOR
+ Thomas Dickey (from an equivalent function written in 1988 for BSD curses).
+Index: man/scr_dump.5
+Prereq:  1.17 
+--- ncurses-6.3-20211219+/man/scr_dump.5	2021-06-17 21:26:02.000000000 +0000
++++ ncurses-6.3-20211225/man/scr_dump.5	2021-12-25 21:13:38.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: scr_dump.5,v 1.17 2021/06/17 21:26:02 tom Exp $
++.\" $Id: scr_dump.5,v 1.20 2021/12/25 21:13:38 tom Exp $
+ .TH scr_dump 5
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -139,15 +139,15 @@
+ X/Open's documentation for \fIenhanced curses\fP says only:
+ .RS 3
+ .PP
+-The \fIgetwin(\ ) \fPfunction reads window-related data
++The \fBgetwin(\ ) \fPfunction reads window-related data
+ stored in the file by \fIputwin(\ )\fP.
+ The function
+ then creates and initializes a new window using that data.
+ .PP
+-The \fIputwin(\ )\fP function writes all data associated
+-with \fIwin\fP into the \fIstdio\fP stream to which \fIfilep\fP
++The \fBputwin(\ )\fP function writes all data associated
++with \fIwin\fP into the \fBstdio\fP(3) stream to which \fIfilep\fP
+ points, using an \fBunspecified format\fP.
+-This information can be retrieved later using \fIgetwin(\ )\fP.
++This information can be retrieved later using \fBgetwin(\ )\fP.
+ .RE
+ .PP
+ In the mid-1990s when the X/Open Curses document was written,
+@@ -416,8 +416,8 @@
+ .NE
+ .SH SEE ALSO
+ .PP
+-\fBcurs_scr_dump\fR(3X),
+-\fBcurs_util\fR(3X).
++\fBcurs_scr_dump\fP(3X),
++\fBcurs_util\fP(3X).
+ .SH AUTHORS
+ .PP
+ Thomas E. Dickey
+Index: man/tabs.1
+Prereq:  1.32 
+--- ncurses-6.3-20211219+/man/tabs.1	2021-10-16 13:37:43.000000000 +0000
++++ ncurses-6.3-20211225/man/tabs.1	2021-12-25 19:04:39.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tabs.1,v 1.32 2021/10/16 13:37:43 tom Exp $
++.\" $Id: tabs.1,v 1.35 2021/12/25 19:04:39 tom Exp $
+ .TH @TABS@ 1 ""
+ .ds n 5
+ .ie \n(.g .ds `` \(lq
+@@ -53,22 +53,22 @@
+ .el    .in -2
+ ..
+ .SH NAME
+-\fB@TABS@\fR \- set tabs on a terminal
++\fB@TABS@\fP \- set tabs on a terminal
+ .SH SYNOPSIS
+-\fB@TABS@\fR [\fIoptions\fR]] \fI[tabstop-list]\fR
++\fB@TABS@\fP [\fIoptions\fP]] \fI[tabstop-list]\fP
+ .SH DESCRIPTION
+ .PP
+ The \fB@TABS@\fP program clears and sets tab-stops on the terminal.
+-This uses the terminfo \fIclear_all_tabs\fP and \fIset_tab\fP capabilities.
++This uses the terminfo \fBclear_all_tabs\fP and \fBset_tab\fP capabilities.
+ If either is absent, \fB@TABS@\fP is unable to clear/set tab-stops.
+ The terminal should be configured to use hard tabs, e.g.,
+ .NS
+ stty tab0
+ .NE
+ .PP
+-Like \fB@CLEAR@\fR(1), \fB@TABS@\fR writes to the standard output.
++Like \fB@CLEAR@\fP(1), \fB@TABS@\fP writes to the standard output.
+ You can redirect the standard output to a file (which prevents
+-\fB@TABS@\fR from actually changing the tabstops),
++\fB@TABS@\fP from actually changing the tabstops),
+ and later \fBcat\fP the file to the screen, setting tabstops at that point.
+ .PP
+ These are hardware tabs, which cannot be queried rapidly by applications
+@@ -104,7 +104,7 @@
+ This option tells \fB@TABS@\fP to check the options and run any debugging
+ option, but not to modify the terminal settings.
+ .TP
+-\fB\-V\fR
++\fB\-V\fP
+ reports the version of ncurses which was used in this program, and exits.
+ .PP
+ The \fB@TABS@\fP program processes a single list of tab stops.
+@@ -190,7 +190,7 @@
+ A few terminals provide the capability for changing their left/right margins.
+ The @TABS@ program has an option to use this feature:
+ .TP 5
+-.BI \+m \ margin
++.BI +m \ margin
+ The effect depends on whether the terminal has the margin capabilities:
+ .RS
+ .bP
+@@ -204,7 +204,7 @@
+ .RE
+ .IP
+ If the \fImargin\fP parameter is omitted, the default is 10.
+-Use \fB\+m0\fP to reset the left margin,
++Use \fB+m0\fP to reset the left margin,
+ i.e., to the left edge of the terminal's display.
+ Before setting a left-margin,
+ @TABS@ resets the margin to reduce problems which might arise
+@@ -250,7 +250,7 @@
+ the tab-stop initialization provided by \fBtset\fP (1982)
+ and incorporated into \fBtput\fP uses the terminal database,
+ .PP
+-The \fB\+m\fP option was documented
++The \fB+m\fP option was documented
+ in the Base Specifications Issue 5 (Unix98, 1997),
+ and omitted in Issue 6 (Unix03, 2004) without documenting the rationale,
+ though an introductory comment
+@@ -258,7 +258,7 @@
+ overlooked in the removal.
+ The documented \fBtabs\fP utility in Issues 6 and later has no mechanism
+ for setting margins.
+-The \fB\+m\fP option in this implementation differs from the feature
++The \fB+m\fP option in this implementation differs from the feature
+ in SVr4 by using terminal capabilities rather than built-in tables.
+ .PP
+ POSIX documents no limits on the number of tab stops.
+@@ -284,10 +284,10 @@
+ were implemented in PWB/Unix.
+ Those provide the capability of setting abitrary tab stops.
+ .SH SEE ALSO
+-\fB@INFOCMP@\fR(1M),
+-\fB@TSET@\fR(1),
+-\fBcurses\fR(3X),
+-\fBterminfo\fR(\*n).
++\fB@INFOCMP@\fP(1M),
++\fB@TSET@\fP(1),
++\fBcurses\fP(3X),
++\fBterminfo\fP(\*n).
+ .PP
+-This describes \fBncurses\fR
++This describes \fBncurses\fP
+ version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
+Index: man/term.5
+Prereq:  1.40 
+--- ncurses-6.3-20211219+/man/term.5	2021-08-15 19:38:47.000000000 +0000
++++ ncurses-6.3-20211225/man/term.5	2021-12-25 21:28:59.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: term.5,v 1.40 2021/08/15 19:38:47 tom Exp $
++.\" $Id: term.5,v 1.43 2021/12/25 21:28:59 tom Exp $
+ .TH term 5
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -311,7 +311,7 @@
+ diverged from System V terminfo after SVr1, and have added extension
+ capabilities to the string table that (in the binary format) collide with
+ System V and XSI Curses extensions.
+-See \fBterminfo\fR(\*n) for detailed
++See \fBterminfo\fP(\*n) for detailed
+ discussion of terminfo source compatibility issues.
+ .PP
+ This implementation is by default compatible with the binary
+@@ -326,7 +326,7 @@
+ The magic number in a binary terminfo file is the first 16-bits (two bytes).
+ Besides making it more reliable for the library to check that a file
+ is terminfo,
+-utilities such as \fBfile\fP also use that to tell what the file-format is.
++utilities such as \fBfile\fP(1) also use that to tell what the file-format is.
+ System V defined more than one magic number,
+ with 0433, 0435 as screen-dumps (see \fBscr_dump\fP(5)).
+ This implementation uses 01036 as a continuation of that sequence,
+@@ -402,7 +402,7 @@
+ .SH FILES
+ \*d/*/*	compiled terminal capability database
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBterminfo\fR(\*n).
++\fBcurses\fP(3X), \fBterminfo\fP(\*n).
+ .SH AUTHORS
+ Thomas E. Dickey
+ .br
+@@ -414,4 +414,4 @@
+ .sp
+ Eric S. Raymond
+ .br
+-documented legacy terminfo format, e.g., from pcurses.
++documented legacy terminfo format, e.g., from \fIpcurses\fP.
+Index: man/term.7
+Prereq:  1.30 
+--- ncurses-6.3-20211219+/man/term.7	2021-08-15 19:39:57.000000000 +0000
++++ ncurses-6.3-20211225/man/term.7	2021-12-25 17:39:16.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: term.7,v 1.30 2021/08/15 19:39:57 tom Exp $
++.\" $Id: term.7,v 1.31 2021/12/25 17:39:16 tom Exp $
+ .TH term 7
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -39,14 +39,14 @@
+ term \- conventions for naming terminal types
+ .SH DESCRIPTION
+ .PP
+-The environment variable \fBTERM\fR should normally contain the type name of
++The environment variable \fBTERM\fP should normally contain the type name of
+ the terminal, console or display-device type you are using.
+ This information
+ is critical for all screen-oriented programs, including your editor and mailer.
+ .PP
+-A default \fBTERM\fR value will be set on a per-line basis by either
+-\fB/etc/inittab\fR (e.g., System\-V-like UNIXes)
+-or \fB/etc/ttys\fR (BSD UNIXes).
++A default \fBTERM\fP value will be set on a per-line basis by either
++\fB/etc/inittab\fP (e.g., System\-V-like UNIXes)
++or \fB/etc/ttys\fP (BSD UNIXes).
+ This will nearly always suffice for workstation and microcomputer consoles.
+ .PP
+ If you use a dialup line, the type of device attached to it may vary.
+@@ -55,7 +55,7 @@
+ Newer ones may pre-set \*(``vt100\*('', reflecting the prevalence of DEC
+ VT100-compatible terminals and personal-computer emulators.
+ .PP
+-Modern telnets pass your \fBTERM\fR environment variable from the local side to
++Modern telnets pass your \fBTERM\fP environment variable from the local side to
+ the remote one.
+ There can be problems if the remote terminfo or termcap entry
+ for your type is not compatible with yours, but this situation is rare and
+@@ -63,13 +63,13 @@
+ (assuming you are in fact using a VT100-superset console,
+ terminal, or terminal emulator).
+ .PP
+-In any case, you are free to override the system \fBTERM\fR setting to your
++In any case, you are free to override the system \fBTERM\fP setting to your
+ taste in your shell profile.
+ The \fB@TSET@\fP(1) utility may be of assistance;
+ you can give it a set of rules for deducing or requesting a terminal type based
+ on the tty device and baud rate.
+ .PP
+-Setting your own \fBTERM\fR value may also be useful if you have created a
++Setting your own \fBTERM\fP value may also be useful if you have created a
+ custom entry incorporating options (such as visual bell or reverse-video)
+ which you wish to override the system default type for your line.
+ .PP
+@@ -81,24 +81,24 @@
+ .sp
+ from your shell.
+ These capability files are in a binary format optimized for
+-retrieval speed (unlike the old text-based \fBtermcap\fR format they replace);
+-to examine an entry, you must use the \fB@INFOCMP@\fR(1M) command.
++retrieval speed (unlike the old text-based \fBtermcap\fP format they replace);
++to examine an entry, you must use the \fB@INFOCMP@\fP(1M) command.
+ Invoke it as follows:
+ .sp
+-	@INFOCMP@ \fIentry_name\fR
++	@INFOCMP@ \fIentry_name\fP
+ .sp
+-where \fIentry_name\fR is the name of the type you wish to examine (and the
++where \fIentry_name\fP is the name of the type you wish to examine (and the
+ name of its capability file the subdirectory of \*d named for its first
+ letter).
+ This command dumps a capability file in the text format described by
+-\fBterminfo\fR(\*n).
++\fBterminfo\fP(\*n).
+ .PP
+-The first line of a \fBterminfo\fR(\*n) description gives the names by which
++The first line of a \fBterminfo\fP(\*n) description gives the names by which
+ terminfo knows a terminal,
+ separated by \*(``|\*('' (pipe-bar) characters with the last
+ name field terminated by a comma.
+ The first name field is the type's
+-\fIprimary name\fR, and is the one to use when setting \fBTERM\fR.  The last
++\fIprimary name\fP, and is the one to use when setting \fBTERM\fP.  The last
+ name field (if distinct from the first) is actually a description of the
+ terminal type (it may contain blanks; the others must be single words).
+ Name
+@@ -126,23 +126,23 @@
+ name; some historical terminfo names use it.
+ .PP
+ The root name for a terminal or workstation console type should almost always
+-begin with a vendor prefix (such as \fBhp\fR for Hewlett-Packard, \fBwy\fR for
+-Wyse, or \fBatt\fR for AT&T terminals), or a common name of the terminal line
+-(\fBvt\fR for the VT series of terminals from DEC, or \fBsun\fR for Sun
+-Microsystems workstation consoles, or \fBregent\fR for the ADDS Regent series.
++begin with a vendor prefix (such as \fBhp\fP for Hewlett-Packard, \fBwy\fP for
++Wyse, or \fBatt\fP for AT&T terminals), or a common name of the terminal line
++(\fBvt\fP for the VT series of terminals from DEC, or \fBsun\fP for Sun
++Microsystems workstation consoles, or \fBregent\fP for the ADDS Regent series.
+ You can list the terminfo tree to see what prefixes are already in common use.
+ The root name prefix should be followed when appropriate by a model number;
+-thus \fBvt100\fR, \fBhp2621\fR, \fBwy50\fR.
++thus \fBvt100\fP, \fBhp2621\fP, \fBwy50\fP.
+ .PP
+ The root name for a PC-Unix console type should be the OS name,
+-i.e., \fBlinux\fR, \fBbsdos\fR, \fBfreebsd\fR, \fBnetbsd\fR.  It should
+-\fInot\fR be \fBconsole\fR or any other generic that might cause confusion in a
++i.e., \fBlinux\fP, \fBbsdos\fP, \fBfreebsd\fP, \fBnetbsd\fP.  It should
++\fInot\fP be \fBconsole\fP or any other generic that might cause confusion in a
+ multi-platform environment!  If a model number follows, it should indicate
+ either the OS release level or the console driver release level.
+ .PP
+ The root name for a terminal emulator (assuming it does not fit one of the
+ standard ANSI or vt100 types) should be the program name or a readily
+-recognizable abbreviation of it (i.e., \fBversaterm\fR, \fBctrm\fR).
++recognizable abbreviation of it (i.e., \fBversaterm\fP, \fBctrm\fP).
+ .PP
+ Following the root name, you may add any reasonable number of hyphen-separated
+ feature suffixes.
+@@ -197,7 +197,7 @@
+ line height, that suffix should go first.
+ So, for a hypothetical FuBarCo
+ model 2317 terminal in 30-line mode with reverse video, best form would be
+-\fBfubar\-30\-rv\fR (rather than, say, \*(``fubar\-rv\-30\*('').
++\fBfubar\-30\-rv\fP (rather than, say, \*(``fubar\-rv\-30\*('').
+ .PP
+ Terminal types that are written not as standalone entries, but rather as
+ components to be plugged into other entries via \fBuse\fP capabilities,
+@@ -206,7 +206,7 @@
+ Commands which use a terminal type to control display often accept a \-T
+ option that accepts a terminal name argument.
+ Such programs should fall back
+-on the \fBTERM\fR environment variable when no \-T option is specified.
++on the \fBTERM\fP environment variable when no \-T option is specified.
+ .SH PORTABILITY
+ For maximum compatibility with older System V UNIXes, names and aliases
+ should be unique within the first 14 characters.
+@@ -221,4 +221,4 @@
+ /etc/ttys
+ tty line initialization (BSD-like UNIXes)
+ .SH SEE ALSO
+-\fBcurses\fR(3X), \fBterminfo\fR(\*n), \fBterm\fR(\*n).
++\fBcurses\fP(3X), \fBterminfo\fP(\*n), \fBterm\fP(\*n).
+Index: man/term_variables.3x
+Prereq:  1.12 
+--- ncurses-6.3-20211219+/man/term_variables.3x	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.3-20211225/man/term_variables.3x	2021-12-25 22:03:30.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2019,2020 Thomas E. Dickey                                     *
++.\" Copyright 2019-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 2010-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: term_variables.3x,v 1.12 2020/02/02 23:34:34 tom Exp $
++.\" $Id: term_variables.3x,v 1.15 2021/12/25 22:03:30 tom Exp $
+ .TH term_variables 3X ""
+ .ds n 5
+ .ie \n(.g .ds `` \(lq
+@@ -50,40 +50,40 @@
+ \fBstrfnames\fP,
+ \fBstrnames\fP,
+ \fBttytype\fP
+-\- \fBcurses\fR terminfo global variables
++\- \fBcurses\fP terminfo global variables
+ .ad
+ .hy
+ .SH SYNOPSIS
+ .nf
+-\fB#include \fR
++\fB#include \fP
+ .br
+-\fB#include \fR
++\fB#include \fP
+ .PP
+-\fBchtype acs_map[];\fR
++\fBchtype acs_map[];\fP
+ .sp
+-\fBSCREEN * SP;\fR
++\fBSCREEN * SP;\fP
+ .sp
+-\fBTERMINAL * cur_term;\fR
++\fBTERMINAL * cur_term;\fP
+ .sp
+-\fBchar ttytype[];\fR
++\fBchar ttytype[];\fP
+ .sp
+-\fBNCURSES_CONST char * const boolcodes[];\fR
++\fBNCURSES_CONST char * const boolcodes[];\fP
+ .br
+-\fBNCURSES_CONST char * const boolfnames[];\fR
++\fBNCURSES_CONST char * const boolfnames[];\fP
+ .br
+-\fBNCURSES_CONST char * const boolnames[];\fR
++\fBNCURSES_CONST char * const boolnames[];\fP
+ .sp
+-\fBNCURSES_CONST char * const numcodes[];\fR
++\fBNCURSES_CONST char * const numcodes[];\fP
+ .br
+-\fBNCURSES_CONST char * const numfnames[];\fR
++\fBNCURSES_CONST char * const numfnames[];\fP
+ .br
+-\fBNCURSES_CONST char * const numnames[];\fR
++\fBNCURSES_CONST char * const numnames[];\fP
+ .sp
+-\fBNCURSES_CONST char * const strcodes[];\fR
++\fBNCURSES_CONST char * const strcodes[];\fP
+ .br
+-\fBNCURSES_CONST char * const strfnames[];\fR
++\fBNCURSES_CONST char * const strfnames[];\fP
+ .br
+-\fBNCURSES_CONST char * const strnames[];\fR
++\fBNCURSES_CONST char * const strnames[];\fP
+ .br
+ .fi
+ .SH DESCRIPTION
+@@ -92,7 +92,7 @@
+ A more complete description is given in the \fBcurs_terminfo\fP(3X) manual page.
+ .PP
+ Depending on the configuration, these may be actual variables,
+-or macros (see \fBcurs_threads\fR(3X))
++or macros (see \fBcurs_threads\fP(3X))
+ which provide read-only access to \fIcurses\fP's state.
+ In either case, applications should treat them as read-only to avoid
+ confusing the library.
+@@ -116,7 +116,7 @@
+ use as a parameter to \fBset_term\fP, for switching between screens.
+ Alternatively, one can save the return value from \fBnewterm\fP
+ or \fBsetupterm\fP(3X) to reuse in \fBset_term\fP.
+-.SS Terminfo Names
++.SS Terminfo Lookup Tables
+ The \fB@TIC@\fP(1) and \fB@INFOCMP@\fP(1) programs use lookup tables for
+ the long and short names of terminfo capabilities,
+ as well as the corresponding names for termcap capabilities.
+@@ -159,7 +159,7 @@
+ .ft R
+ .PP
+ These symbols provide a faster method of accessing terminfo capabilities
+-than using \fBtigetstr\fR(3X), etc.
++than using \fBtigetstr\fP(3X), etc.
+ .PP
+ The actual definition of \fBCUR\fP depends upon the implementation,
+ but each terminfo library provides these long names defined to point
+@@ -168,7 +168,7 @@
+ .SH NOTES
+ The low-level terminfo interface is initialized using
+ .hy 0
+-\fBsetupterm\fR(3X).
++\fBsetupterm\fP(3X).
+ .hy
+ The upper-level curses interface uses the low-level terminfo interface,
+ internally.
+@@ -187,8 +187,8 @@
+ Most, but not all, base the definition upon the \fBcur_term\fP variable.
+ .SH SEE ALSO
+ .hy 0
+-\fBcurses\fR(3X),
+-\fBcurs_terminfo\fR(3X),
+-\fBcurs_threads\fR(3X),
+-\fBterminfo\fR(\*n).
++\fBcurses\fP(3X),
++\fBcurs_terminfo\fP(3X),
++\fBcurs_threads\fP(3X),
++\fBterminfo\fP(\*n).
+ .hy
+Index: man/terminfo.head
+Prereq:  1.41 
+--- ncurses-6.3-20211219+/man/terminfo.head	2021-08-15 19:32:53.000000000 +0000
++++ ncurses-6.3-20211225/man/terminfo.head	2021-12-25 17:39:16.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: terminfo.head,v 1.41 2021/08/15 19:32:53 tom Exp $
++.\" $Id: terminfo.head,v 1.42 2021/12/25 17:39:16 tom Exp $
+ .TH terminfo 5 "" "" "File Formats"
+ .ds n 5
+ .ds d @TERMINFO@
+@@ -61,11 +61,11 @@
+ .I Terminfo
+ is a database describing terminals,
+ used by screen-oriented programs such as
+-\fBnvi\fR(1),
+-\fBlynx\fR(1),
+-\fBmutt\fR(1),
++\fBnvi\fP(1),
++\fBlynx\fP(1),
++\fBmutt\fP(1),
+ and other curses applications,
+-using high-level calls to libraries such as \fBcurses\fR(3X).
++using high-level calls to libraries such as \fBcurses\fP(3X).
+ It is also used via low-level calls by non-curses applications
+ which may be screen-oriented (such as \fB@CLEAR@\fP(1))
+ or non-screen (such as \fB@TABS@\fP(1)).
+@@ -75,7 +75,7 @@
+ have, by specifying how to perform screen operations, and by
+ specifying padding requirements and initialization sequences.
+ .PP
+-This manual describes \fBncurses\fR
++This manual describes \fBncurses\fP
+ version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
+ .SS Terminfo Entry Syntax
+ .PP
+@@ -191,7 +191,7 @@
+ If there are two very similar terminals, one (the variant) can be defined as
+ being just like the other (the base) with certain exceptions.
+ In the
+-definition of the variant, the string capability \fBuse\fR can be given with
++definition of the variant, the string capability \fBuse\fP can be given with
+ the name of the base terminal:
+ .bP
+ The capabilities given before
+@@ -199,14 +199,14 @@
+ override those in the base type named by
+ .BR use .
+ .bP
+-If there are multiple \fBuse\fR capabilities, they are merged in reverse order.
+-That is, the rightmost \fBuse\fR reference is processed first, then the one to
++If there are multiple \fBuse\fP capabilities, they are merged in reverse order.
++That is, the rightmost \fBuse\fP reference is processed first, then the one to
+ its left, and so forth.
+ .bP
+ Capabilities given explicitly in the entry override
+-those brought in by \fBuse\fR references.
++those brought in by \fBuse\fP references.
+ .PP
+-A capability can be canceled by placing \fBxx@\fR to the left of the
++A capability can be canceled by placing \fBxx@\fP to the left of the
+ use reference that imports it, where \fIxx\fP is the capability.
+ For example, the entry
+ .RS
+@@ -214,7 +214,7 @@
+ 2621\-nl, smkx@, rmkx@, use=2621,
+ .RE
+ .PP
+-defines a 2621\-nl that does not have the \fBsmkx\fR or \fBrmkx\fR capabilities,
++defines a 2621\-nl that does not have the \fBsmkx\fP or \fBrmkx\fP capabilities,
+ and hence does not turn on the function key labels when in visual mode.
+ This is useful for different modes for a terminal, or for different
+ user preferences.
+Index: man/terminfo.tail
+Prereq:  1.108 
+--- ncurses-6.3-20211219+/man/terminfo.tail	2021-10-09 23:13:23.000000000 +0000
++++ ncurses-6.3-20211225/man/terminfo.tail	2021-12-25 20:14:56.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: terminfo.tail,v 1.108 2021/10/09 23:13:23 tom Exp $
++.\" $Id: terminfo.tail,v 1.110 2021/12/25 20:14:56 tom Exp $
+ .ps +1
+ .SS User-Defined Capabilities
+ .
+@@ -76,7 +76,7 @@
+ .SS A Sample Entry
+ .
+ The following entry, describing an ANSI-standard terminal, is representative
+-of what a \fBterminfo\fR entry for a modern terminal typically looks like.
++of what a \fBterminfo\fP entry for a modern terminal typically looks like.
+ .PP
+ .nf
+ .ft CW
+@@ -137,30 +137,30 @@
+ ANSI-standard terminals have
+ .I "automatic margins"
+ (i.e., an automatic return and line-feed
+-when the end of a line is reached) is indicated by the capability \fBam\fR.
+-Hence the description of ansi includes \fBam\fR.
++when the end of a line is reached) is indicated by the capability \fBam\fP.
++Hence the description of ansi includes \fBam\fP.
+ Numeric capabilities are followed by the character \*(``#\*('' and then a positive value.
+-Thus \fBcols\fR, which indicates the number of columns the terminal has,
++Thus \fBcols\fP, which indicates the number of columns the terminal has,
+ gives the value \*(``80\*('' for ansi.
+ Values for numeric capabilities may be specified in decimal, octal or hexadecimal,
+ using the C programming language conventions (e.g., 255, 0377 and 0xff or 0xFF).
+ .PP
+-Finally, string valued capabilities, such as \fBel\fR (clear to end of line
++Finally, string valued capabilities, such as \fBel\fP (clear to end of line
+ sequence) are given by the two-character code, an \*(``=\*('', and then a string
+ ending at the next following \*(``,\*(''.
+ .PP
+ A number of escape sequences are provided in the string valued capabilities
+ for easy encoding of characters there:
+ .bP
+-Both \fB\eE\fR and \fB\ee\fR
++Both \fB\eE\fP and \fB\ee\fP
+ map to an \s-1ESCAPE\s0 character,
+ .bP
+-\fB^x\fR maps to a control-x for any appropriate \fIx\fP, and
++\fB^x\fP maps to a control-x for any appropriate \fIx\fP, and
+ .bP
+ the sequences
+ .RS 6
+ .PP
+-\fB\en\fP, \fB\el\fP, \fB\er\fP, \fB\et\fP, \fB\eb\fP, \fB\ef\fP, and \fB\es\fR
++\fB\en\fP, \fB\el\fP, \fB\er\fP, \fB\et\fP, \fB\eb\fP, \fB\ef\fP, and \fB\es\fP
+ .RE
+ .IP
+ produce
+@@ -179,17 +179,17 @@
+ .PP
+ Other escapes include
+ .bP
+-\fB\e^\fR for \fB^\fR,
++\fB\e^\fP for \fB^\fP,
+ .bP
+-\fB\e\e\fR for \fB\e\fR,
++\fB\e\e\fP for \fB\e\fP,
+ .bP
+-\fB\e\fR, for comma,
++\fB\e\fP, for comma,
+ .bP
+-\fB\e:\fR for \fB:\fR,
++\fB\e:\fP for \fB:\fP,
+ .bP
+-and \fB\e0\fR for null.
++and \fB\e0\fP for null.
+ .IP
+-\fB\e0\fR will produce \e200, which does not terminate a string but behaves
++\fB\e0\fP will produce \e200, which does not terminate a string but behaves
+ as a null character on most terminals, providing CS7 is specified.
+ See \fBstty\fP(1).
+ .IP
+@@ -200,7 +200,7 @@
+ Modifying this would require a new binary format,
+ which would not work with other implementations.
+ .PP
+-Finally, characters may be given as three octal digits after a \fB\e\fR.
++Finally, characters may be given as three octal digits after a \fB\e\fP.
+ .PP
+ A delay in milliseconds may appear anywhere in a string capability, enclosed in
+ $<..> brackets, as in \fBel\fP=\eEK$<5>,
+@@ -217,12 +217,12 @@
+ (In the case of insert character, the factor is still the
+ number of \fIlines\fP affected.)
+ .IP
+-Normally, padding is advisory if the device has the \fBxon\fR
++Normally, padding is advisory if the device has the \fBxon\fP
+ capability; it is used for cost computation but does not trigger delays.
+ .bP
+ A \*(``/\*(''
+ suffix indicates that the padding is mandatory and forces a delay of the given
+-number of milliseconds even on devices for which \fBxon\fR is present to
++number of milliseconds even on devices for which \fBxon\fP is present to
+ indicate flow control.
+ .PP
+ Sometimes individual capabilities must be commented out.
+@@ -247,23 +247,23 @@
+ Only that directory is searched.
+ .bP
+ If TERMINFO is not set,
+-\fBncurses\fR will instead look in the directory \fB$HOME/.terminfo\fR
++\fBncurses\fP will instead look in the directory \fB$HOME/.terminfo\fP
+ for a compiled description.
+ .bP
+ Next, if the environment variable TERMINFO_DIRS is set,
+-\fBncurses\fR will interpret the contents of that variable
++\fBncurses\fP will interpret the contents of that variable
+ as a list of colon-separated directories (or database files) to be searched.
+ .IP
+ An empty directory name (i.e., if the variable begins or ends
+ with a colon, or contains adjacent colons)
+-is interpreted as the system location \fI\*d\fR.
++is interpreted as the system location \fI\*d\fP.
+ .bP
+ Finally, \fBncurses\fP searches these compiled-in locations:
+ .RS
+ .bP
+ a list of directories (@TERMINFO_DIRS@), and
+ .bP
+-the system terminfo directory, \fI\*d\fR (the compiled-in default).
++the system terminfo directory, \fI\*d\fP (the compiled-in default).
+ .RE
+ .SS Preparing Descriptions
+ .PP
+@@ -291,16 +291,16 @@
+ .SS Basic Capabilities
+ .PP
+ The number of columns on each line for the terminal is given by the
+-\fBcols\fR numeric capability.
++\fBcols\fP numeric capability.
+ If the terminal is a \s-1CRT\s0, then the
+-number of lines on the screen is given by the \fBlines\fR capability.
++number of lines on the screen is given by the \fBlines\fP capability.
+ If the terminal wraps around to the beginning of the next line when
+-it reaches the right margin, then it should have the \fBam\fR capability.
++it reaches the right margin, then it should have the \fBam\fP capability.
+ If the terminal can clear its screen, leaving the cursor in the home
+-position, then this is given by the \fBclear\fR string capability.
++position, then this is given by the \fBclear\fP string capability.
+ If the terminal overstrikes
+ (rather than clearing a position when a character is struck over)
+-then it should have the \fBos\fR capability.
++then it should have the \fBos\fP capability.
+ If the terminal is a printing terminal, with no soft copy unit,
+ give it both
+ .B hc
+@@ -365,7 +365,7 @@
+ except that they take one parameter, and scroll that many lines.
+ They are also undefined except at the appropriate edge of the screen.
+ .PP
+-The \fBam\fR capability tells whether the cursor sticks at the right
++The \fBam\fP capability tells whether the cursor sticks at the right
+ edge of the screen when text is output, but this does not necessarily
+ apply to a
+ .B cuf1
+@@ -382,7 +382,7 @@
+ If the terminal has switch selectable automatic margins,
+ the
+ .I terminfo
+-file usually assumes that this is on; i.e., \fBam\fR.
++file usually assumes that this is on; i.e., \fBam\fP.
+ If the terminal has a command which moves to the first column of the next
+ line, that command can be given as
+ .B nel
+@@ -427,7 +427,7 @@
+ Cursor addressing and other strings requiring parameters
+ in the terminal are described by a
+ parameterized string capability,
+-with \fIprintf\fP-like escapes such as \fI%x\fR in it.
++with \fIprintf\fP-like escapes such as \fI%x\fP in it.
+ For example, to address the cursor, the
+ .B cup
+ capability is given, using two parameters:
+@@ -447,7 +447,7 @@
+ It is noted that more complex operations are often necessary,
+ e.g., in the \fBsgr\fP string.
+ .PP
+-The \fB%\fR encodings have the following meanings:
++The \fB%\fP encodings have the following meanings:
+ .PP
+ .TP 5
+ \fB%%\fP
+@@ -572,16 +572,16 @@
+ Note that the order
+ of the rows and columns is inverted here, and that the row and column
+ are printed as two digits.
+-Thus its \fBcup\fR capability is \*(``cup=6\eE&%p2%2dc%p1%2dY\*(''.
++Thus its \fBcup\fP capability is \*(``cup=6\eE&%p2%2dc%p1%2dY\*(''.
+ .PP
+ The Microterm \s-1ACT-IV\s0 needs the current row and column sent
+-preceded by a \fB^T\fR, with the row and column simply encoded in binary,
++preceded by a \fB^T\fP, with the row and column simply encoded in binary,
+ \*(``cup=^T%p1%c%p2%c\*(''.
+ Terminals which use \*(``%c\*('' need to be able to
+-backspace the cursor (\fBcub1\fR),
+-and to move the cursor up one line on the screen (\fBcuu1\fR).
+-This is necessary because it is not always safe to transmit \fB\en\fR
+-\fB^D\fR and \fB\er\fR, as the system may change or discard them.
++backspace the cursor (\fBcub1\fP),
++and to move the cursor up one line on the screen (\fBcuu1\fP).
++This is necessary because it is not always safe to transmit \fB\en\fP
++\fB^D\fP and \fB\er\fP, as the system may change or discard them.
+ (The library routines dealing with terminfo set tty modes so that
+ tabs are never expanded, so \et is safe to send.
+ This turns out to be essential for the Ann Arbor 4080.)
+@@ -598,10 +598,10 @@
+ .PP
+ If the terminal has a fast way to home the cursor
+ (to very upper left corner of screen) then this can be given as
+-\fBhome\fR; similarly a fast way of getting to the lower left-hand corner
+-can be given as \fBll\fR; this may involve going up with \fBcuu1\fR
++\fBhome\fP; similarly a fast way of getting to the lower left-hand corner
++can be given as \fBll\fP; this may involve going up with \fBcuu1\fP
+ from the home position,
+-but a program should never do this itself (unless \fBll\fR does) because it
++but a program should never do this itself (unless \fBll\fP does) because it
+ can make no assumption about the effect of moving up from the home position.
+ Note that the home position is the same as addressing to (0,0):
+ to the top left corner of the screen, not of memory.
+@@ -633,7 +633,7 @@
+ .PP
+ If the terminal needs to be in a special mode when running
+ a program that uses these capabilities,
+-the codes to enter and exit this mode can be given as \fBsmcup\fR and \fBrmcup\fR.
++the codes to enter and exit this mode can be given as \fBsmcup\fP and \fBrmcup\fP.
+ This arises, for example, from terminals like the Concept with more than
+ one page of memory.
+ If the terminal has only memory relative cursor addressing and not screen
+@@ -775,13 +775,13 @@
+ .SS Area Clears
+ .PP
+ If the terminal can clear from the current position to the end of the
+-line, leaving the cursor where it is, this should be given as \fBel\fR.
++line, leaving the cursor where it is, this should be given as \fBel\fP.
+ If the terminal can clear from the beginning of the line to the current
+ position inclusive, leaving
+ the cursor where it is, this should be given as \fBel1\fP.
+ If the terminal can clear from the current position to the end of the
+-display, then this should be given as \fBed\fR.
+-\fBEd\fR is only defined from the first column of a line.
++display, then this should be given as \fBed\fP.
++\fBEd\fP is only defined from the first column of a line.
+ (Thus, it can be simulated by a request to delete a large number of lines,
+ if a true
+ .B ed
+@@ -791,11 +791,11 @@
+ .SS Insert/delete line and vertical motions
+ .PP
+ If the terminal can open a new blank line before the line where the cursor
+-is, this should be given as \fBil1\fR; this is done only from the first
++is, this should be given as \fBil1\fP; this is done only from the first
+ position of a line.
+ The cursor must then appear on the newly blank line.
+ If the terminal can delete the line which the cursor is on, then this
+-should be given as \fBdl1\fR; this is done only from the first position on
++should be given as \fBdl1\fP; this is done only from the first position on
+ the line to be deleted.
+ Versions of
+ .B il1
+@@ -822,9 +822,9 @@
+ .B rc
+ (save and restore cursor) commands may be useful for ensuring that
+ your synthesized insert/delete string does not move the cursor.
+-(Note that the \fBncurses\fR(3X) library does this synthesis
++(Note that the \fBncurses\fP(3X) library does this synthesis
+ automatically, so you need not compose insert/delete strings for
+-an entry with \fBcsr\fR).
++an entry with \fBcsr\fP).
+ .PP
+ Yet another way to construct insert and delete might be to use a combination of
+ index with the memory-lock feature found on some terminals (like the HP\-700/90
+@@ -838,20 +838,20 @@
+ on many terminals without a true insert/delete line,
+ and is often faster even on terminals with those features.
+ .PP
+-The boolean \fBnon_dest_scroll_region\fR should be set if each scrolling
++The boolean \fBnon_dest_scroll_region\fP should be set if each scrolling
+ window is effectively a view port on a screen-sized canvas.
+ To test for
+ this capability, create a scrolling region in the middle of the screen,
+ write something to the bottom line, move the cursor to the top of the region,
+-and do \fBri\fR followed by \fBdl1\fR or \fBind\fR.
++and do \fBri\fP followed by \fBdl1\fP or \fBind\fP.
+ If the data scrolled
+-off the bottom of the region by the \fBri\fR re-appears, then scrolling
++off the bottom of the region by the \fBri\fP re-appears, then scrolling
+ is non-destructive.
+-System V and XSI Curses expect that \fBind\fR, \fBri\fR,
+-\fBindn\fR, and \fBrin\fR will simulate destructive scrolling; their
+-documentation cautions you not to define \fBcsr\fR unless this is true.
+-This \fBcurses\fR implementation is more liberal and will do explicit erases
+-after scrolling if \fBndsrc\fR is defined.
++System V and XSI Curses expect that \fBind\fP, \fBri\fP,
++\fBindn\fP, and \fBrin\fP will simulate destructive scrolling; their
++documentation cautions you not to define \fBcsr\fP unless this is true.
++This \fBcurses\fP implementation is more liberal and will do explicit erases
++after scrolling if \fBndsrc\fP is defined.
+ .PP
+ If the terminal has the ability to define a window as part of
+ memory, which all commands affect,
+@@ -861,11 +861,11 @@
+ and the starting and ending columns in memory, in that order.
+ .PP
+ If the terminal can retain display memory above, then the
+-\fBda\fR capability should be given; if display memory can be retained
+-below, then \fBdb\fR should be given.
++\fBda\fP capability should be given; if display memory can be retained
++below, then \fBdb\fP should be given.
+ These indicate
+ that deleting a line or scrolling may bring non-blank lines up from below
+-or that scrolling back with \fBri\fR may bring down non-blank lines.
++or that scrolling back with \fBri\fP may bring down non-blank lines.
+ .PP
+ .SS Insert/Delete Character
+ .PP
+@@ -892,7 +892,7 @@
+ If the \*(``abc\*(''
+ shifts over to the \*(``def\*('' which then move together around the end of the
+ current line and onto the next as you insert, you have the second type of
+-terminal, and should give the capability \fBin\fR, which stands for
++terminal, and should give the capability \fBin\fP, which stands for
+ \*(``insert null\*(''.
+ .PP
+ While these are two logically separate attributes (one line versus multi-line
+@@ -901,34 +901,34 @@
+ .PP
+ Terminfo can describe both terminals which have an insert mode, and terminals
+ which send a simple sequence to open a blank position on the current line.
+-Give as \fBsmir\fR the sequence to get into insert mode.
+-Give as \fBrmir\fR the sequence to leave insert mode.
+-Now give as \fBich1\fR any sequence needed to be sent just before sending
++Give as \fBsmir\fP the sequence to get into insert mode.
++Give as \fBrmir\fP the sequence to leave insert mode.
++Now give as \fBich1\fP any sequence needed to be sent just before sending
+ the character to be inserted.
+ Most terminals with a true insert mode
+-will not give \fBich1\fR; terminals which send a sequence to open a screen
++will not give \fBich1\fP; terminals which send a sequence to open a screen
+ position should give it here.
+ .PP
+-If your terminal has both, insert mode is usually preferable to \fBich1\fR.
++If your terminal has both, insert mode is usually preferable to \fBich1\fP.
+ Technically, you should not give both unless the terminal actually requires
+ both to be used in combination.
+ Accordingly, some non-curses applications get
+ confused if both are present; the symptom is doubled characters in an update
+ using insert.
+-This requirement is now rare; most \fBich\fR sequences do not
+-require previous smir, and most smir insert modes do not require \fBich1\fR
++This requirement is now rare; most \fBich\fP sequences do not
++require previous smir, and most smir insert modes do not require \fBich1\fP
+ before each character.
+-Therefore, the new \fBcurses\fR actually assumes this
+-is the case and uses either \fBrmir\fR/\fBsmir\fR or \fBich\fR/\fBich1\fR as
++Therefore, the new \fBcurses\fP actually assumes this
++is the case and uses either \fBrmir\fP/\fBsmir\fP or \fBich\fP/\fBich1\fP as
+ appropriate (but not both).
+ If you have to write an entry to be used under
+ new curses for a terminal old enough to need both, include the
+-\fBrmir\fR/\fBsmir\fR sequences in \fBich1\fR.
++\fBrmir\fP/\fBsmir\fP sequences in \fBich1\fP.
+ .PP
+ If post insert padding is needed, give this as a number of milliseconds
+-in \fBip\fR (a string option).
++in \fBip\fP (a string option).
+ Any other sequence which may need to be
+-sent after an insert of a single character may also be given in \fBip\fR.
++sent after an insert of a single character may also be given in \fBip\fP.
+ If your terminal needs both to be placed into an \*(``insert mode\*('' and
+ a special code to precede each inserted character, then both
+ .BR smir / rmir
+@@ -951,11 +951,11 @@
+ to delete characters on the same line (e.g., if there is a tab after
+ the insertion position).
+ If your terminal allows motion while in
+-insert mode you can give the capability \fBmir\fR to speed up inserting
++insert mode you can give the capability \fBmir\fP to speed up inserting
+ in this case.
+-Omitting \fBmir\fR will affect only speed.
++Omitting \fBmir\fP will affect only speed.
+ Some terminals
+-(notably Datamedia's) must not have \fBmir\fR because of the way their
++(notably Datamedia's) must not have \fBmir\fP because of the way their
+ insert mode works.
+ .PP
+ Finally, you can specify
+@@ -966,7 +966,7 @@
+ .IR n ,
+ to delete
+ .I n characters,
+-and delete mode by giving \fBsmdc\fR and \fBrmdc\fR
++and delete mode by giving \fBsmdc\fP and \fBrmdc\fP
+ to enter and exit delete mode (any mode the terminal needs to be placed
+ in for
+ .B dch1
+@@ -986,24 +986,24 @@
+ If your terminal has one or more kinds of display attributes,
+ these can be represented in a number of different ways.
+ You should choose one display form as
+-\f2standout mode\fR,
++\f2standout mode\fP,
+ representing a good, high contrast, easy-on-the-eyes,
+ format for highlighting error messages and other attention getters.
+ (If you have a choice, reverse video plus half-bright is good,
+ or reverse video alone.)
+ The sequences to enter and exit standout mode
+-are given as \fBsmso\fR and \fBrmso\fR, respectively.
++are given as \fBsmso\fP and \fBrmso\fP, respectively.
+ If the code to change into or out of standout
+ mode leaves one or even two blank spaces on the screen,
+ as the TVI 912 and Teleray 1061 do,
+-then \fBxmc\fR should be given to tell how many spaces are left.
++then \fBxmc\fP should be given to tell how many spaces are left.
+ .PP
+-Codes to begin underlining and end underlining can be given as \fBsmul\fR
+-and \fBrmul\fR respectively.
++Codes to begin underlining and end underlining can be given as \fBsmul\fP
++and \fBrmul\fP respectively.
+ If the terminal has a code to underline the current character and move
+ the cursor one space to the right,
+ such as the Microterm Mime,
+-this can be given as \fBuc\fR.
++this can be given as \fBuc\fP.
+ .PP
+ Other capabilities to enter various highlighting modes include
+ .B blink
+@@ -1131,7 +1131,7 @@
+ .PP
+ If the terminal has
+ a way of flashing the screen to indicate an error quietly (a bell replacement)
+-then this can be given as \fBflash\fR; it must not move the cursor.
++then this can be given as \fBflash\fP; it must not move the cursor.
+ .PP
+ If the cursor needs to be made more visible than normal when it is
+ not on the bottom line (to make, for example, a non-blinking underline into an
+@@ -1147,11 +1147,11 @@
+ If your terminal correctly generates underlined characters
+ (with no special codes needed)
+ even though it does not overstrike,
+-then you should give the capability \fBul\fR.
++then you should give the capability \fBul\fP.
+ If a character overstriking another leaves both characters on the screen,
+ specify the capability \fBos\fP.
+ If overstrikes are erasable with a blank,
+-then this should be indicated by giving \fBeo\fR.
++then this should be indicated by giving \fBeo\fP.
+ .PP
+ .SS Keypad and Function Keys
+ .PP
+@@ -1161,16 +1161,16 @@
+ terminals where the keypad only works in local (this applies, for example,
+ to the unshifted HP 2621 keys).
+ If the keypad can be set to transmit or not transmit,
+-give these codes as \fBsmkx\fR and \fBrmkx\fR.
++give these codes as \fBsmkx\fP and \fBrmkx\fP.
+ Otherwise the keypad is assumed to always transmit.
+ .PP
+ The codes sent by the left arrow, right arrow, up arrow, down arrow,
+ and home keys can be given as
+-\fBkcub1, kcuf1, kcuu1, kcud1, \fRand\fB khome\fR respectively.
++\fBkcub1, kcuf1, kcuu1, kcud1, \fRand\fB khome\fP respectively.
+ If there are function keys such as f0, f1, ..., f10, the codes they send
+-can be given as \fBkf0, kf1, ..., kf10\fR.
++can be given as \fBkf0, kf1, ..., kf10\fP.
+ If these keys have labels other than the default f0 through f10, the labels
+-can be given as \fBlf0, lf1, ..., lf10\fR.
++can be given as \fBlf0, lf1, ..., lf10\fP.
+ .PP
+ The codes transmitted by certain other special keys can be given:
+ .bP
+@@ -1309,7 +1309,7 @@
+ .BR iprog ,
+ the path name of a program to be run to initialize the terminal,
+ .bP
+-and \fBif\fR, the name of a file containing long initialization strings.
++and \fBif\fP, the name of a file containing long initialization strings.
+ .PP
+ These strings are expected to set the terminal into modes consistent
+ with the rest of the terminfo description.
+@@ -1466,59 +1466,59 @@
+ make better decisions about relative costs, but actual pad characters will
+ not be transmitted.
+ .PP
+-If \fBpb\fR (padding baud rate) is given, padding is suppressed at baud rates
+-below the value of \fBpb\fR.
++If \fBpb\fP (padding baud rate) is given, padding is suppressed at baud rates
++below the value of \fBpb\fP.
+ If the entry has no padding baud rate, then
+-whether padding is emitted or not is completely controlled by \fBxon\fR.
++whether padding is emitted or not is completely controlled by \fBxon\fP.
+ .PP
+ If the terminal requires other than a null (zero) character as a pad,
+-then this can be given as \fBpad\fR.
++then this can be given as \fBpad\fP.
+ Only the first character of the
+ .B pad
+ string is used.
+ .PP
+ .SS Status Lines
+ Some terminals have an extra \*(``status line\*('' which is not normally used by
+-software (and thus not counted in the terminal's \fBlines\fR capability).
++software (and thus not counted in the terminal's \fBlines\fP capability).
+ .PP
+ The simplest case is a status line which is cursor-addressable but not
+ part of the main scrolling region on the screen; the Heathkit H19 has
+ a status line of this kind, as would a 24-line VT100 with a 23-line
+ scrolling region set up on initialization.
+ This situation is indicated
+-by the \fBhs\fR capability.
++by the \fBhs\fP capability.
+ .PP
+ Some terminals with status lines need special sequences to access the
+ status line.
+ These may be expressed as a string with single parameter
+-\fBtsl\fR which takes the cursor to a given zero-origin column on the
++\fBtsl\fP which takes the cursor to a given zero-origin column on the
+ status line.
+-The capability \fBfsl\fR must return to the main-screen
+-cursor positions before the last \fBtsl\fR.
++The capability \fBfsl\fP must return to the main-screen
++cursor positions before the last \fBtsl\fP.
+ You may need to embed the
+-string values of \fBsc\fR (save cursor) and \fBrc\fR (restore cursor)
+-in \fBtsl\fR and \fBfsl\fR to accomplish this.
++string values of \fBsc\fP (save cursor) and \fBrc\fP (restore cursor)
++in \fBtsl\fP and \fBfsl\fP to accomplish this.
+ .PP
+ The status line is normally assumed to be the same width as the width
+ of the terminal.
+ If this is untrue, you can specify it with the numeric
+-capability \fBwsl\fR.
++capability \fBwsl\fP.
+ .PP
+-A command to erase or blank the status line may be specified as \fBdsl\fR.
++A command to erase or blank the status line may be specified as \fBdsl\fP.
+ .PP
+-The boolean capability \fBeslok\fR specifies that escape sequences, tabs,
++The boolean capability \fBeslok\fP specifies that escape sequences, tabs,
+ etc., work ordinarily in the status line.
+ .PP
+-The \fBncurses\fR implementation does not yet use any of these capabilities.
++The \fBncurses\fP implementation does not yet use any of these capabilities.
+ They are documented here in case they ever become important.
+ .PP
+ .SS Line Graphics
+ .PP
+ Many terminals have alternate character sets useful for forms-drawing.
+-Terminfo and \fBcurses\fR have built-in support
++Terminfo and \fBcurses\fP have built-in support
+ for most of the drawing characters
+ supported by the VT100, with some characters from the AT&T 4410v1 added.
+-This alternate character set may be specified by the \fBacsc\fR capability.
++This alternate character set may be specified by the \fBacsc\fP capability.
+ .PP
+ .TS H
+ center expand;
+@@ -1527,8 +1527,8 @@
+ _ _ _ _ _
+ lw25 lw10 lw6 lw6 lw6.
+ .\".TH
+-\fBGlyph	ACS	Ascii	acsc	acsc\fR
+-\fBName	Name	Default	Char	Value\fR
++\fBGlyph	ACS	Ascii	acsc	acsc\fP
++\fBName	Name	Default	Char	Value\fP
+ arrow pointing right	ACS_RARROW	>	+	0x2b
+ arrow pointing left	ACS_LARROW	<	,	0x2c
+ arrow pointing up	ACS_UARROW	^	\-	0x2d
+@@ -1585,7 +1585,7 @@
+ .PP
+ The best way to define a new device's graphics set is to add a column
+ to a copy of this table for your terminal, giving the character which
+-(when emitted between \fBsmacs\fR/\fBrmacs\fR switches) will be rendered
++(when emitted between \fBsmacs\fP/\fBrmacs\fP switches) will be rendered
+ as the corresponding graphic.
+ Then read off the VT100/your terminal
+ character pairs right to left in sequence; these become the ACSC string.
+@@ -1613,17 +1613,17 @@
+ .PP
+ Some basic color capabilities are independent of the color method.
+ The numeric
+-capabilities \fBcolors\fR and \fBpairs\fR specify the maximum numbers of colors
++capabilities \fBcolors\fP and \fBpairs\fP specify the maximum numbers of colors
+ and color-pairs that can be displayed simultaneously.
+-The \fBop\fR (original
++The \fBop\fP (original
+ pair) string resets foreground and background colors to their default values
+ for the terminal.
+-The \fBoc\fR string resets all colors or color-pairs to
++The \fBoc\fP string resets all colors or color-pairs to
+ their default values for the terminal.
+ Some terminals (including many PC
+ terminal emulators) erase screen areas with the current background color rather
+ than the power-up default background; these should have the boolean capability
+-\fBbce\fR.
++\fBbce\fP.
+ .PP
+ While the curses library works with \fIcolor pairs\fP
+ (reflecting the inability of some devices to set foreground
+@@ -1631,25 +1631,25 @@
+ there are separate capabilities for setting these features:
+ .bP
+ To change the current foreground or background color on a Tektronix-type
+-terminal, use \fBsetaf\fR (set ANSI foreground) and \fBsetab\fR (set ANSI
+-background) or \fBsetf\fR (set foreground) and \fBsetb\fR (set background).
++terminal, use \fBsetaf\fP (set ANSI foreground) and \fBsetab\fP (set ANSI
++background) or \fBsetf\fP (set foreground) and \fBsetb\fP (set background).
+ These take one parameter, the color number.
+ The SVr4 documentation describes
+-only \fBsetaf\fR/\fBsetab\fR; the XPG4 draft says that "If the terminal
++only \fBsetaf\fP/\fBsetab\fP; the XPG4 draft says that "If the terminal
+ supports ANSI escape sequences to set background and foreground, they should
+-be coded as \fBsetaf\fR and \fBsetab\fR, respectively.
++be coded as \fBsetaf\fP and \fBsetab\fP, respectively.
+ .bP
+ If the terminal
+ supports other escape sequences to set background and foreground, they should
+-be coded as \fBsetf\fR and \fBsetb\fR, respectively.
+-The \fBvidputs\fR and the \fBrefresh\fP(3X) functions
+-use the \fBsetaf\fR and \fBsetab\fR capabilities if they are defined.
++be coded as \fBsetf\fP and \fBsetb\fP, respectively.
++The \fBvidputs\fP and the \fBrefresh\fP(3X) functions
++use the \fBsetaf\fP and \fBsetab\fP capabilities if they are defined.
+ .PP
+-The \fBsetaf\fR/\fBsetab\fR and \fBsetf\fR/\fBsetb\fR capabilities take a
++The \fBsetaf\fP/\fBsetab\fP and \fBsetf\fP/\fBsetb\fP capabilities take a
+ single numeric argument each.
+-Argument values 0-7 of \fBsetaf\fR/\fBsetab\fR are portably defined as
++Argument values 0-7 of \fBsetaf\fP/\fBsetab\fP are portably defined as
+ follows (the middle column is the symbolic #define available in the header for
+-the \fBcurses\fR or \fBncurses\fR libraries).
++the \fBcurses\fP or \fBncurses\fP libraries).
+ The terminal hardware is free to
+ map these as it likes, but the RGB values indicate normal locations in color
+ space.
+@@ -1658,75 +1658,75 @@
+ center;
+ l c c c
+ l l n l.
+-\fBColor	#define 	Value	RGB\fR
+-black	\fBCOLOR_BLACK\fR	0	0, 0, 0
+-red	\fBCOLOR_RED\ \fR	1	max,0,0
+-green	\fBCOLOR_GREEN\fR	2	0,max,0
+-yellow	\fBCOLOR_YELLOW\fR	3	max,max,0
+-blue	\fBCOLOR_BLUE\fR	4	0,0,max
+-magenta	\fBCOLOR_MAGENTA\fR	5	max,0,max
+-cyan	\fBCOLOR_CYAN\fR	6	0,max,max
+-white	\fBCOLOR_WHITE\fR	7	max,max,max
++\fBColor	#define 	Value	RGB\fP
++black	\fBCOLOR_BLACK\fP	0	0, 0, 0
++red	\fBCOLOR_RED\ \fP	1	max,0,0
++green	\fBCOLOR_GREEN\fP	2	0,max,0
++yellow	\fBCOLOR_YELLOW\fP	3	max,max,0
++blue	\fBCOLOR_BLUE\fP	4	0,0,max
++magenta	\fBCOLOR_MAGENTA\fP	5	max,0,max
++cyan	\fBCOLOR_CYAN\fP	6	0,max,max
++white	\fBCOLOR_WHITE\fP	7	max,max,max
+ .TE
+ .PP
+-The argument values of \fBsetf\fR/\fBsetb\fR historically correspond to
++The argument values of \fBsetf\fP/\fBsetb\fP historically correspond to
+ a different mapping, i.e.,
+ .TS H
+ center;
+ l c c c
+ l l n l.
+-\fBColor	#define 	Value	RGB\fR
+-black	\fBCOLOR_BLACK\fR	0	0, 0, 0
+-blue	\fBCOLOR_BLUE\fR	1	0,0,max
+-green	\fBCOLOR_GREEN\fR	2	0,max,0
+-cyan	\fBCOLOR_CYAN\fR	3	0,max,max
+-red	\fBCOLOR_RED\ \fR	4	max,0,0
+-magenta	\fBCOLOR_MAGENTA\fR	5	max,0,max
+-yellow	\fBCOLOR_YELLOW\fR	6	max,max,0
+-white	\fBCOLOR_WHITE\fR	7	max,max,max
++\fBColor	#define 	Value	RGB\fP
++black	\fBCOLOR_BLACK\fP	0	0, 0, 0
++blue	\fBCOLOR_BLUE\fP	1	0,0,max
++green	\fBCOLOR_GREEN\fP	2	0,max,0
++cyan	\fBCOLOR_CYAN\fP	3	0,max,max
++red	\fBCOLOR_RED\ \fP	4	max,0,0
++magenta	\fBCOLOR_MAGENTA\fP	5	max,0,max
++yellow	\fBCOLOR_YELLOW\fP	6	max,max,0
++white	\fBCOLOR_WHITE\fP	7	max,max,max
+ .TE
+ .PP
+ It is important to not confuse the two sets of color capabilities;
+ otherwise red/blue will be interchanged on the display.
+ .PP
+-On an HP-like terminal, use \fBscp\fR with a color-pair number parameter to set
++On an HP-like terminal, use \fBscp\fP with a color-pair number parameter to set
+ which color pair is current.
+ .PP
+ Some terminals allow the \fIcolor values\fP to be modified:
+ .bP
+-On a Tektronix-like terminal, the capability \fBccc\fR may be present to
++On a Tektronix-like terminal, the capability \fBccc\fP may be present to
+ indicate that colors can be modified.
+-If so, the \fBinitc\fR capability will
+-take a color number (0 to \fBcolors\fR \- 1)and three more parameters which
++If so, the \fBinitc\fP capability will
++take a color number (0 to \fBcolors\fP \- 1)and three more parameters which
+ describe the color.
+ These three parameters default to being interpreted as RGB
+ (Red, Green, Blue) values.
+-If the boolean capability \fBhls\fR is present,
++If the boolean capability \fBhls\fP is present,
+ they are instead as HLS (Hue, Lightness, Saturation) indices.
+ The ranges are
+ terminal-dependent.
+ .bP
+-On an HP-like terminal, \fBinitp\fR may give a capability for changing a
++On an HP-like terminal, \fBinitp\fP may give a capability for changing a
+ color-pair value.
+ It will take seven parameters; a color-pair number (0 to
+-\fBmax_pairs\fR \- 1), and two triples describing first background and then
++\fBmax_pairs\fP \- 1), and two triples describing first background and then
+ foreground colors.
+ These parameters must be (Red, Green, Blue) or
+-(Hue, Lightness, Saturation) depending on \fBhls\fR.
++(Hue, Lightness, Saturation) depending on \fBhls\fP.
+ .PP
+ On some color terminals, colors collide with highlights.
+ You can register
+-these collisions with the \fBncv\fR capability.
++these collisions with the \fBncv\fP capability.
+ This is a bit-mask of
+ attributes not to be used when colors are enabled.
+ The correspondence with the
+-attributes understood by \fBcurses\fR is as follows:
++attributes understood by \fBcurses\fP is as follows:
+ .PP
+ .TS
+ center;
+ l l l l
+ lw20 lw2 lw10 lw10.
+-\fBAttribute	Bit	Decimal	Set by\fR
++\fBAttribute	Bit	Decimal	Set by\fP
+ A_STANDOUT	0	1	sgr
+ A_UNDERLINE	1	2	sgr
+ A_REVERSE	2	4	sgr
+@@ -1748,9 +1748,9 @@
+ For example, on many IBM PC consoles, the underline attribute collides with the
+ foreground color blue and is not available in color mode.
+ These should have
+-an \fBncv\fR capability of 2.
++an \fBncv\fP capability of 2.
+ .PP
+-SVr4 curses does nothing with \fBncv\fR, ncurses recognizes it and optimizes
++SVr4 curses does nothing with \fBncv\fP, ncurses recognizes it and optimizes
+ the output in favor of colors.
+ .PP
+ .SS Miscellaneous
+@@ -1758,9 +1758,9 @@
+ can be given as pad.
+ Only the first character of the pad string is used.
+ If the terminal does not have a pad character, specify npc.
+-Note that ncurses implements the termcap-compatible \fBPC\fR variable;
++Note that ncurses implements the termcap-compatible \fBPC\fP variable;
+ though the application may set this value to something other than
+-a null, ncurses will test \fBnpc\fR first and use napms if the terminal
++a null, ncurses will test \fBnpc\fP first and use napms if the terminal
+ has no pad character.
+ .PP
+ If the terminal can move up or down half a line,
+@@ -1863,11 +1863,11 @@
+ .SS Glitches and Braindamage
+ .PP
+ Hazeltine terminals, which do not allow \*(``~\*('' characters to be displayed should
+-indicate \fBhz\fR.
++indicate \fBhz\fP.
+ .PP
+-Terminals which ignore a line-feed immediately after an \fBam\fR wrap,
++Terminals which ignore a line-feed immediately after an \fBam\fP wrap,
+ such as the Concept and vt100,
+-should indicate \fBxenl\fR.
++should indicate \fBxenl\fP.
+ .PP
+ If
+ .B el
+@@ -1876,7 +1876,7 @@
+ \fBxhp\fP should be given.
+ .PP
+ Teleray terminals, where tabs turn all characters moved over to blanks,
+-should indicate \fBxt\fR (destructive tabs).
++should indicate \fBxt\fP (destructive tabs).
+ Note: the variable indicating this is now \*(``dest_tabs_magic_smso\*(''; in
+ older versions, it was teleray_glitch.
+ This glitch is also taken to mean that it is not possible to position
+@@ -1894,7 +1894,7 @@
+ \*(``beehive_glitch\*(''; it is now \*(``no_esc_ctl_c\*(''.
+ .PP
+ Other specific terminal problems may be corrected by adding more
+-capabilities of the form \fBx\fR\fIx\fR.
++capabilities of the form \fBx\fP\fIx\fP.
+ .PP
+ .SS Pitfalls of Long Entries
+ .PP
+@@ -1972,8 +1972,8 @@
+ terminal types and users whose TERM variable does not have a termcap
+ entry.
+ .PP
+-When in \-C (translate to termcap) mode, the \fBncurses\fR implementation of
+-\fB@TIC@\fR(1M) issues warning messages when the pre-tc length of a termcap
++When in \-C (translate to termcap) mode, the \fBncurses\fP implementation of
++\fB@TIC@\fP(1M) issues warning messages when the pre-tc length of a termcap
+ translation is too long.
+ The \-c (check) option also checks resolved (after tc
+ expansion) lengths.
+@@ -1987,33 +1987,33 @@
+ .SH EXTENSIONS
+ .PP
+ Searching for terminal descriptions in
+-\fB$HOME/.terminfo\fR and TERMINFO_DIRS
++\fB$HOME/.terminfo\fP and TERMINFO_DIRS
+ is not supported by older implementations.
+ .PP
+-Some SVr4 \fBcurses\fR implementations, and all previous to SVr4, do not
++Some SVr4 \fBcurses\fP implementations, and all previous to SVr4, do not
+ interpret the %A and %O operators in parameter strings.
+ .PP
+-SVr4/XPG4 do not specify whether \fBmsgr\fR licenses movement while in
++SVr4/XPG4 do not specify whether \fBmsgr\fP licenses movement while in
+ an alternate-character-set mode (such modes may, among other things, map
+ CR and NL to characters that do not trigger local motions).
+-The \fBncurses\fR implementation ignores \fBmsgr\fR in \fBALTCHARSET\fR
++The \fBncurses\fP implementation ignores \fBmsgr\fP in \fBALTCHARSET\fP
+ mode.
+ This raises the possibility that an XPG4
+ implementation making the opposite interpretation may need terminfo
+-entries made for \fBncurses\fR to have \fBmsgr\fR turned off.
++entries made for \fBncurses\fP to have \fBmsgr\fP turned off.
+ .PP
+-The \fBncurses\fR library handles insert-character and insert-character modes
++The \fBncurses\fP library handles insert-character and insert-character modes
+ in a slightly non-standard way to get better update efficiency.
+ See
+-the \fBInsert/Delete Character\fR subsection above.
++the \fBInsert/Delete Character\fP subsection above.
+ .PP
+-The parameter substitutions for \fBset_clock\fR and \fBdisplay_clock\fR are
++The parameter substitutions for \fBset_clock\fP and \fBdisplay_clock\fP are
+ not documented in SVr4 or the XSI Curses standard.
+ They are deduced from the
+ documentation for the AT&T 505 terminal.
+ .PP
+-Be careful assigning the \fBkmous\fR capability.
+-The \fBncurses\fR library wants to interpret it as \fBKEY_MOUSE\fR,
++Be careful assigning the \fBkmous\fP capability.
++The \fBncurses\fP library wants to interpret it as \fBKEY_MOUSE\fP,
+ for use by terminals and emulators like xterm
+ that can return mouse-tracking information in the keyboard-input stream.
+ .PP
+@@ -2031,46 +2031,46 @@
+ Here
+ is a summary, accurate as of October 1995:
+ .bP
+-\fBSVR4, Solaris, ncurses\fR \-\-
++\fBSVR4, Solaris, ncurses\fP \-\-
+ These support all SVr4 capabilities.
+ .bP
+-\fBSGI\fR \-\-
++\fBSGI\fP \-\-
+ Supports the SVr4 set, adds one undocumented extended string
+-capability (\fBset_pglen\fR).
++capability (\fBset_pglen\fP).
+ .bP
+-\fBSVr1, Ultrix\fR \-\-
++\fBSVr1, Ultrix\fP \-\-
+ These support a restricted subset of terminfo capabilities.
+-The booleans end with \fBxon_xoff\fR;
+-the numerics with \fBwidth_status_line\fR;
+-and the strings with \fBprtr_non\fR.
+-.bP
+-\fBHP/UX\fR \-\-
+-Supports the SVr1 subset, plus the SVr[234] numerics \fBnum_labels\fR,
+-\fBlabel_height\fR, \fBlabel_width\fR, plus function keys 11 through 63, plus
+-\fBplab_norm\fR, \fBlabel_on\fR, and \fBlabel_off\fR, plus some incompatible
++The booleans end with \fBxon_xoff\fP;
++the numerics with \fBwidth_status_line\fP;
++and the strings with \fBprtr_non\fP.
++.bP
++\fBHP/UX\fP \-\-
++Supports the SVr1 subset, plus the SVr[234] numerics \fBnum_labels\fP,
++\fBlabel_height\fP, \fBlabel_width\fP, plus function keys 11 through 63, plus
++\fBplab_norm\fP, \fBlabel_on\fP, and \fBlabel_off\fP, plus some incompatible
+ extensions in the string table.
+ .bP
+-\fBAIX\fR \-\-
++\fBAIX\fP \-\-
+ Supports the SVr1 subset, plus function keys 11 through 63, plus a number
+ of incompatible string table extensions.
+ .bP
+-\fBOSF\fR \-\-
++\fBOSF\fP \-\-
+ Supports both the SVr4 set and the AIX extensions.
+ .SH FILES
+ .TP 25
+ \*d/?/*
+ files containing terminal descriptions
+ .SH SEE ALSO
+-\fB@INFOCMP@\fR(1M),
+-\fB@TABS@\fR(1),
+-\fB@TIC@\fR(1M),
+-\fBcurses\fR(3X),
+-\fBcurs_color\fR(3X),
+-\fBcurs_variables\fR(3X),
+-\fBprintf\fR(3),
+-\fBterm_variables\fR(3X).
+-\fBterm\fR(\*n).
+-\fBuser_caps\fR(5).
++\fB@INFOCMP@\fP(1M),
++\fB@TABS@\fP(1),
++\fB@TIC@\fP(1M),
++\fBcurses\fP(3X),
++\fBcurs_color\fP(3X),
++\fBcurs_variables\fP(3X),
++\fBprintf\fP(3),
++\fBterm_variables\fP(3X).
++\fBterm\fP(\*n).
++\fBuser_caps\fP(5).
+ .SH AUTHORS
+ Zeyd M. Ben-Halim, Eric S. Raymond, Thomas E. Dickey.
+-Based on pcurses by Pavel Curtis.
++Based on \fIpcurses\fP by Pavel Curtis.
+Index: man/tic.1m
+Prereq:  1.80 
+--- ncurses-6.3-20211219+/man/tic.1m	2021-08-15 20:01:19.000000000 +0000
++++ ncurses-6.3-20211225/man/tic.1m	2021-12-25 17:39:16.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tic.1m,v 1.80 2021/08/15 20:01:19 tom Exp $
++.\" $Id: tic.1m,v 1.81 2021/12/25 17:39:16 tom Exp $
+ .TH @TIC@ 1M ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -40,9 +40,9 @@
+ .el    .IP \(bu 2
+ ..
+ .SH NAME
+-\fB@TIC@\fR \- the \fIterminfo\fR entry-description compiler
++\fB@TIC@\fP \- the \fIterminfo\fP entry-description compiler
+ .SH SYNOPSIS
+-\fB@TIC@\fR
++\fB@TIC@\fP
+ [\fB\-\
+ 0\
+ 1\
+@@ -66,24 +66,24 @@
+ s\
+ t\
+ x\
+-\fR]
+-[\fB\-e\fR \fInames\fR]
+-[\fB\-o\fR \fIdir\fR]
+-[\fB\-Q\fR[\fIn\fR]]
+-[\fB\-R\fR \fIsubset\fR]
+-[\fB\-v\fR[\fIn\fR]]
+-[\fB\-w\fR[\fIn\fR]]
+-\fIfile\fR
++\fP]
++[\fB\-e\fP \fInames\fP]
++[\fB\-o\fP \fIdir\fP]
++[\fB\-Q\fP[\fIn\fP]]
++[\fB\-R\fP \fIsubset\fP]
++[\fB\-v\fP[\fIn\fP]]
++[\fB\-w\fP[\fIn\fP]]
++\fIfile\fP
+ .br
+ .SH DESCRIPTION
+-The \fB@TIC@\fR command translates a \fBterminfo\fR file from source
++The \fB@TIC@\fP command translates a \fBterminfo\fP file from source
+ format into compiled format.
+ The compiled format is necessary for use with
+-the library routines in \fBncurses\fR(3X).
++the library routines in \fBncurses\fP(3X).
+ .PP
+-As described in \fBterm\fR(\*n), the database may be either a directory
++As described in \fBterm\fP(\*n), the database may be either a directory
+ tree (one file per terminal entry) or a hashed database (one record per entry).
+-The \fB@TIC@\fR command writes only one type of entry,
++The \fB@TIC@\fP command writes only one type of entry,
+ depending on how it was built:
+ .bP
+ For directory trees, the top-level directory, e.g., /usr/share/terminfo,
+@@ -102,33 +102,33 @@
+ For a directory, this would be the \*(``terminfo\*('' leaf,
+ versus a "terminfo.db" file.
+ .PP
+-The results are normally placed in the system terminfo database \fB\*d\fR.
++The results are normally placed in the system terminfo database \fB\*d\fP.
+ The compiled terminal description can be placed
+ in a different terminfo database.
+ There are two ways to achieve this:
+ .bP
+ First, you may override the system default either by
+ using the \fB\-o\fP option,
+-or by setting the variable \fBTERMINFO\fR
++or by setting the variable \fBTERMINFO\fP
+ in your shell environment to a valid database location.
+ .bP
+-Secondly, if \fB@TIC@\fR cannot write in \fI\*d\fR
++Secondly, if \fB@TIC@\fP cannot write in \fI\*d\fP
+ or the location specified using your TERMINFO variable,
+-it looks for the directory \fI$HOME/.terminfo\fR
+-(or hashed database \fI$HOME/.terminfo.db)\fR;
++it looks for the directory \fI$HOME/.terminfo\fP
++(or hashed database \fI$HOME/.terminfo.db)\fP;
+ if that location exists, the entry is placed there.
+ .PP
+ Libraries that read terminfo entries are expected to check in succession
+ .bP
+ a location specified with the TERMINFO environment variable,
+ .bP
+-\fI$HOME/.terminfo\fR,
++\fI$HOME/.terminfo\fP,
+ .bP
+ directories listed in the TERMINFO_DIRS environment variable,
+ .bP
+ a compiled-in list of directories (@TERMINFO_DIRS@), and
+ .bP
+-the system terminfo database (\fI\*d\fR).
++the system terminfo database (\fI\*d\fP).
+ .SS ALIASES
+ .PP
+ This is the same program as @INFOTOCAP@ and @CAPTOINFO@;
+@@ -139,34 +139,34 @@
+ When invoked as @CAPTOINFO@, @TIC@ sets the \fB\-C\fP option.
+ .SS OPTIONS
+ .TP
+-\fB\-0\fR
++\fB\-0\fP
+ restricts the output to a single line
+ .TP
+-\fB\-1\fR
++\fB\-1\fP
+ restricts the output to a single column
+ .TP
+-\fB\-a\fR
++\fB\-a\fP
+ tells \fB@TIC@\fP to retain commented-out capabilities rather than discarding
+ them.
+ Capabilities are commented by prefixing them with a period.
+-This sets the \fB\-x\fR option, because it treats the commented-out
++This sets the \fB\-x\fP option, because it treats the commented-out
+ entries as user-defined names.
+ If the source is termcap, accept the 2-character names required by version 6.
+ Otherwise these are ignored.
+ .TP
+-\fB\-C\fR
++\fB\-C\fP
+ Force source translation to termcap format.
+-Note: this differs from the \fB\-C\fR
+-option of \fB@INFOCMP@\fR(1M) in that it does not merely translate capability
++Note: this differs from the \fB\-C\fP
++option of \fB@INFOCMP@\fP(1M) in that it does not merely translate capability
+ names, but also translates terminfo strings to termcap format.
+ Capabilities
+ that are not translatable are left in the entry under their terminfo names
+ but commented out with two preceding dots.
+ The actual format used incorporates some improvements for escaped characters
+ from terminfo format.
+-For a stricter BSD-compatible translation, add the \fB\-K\fR option.
++For a stricter BSD-compatible translation, add the \fB\-K\fP option.
+ .IP
+-If this is combined with \fB\-c\fR, \fB@TIC@\fR makes additional checks
++If this is combined with \fB\-c\fP, \fB@TIC@\fP makes additional checks
+ to report cases where the terminfo values do not have an exact equivalent
+ in termcap form.
+ For example:
+@@ -180,10 +180,10 @@
+ the string will not convert completely.
+ .RE
+ .TP
+-\fB\-c\fR
+-tells \fB@TIC@\fP to only check \fIfile\fR for errors,
++\fB\-c\fP
++tells \fB@TIC@\fP to only check \fIfile\fP for errors,
+ including syntax problems and bad use-links.
+-If you specify \fB\-C\fR (\fB\-I\fR) with this option, the code
++If you specify \fB\-C\fP (\fB\-I\fP) with this option, the code
+ will print warnings about entries which, after use resolution, are more than
+ 1023 (4096) bytes long.
+ Due to a fixed buffer length in older termcap libraries,
+@@ -197,7 +197,7 @@
+ It does this check only for the predefined string capabilities;
+ those which are defined with the \fB\-x\fP option are ignored.
+ .TP
+-\fB\-D\fR
++\fB\-D\fP
+ tells \fB@TIC@\fP to print the database locations that it knows about, and exit.
+ The first location shown is the one to which it would write compiled
+ terminal descriptions.
+@@ -206,7 +206,7 @@
+ it will print a diagnostic and exit with an error rather than
+ printing a list of database locations.
+ .TP
+-\fB\-e \fR\fInames\fR
++\fB\-e \fP\fInames\fP
+ Limit writes and translations to the following comma-separated list of
+ terminals.
+ If any name or alias of a terminal matches one of the names in
+@@ -215,49 +215,49 @@
+ The option value is interpreted as a file containing the list if it
+ contains a '/'.
+ (Note: depending on how @TIC@ was compiled,
+-this option may require \fB\-I\fR or \fB\-C\fR.)
++this option may require \fB\-I\fP or \fB\-C\fP.)
+ .TP
+-\fB\-f\fR
++\fB\-f\fP
+ Display complex terminfo strings which contain if/then/else/endif expressions
+ indented for readability.
+ .TP
+-\fB\-G\fR
++\fB\-G\fP
+ Display constant literals in decimal form
+ rather than their character equivalents.
+ .TP
+-\fB\-g\fR
++\fB\-g\fP
+ Display constant character literals in quoted form
+ rather than their decimal equivalents.
+ .TP
+-\fB\-I\fR
++\fB\-I\fP
+ Force source translation to terminfo format.
+ .TP
+-\fB\-K\fR
++\fB\-K\fP
+ Suppress some longstanding ncurses extensions to termcap format,
+ e.g., "\\s" for space.
+ .TP
+-\fB\-L\fR
++\fB\-L\fP
+ Force source translation to terminfo format
+-using the long C variable names listed in <\fBterm.h\fR>
++using the long C variable names listed in <\fBterm.h\fP>
+ .TP
+-\fB\-N\fR
++\fB\-N\fP
+ Disable smart defaults.
+ Normally, when translating from termcap to terminfo, the compiler makes
+ a number of assumptions about the defaults of string capabilities
+-\fBreset1_string\fR, \fBcarriage_return\fR, \fBcursor_left\fR,
+-\fBcursor_down\fR, \fBscroll_forward\fR, \fBtab\fR, \fBnewline\fR,
+-\fBkey_backspace\fR, \fBkey_left\fR, and \fBkey_down\fR, then attempts
++\fBreset1_string\fP, \fBcarriage_return\fP, \fBcursor_left\fP,
++\fBcursor_down\fP, \fBscroll_forward\fP, \fBtab\fP, \fBnewline\fP,
++\fBkey_backspace\fP, \fBkey_left\fP, and \fBkey_down\fP, then attempts
+ to use obsolete termcap capabilities to deduce correct values.
+ It also
+-normally suppresses output of obsolete termcap capabilities such as \fBbs\fR.
++normally suppresses output of obsolete termcap capabilities such as \fBbs\fP.
+ This option forces a more literal translation that also preserves the
+ obsolete capabilities.
+ .TP
+-\fB\-o\fR\fIdir\fR
++\fB\-o\fP\fIdir\fP
+ Write compiled entries to given database location.
+ Overrides the TERMINFO environment variable.
+ .TP
+-\fB\-Q\fR\fIn\fR
++\fB\-Q\fP\fIn\fP
+ Rather than show source in terminfo (text) format,
+ print the compiled (binary) format in hexadecimal or base64 form,
+ depending on the option's value:
+@@ -273,10 +273,10 @@
+ hexadecimal and base64
+ .RE
+ .TP
+-\fB\-q\fR
++\fB\-q\fP
+ Suppress comments and blank lines when showing translated source.
+ .TP
+-\fB\-R\fR\fIsubset\fR
++\fB\-R\fP\fIsubset\fP
+ Restrict output to a given subset.
+ This option is for use with archaic
+ versions of terminfo like those on SVr1, Ultrix, or HP-UX that do not support
+@@ -284,9 +284,9 @@
+ that have their own extensions incompatible with SVr4/XSI.
+ Available subsets
+ are \*(``SVr1\*('', \*(``Ultrix\*('', \*(``HP\*('', \*(``BSD\*('' and \*(``AIX\*('';
+-see \fBterminfo\fR(\*n) for details.
++see \fBterminfo\fP(\*n) for details.
+ .TP
+-\fB\-r\fR
++\fB\-r\fP
+ Force entry resolution (so there are no remaining tc capabilities) even
+ when doing translation to termcap format.
+ This may be needed if you are
+@@ -294,37 +294,37 @@
+ version 1.3 or BSD termcap through 4.3BSD) that does not handle multiple
+ tc capabilities per entry.
+ .TP
+-\fB\-s\fR
++\fB\-s\fP
+ Summarize the compile by showing the database location into which entries
+ are written, and the number of entries which are compiled.
+ .TP
+-\fB\-T\fR
++\fB\-T\fP
+ eliminates size-restrictions on the generated text.
+ This is mainly useful for testing and analysis, since the compiled
+ descriptions are limited (e.g., 1023 for termcap, 4096 for terminfo).
+ .TP
+-\fB\-t\fR
++\fB\-t\fP
+ tells \fB@TIC@\fP to discard commented-out capabilities.
+ Normally when translating from terminfo to termcap,
+ untranslatable capabilities are commented-out.
+ .TP 5
+-\fB\-U\fR
++\fB\-U\fP
+ tells \fB@TIC@\fP to not post-process the data after parsing the source file.
+ Normally, it infers data which is commonly missing in older terminfo data,
+ or in termcaps.
+ .TP
+-\fB\-V\fR
++\fB\-V\fP
+ reports the version of ncurses which was used in this program, and exits.
+ .TP
+-\fB\-v\fR\fIn\fR
++\fB\-v\fP\fIn\fP
+ specifies that (verbose) output be written to standard error trace
+-information showing \fB@TIC@\fR's progress.
++information showing \fB@TIC@\fP's progress.
+ .IP
+-The optional parameter \fIn\fR is a number from 1 to 10, inclusive,
++The optional parameter \fIn\fP is a number from 1 to 10, inclusive,
+ indicating the desired level of detail of information.
+ If ncurses is built without tracing support, the optional parameter is ignored.
+-If \fIn\fR is omitted, the default level is 1.
+-If \fIn\fR is specified and greater than 1, the level of
++If \fIn\fP is omitted, the default level is 1.
++If \fIn\fP is specified and greater than 1, the level of
+ detail is increased.
+ .RS
+ .PP
+@@ -351,22 +351,22 @@
+ 9
+ All values computed in construction of the hash table
+ .LP
+-If the debug level \fIn\fR is not given, it is taken to be one.
++If the debug level \fIn\fP is not given, it is taken to be one.
+ .RE
+ .TP
+-\fB\-W\fR
++\fB\-W\fP
+ By itself, the \fB\-w\fP option will not force long strings to be wrapped.
+ Use the \fB\-W\fP option to do this.
+ .IP
+ If you specify both \fB\-f\fP and \fB\-W\fP options,
+ the latter is ignored when \fB\-f\fP has already split the line.
+ .TP
+-\fB\-w\fR\fIn\fR
++\fB\-w\fP\fIn\fP
+ specifies the width of the output.
+ The parameter is optional.
+ If it is omitted, it defaults to 60.
+ .TP
+-\fB\-x\fR
++\fB\-x\fP
+ Treat unknown capabilities as user-defined (see \fBuser_caps(\*n)\fP).
+ That is, if you supply a capability name which \fB@TIC@\fP does not recognize,
+ it will infer its type (boolean, number or string) from the syntax and
+@@ -375,34 +375,34 @@
+ whose name begins with \*(``k\*('' are treated as function keys.
+ .SS PARAMETERS
+ .TP
+-\fIfile\fR
+-contains one or more \fBterminfo\fR terminal descriptions in source
+-format [see \fBterminfo\fR(\*n)].
++\fIfile\fP
++contains one or more \fBterminfo\fP terminal descriptions in source
++format [see \fBterminfo\fP(\*n)].
+ Each description in the file
+ describes the capabilities of a particular terminal.
+ .IP
+-If \fIfile\fR is \*(``-\*('', then the data is read from the standard input.
+-The \fIfile\fR parameter may also be the path of a character-device.
++If \fIfile\fP is \*(``-\*('', then the data is read from the standard input.
++The \fIfile\fP parameter may also be the path of a character-device.
+ .SS PROCESSING
+ .PP
+-All but one of the capabilities recognized by \fB@TIC@\fR are documented
+-in \fBterminfo\fR(\*n).
+-The exception is the \fBuse\fR capability.
+-.PP
+-When a \fBuse\fR=\fIentry\fR\-\fIname\fR field is discovered in a
+-terminal entry currently being compiled, \fB@TIC@\fR reads in the binary
+-from \fB\*d\fR to complete the entry.
++All but one of the capabilities recognized by \fB@TIC@\fP are documented
++in \fBterminfo\fP(\*n).
++The exception is the \fBuse\fP capability.
++.PP
++When a \fBuse\fP=\fIentry\fP\-\fIname\fP field is discovered in a
++terminal entry currently being compiled, \fB@TIC@\fP reads in the binary
++from \fB\*d\fP to complete the entry.
+ (Entries created from
+-\fIfile\fR will be used first.
+-\fB@TIC@\fR duplicates the capabilities in
+-\fIentry\fR\-\fIname\fR for the current entry, with the exception of
++\fIfile\fP will be used first.
++\fB@TIC@\fP duplicates the capabilities in
++\fIentry\fP\-\fIname\fP for the current entry, with the exception of
+ those capabilities that explicitly are defined in the current entry.
+ .PP
+-When an entry, e.g., \fBentry_name_1\fR, contains a
+-\fBuse=\fR\fIentry\fR_\fIname\fR_\fI2\fR field, any canceled
+-capabilities in \fIentry\fR_\fIname\fR_\fI2\fR must also appear in
+-\fBentry_name_1\fR before \fBuse=\fR for these capabilities to be
+-canceled in \fBentry_name_1\fR.
++When an entry, e.g., \fBentry_name_1\fP, contains a
++\fBuse=\fP\fIentry\fR_\fIname\fR_\fI2\fP field, any canceled
++capabilities in \fIentry\fR_\fIname\fR_\fI2\fP must also appear in
++\fBentry_name_1\fP before \fBuse=\fP for these capabilities to be
++canceled in \fBentry_name_1\fP.
+ .PP
+ Total compiled entries cannot exceed 4096 bytes.
+ The name field cannot
+@@ -499,31 +499,31 @@
+ but that is obsolescent behavior from SVr2,
+ and is not (for example) a documented feature of SVr3.
+ .SS COMPATIBILITY
+-There is some evidence that historic \fB@TIC@\fR implementations treated
++There is some evidence that historic \fB@TIC@\fP implementations treated
+ description fields with no whitespace in them as additional aliases or
+ short names.
+-This \fB@TIC@\fR does not do that, but it does warn when
++This \fB@TIC@\fP does not do that, but it does warn when
+ description fields may be treated that way and check them for dangerous
+ characters.
+ .SS EXTENSIONS
+-Unlike the SVr4 \fB@TIC@\fR command, this implementation can actually
++Unlike the SVr4 \fB@TIC@\fP command, this implementation can actually
+ compile termcap sources.
+ In fact, entries in terminfo and termcap syntax can
+ be mixed in a single source file.
+-See \fBterminfo\fR(\*n) for the list of
++See \fBterminfo\fP(\*n) for the list of
+ termcap names taken to be equivalent to terminfo names.
+ .PP
+-The SVr4 manual pages are not clear on the resolution rules for \fBuse\fR
++The SVr4 manual pages are not clear on the resolution rules for \fBuse\fP
+ capabilities.
+-This implementation of \fB@TIC@\fR will find \fBuse\fR targets anywhere
+-in the source file, or anywhere in the file tree rooted at \fBTERMINFO\fR (if
+-\fBTERMINFO\fR is defined),
+-or in the user's \fI$HOME/.terminfo\fR database
++This implementation of \fB@TIC@\fP will find \fBuse\fP targets anywhere
++in the source file, or anywhere in the file tree rooted at \fBTERMINFO\fP (if
++\fBTERMINFO\fP is defined),
++or in the user's \fI$HOME/.terminfo\fP database
+ (if it exists),
+ or (finally) anywhere in the system's file tree of
+ compiled entries.
+ .PP
+-The error messages from this \fB@TIC@\fR have the same format as GNU C
++The error messages from this \fB@TIC@\fP have the same format as GNU C
+ error messages, and can be parsed by GNU Emacs's compile facility.
+ .PP
+ Aside from \fB\-c\fP and \fB\-v\fP, options are not portable:
+@@ -532,24 +532,24 @@
+ are not supported by SVr4 \fBtic\fP:
+ .sp
+ .RS
+-\fB\-0\fR
+-\fB\-1\fR
+-\fB\-C\fR
+-\fB\-G\fR
+-\fB\-I\fR
+-\fB\-N\fR
+-\fB\-R\fR
+-\fB\-T\fR
+-\fB\-V\fR
+-\fB\-a\fR
+-\fB\-e\fR
+-\fB\-f\fR
+-\fB\-g\fR
+-\fB\-o\fR
+-\fB\-r\fR
+-\fB\-s\fR
+-\fB\-t\fR
+-\fB\-x\fR
++\fB\-0\fP
++\fB\-1\fP
++\fB\-C\fP
++\fB\-G\fP
++\fB\-I\fP
++\fB\-N\fP
++\fB\-R\fP
++\fB\-T\fP
++\fB\-V\fP
++\fB\-a\fP
++\fB\-e\fP
++\fB\-f\fP
++\fB\-g\fP
++\fB\-o\fP
++\fB\-r\fP
++\fB\-s\fP
++\fB\-t\fP
++\fB\-x\fP
+ .RE
+ .bP
+ The NetBSD \fBtic\fP  supports a few of the ncurses options
+@@ -564,25 +564,25 @@
+ (a feature which does the same thing
+ as @INFOCMP@'s \fB\-e\fP and \fB\-E\fP options).
+ .PP
+-The SVr4 \fB\-c\fR mode does not report bad \*(``use=\*('' links.
++The SVr4 \fB\-c\fP mode does not report bad \*(``use=\*('' links.
+ .PP
+ System V does not compile entries to or read entries from your
+-\fI$HOME/.terminfo\fR database unless TERMINFO is explicitly set to it.
++\fI$HOME/.terminfo\fP database unless TERMINFO is explicitly set to it.
+ .SH FILES
+ .TP 5
+-\fB\*d/?/*\fR
++\fB\*d/?/*\fP
+ Compiled terminal description database.
+ .SH SEE ALSO
+-\fB@CAPTOINFO@\fR(1M),
+-\fB@INFOCMP@\fR(1M),
+-\fB@INFOTOCAP@\fR(1M),
+-\fB@TOE@\fR(1M),
+-\fBcurses\fR(3X),
+-\fBterm\fR(\*n).
+-\fBterminfo\fR(\*n).
+-\fBuser_caps\fR(\*n).
++\fB@CAPTOINFO@\fP(1M),
++\fB@INFOCMP@\fP(1M),
++\fB@INFOTOCAP@\fP(1M),
++\fB@TOE@\fP(1M),
++\fBcurses\fP(3X),
++\fBterm\fP(\*n).
++\fBterminfo\fP(\*n).
++\fBuser_caps\fP(\*n).
+ .PP
+-This describes \fBncurses\fR
++This describes \fBncurses\fP
+ version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
+ .SH AUTHOR
+ Eric S. Raymond 
+Index: man/toe.1m
+Prereq:  1.34 
+--- ncurses-6.3-20211219+/man/toe.1m	2021-06-17 21:26:02.000000000 +0000
++++ ncurses-6.3-20211225/man/toe.1m	2021-12-25 17:39:16.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: toe.1m,v 1.34 2021/06/17 21:26:02 tom Exp $
++.\" $Id: toe.1m,v 1.35 2021/12/25 17:39:16 tom Exp $
+ .TH @TOE@ 1M ""
+ .de bP
+ .ie n  .IP \(bu 4
+@@ -54,41 +54,41 @@
+ .ds n 5
+ .ds d @TERMINFO@
+ .SH NAME
+-\fB@TOE@\fR \- table of (terminfo) entries
++\fB@TOE@\fP \- table of (terminfo) entries
+ .SH SYNOPSIS
+-\fB@TOE@\fR [\fB\-v\fR[\fIn\fR]] [\fB\-ahsuUV\fR] \fIfile...\fR
++\fB@TOE@\fP [\fB\-v\fP[\fIn\fP]] [\fB\-ahsuUV\fP] \fIfile...\fP
+ .br
+ .SH DESCRIPTION
+ .PP
+ With no options,
+-\fB@TOE@\fR lists all available terminal types by primary name
++\fB@TOE@\fP lists all available terminal types by primary name
+ with descriptions.
+ File arguments specify the directories to be scanned; if no
+ such arguments are given,
+ your default terminfo directory is scanned.
+-If you also specify the \fB\-h\fR option,
++If you also specify the \fB\-h\fP option,
+ a directory header will be issued as each
+ directory is entered.
+ .PP
+ There are other options intended for use by terminfo file maintainers:
+ .TP
+-\fB\-a\fR
++\fB\-a\fP
+ report on all of the terminal databases which ncurses would search,
+ rather than only the first one that it finds.
+ .IP
+-If the \fB\-s\fR is also given, \fB@TOE@\fR
++If the \fB\-s\fP is also given, \fB@TOE@\fP
+ adds a column to the report,
+ showing (like \fBconflict\fP(1)) which entries which
+ belong to a given terminal database.
+ An "*" marks entries which differ, and "+" marks equivalent entries.
+ .IP
+-Without the \fB\-s\fP option, \fB@TOE@\fR does not attempt to merge
++Without the \fB\-s\fP option, \fB@TOE@\fP does not attempt to merge
+ duplicates in its report
+ .TP
+-\fB\-s\fR
++\fB\-s\fP
+ sort the output by the entry names.
+ .TP
+-\fB\-u\fR \fIfile\fR
++\fB\-u\fP \fIfile\fP
+ says to write a report to the standard output,
+ listing dependencies in the given terminfo/termcap source file.
+ The report condenses the \*(``use\*('' relation:
+@@ -100,7 +100,7 @@
+ capabilities,
+ followed by a newline
+ .TP
+-\fB\-U\fR \fIfile\fR
++\fB\-U\fP \fIfile\fP
+ says to write a report to the standard output,
+ listing reverse dependencies in the given terminfo/termcap source file.
+ The report reverses the \*(``use\*('' relation:
+@@ -111,15 +111,15 @@
+ whitespace-separated primary names of all terminals which depend on it,
+ followed by a newline.
+ .TP
+-\fB\-v\fR\fIn\fR
++\fB\-v\fP\fIn\fP
+ specifies that (verbose) output be written to standard error,
+-showing \fB@TOE@\fR's progress.
++showing \fB@TOE@\fP's progress.
+ .IP
+-The optional parameter \fIn\fR is a number from 1 to 10,
+-interpreted as for \fB@TIC@\fR(1M).
++The optional parameter \fIn\fP is a number from 1 to 10,
++interpreted as for \fB@TIC@\fP(1M).
+ If ncurses is built without tracing support, the optional parameter is ignored.
+ .TP
+-\fB\-V\fR
++\fB\-V\fP
+ reports the version of ncurses which was used in this program,
+ and exits.
+ .SH EXAMPLES
+@@ -163,7 +163,7 @@
+ .NE
+ .SH FILES
+ .TP 5
+-\fB\*d/?/*\fR
++\fB\*d/?/*\fP
+ Compiled terminal description database.
+ .SH HISTORY
+ This utility is not provided by other implementations.
+@@ -181,14 +181,14 @@
+ the ncurses \fBinfocmp\fP utility in 1995.
+ .PP
+ The \fB\-a\fP and \fB\-s\fP options were added to
+-\fB@TOE@\fR several years later (2006 and 2011, respectively).
++\fB@TOE@\fP several years later (2006 and 2011, respectively).
+ .SH SEE ALSO
+-\fB@CAPTOINFO@\fR(1M),
+-\fB@INFOCMP@\fR(1M),
+-\fB@INFOTOCAP@\fR(1M),
+-\fB@TIC@\fR(1M),
+-\fBcurses\fR(3X),
+-\fBterminfo\fR(\*n).
++\fB@CAPTOINFO@\fP(1M),
++\fB@INFOCMP@\fP(1M),
++\fB@INFOTOCAP@\fP(1M),
++\fB@TIC@\fP(1M),
++\fBcurses\fP(3X),
++\fBterminfo\fP(\*n).
+ .PP
+-This describes \fBncurses\fR
++This describes \fBncurses\fP
+ version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
+Index: man/tput.1
+Prereq:  1.72 
+--- ncurses-6.3-20211219+/man/tput.1	2021-10-02 21:41:00.000000000 +0000
++++ ncurses-6.3-20211225/man/tput.1	2021-12-25 21:31:59.000000000 +0000
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tput.1,v 1.72 2021/10/02 21:41:00 tom Exp $
++.\" $Id: tput.1,v 1.75 2021/12/25 21:31:59 tom Exp $
+ .TH @TPUT@ 1 ""
+ .ds d @TERMINFO@
+ .ds n 1
+@@ -41,77 +41,77 @@
+ .el    .IP \(bu 2
+ ..
+ .SH NAME
+-\fB@TPUT@\fR, \fBreset\fR \- initialize a terminal or query terminfo database
++\fB@TPUT@\fP, \fBreset\fP \- initialize a terminal or query terminfo database
+ .SH SYNOPSIS
+-\fB@TPUT@\fR [\fB\-T\fR\fItype\fR] \fIcapname\fR [\fIparameters\fR]
++\fB@TPUT@\fP [\fB\-T\fP\fItype\fP] \fIcapname\fP [\fIparameters\fP]
+ .br
+-\fB@TPUT@\fR [\fB\-T\fR\fItype\fR] [\fB\-x\fP] \fBclear\fR
++\fB@TPUT@\fP [\fB\-T\fP\fItype\fP] [\fB\-x\fP] \fBclear\fP
+ .br
+-\fB@TPUT@\fR [\fB\-T\fR\fItype\fR] \fBinit\fR
++\fB@TPUT@\fP [\fB\-T\fP\fItype\fP] \fBinit\fP
+ .br
+-\fB@TPUT@\fR [\fB\-T\fR\fItype\fR] \fBreset\fR
++\fB@TPUT@\fP [\fB\-T\fP\fItype\fP] \fBreset\fP
+ .br
+-\fB@TPUT@\fR [\fB\-T\fR\fItype\fR] \fBlongname\fR
++\fB@TPUT@\fP [\fB\-T\fP\fItype\fP] \fBlongname\fP
+ .br
+-\fB@TPUT@ \-S\fR  \fB<<\fR
++\fB@TPUT@ \-S\fP  \fB<<\fP
+ .br
+-\fB@TPUT@ \-V\fR
++\fB@TPUT@ \-V\fP
+ .br
+ .SH DESCRIPTION
+-The \fB@TPUT@\fR utility uses the \fBterminfo\fR database to make the
++The \fB@TPUT@\fP utility uses the \fBterminfo\fP database to make the
+ values of terminal-dependent capabilities and information available to
+-the shell (see \fBsh\fR(1)), to initialize or reset the terminal, or
++the shell (see \fBsh\fP(1)), to initialize or reset the terminal, or
+ return the long name of the requested terminal type.
+ The result depends upon the capability's type:
+ .RS 3
+ .TP 5
+ string
+-\fB@TPUT@\fR writes the string to the standard output.
++\fB@TPUT@\fP writes the string to the standard output.
+ No trailing newline is supplied.
+ .TP
+ integer
+-\fB@TPUT@\fR writes the decimal value to the standard output,
++\fB@TPUT@\fP writes the decimal value to the standard output,
+ with a trailing newline.
+ .TP
+ boolean
+-\fB@TPUT@\fR simply sets the exit code
+-(\fB0\fR for TRUE if the terminal has the capability,
+-\fB1\fR for FALSE if it does not),
++\fB@TPUT@\fP simply sets the exit code
++(\fB0\fP for TRUE if the terminal has the capability,
++\fB1\fP for FALSE if it does not),
+ and writes nothing to the standard output.
+ .RE
+ .PP
+ Before using a value returned on the standard output,
+ the application should test the exit code
+-(e.g., \fB$?\fR, see \fBsh\fR(1)) to be sure it is \fB0\fR.
+-(See the \fBEXIT CODES\fR and \fBDIAGNOSTICS\fR sections.)
++(e.g., \fB$?\fP, see \fBsh\fP(1)) to be sure it is \fB0\fP.
++(See the \fBEXIT CODES\fP and \fBDIAGNOSTICS\fP sections.)
+ For a complete list of capabilities
+-and the \fIcapname\fR associated with each, see \fBterminfo\fR(5).
++and the \fIcapname\fP associated with each, see \fBterminfo\fP(5).
+ .SS Options
+ .TP
+-\fB\-S\fR
+-allows more than one capability per invocation of \fB@TPUT@\fR.  The
+-capabilities must be passed to \fB@TPUT@\fR from the standard input
++\fB\-S\fP
++allows more than one capability per invocation of \fB@TPUT@\fP.  The
++capabilities must be passed to \fB@TPUT@\fP from the standard input
+ instead of from the command line (see example).
+-Only one \fIcapname\fR is allowed per line.
+-The \fB\-S\fR option changes the
+-meaning of the \fB0\fR and \fB1\fR boolean and string exit codes (see the
++Only one \fIcapname\fP is allowed per line.
++The \fB\-S\fP option changes the
++meaning of the \fB0\fP and \fB1\fP boolean and string exit codes (see the
+ EXIT CODES section).
+ .IP
+ Because some capabilities may use
+ \fIstring\fP parameters rather than \fInumbers\fP,
+-\fB@TPUT@\fR uses a table and the presence of parameters in its input
+-to decide whether to use \fBtparm\fR(3X),
++\fB@TPUT@\fP uses a table and the presence of parameters in its input
++to decide whether to use \fBtparm\fP(3X),
+ and how to interpret the parameters.
+ .TP
+-\fB\-T\fR\fItype\fR
+-indicates the \fItype\fR of terminal.
++\fB\-T\fP\fItype\fP
++indicates the \fItype\fP of terminal.
+ Normally this option is
+ unnecessary, because the default is taken from the environment
+-variable \fBTERM\fR.
+-If \fB\-T\fR is specified, then the shell
+-variables \fBLINES\fR and \fBCOLUMNS\fR will also be ignored.
++variable \fBTERM\fP.
++If \fB\-T\fP is specified, then the shell
++variables \fBLINES\fP and \fBCOLUMNS\fP will also be ignored.
+ .TP
+-\fB\-V\fR
++\fB\-V\fP
+ reports the version of ncurses which was used in this program, and exits.
+ .TP
+ .B \-x
+@@ -121,11 +121,11 @@
+ A few commands (\fBinit\fP, \fBreset\fP and \fBlongname\fP) are
+ special; they are defined by the \fB@TPUT@\fP program.
+ The others are the names of \fIcapabilities\fP from the terminal database
+-(see \fBterminfo\fR(5) for a list).
++(see \fBterminfo\fP(5) for a list).
+ Although \fBinit\fP and \fBreset\fP resemble capability names,
+ \fB@TPUT@\fP uses several capabilities to perform these special functions.
+ .TP
+-\fIcapname\fR
++\fIcapname\fP
+ indicates the capability from the terminal database.
+ .IP
+ If the capability is a string that takes parameters, the arguments
+@@ -133,19 +133,19 @@
+ .IP
+ Most parameters are numbers.
+ Only a few terminal capabilities require string parameters;
+-\fB@TPUT@\fR uses a table to decide which to pass as strings.
+-Normally \fB@TPUT@\fR uses \fBtparm\fR(3X) to perform the substitution.
++\fB@TPUT@\fP uses a table to decide which to pass as strings.
++Normally \fB@TPUT@\fP uses \fBtparm\fP(3X) to perform the substitution.
+ If no parameters are given for the capability,
+-\fB@TPUT@\fR writes the string without performing the substitution.
++\fB@TPUT@\fP writes the string without performing the substitution.
+ .TP
+-\fBinit\fR
++\fBinit\fP
+ If the terminal database is present and an entry for the user's
+-terminal exists (see \fB\-T\fR\fItype\fR, above), the following will
++terminal exists (see \fB\-T\fP\fItype\fP, above), the following will
+ occur:
+ .RS
+ .TP 5
+ (1)
+-first, \fB@TPUT@\fR retrieves the current terminal mode settings
++first, \fB@TPUT@\fP retrieves the current terminal mode settings
+ for your terminal.
+ It does this by successively testing
+ .RS
+@@ -185,7 +185,7 @@
+ .TP
+ (4)
+ if present, the terminal's initialization strings will be
+-output as detailed in the \fBterminfo\fR(5) section on
++output as detailed in the \fBterminfo\fP(5) section on
+ .IR "Tabs and Initialization" ,
+ .TP
+ (5)
+@@ -196,7 +196,7 @@
+ contain the information needed for any of these activities,
+ that activity will silently be skipped.
+ .TP
+-\fBreset\fR
++\fBreset\fP
+ This is similar to \fBinit\fP, with two differences:
+ .RS
+ .TP 5
+@@ -217,28 +217,28 @@
+ (2)
+ Instead of putting out \fIinitialization\fP strings, the terminal's
+ \fIreset\fP strings will be output if present
+-(\fBrs1\fR, \fBrs2\fR, \fBrs3\fR, \fBrf\fR).
++(\fBrs1\fP, \fBrs2\fP, \fBrs3\fP, \fBrf\fP).
+ If the \fIreset\fP strings are not present, but \fIinitialization\fP
+ strings are, the \fIinitialization\fP strings will be output.
+ .RE
+ .IP
+-Otherwise, \fBreset\fR acts identically to \fBinit\fR.
++Otherwise, \fBreset\fP acts identically to \fBinit\fP.
+ .TP
+-\fBlongname\fR
++\fBlongname\fP
+ If the terminal database is present and an entry for the
+-user's terminal exists (see \fB\-T\fR\fItype\fR above), then the long name
++user's terminal exists (see \fB\-T\fP\fItype\fP above), then the long name
+ of the terminal will be put out.
+ The long name is the last
+ name in the first line of the terminal's description in the
+-\fBterminfo\fR database [see \fBterm\fR(5)].
++\fBterminfo\fP database [see \fBterm\fP(5)].
+ .SS Aliases
+-\fB@TPUT@\fR handles the \fBclear\fP, \fBinit\fP and \fBreset\fP
++\fB@TPUT@\fP handles the \fBclear\fP, \fBinit\fP and \fBreset\fP
+ commands specially:
+ it allows for the possibility that it is invoked by a link with those names.
+ .PP
+-If \fB@TPUT@\fR is invoked by a link named \fBreset\fR, this has the
+-same effect as \fB@TPUT@ reset\fR.
+-The \fB@TSET@\fR(\*n) utility also treats a link named \fBreset\fP specially.
++If \fB@TPUT@\fP is invoked by a link named \fBreset\fP, this has the
++same effect as \fB@TPUT@ reset\fP.
++The \fB@TSET@\fP(\*n) utility also treats a link named \fBreset\fP specially.
+ .PP
+ Before ncurses 6.1, the two utilities were different from each other:
+ .bP
+@@ -268,8 +268,8 @@
+ redirecting their output to a file will capture only part of their actions.
+ The changes to the terminal modes are not affected by redirecting the output.
+ .PP
+-If \fB@TPUT@\fR is invoked by a link named \fBinit\fR, this has the
+-same effect as \fB@TPUT@ init\fR.
++If \fB@TPUT@\fP is invoked by a link named \fBinit\fP, this has the
++same effect as \fB@TPUT@ init\fP.
+ Again, you are less likely to use that link because another program
+ named \fBinit\fP has a more well-established use.
+ .SS Terminal Size
+@@ -295,124 +295,124 @@
+ relying upon the operating system (or finally, the terminal database).
+ .SH EXAMPLES
+ .TP 5
+-\fB@TPUT@ init\fR
++\fB@TPUT@ init\fP
+ Initialize the terminal according to the type of
+-terminal in the environmental variable \fBTERM\fR.  This
++terminal in the environmental variable \fBTERM\fP.  This
+ command should be included in everyone's .profile after
+-the environmental variable \fBTERM\fR has been exported, as
+-illustrated on the \fBprofile\fR(5) manual page.
++the environmental variable \fBTERM\fP has been exported, as
++illustrated on the \fBprofile\fP(5) manual page.
+ .TP 5
+-\fB@TPUT@ \-T5620 reset\fR
++\fB@TPUT@ \-T5620 reset\fP
+ Reset an AT&T 5620 terminal, overriding the type of
+-terminal in the environmental variable \fBTERM\fR.
++terminal in the environmental variable \fBTERM\fP.
+ .TP 5
+-\fB@TPUT@ cup 0 0\fR
+-Send the sequence to move the cursor to row \fB0\fR, column \fB0\fR
++\fB@TPUT@ cup 0 0\fP
++Send the sequence to move the cursor to row \fB0\fP, column \fB0\fP
+ (the upper left corner of the screen, usually known as the \*(``home\*(''
+ cursor position).
+ .TP 5
+-\fB@TPUT@ clear\fR
++\fB@TPUT@ clear\fP
+ Echo the clear-screen sequence for the current terminal.
+ .TP 5
+-\fB@TPUT@ cols\fR
++\fB@TPUT@ cols\fP
+ Print the number of columns for the current terminal.
+ .TP 5
+-\fB@TPUT@ \-T450 cols\fR
++\fB@TPUT@ \-T450 cols\fP
+ Print the number of columns for the 450 terminal.
+ .TP 5
+-\fBbold=`@TPUT@ smso` offbold=`@TPUT@ rmso`\fR
+-Set the shell variables \fBbold\fR, to begin stand-out mode
+-sequence, and \fBoffbold\fR, to end standout mode sequence,
++\fBbold=`@TPUT@ smso` offbold=`@TPUT@ rmso`\fP
++Set the shell variables \fBbold\fP, to begin stand-out mode
++sequence, and \fBoffbold\fP, to end standout mode sequence,
+ for the current terminal.
+ This might be followed by a
+-prompt: \fBecho "${bold}Please type in your name: ${offbold}\\c"\fR
++prompt: \fBecho "${bold}Please type in your name: ${offbold}\\c"\fP
+ .TP 5
+-\fB@TPUT@ hc\fR
++\fB@TPUT@ hc\fP
+ Set exit code to indicate if the current terminal is a hard copy terminal.
+ .TP 5
+-\fB@TPUT@ cup 23 4\fR
++\fB@TPUT@ cup 23 4\fP
+ Send the sequence to move the cursor to row 23, column 4.
+ .TP 5
+-\fB@TPUT@ cup\fR
++\fB@TPUT@ cup\fP
+ Send the terminfo string for cursor-movement, with no parameters substituted.
+ .TP 5
+-\fB@TPUT@ longname\fR
+-Print the long name from the \fBterminfo\fR database for the
++\fB@TPUT@ longname\fP
++Print the long name from the \fBterminfo\fP database for the
+ type of terminal specified in the environmental
+-variable \fBTERM\fR.
++variable \fBTERM\fP.
+ .PP
+ .RS 5
+-\fB@TPUT@ \-S < clear\fR
++\fB> clear\fP
+ .br
+-\fB> cup 10 10\fR
++\fB> cup 10 10\fP
+ .br
+-\fB> bold\fR
++\fB> bold\fP
+ .br
+-\fB> !\fR
++\fB> !\fP
+ .RE
+ .TP 5
+ \&
+-This example shows \fB@TPUT@\fR processing several capabilities
++This example shows \fB@TPUT@\fP processing several capabilities
+ in one invocation.
+ It clears the screen,
+ moves the cursor to position 10, 10
+ and turns on bold (extra bright) mode.
+-The list is terminated by an exclamation mark (\fB!\fR) on a line by itself.
++The list is terminated by an exclamation mark (\fB!\fP) on a line by itself.
+ .SH FILES
+ .TP
+-\fB\*d\fR
++\fB\*d\fP
+ compiled terminal description database
+ .TP
+-\fB@DATADIR@/tabset/*\fR
++\fB@DATADIR@/tabset/*\fP
+ tab settings for some terminals, in a format
+ appropriate to be output to the terminal (escape
+ sequences that set margins and tabs); for more
+ information, see the
+ .IR "Tabs and Initialization" ,
+-section of \fBterminfo\fR(5)
++section of \fBterminfo\fP(5)
+ .SH EXIT CODES
+-If the \fB\-S\fR option is used,
+-\fB@TPUT@\fR checks for errors from each line,
++If the \fB\-S\fP option is used,
++\fB@TPUT@\fP checks for errors from each line,
+ and if any errors are found, will set the exit code to 4 plus the
+ number of lines with errors.
+-If no errors are found, the exit code is \fB0\fR.
++If no errors are found, the exit code is \fB0\fP.
+ No indication of which line failed can be given so
+-exit code \fB1\fR will never appear.
+-Exit codes \fB2\fR, \fB3\fR, and
+-\fB4\fR retain their usual interpretation.
+-If the \fB\-S\fR option is not used,
+-the exit code depends on the type of \fIcapname\fR:
++exit code \fB1\fP will never appear.
++Exit codes \fB2\fP, \fB3\fP, and
++\fB4\fP retain their usual interpretation.
++If the \fB\-S\fP option is not used,
++the exit code depends on the type of \fIcapname\fP:
+ .RS 3
+ .TP
+ .I boolean
+-a value of \fB0\fR is set for TRUE and \fB1\fR for FALSE.
++a value of \fB0\fP is set for TRUE and \fB1\fP for FALSE.
+ .TP
+ .I string
+-a value of \fB0\fR is set if the
+-\fIcapname\fR is defined for this terminal \fItype\fR (the value of
+-\fIcapname\fR is returned on standard output);
+-a value of \fB1\fR is set if \fIcapname\fR
+-is not defined for this terminal \fItype\fR
++a value of \fB0\fP is set if the
++\fIcapname\fP is defined for this terminal \fItype\fP (the value of
++\fIcapname\fP is returned on standard output);
++a value of \fB1\fP is set if \fIcapname\fP
++is not defined for this terminal \fItype\fP
+ (nothing is written to standard output).
+ .TP
+ .I integer
+-a value of \fB0\fR is always set,
+-whether or not \fIcapname\fR is defined for this terminal \fItype\fR.
+-To determine if \fIcapname\fR is defined for this terminal \fItype\fR,
++a value of \fB0\fP is always set,
++whether or not \fIcapname\fP is defined for this terminal \fItype\fP.
++To determine if \fIcapname\fP is defined for this terminal \fItype\fP,
+ the user must test the value written to standard output.
+-A value of \fB\-1\fR
+-means that \fIcapname\fR is not defined for this terminal \fItype\fR.
++A value of \fB\-1\fP
++means that \fIcapname\fP is not defined for this terminal \fItype\fP.
+ .TP
+ .I other
+-\fBreset\fR or \fBinit\fR may fail to find their respective files.
+-In that case, the exit code is set to 4 + \fBerrno\fR.
++\fBreset\fP or \fBinit\fP may fail to find their respective files.
++In that case, the exit code is set to 4 + \fBerrno\fP.
+ .RE
+ .PP
+ Any other exit code indicates an error; see the DIAGNOSTICS section.
+ .SH DIAGNOSTICS
+-\fB@TPUT@\fR prints the following error messages and sets the corresponding exit
++\fB@TPUT@\fP prints the following error messages and sets the corresponding exit
+ codes.
+ .PP
+ .ne 15
+@@ -420,16 +420,16 @@
+ l l.
+ exit code	error message
+ =
+-\fB0\fR	T{
+-(\fIcapname\fR is a numeric variable that is not specified in the
+-\fBterminfo\fR(5) database for this terminal type, e.g.
+-\fB@TPUT@ \-T450 lines\fR and \fB@TPUT@ \-Thp2621 xmc\fR)
++\fB0\fP	T{
++(\fIcapname\fP is a numeric variable that is not specified in the
++\fBterminfo\fP(5) database for this terminal type, e.g.
++\fB@TPUT@ \-T450 lines\fP and \fB@TPUT@ \-Thp2621 xmc\fP)
+ T}
+-\fB1\fR	no error message is printed, see the \fBEXIT CODES\fR section.
+-\fB2\fR	usage error
+-\fB3\fR	unknown terminal \fItype\fR or no \fBterminfo\fR database
+-\fB4\fR	unknown \fBterminfo\fR capability \fIcapname\fR
+-\fB>4\fR	error occurred in \-S
++\fB1\fP	no error message is printed, see the \fBEXIT CODES\fP section.
++\fB2\fP	usage error
++\fB3\fP	unknown terminal \fItype\fP or no \fBterminfo\fP database
++\fB4\fP	unknown \fBterminfo\fP capability \fIcapname\fP
++\fB>4\fP	error occurred in \-S
+ =
+ .TE
+ .SH HISTORY
+@@ -449,17 +449,17 @@
+ (more than half the program) were incorporated from
+ the \fBreset\fP feature of BSD \fBtset\fP written by Eric Allman.
+ .bP
+-SVr4 added color initialization using the \fIorig_colors\fP and
+-\fIorig_pairs\fP capabilities in the \fBinit\fP subcommand.
++SVr4 added color initialization using the \fBorig_colors\fP and
++\fBorig_pair\fP capabilities in the \fBinit\fP subcommand.
+ .PP
+ Keith Bostic replaced the BSD \fBtput\fP command in 1989
+ with a new implementation
+ based on the AT&T System V program \fBtput\fP.
+ Like the AT&T program, Bostic's version
+-accepted some parameters named for \fIterminfo capabilities\fP
++accepted some parameters named for \fIterminfo\fP capabilities
+ (\fBclear\fP, \fBinit\fP, \fBlongname\fP and \fBreset\fP).
+-However (because he had only termcap available),
+-it accepted \fItermcap names\fP for other capabilities.
++However (because he had only \fItermcap\fP available),
++it accepted \fItermcap\fP names for other capabilities.
+ Also, Bostic's BSD \fBtput\fP did not modify the terminal I/O modes
+ as the earlier BSD \fBtset\fP had done.
+ .PP
+@@ -502,20 +502,20 @@
+ \fB@TPUT@\fP now uses a similar scheme,
+ using functions shared with \fB@TSET@\fP
+ (and ultimately based on the 4.4BSD \fBtset\fP).
+-If it is not able to open a terminal, e.g., when running in \fBcron\fP,
++If it is not able to open a terminal, e.g., when running in \fBcron\fP(1),
+ \fB@TPUT@\fP will return an error.
+ .bP
+ AT&T \fBtput\fP guesses the type of its \fIcapname\fP operands by seeing if
+ all of the characters are numeric, or not.
+ .IP
+-Most implementations which provide support for \fIcapname\fR operands
+-use the \fItparm\fP function to expand parameters in it.
++Most implementations which provide support for \fIcapname\fP operands
++use the \fBtparm\fP function to expand parameters in it.
+ That function expects a mixture of numeric and string parameters,
+ requiring \fB@TPUT@\fP to know which type to use.
+ .IP
+ This implementation uses a table to determine the parameter types for
+-the standard \fIcapname\fR operands, and an internal library
+-function to analyze nonstandard \fIcapname\fR operands.
++the standard \fIcapname\fP operands, and an internal library
++function to analyze nonstandard \fIcapname\fP operands.
+ .IP
+ Besides providing more reliable operation than AT&T's utility,
+ a portability problem is introduced by this analysis:
+@@ -529,7 +529,7 @@
+ This implementation (unlike others) can accept both \fItermcap\fP
+ and \fIterminfo\fP names for the \fIcapname\fP feature,
+ if
+-\fItermcap\fR support is compiled in.
++\fItermcap\fP support is compiled in.
+ However, the predefined \fItermcap\fP and \fIterminfo\fP names have two
+ ambiguities in this case (and the \fIterminfo\fP name is assumed):
+ .bP
+@@ -545,8 +545,8 @@
+ The \fIterminfo\fP name \fBed\fP corresponds to
+ the \fItermcap\fP name \fBcd\fP (clear to end of screen).
+ .PP
+-The \fBlongname\fR and \fB\-S\fR options, and the parameter-substitution
+-features used in the \fBcup\fR example,
++The \fBlongname\fP and \fB\-S\fP options, and the parameter-substitution
++features used in the \fBcup\fP example,
+ were not supported in BSD curses before 4.3reno (1989) or in
+ AT&T/USL curses before SVr4 (1988).
+ .PP
+@@ -554,14 +554,14 @@
+ documents only the operands for \fBclear\fP, \fBinit\fP and \fBreset\fP.
+ There are a few interesting observations to make regarding that:
+ .bP
+-In this implementation, \fBclear\fP is part of the \fIcapname\fR support.
++In this implementation, \fBclear\fP is part of the \fIcapname\fP support.
+ The others (\fBinit\fP and \fBlongname\fP) do not correspond to terminal
+ capabilities.
+ .bP
+ Other implementations of \fBtput\fP on
+ SVr4-based systems such as Solaris, IRIX64 and HPUX
+ as well as others such as AIX and Tru64
+-provide support for \fIcapname\fR operands.
++provide support for \fIcapname\fP operands.
+ .bP
+ A few platforms such as FreeBSD recognize termcap names rather
+ than terminfo capability names in their respective \fBtput\fP commands.
+@@ -609,12 +609,12 @@
+ NetBSD curses documents different exit codes which do not correspond
+ to either ncurses or X/Open.
+ .SH SEE ALSO
+-\fB@CLEAR@\fR(\*n),
+-\fBstty\fR(1),
+-\fB@TABS@\fR(\*n),
+-\fB@TSET@\fR(\*n),
+-\fBcurs_termcap\fR(3X),
+-\fBterminfo\fR(5).
++\fB@CLEAR@\fP(\*n),
++\fBstty\fP(1),
++\fB@TABS@\fP(\*n),
++\fB@TSET@\fP(\*n),
++\fBcurs_termcap\fP(3X),
++\fBterminfo\fP(5).
+ .PP
+-This describes \fBncurses\fR
++This describes \fBncurses\fP
+ version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
+Index: man/tset.1
+Prereq:  1.58 
+--- ncurses-6.3-20211219+/man/tset.1	2021-09-18 21:21:55.000000000 +0000
++++ ncurses-6.3-20211225/man/tset.1	2021-12-25 21:27:03.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tset.1,v 1.58 2021/09/18 21:21:55 tom Exp $
++.\" $Id: tset.1,v 1.61 2021/12/25 21:27:03 tom Exp $
+ .TH @TSET@ 1 ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -38,16 +38,16 @@
+ .el    .IP \(bu 2
+ ..
+ .SH NAME
+-\fB@TSET@\fR, \fB@RESET@\fR \- terminal initialization
++\fB@TSET@\fP, \fB@RESET@\fP \- terminal initialization
+ .SH SYNOPSIS
+-\fB@TSET@\fR [\fB\-IQVcqrsw\fR] [\fB\-\fR] [\fB\-e\fR \fIch\fR] [\fB\-i\fR \fIch\fR] [\fB\-k\fR \fIch\fR] [\fB\-m\fR \fImapping\fR] [\fIterminal\fR]
++\fB@TSET@\fP [\fB\-IQVcqrsw\fP] [\fB\-\fP] [\fB\-e\fP \fIch\fP] [\fB\-i\fP \fIch\fP] [\fB\-k\fP \fIch\fP] [\fB\-m\fP \fImapping\fP] [\fIterminal\fP]
+ .br
+-\fB@RESET@\fR [\fB\-IQVcqrsw\fR] [\fB\-\fR] [\fB\-e\fR \fIch\fR] [\fB\-i\fR \fIch\fR] [\fB\-k\fR \fIch\fR] [\fB\-m\fR \fImapping\fR] [\fIterminal\fR]
++\fB@RESET@\fP [\fB\-IQVcqrsw\fP] [\fB\-\fP] [\fB\-e\fP \fIch\fP] [\fB\-i\fP \fIch\fP] [\fB\-k\fP \fIch\fP] [\fB\-m\fP \fImapping\fP] [\fIterminal\fP]
+ .SH DESCRIPTION
+ .SS tset - initialization
+ This program initializes terminals.
+ .PP
+-First, \fB@TSET@\fR retrieves the current terminal mode settings
++First, \fB@TSET@\fP retrieves the current terminal mode settings
+ for your terminal.
+ It does this by successively testing
+ .bP
+@@ -66,19 +66,19 @@
+ Next, \fB@TSET@\fP determines the type of terminal that you are using.
+ This determination is done as follows, using the first terminal type found.
+ .PP
+-1. The \fBterminal\fR argument specified on the command line.
++1. The \fBterminal\fP argument specified on the command line.
+ .PP
+-2. The value of the \fBTERM\fR environmental variable.
++2. The value of the \fBTERM\fP environmental variable.
+ .PP
+ 3. (BSD systems only.) The terminal type associated with the standard
+-error output device in the \fI/etc/ttys\fR file.
++error output device in the \fI/etc/ttys\fP file.
+ (On System\-V-like UNIXes and systems using that convention,
+-\fIgetty\fR does this job by setting
+-\fBTERM\fR according to the type passed to it by \fI/etc/inittab\fR.)
++\fBgetty\fP(1) does this job by setting
++\fBTERM\fP according to the type passed to it by \fI/etc/inittab\fP.)
+ .PP
+ 4. The default terminal type, \*(``unknown\*(''.
+ .PP
+-If the terminal type was not specified on the command-line, the \fB\-m\fR
++If the terminal type was not specified on the command-line, the \fB\-m\fP
+ option mappings are then applied (see the section
+ .B TERMINAL TYPE MAPPING
+ for more information).
+@@ -116,7 +116,7 @@
+ standard error output.
+ .SS reset - reinitialization
+ .PP
+-When invoked as \fB@RESET@\fR, \fB@TSET@\fR sets the terminal
++When invoked as \fB@RESET@\fP, \fB@TSET@\fP sets the terminal
+ modes to \*(``sane\*('' values:
+ .bP
+ sets cooked and echo modes,
+@@ -151,16 +151,16 @@
+ Set control characters and modes.
+ .TP 5
+ .BI \-e\  ch
+-Set the erase character to \fIch\fR.
++Set the erase character to \fIch\fP.
+ .TP
+ .B \-I
+ Do not send the terminal or tab initialization strings to the terminal.
+ .TP
+ .BI \-i\  ch
+-Set the interrupt character to \fIch\fR.
++Set the interrupt character to \fIch\fP.
+ .TP
+ .BI \-k\  ch
+-Set the line kill character to \fIch\fR.
++Set the line kill character to \fIch\fP.
+ .TP
+ .BI \-m\  mapping
+ Specify a mapping from a port type to a terminal.
+@@ -170,7 +170,7 @@
+ .TP
+ .B \-Q
+ Do not display any values for the erase, interrupt and line kill characters.
+-Normally \fB@TSET@\fR displays the values for control characters which
++Normally \fB@TSET@\fP displays the values for control characters which
+ differ from the system's default values.
+ .TP
+ .B \-q
+@@ -183,7 +183,7 @@
+ .TP
+ .B \-s
+ Print the sequence of shell commands to initialize the environment variable
+-\fBTERM\fR to the standard output.
++\fBTERM\fP to the standard output.
+ See the section
+ .B SETTING THE ENVIRONMENT
+ for details.
+@@ -196,7 +196,7 @@
+ Normally this has no effect,
+ unless \fBsetupterm\fP is not able to detect the window size.
+ .PP
+-The arguments for the \fB\-e\fR, \fB\-i\fR, and \fB\-k\fR
++The arguments for the \fB\-e\fP, \fB\-i\fP, and \fB\-k\fP
+ options may either be entered as actual characters
+ or by using the \*(``hat\*(''
+ notation, i.e., control-h may be specified as \*(``^H\*('' or \*(``^h\*(''.
+@@ -206,35 +206,35 @@
+ .SH SETTING THE ENVIRONMENT
+ It is often desirable to enter the terminal type and information about
+ the terminal's capabilities into the shell's environment.
+-This is done using the \fB\-s\fR option.
++This is done using the \fB\-s\fP option.
+ .PP
+-When the \fB\-s\fR option is specified, the commands to enter the information
++When the \fB\-s\fP option is specified, the commands to enter the information
+ into the shell's environment are written to the standard output.
+ If
+-the \fBSHELL\fR environmental variable ends in \*(``csh\*('', the commands
+-are for \fBcsh\fR, otherwise, they are for \fBsh\fR.
+-Note, the \fBcsh\fR commands set and unset the shell variable
+-\fBnoglob\fR, leaving it unset.
+-The following line in the \fB.login\fR
+-or \fB.profile\fR files will initialize the environment correctly:
++the \fBSHELL\fP environmental variable ends in \*(``csh\*('', the commands
++are for \fBcsh\fP, otherwise, they are for \fBsh\fP(1).
++Note, the \fBcsh\fP commands set and unset the shell variable
++\fBnoglob\fP, leaving it unset.
++The following line in the \fB.login\fP
++or \fB.profile\fP files will initialize the environment correctly:
+ .sp
+     eval \`@TSET@ \-s options ... \`
+ .
+ .SH TERMINAL TYPE MAPPING
+ When the terminal is not hardwired into the system (or the current
+ system information is incorrect) the terminal type derived from the
+-\fI/etc/ttys\fR file or the \fBTERM\fR environmental variable is often
+-something generic like \fBnetwork\fR, \fBdialup\fR, or \fBunknown\fR.
+-When \fB@TSET@\fR is used in a startup script it is often desirable to
++\fI/etc/ttys\fP file or the \fBTERM\fP environmental variable is often
++something generic like \fBnetwork\fP, \fBdialup\fP, or \fBunknown\fP.
++When \fB@TSET@\fP is used in a startup script it is often desirable to
+ provide information about the type of terminal used on such ports.
+ .PP
+-The \fB\-m\fR options maps
++The \fB\-m\fP options maps
+ from some set of conditions to a terminal type, that is, to
+-tell \fB@TSET@\fR
++tell \fB@TSET@\fP
+ \*(``If I'm on this port at a particular speed,
+ guess that I'm on that kind of terminal\*(''.
+ .PP
+-The argument to the \fB\-m\fR option consists of an optional port type, an
++The argument to the \fB\-m\fP option consists of an optional port type, an
+ optional operator, an optional baud rate specification, an optional
+ colon (\*(``:\*('') character and a terminal type.
+ The port type is a
+@@ -252,7 +252,7 @@
+ of the standard error output (which should be the control terminal).
+ The terminal type is a string.
+ .PP
+-If the terminal type is not specified on the command line, the \fB\-m\fR
++If the terminal type is not specified on the command line, the \fB\-m\fP
+ mappings are applied to the terminal type.
+ If the port type and baud
+ rate match the mapping, the terminal type specified in the mapping
+@@ -260,27 +260,27 @@
+ If more than one mapping is specified, the
+ first applicable mapping is used.
+ .PP
+-For example, consider the following mapping: \fBdialup>9600:vt100\fR.
++For example, consider the following mapping: \fBdialup>9600:vt100\fP.
+ The port type is dialup , the operator is >, the baud rate
+ specification is 9600, and the terminal type is vt100.
+ The result of
+-this mapping is to specify that if the terminal type is \fBdialup\fR,
++this mapping is to specify that if the terminal type is \fBdialup\fP,
+ and the baud rate is greater than 9600 baud, a terminal type of
+-\fBvt100\fR will be used.
++\fBvt100\fP will be used.
+ .PP
+ If no baud rate is specified, the terminal type will match any baud rate.
+ If no port type is specified, the terminal type will match any port type.
+-For example, \fB\-m dialup:vt100 \-m :?xterm\fR
++For example, \fB\-m dialup:vt100 \-m :?xterm\fP
+ will cause any dialup port, regardless of baud rate, to match the terminal
+ type vt100, and any non-dialup port type to match the terminal type ?xterm.
+ Note, because of the leading question mark, the user will be
+ queried on a default port as to whether they are actually using an xterm
+ terminal.
+ .PP
+-No whitespace characters are permitted in the \fB\-m\fR option argument.
++No whitespace characters are permitted in the \fB\-m\fP option argument.
+ Also, to avoid problems with meta-characters, it is suggested that the
+-entire \fB\-m\fR option argument be placed within single quote characters,
+-and that \fBcsh\fR users insert a backslash character (\*(``\e\*('') before
++entire \fB\-m\fP option argument be placed within single quote characters,
++and that \fBcsh\fP users insert a backslash character (\*(``\e\*('') before
+ any exclamation marks (\*(``!\*('').
+ .SH HISTORY
+ .PP
+@@ -307,7 +307,7 @@
+ Other developers (e.g., Keith Bostic and Jim Bloom)
+ continued to modify \fBtset\fP until 4.4BSD was released in 1993.
+ .PP
+-The \fBncurses\fR implementation
++The \fBncurses\fP implementation
+ was lightly adapted from the 4.4BSD sources for a terminfo environment by Eric
+ S. Raymond .
+ .SH COMPATIBILITY
+@@ -324,21 +324,21 @@
+ In fact, the commonly-used \fBreset\fP utility
+ is always an alias for \fBtset\fP.
+ .PP
+-The \fB@TSET@\fR utility provides for backward-compatibility with BSD
+-environments (under most modern UNIXes, \fB/etc/inittab\fR and \fBgetty\fR(1)
+-can set \fBTERM\fR appropriately for each dial-up line; this obviates what was
+-\fB@TSET@\fR's most important use).
++The \fB@TSET@\fP utility provides for backward-compatibility with BSD
++environments (under most modern UNIXes, \fB/etc/inittab\fP and \fBgetty\fP(1)
++can set \fBTERM\fP appropriately for each dial-up line; this obviates what was
++\fB@TSET@\fP's most important use).
+ This implementation behaves like 4.4BSD
+ \fBtset\fP, with a few exceptions specified here.
+ .PP
+ A few options are different
+-because the \fBTERMCAP\fR variable
+-is no longer supported under terminfo-based \fBncurses\fR:
++because the \fBTERMCAP\fP variable
++is no longer supported under terminfo-based \fBncurses\fP:
+ .bP
+-The \fB\-S\fR option of BSD \fBtset\fP no longer works;
++The \fB\-S\fP option of BSD \fBtset\fP no longer works;
+ it prints an error message to the standard error and dies.
+ .bP
+-The \fB\-s\fR option only sets \fBTERM\fR, not \fBTERMCAP\fP.
++The \fB\-s\fP option only sets \fBTERM\fP, not \fBTERMCAP\fP.
+ .PP
+ There was an undocumented 4.4BSD feature
+ that invoking \fBtset\fP via a link named
+@@ -346,17 +346,17 @@
+ set the terminal to use upper-case only.
+ This feature has been omitted.
+ .PP
+-The \fB\-A\fR, \fB\-E\fR, \fB\-h\fR, \fB\-u\fR and \fB\-v\fR
+-options were deleted from the \fB@TSET@\fR
++The \fB\-A\fP, \fB\-E\fP, \fB\-h\fP, \fB\-u\fP and \fB\-v\fP
++options were deleted from the \fB@TSET@\fP
+ utility in 4.4BSD.
+ None of them were documented in 4.3BSD and all are
+ of limited utility at best.
+-The \fB\-a\fR, \fB\-d\fR, and \fB\-p\fR options are similarly
++The \fB\-a\fP, \fB\-d\fP, and \fB\-p\fP options are similarly
+ not documented or useful, but were retained as they appear to be in
+ widespread use.
+ It is strongly recommended that any usage of these
+-three options be changed to use the \fB\-m\fR option instead.
+-The \fB\-a\fP, \fB\-d\fP, and \fB\-p\fR options
++three options be changed to use the \fB\-m\fP option instead.
++The \fB\-a\fP, \fB\-d\fP, and \fB\-p\fP options
+ are therefore omitted from the usage summary above.
+ .PP
+ Very old systems, e.g., 3BSD, used a different terminal driver which
+@@ -365,15 +365,15 @@
+ \fB\-n\fP option to specify that the new terminal driver should be used.
+ This implementation does not provide that choice.
+ .PP
+-It is still permissible to specify the \fB\-e\fR, \fB\-i\fR,
+-and \fB\-k\fR options without arguments,
++It is still permissible to specify the \fB\-e\fP, \fB\-i\fP,
++and \fB\-k\fP options without arguments,
+ although it is strongly recommended that such usage be fixed to
+ explicitly specify the character.
+ .PP
+ As of 4.4BSD,
+-executing \fB@TSET@\fR as \fB@RESET@\fR no longer implies the \fB\-Q\fR option.
+-Also, the interaction between the \- option and the \fIterminal\fR
+-argument in some historic implementations of \fB@TSET@\fR has been removed.
++executing \fB@TSET@\fP as \fB@RESET@\fP no longer implies the \fB\-Q\fP option.
++Also, the interaction between the \- option and the \fIterminal\fP
++argument in some historic implementations of \fB@TSET@\fP has been removed.
+ .PP
+ The \fB\-c\fP and \fB\-w\fP options are not found in earlier implementations.
+ However, a different window size-change feature was provided in 4.4BSD.
+@@ -382,7 +382,7 @@
+ to set the window size if \fBtset\fP is not able to obtain the window
+ size from the operating system.
+ .bP
+-In ncurses, \fB@TSET@\fR obtains the window size using
++In ncurses, \fB@TSET@\fP obtains the window size using
+ \fBsetupterm\fP, which may be from
+ the operating system,
+ the \fBLINES\fP and \fBCOLUMNS\fP environment variables or
+@@ -400,11 +400,11 @@
+ those variables must be recomputed and reassigned.
+ To do this more easily, use the \fBresize\fP(1) program.
+ .SH ENVIRONMENT
+-The \fB@TSET@\fR command uses these environment variables:
++The \fB@TSET@\fP command uses these environment variables:
+ .TP 5
+ SHELL
+-tells \fB@TSET@\fP whether to initialize \fBTERM\fP using \fBsh\fP or
+-\fBcsh\fP syntax.
++tells \fB@TSET@\fP whether to initialize \fBTERM\fP using \fBsh\fP(1) or
++\fBcsh\fP(1) syntax.
+ .TP 5
+ TERM
+ Denotes your terminal type.
+@@ -434,5 +434,5 @@
+ \fBenviron\fP(7)
+ .hy
+ .PP
+-This describes \fBncurses\fR
++This describes \fBncurses\fP
+ version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
+Index: man/user_caps.5
+Prereq:  1.17 
+--- ncurses-6.3-20211219+/man/user_caps.5	2021-06-17 21:30:22.000000000 +0000
++++ ncurses-6.3-20211225/man/user_caps.5	2021-12-25 21:09:22.000000000 +0000
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: user_caps.5,v 1.17 2021/06/17 21:30:22 tom Exp $
++.\" $Id: user_caps.5,v 1.20 2021/12/25 21:09:22 tom Exp $
+ .TH user_caps 5
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -124,7 +124,7 @@
+ .RE
+ .IP
+ The memory lock/unlock capabilities were included because they were used
+-in the X11R6 terminal description for \fBxterm\fP.
++in the X11R6 terminal description for \fBxterm\fP(1).
+ The \fIbox1\fP capability is used in @TIC@ to help with terminal descriptions
+ written for AIX.
+ .PP
+@@ -181,7 +181,7 @@
+ to which a series of keys can be assigned,
+ that is insufficient for more than a dozen keys multiplied by more than
+ a couple of modifier combinations.
+-The ncurses database uses a convention based on \fBxterm\fP to
++The ncurses database uses a convention based on \fBxterm\fP(1) to
+ provide extended special-key names.
+ .IP
+ Fitting that into termcap's limitation of 2-character names
+@@ -258,7 +258,7 @@
+ XM
+ \fIstring\fP,
+ override ncurses's built-in string which
+-enables/disables \fBxterm\fP mouse mode.
++enables/disables \fBxterm\fP(1) mouse mode.
+ .IP
+ ncurses sends a character sequence to the terminal to initialize mouse mode,
+ and when the user clicks the mouse buttons or (in certain modes) moves the
+@@ -344,7 +344,7 @@
+ combinations of modified special keys.
+ There is no standard for what those keys can send.
+ .PP
+-Since 1999, \fBxterm\fP has supported
++Since 1999, \fBxterm\fP(1) has supported
+ \fIshift\fP, \fIcontrol\fP, \fIalt\fP, and \fImeta\fP modifiers which produce
+ distinct special-key strings.
+ In a terminal description, ncurses has no special knowledge of the
+@@ -359,7 +359,7 @@
+ .TS
+ tab(/) ;
+ l l .
+-\fIName\fR/\fIDescription\fR
++\fBName\fP/\fBDescription\fP
+ _
+ kDC/special form of kdch1 (delete character)
+ kDN/special form of kcud1 (cursor down)
+@@ -378,7 +378,7 @@
+ .TS
+ tab(/) ;
+ l l .
+-\fIValue\fR/\fIDescription\fR
++\fBValue\fP/\fBDescription\fP
+ _
+ 2/Shift
+ 3/Alt
+@@ -419,17 +419,17 @@
+ .\"
+ .SH SEE ALSO
+ .PP
+-\fB@INFOCMP@\fR(1M),
+-\fB@TIC@\fR(1M).
++\fB@INFOCMP@\fP(1M),
++\fB@TIC@\fP(1M).
+ .PP
+ The terminal database section
+ .I "NCURSES USER-DEFINABLE CAPABILITIES"
+ summarizes commonly-used user-defined capabilities
+ which are used in the terminal descriptions.
+-Some of those features are mentioned in \fBscreen\fR(1) or \fBtmux\fR(1).
++Some of those features are mentioned in \fBscreen\fP(1) or \fBtmux\fP(1).
+ .PP
+ .I "XTerm Control Sequences"
+-provides further information on the \fBxterm\fP features
++provides further information on the \fBxterm\fP(1) features
+ which are used in these extended capabilities.
+ .\"
+ .SH AUTHORS
+Index: man/wresize.3x
+Prereq:  1.17 
+--- ncurses-6.3-20211219+/man/wresize.3x	2020-10-17 23:56:38.000000000 +0000
++++ ncurses-6.3-20211225/man/wresize.3x	2021-12-25 21:42:57.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018,2020 Thomas E. Dickey                                     *
++.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -29,29 +29,29 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1996
+ .\"
+-.\" $Id: wresize.3x,v 1.17 2020/10/17 23:56:38 tom Exp $
++.\" $Id: wresize.3x,v 1.19 2021/12/25 21:42:57 tom Exp $
+ .TH wresize 3X ""
+ .SH NAME
+-\fBwresize\fR \- resize a curses window
++\fBwresize\fP \- resize a curses window
+ .SH SYNOPSIS
+-\fB#include \fR
++\fB#include \fP
+ .sp
+-\fBint wresize(WINDOW *\fP\fIwin\fP\fB, int \fP\fIlines\fP\fB, int \fP\fIcolumns\fP\fB);\fR
++\fBint wresize(WINDOW *\fP\fIwin\fP\fB, int \fP\fIlines\fP\fB, int \fP\fIcolumns\fP\fB);\fP
+ .SH DESCRIPTION
+ This is an extension to the curses library.
+-It reallocates storage for an \fBncurses\fR
++It reallocates storage for an \fBncurses\fP
+ window to adjust its dimensions to the specified values.
+ If either dimension is larger than the current values, the
+ window's data is filled with blanks that have the current background rendition
+-(as set by \fBwbkgdset\fR) merged into them.
++(as set by \fBwbkgdset\fP) merged into them.
+ .SH RETURN VALUE
+-The function returns the integer \fBERR\fR upon failure and \fBOK\fR on success.
++The function returns the integer \fBERR\fP upon failure and \fBOK\fP on success.
+ It will fail if either of the dimensions less than or equal to zero,
+ or if an error occurs while (re)allocating memory for the window.
+ .SH NOTES
+ The only restriction placed on the dimensions is that they be greater than zero.
+-The dimensions are not compared to \fBcurses\fR screen dimensions to
+-simplify the logic of \fBresizeterm\fR.
++The dimensions are not compared to \fBcurses\fP screen dimensions to
++simplify the logic of \fBresizeterm\fP.
+ The caller must ensure that the window's dimensions fit within the
+ actual screen dimensions.
+ .SH PORTABILITY
+@@ -61,6 +61,6 @@
+ This extension of ncurses was introduced in mid-1995.
+ It was adopted in NetBSD curses (2001) and PDCurses (2003).
+ .SH SEE ALSO
+-\fBresizeterm\fR(3X).
++\fBresizeterm\fP(3X).
+ .SH AUTHOR
+ Thomas Dickey (from an equivalent function written in 1988 for BSD curses).
+Index: package/debian-mingw/changelog
+--- ncurses-6.3-20211219+/package/debian-mingw/changelog	2021-12-19 11:24:57.000000000 +0000
++++ ncurses-6.3-20211225/package/debian-mingw/changelog	2021-12-24 20:26:19.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.3+20211219) unstable; urgency=low
++ncurses6 (6.3+20211225) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 19 Dec 2021 06:24:57 -0500
++ -- Thomas E. Dickey   Fri, 24 Dec 2021 15:26:19 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.3-20211219+/package/debian-mingw64/changelog	2021-12-19 11:24:57.000000000 +0000
++++ ncurses-6.3-20211225/package/debian-mingw64/changelog	2021-12-24 20:26:19.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.3+20211219) unstable; urgency=low
++ncurses6 (6.3+20211225) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 19 Dec 2021 06:24:57 -0500
++ -- Thomas E. Dickey   Fri, 24 Dec 2021 15:26:19 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.3-20211219+/package/debian/changelog	2021-12-19 11:24:57.000000000 +0000
++++ ncurses-6.3-20211225/package/debian/changelog	2021-12-24 20:26:19.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.3+20211219) unstable; urgency=low
++ncurses6 (6.3+20211225) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sun, 19 Dec 2021 06:24:57 -0500
++ -- Thomas E. Dickey   Fri, 24 Dec 2021 15:26:19 -0500
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.498 
+--- ncurses-6.3-20211219+/package/mingw-ncurses.nsi	2021-12-19 11:24:57.000000000 +0000
++++ ncurses-6.3-20211225/package/mingw-ncurses.nsi	2021-12-24 20:26:19.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.498 2021/12/19 11:24:57 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.499 2021/12/24 20:26:19 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "3"
+ !define VERSION_YYYY  "2021"
+-!define VERSION_MMDD  "1219"
++!define VERSION_MMDD  "1225"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.3-20211219+/package/mingw-ncurses.spec	2021-12-19 11:24:57.000000000 +0000
++++ ncurses-6.3-20211225/package/mingw-ncurses.spec	2021-12-24 20:26:19.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.3
+-Release: 20211219
++Release: 20211225
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.3-20211219+/package/ncurses.spec	2021-12-19 11:24:57.000000000 +0000
++++ ncurses-6.3-20211225/package/ncurses.spec	2021-12-24 20:26:19.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.3
+-Release: 20211219
++Release: 20211225
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncursest.spec
+--- ncurses-6.3-20211219+/package/ncursest.spec	2021-12-19 11:24:57.000000000 +0000
++++ ncurses-6.3-20211225/package/ncursest.spec	2021-12-24 20:26:19.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.3
+-Release: 20211219
++Release: 20211225
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
diff --git a/system/ncurses/ncurses-6.3-20220101.patch b/system/ncurses/ncurses-6.3-20220101.patch
new file mode 100644
index 000000000..4b6a7f147
--- /dev/null
+++ b/system/ncurses/ncurses-6.3-20220101.patch
@@ -0,0 +1,1076 @@
+# ncurses 6.3 - patch 20220101 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.3 is at
+# 	ftp://ftp.invisible-island.net/ncurses/
+#	https://invisible-mirror.net/archives/ncurses/
+#	https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.3 can be found at
+# 	ftp://ftp.invisible-island.net/ncurses/6.3
+#	https://invisible-mirror.net/archives/ncurses/6.3
+#
+# ------------------------------------------------------------------------------
+# ftp://ftp.invisible-island.net/ncurses/6.3/ncurses-6.3-20220101.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Jan  2 01:07:07 UTC 2022
+# ------------------------------------------------------------------------------
+# Ada95/package/debian/copyright        |    2 
+# COPYING                               |    4 
+# NEWS                                  |    8 +
+# VERSION                               |    2 
+# dist.mk                               |    6 -
+# doc/html/man/adacurses6-config.1.html |    2 
+# doc/html/man/captoinfo.1m.html        |    2 
+# doc/html/man/clear.1.html             |    2 
+# doc/html/man/curs_termcap.3x.html     |   44 +++++++--
+# doc/html/man/curs_terminfo.3x.html    |  146 +++++++++++++++++++-------------
+# doc/html/man/form.3x.html             |    2 
+# doc/html/man/infocmp.1m.html          |    2 
+# doc/html/man/infotocap.1m.html        |    2 
+# doc/html/man/menu.3x.html             |    2 
+# doc/html/man/ncurses.3x.html          |    2 
+# doc/html/man/ncurses6-config.1.html   |    2 
+# doc/html/man/panel.3x.html            |    2 
+# doc/html/man/tabs.1.html              |    2 
+# doc/html/man/terminfo.5.html          |    2 
+# doc/html/man/tic.1m.html              |    2 
+# doc/html/man/toe.1m.html              |    2 
+# doc/html/man/tput.1.html              |    2 
+# doc/html/man/tset.1.html              |    2 
+# man/curs_termcap.3x                   |   36 ++++++-
+# man/curs_terminfo.3x                  |   31 ++++++
+# package/debian-mingw/changelog        |    4 
+# package/debian-mingw/copyright        |    2 
+# package/debian-mingw64/changelog      |    4 
+# package/debian-mingw64/copyright      |    2 
+# package/debian/changelog              |    4 
+# package/debian/copyright              |    2 
+# package/mingw-ncurses.nsi             |    6 -
+# package/mingw-ncurses.spec            |    2 
+# package/ncurses.spec                  |    2 
+# package/ncursest.spec                 |    2 
+# test/package/debian-mingw/copyright   |    2 
+# test/package/debian-mingw64/copyright |    2 
+# test/package/debian/copyright         |    2 
+# 38 files changed, 228 insertions(+), 119 deletions(-)
+# ------------------------------------------------------------------------------
+Index: Ada95/package/debian/copyright
+--- ncurses-6.3-20211225+/Ada95/package/debian/copyright	2021-01-01 09:54:30.000000000 +0000
++++ ncurses-6.3-20220101/Ada95/package/debian/copyright	2022-01-02 00:28:07.000000000 +0000
+@@ -4,7 +4,7 @@
+ 
+ -------------------------------------------------------------------------------
+ Files: *
+-Copyright: 2017-2020,2021 by Thomas E. Dickey
++Copyright: 2017-2021,2022 by Thomas E. Dickey
+ Copyright: 1998-2016,2017 Free Software Foundation, Inc.
+ Licence: X11
+ 
+Index: COPYING
+Prereq:  1.10 
+--- ncurses-6.3-20211225+/COPYING	2021-01-01 09:54:30.000000000 +0000
++++ ncurses-6.3-20220101/COPYING	2022-01-01 11:47:50.000000000 +0000
+@@ -1,4 +1,4 @@
+-Copyright 2018-2020,2021 Thomas E. Dickey
++Copyright 2018-2021,2022 Thomas E. Dickey
+ Copyright 1998-2017,2018 Free Software Foundation, Inc.
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a
+@@ -26,4 +26,4 @@
+ authorization.
+ 
+ -- vile:txtmode fc=72
+--- $Id: COPYING,v 1.10 2021/01/01 09:54:30 tom Exp $
++-- $Id: COPYING,v 1.11 2022/01/01 11:47:50 tom Exp $
+Index: NEWS
+Prereq:  1.3761 
+--- ncurses-6.3-20211225+/NEWS	2021-12-26 00:29:27.000000000 +0000
++++ ncurses-6.3-20220101/NEWS	2022-01-01 23:59:36.000000000 +0000
+@@ -1,5 +1,5 @@
+ -------------------------------------------------------------------------------
+--- Copyright 2018-2020,2021 Thomas E. Dickey                                 --
++-- Copyright 2018-2021,2022 Thomas E. Dickey                                 --
+ -- Copyright 1998-2017,2018 Free Software Foundation, Inc.                   --
+ --                                                                           --
+ -- Permission is hereby granted, free of charge, to any person obtaining a   --
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.3761 2021/12/26 00:29:27 tom Exp $
++-- $Id: NEWS,v 1.3764 2022/01/01 23:59:36 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -46,6 +46,10 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20220101
++	+ add section on releasing memory to curs_termcap.3x and
++	  curs_terminfo.3x manpages.
++
+ 20211225
+ 	+ improve markup, e.g., for external manpage links in the manpages
+ 	  (prompted by report by Helge Kreutzmann).
+Index: VERSION
+--- ncurses-6.3-20211225+/VERSION	2021-12-24 20:26:19.000000000 +0000
++++ ncurses-6.3-20220101/VERSION	2022-01-01 11:46:49.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.3	20211225
++5:0:10	6.3	20220101
+Index: dist.mk
+Prereq:  1.1458 
+--- ncurses-6.3-20211225+/dist.mk	2021-12-25 22:11:07.000000000 +0000
++++ ncurses-6.3-20220101/dist.mk	2022-01-01 11:48:38.000000000 +0000
+@@ -1,5 +1,5 @@
+ ##############################################################################
+-# Copyright 2018-2020,2021 Thomas E. Dickey                                  #
++# Copyright 2018-2021,2022 Thomas E. Dickey                                  #
+ # Copyright 1998-2017,2018 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1458 2021/12/25 22:11:07 tom Exp $
++# $Id: dist.mk,v 1.1460 2022/01/01 11:48:38 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -38,7 +38,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 3
+-NCURSES_PATCH = 20211225
++NCURSES_PATCH = 20220101
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/man/adacurses6-config.1.html
+--- ncurses-6.3-20211225+/doc/html/man/adacurses6-config.1.html	2021-12-25 22:12:43.000000000 +0000
++++ ncurses-6.3-20220101/doc/html/man/adacurses6-config.1.html	2022-01-02 00:19:47.000000000 +0000
+@@ -126,7 +126,7 @@
+

    SEE ALSO

    +        curses(3x)
+ 
+-       This describes ncurses version 6.3 (patch 20211225).
++       This describes ncurses version 6.3 (patch 20220101).
+ 
+ 
+ 
+Index: doc/html/man/captoinfo.1m.html
+--- ncurses-6.3-20211225+/doc/html/man/captoinfo.1m.html	2021-12-25 22:12:43.000000000 +0000
++++ ncurses-6.3-20220101/doc/html/man/captoinfo.1m.html	2022-01-02 00:19:47.000000000 +0000
+@@ -199,7 +199,7 @@
+

    SEE ALSO

    +        infocmp(1m), curses(3x), terminfo(5)
+ 
+-       This describes ncurses version 6.3 (patch 20211225).
++       This describes ncurses version 6.3 (patch 20220101).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/clear.1.html
+--- ncurses-6.3-20211225+/doc/html/man/clear.1.html	2021-12-26 00:19:27.000000000 +0000
++++ ncurses-6.3-20220101/doc/html/man/clear.1.html	2022-01-02 00:19:47.000000000 +0000
+@@ -150,7 +150,7 @@
+

    SEE ALSO

    +        tput(1), terminfo(5), xterm(1).
+ 
+-       This describes ncurses version 6.3 (patch 20211225).
++       This describes ncurses version 6.3 (patch 20220101).
+ 
+ 
+ 
+Index: doc/html/man/curs_termcap.3x.html
+--- ncurses-6.3-20211225+/doc/html/man/curs_termcap.3x.html	2021-12-26 00:04:53.000000000 +0000
++++ ncurses-6.3-20220101/doc/html/man/curs_termcap.3x.html	2022-01-02 00:19:51.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -76,7 +76,7 @@
+        been compiled.
+ 
+ 
+-

    INITIALIZATION

    ++

    Initialization

    +        The tgetent routine loads the entry for name.  It returns:
+ 
+           1  on success,
+@@ -100,7 +100,7 @@
+               ing.
+ 
+ 
+-

    CAPABILITY VALUES

    ++

    Capability Values

    +        The tgetflag routine gets the boolean entry for id, or zero  if  it  is
+        not available.
+ 
+@@ -129,7 +129,7 @@
+        and tgetstr are compared in lookups.
+ 
+ 
+-

    FORMATTING CAPABILITIES

    ++

    Formatting Capabilities

    +        The tgoto routine expands the given capability using the parameters.
+ 
+        o   Because  the  capability may have padding characters, the output of
+@@ -157,7 +157,7 @@
+        It can retrieve capabilities by either termcap or terminfo name.
+ 
+ 
+-

    GLOBAL VARIABLES

    ++

    Global Variables

    +        The  variables PC, UP and BC are set by tgetent to the terminfo entry's
+        data for pad_char, cursor_up and backspace_if_not_bs, respectively.  UP
+        is  not used by ncurses.  PC is used in the tdelay_output function.  BC
+@@ -165,6 +165,29 @@
+        in a system-specific coding to reflect the terminal speed.
+ 
+ 
++

    Releasing Memory

    ++       The  termcap  functions  provide  no  means for freeing memory, because
++       legacy termcap implementations used only the buffer areas  provided  by
++       the  caller  via tgetent and tgetstr.  Those buffers are unused in ter-
++       minfo.
++
++       On the other hand, terminfo allocates memory.  It uses setupterm to re-
++       trieve the data used by tgetent and the functions which return capabil-
++       ity values such as tgetstr.  One could use
++
++            del_curterm(cur_term);
++
++
++       to free this memory, but  there  is  an  additional  complication  with
++       ncurses.   It uses a fixed-size pool of storage locations, one per set-
++       ting of the TERM variable when tgetent is called.  The  screen(1)  pro-
++       gram relies upon this arrangement, to improve its performance.
++
++       An  application  which  uses only the low-level termcap functions could
++       free the memory using del_curterm, because the pool is freed using oth-
++       er functions (see curs_memleaks(3x)).
++
++
+

    RETURN VALUE

    +        Except  where  explicitly noted, routines that return an integer return
+        ERR upon failure and OK (SVr4 only specifies "an  integer  value  other
+@@ -322,10 +345,11 @@
+ 
  • SYNOPSIS
    • 
+ 
  • DESCRIPTION
+ 
+ 
    • 
+ 
  • RETURN VALUE
    • 
+Index: doc/html/man/curs_terminfo.3x.html
+--- ncurses-6.3-20211225+/doc/html/man/curs_terminfo.3x.html	2021-12-26 00:04:53.000000000 +0000
++++ ncurses-6.3-20220101/doc/html/man/curs_terminfo.3x.html	2022-01-02 00:19:51.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -86,12 +86,18 @@
+ 
+ 
+

    mousemask

    +-       To make mouse events visible, use the mousemask  function.   This  will
+-       set  the  mouse events to be reported.  By default, no mouse events are
+-       reported.  The function will return a mask to  indicate  which  of  the
+-       specified  mouse events can be reported; on complete failure it returns
+-       0.  If oldmask is non-NULL, this function fills the indicated  location
+-       with the previous value of the given window's mouse event mask.
++       To make mouse events visible, use the mousemask  function.   This  sets
++       the  mouse  events to be reported.  By default, no mouse events are re-
++       ported.
++
++       o   The function returns an updated copy of newmask to  indicate  which
++           of the specified mouse events can be reported.
++
++           If the screen has not been initialized, or if the terminal does not
++           support mouse-events, this function returns 0.
++
++       o   If oldmask is non-NULL, this function fills the indicated  location
++           with the previous value of the current screen's mouse event mask.
+ 
+        As  a  side  effect,  setting  a  zero mousemask may turn off the mouse
+        pointer; setting a nonzero mask may turn it on.  Whether  this  happens
+@@ -106,13 +112,13 @@
+        BUTTON1_PRESSED          mouse button 1 down
+        BUTTON1_RELEASED         mouse button 1 up
+        BUTTON1_CLICKED          mouse button 1 clicked
++
+        BUTTON1_DOUBLE_CLICKED   mouse button 1 double clicked
+        BUTTON1_TRIPLE_CLICKED   mouse button 1 triple clicked
+        ---------------------------------------------------------------------
+        BUTTON2_PRESSED          mouse button 2 down
+        BUTTON2_RELEASED         mouse button 2 up
+        BUTTON2_CLICKED          mouse button 2 clicked
+-
+        BUTTON2_DOUBLE_CLICKED   mouse button 2 double clicked
+        BUTTON2_TRIPLE_CLICKED   mouse button 2 triple clicked
+        ---------------------------------------------------------------------
+@@ -231,6 +237,9 @@
+           o   If  no mouse driver was initialized, or if the mask parameter is
+               zero,
+ 
++          o   It returns an error if a mouse event was detected which did  not
++              match the current mousemask.
++
+           o   It also returns an error if no more events remain in the queue.
+ 
+           ungetmouse
+@@ -238,8 +247,8 @@
+ 
+        mousemask returns the mask of reportable events.
+ 
+-       mouseinterval returns the previous interval value, unless the  terminal
+-       was  not  initialized.   In  that case, it returns the maximum interval
++       mouseinterval  returns the previous interval value, unless the terminal
++       was not initialized.  In that case, it  returns  the  maximum  interval
+        value (166).
+ 
+        wenclose and wmouse_trafo are boolean functions returning TRUE or FALSE
+@@ -247,13 +256,13 @@
+ 
+ 
+

    PORTABILITY

    +-       These  calls  were  designed for ncurses(3x), and are not found in SVr4
++       These calls were designed for ncurses(3x), and are not  found  in  SVr4
+        curses, 4.4BSD curses, or any other previous version of curses.
+ 
+-       SVr4 curses had support for the mouse in a variant of xterm(1).  It  is
++       SVr4  curses had support for the mouse in a variant of xterm(1).  It is
+        mentioned in a few places, but with no supporting documentation:
+ 
+-       o   the  "libcurses" manual page lists functions for this feature which
++       o   the "libcurses" manual page lists functions for this feature  which
+            are prototyped in curses.h:
+ 
+                extern int mouse_set(long int);
+@@ -272,40 +281,40 @@
+                mouse_info        minfo   Mi       Mouse status information
+                req_mouse_pos     reqmp   RQ       Request mouse position report
+ 
+-       o   the interface made assumptions (as does ncurses) about  the  escape
++       o   the  interface  made assumptions (as does ncurses) about the escape
+            sequences sent to and received from the terminal.
+ 
+-           For  instance the SVr4 curses library used the get_mouse capability
+-           to tell the terminal which mouse  button  events  it  should  send,
+-           passing  the mouse-button bit-mask to the terminal.  Also, it could
+-           ask the terminal where the mouse was using the req_mouse_pos  capa-
++           For instance the SVr4 curses library used the get_mouse  capability
++           to  tell  the  terminal  which  mouse button events it should send,
++           passing the mouse-button bit-mask to the terminal.  Also, it  could
++           ask  the terminal where the mouse was using the req_mouse_pos capa-
+            bility.
+ 
+-           Those  features required a terminal which had been modified to work
++           Those features required a terminal which had been modified to  work
+            with curses.  They were not part of the X Consortium's xterm.
+ 
+-       When developing the xterm mouse support for ncurses in September  1995,
+-       Eric  Raymond  was  uninterested in using the same interface due to its
++       When  developing the xterm mouse support for ncurses in September 1995,
++       Eric Raymond was uninterested in using the same interface  due  to  its
+        lack of documentation.  Later, in 1998, Mark Hesseling provided support
+-       in  PDCurses 2.3 using the SVr4 interface.  PDCurses, however, does not
+-       use video terminals, making it unnecessary to be concerned  about  com-
++       in PDCurses 2.3 using the SVr4 interface.  PDCurses, however, does  not
++       use  video  terminals, making it unnecessary to be concerned about com-
+        patibility with the escape sequences.
+ 
+        The feature macro NCURSES_MOUSE_VERSION is provided so the preprocessor
+-       can be used to test whether these features are present.  If the  inter-
+-       face  is changed, the value of NCURSES_MOUSE_VERSION will be increment-
+-       ed.  These values for NCURSES_MOUSE_VERSION may be specified when  con-
++       can  be used to test whether these features are present.  If the inter-
++       face is changed, the value of NCURSES_MOUSE_VERSION will be  increment-
++       ed.   These values for NCURSES_MOUSE_VERSION may be specified when con-
+        figuring ncurses:
+ 
+           1  has definitions for reserved events.  The mask uses 28 bits.
+ 
+-          2  adds  definitions  for  button 5, removes the definitions for re-
++          2  adds definitions for button 5, removes the  definitions  for  re-
+              served events.  The mask uses 29 bits.
+ 
+        The order of the MEVENT structure members is not guaranteed.  Addition-
+        al fields may be added to the structure in the future.
+ 
+-       Under  ncurses(3x),  these  calls  are implemented using either xterm's
++       Under ncurses(3x), these calls are  implemented  using  either  xterm's
+        built-in mouse-tracking API or platform-specific drivers including
+ 
+           o   Alessandro Rubini's gpm server
+@@ -315,12 +324,12 @@
+           o   OS/2 EMX
+ 
+        If you are using an unsupported configuration, mouse events will not be
+-       visible  to  ncurses(3x) (and the mousemask function will always return
++       visible to ncurses(3x) (and the mousemask function will  always  return
+        0).
+ 
+-       If the terminfo entry contains a XM string, this is used in  the  xterm
+-       mouse  driver  to control the way the terminal is initialized for mouse
+-       operation.  The default, if XM is not  found,  corresponds  to  private
++       If  the  terminfo entry contains a XM string, this is used in the xterm
++       mouse driver to control the way the terminal is initialized  for  mouse
++       operation.   The  default,  if  XM is not found, corresponds to private
+        mode 1000 of xterm:
+ 
+           \E[?1000%?%p1%{1}%=%th%el%;
+@@ -329,39 +338,40 @@
+ 
+           \E[?1006;1000%?%p1%{1}%=%th%el%;
+ 
+-       The  z  member in the event structure is not presently used.  It is in-
+-       tended for use with touch screens (which may be pressure-sensitive)  or
++       The z member in the event structure is not presently used.  It  is  in-
++       tended  for use with touch screens (which may be pressure-sensitive) or
+        with 3D-mice/trackballs/power gloves.
+ 
+-       The  ALL_MOUSE_EVENTS  class  does  not  include REPORT_MOUSE_POSITION.
+-       They are distinct.  For example, in xterm,  wheel/scrolling  mice  send
+-       position  reports  as  a  sequence of presses of buttons 4 or 5 without
++       The ALL_MOUSE_EVENTS  class  does  not  include  REPORT_MOUSE_POSITION.
++       They  are  distinct.   For example, in xterm, wheel/scrolling mice send
++       position reports as a sequence of presses of buttons  4  or  5  without
+        matching button-releases.
+ 
+ 
+

    BUGS

    +-       Mouse events under xterm will not in  fact  be  ignored  during  cooked
++       Mouse  events  under  xterm  will  not in fact be ignored during cooked
+        mode, if they have been enabled by mousemask.  Instead, the xterm mouse
+        report sequence will appear in the string read.
+ 
+-       Mouse events under xterm will not be detected  correctly  in  a  window
+-       with  its  keypad  bit  off, since they are interpreted as a variety of
+-       function key.  Your terminfo  description  should  have  kmous  set  to
+-       "\E[M"  (the  beginning  of  the response from xterm for mouse clicks).
+-       Other values for kmous are permitted, but under  the  same  assumption,
++       Mouse  events  under  xterm  will not be detected correctly in a window
++       with its keypad bit off, since they are interpreted  as  a  variety  of
++       function  key.   Your  terminfo  description  should  have kmous set to
++       "\E[M" (the beginning of the response from  xterm  for  mouse  clicks).
++       Other  values  for  kmous are permitted, but under the same assumption,
+        i.e., it is the beginning of the response.
+ 
+-       Because  there  are  no standard terminal responses that would serve to
+-       identify terminals which support the xterm mouse protocol, ncurses  as-
+-       sumes  that  if kmous is defined in the terminal description, or if the
+-       terminal description's primary  name  or  aliases  contain  the  string
++       Because there are no standard terminal responses that  would  serve  to
++       identify  terminals which support the xterm mouse protocol, ncurses as-
++       sumes that if kmous is defined in the terminal description, or  if  the
++       terminal  description's  primary  name  or  aliases  contain the string
+        "xterm", then the terminal may send mouse events.  The kmous capability
+-       is checked first, allowing the use of newer xterm mouse protocols  such
++       is  checked first, allowing the use of newer xterm mouse protocols such
+        as xterm's private mode 1006.
+ 
+ 
+

    SEE ALSO

    +-       curses(3x), curs_kernel(3x), curs_slk(3x), curs_variables(3x).
++       curses(3x), curs_inopts(3x), curs_kernel(3x), curs_slk(3x),  curs_vari-
++       ables(3x).
+ 
+ 
+ 
+Index: doc/html/man/form.3x.html
+--- ncurses-6.3-20220101+/doc/html/man/form.3x.html	2022-01-02 00:19:52.000000000 +0000
++++ ncurses-6.3-20220115/doc/html/man/form.3x.html	2022-01-16 01:45:16.000000000 +0000
+@@ -248,7 +248,7 @@
+        curses(3x) and related pages whose names  begin  "form_"  for  detailed
+        descriptions of the entry points.
+ 
+-       This describes ncurses version 6.3 (patch 20220101).
++       This describes ncurses version 6.3 (patch 20220115).
+ 
+ 
+ 
+Index: doc/html/man/infocmp.1m.html
+--- ncurses-6.3-20220101+/doc/html/man/infocmp.1m.html	2022-01-02 00:19:53.000000000 +0000
++++ ncurses-6.3-20220115/doc/html/man/infocmp.1m.html	2022-01-16 01:45:17.000000000 +0000
+@@ -514,7 +514,7 @@
+ 
+        https://invisible-island.net/ncurses/tctest.html
+ 
+-       This describes ncurses version 6.3 (patch 20220101).
++       This describes ncurses version 6.3 (patch 20220115).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/infotocap.1m.html
+--- ncurses-6.3-20220101+/doc/html/man/infotocap.1m.html	2022-01-02 00:19:53.000000000 +0000
++++ ncurses-6.3-20220115/doc/html/man/infotocap.1m.html	2022-01-16 01:45:17.000000000 +0000
+@@ -91,7 +91,7 @@
+

    SEE ALSO

    +        infocmp(1m), tic(1m), curses(3x), terminfo(5)
+ 
+-       This describes ncurses version 6.3 (patch 20220101).
++       This describes ncurses version 6.3 (patch 20220115).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/menu.3x.html
+--- ncurses-6.3-20220101+/doc/html/man/menu.3x.html	2022-01-02 00:19:53.000000000 +0000
++++ ncurses-6.3-20220115/doc/html/man/menu.3x.html	2022-01-16 01:45:17.000000000 +0000
+@@ -223,7 +223,7 @@
+        curses(3x) and related pages whose names  begin  "menu_"  for  detailed
+        descriptions of the entry points.
+ 
+-       This describes ncurses version 6.3 (patch 20220101).
++       This describes ncurses version 6.3 (patch 20220115).
+ 
+ 
+ 
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.3-20220101+/doc/html/man/ncurses.3x.html	2022-01-02 00:19:55.000000000 +0000
++++ ncurses-6.3-20220115/doc/html/man/ncurses.3x.html	2022-01-16 01:45:18.000000000 +0000
+@@ -60,7 +60,7 @@
+        method of updating  character  screens  with  reasonable  optimization.
+        This  implementation  is  "new  curses"  (ncurses)  and is the approved
+        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
+-       This describes ncurses version 6.3 (patch 20220101).
++       This describes ncurses version 6.3 (patch 20220115).
+ 
+        The  ncurses  library emulates the curses library of System V Release 4
+        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
+Index: doc/html/man/ncurses6-config.1.html
+--- ncurses-6.3-20220101+/doc/html/man/ncurses6-config.1.html	2022-01-02 00:19:55.000000000 +0000
++++ ncurses-6.3-20220115/doc/html/man/ncurses6-config.1.html	2022-01-16 01:45:18.000000000 +0000
+@@ -113,7 +113,7 @@
+

    SEE ALSO

    +        curses(3x)
+ 
+-       This describes ncurses version 6.3 (patch 20220101).
++       This describes ncurses version 6.3 (patch 20220115).
+ 
+ 
+ 
+Index: doc/html/man/panel.3x.html
+--- ncurses-6.3-20220101+/doc/html/man/panel.3x.html	2022-01-02 00:19:55.000000000 +0000
++++ ncurses-6.3-20220115/doc/html/man/panel.3x.html	2022-01-16 01:45:18.000000000 +0000
+@@ -281,7 +281,7 @@
+

    SEE ALSO

    +        curses(3x), curs_variables(3x),
+ 
+-       This describes ncurses version 6.3 (patch 20220101).
++       This describes ncurses version 6.3 (patch 20220115).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/tabs.1.html
+--- ncurses-6.3-20220101+/doc/html/man/tabs.1.html	2022-01-02 00:19:55.000000000 +0000
++++ ncurses-6.3-20220115/doc/html/man/tabs.1.html	2022-01-16 01:45:18.000000000 +0000
+@@ -252,7 +252,7 @@
+

    SEE ALSO

    +        infocmp(1m), tset(1), curses(3x), terminfo(5).
+ 
+-       This describes ncurses version 6.3 (patch 20220101).
++       This describes ncurses version 6.3 (patch 20220115).
+ 
+ 
+ 
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.3-20220101+/doc/html/man/terminfo.5.html	2022-01-02 00:19:56.000000000 +0000
++++ ncurses-6.3-20220115/doc/html/man/terminfo.5.html	2022-01-16 01:45:18.000000000 +0000
+@@ -106,7 +106,7 @@
+        have, by specifying how to perform screen operations, and by specifying
+        padding requirements and initialization sequences.
+ 
+-       This manual describes ncurses version 6.3 (patch 20220101).
++       This manual describes ncurses version 6.3 (patch 20220115).
+ 
+ 
+

    Terminfo Entry Syntax

    +Index: doc/html/man/tic.1m.html
+--- ncurses-6.3-20220101+/doc/html/man/tic.1m.html	2022-01-02 00:19:56.000000000 +0000
++++ ncurses-6.3-20220115/doc/html/man/tic.1m.html	2022-01-16 01:45:18.000000000 +0000
+@@ -461,7 +461,7 @@
+        captoinfo(1m),   infocmp(1m),   infotocap(1m),   toe(1m),   curses(3x),
+        term(5).  terminfo(5).  user_caps(5).
+ 
+-       This describes ncurses version 6.3 (patch 20220101).
++       This describes ncurses version 6.3 (patch 20220115).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/toe.1m.html
+--- ncurses-6.3-20220101+/doc/html/man/toe.1m.html	2022-01-02 00:19:56.000000000 +0000
++++ ncurses-6.3-20220115/doc/html/man/toe.1m.html	2022-01-16 01:45:18.000000000 +0000
+@@ -171,7 +171,7 @@
+        captoinfo(1m),   infocmp(1m),   infotocap(1m),   tic(1m),   curses(3x),
+        terminfo(5).
+ 
+-       This describes ncurses version 6.3 (patch 20220101).
++       This describes ncurses version 6.3 (patch 20220115).
+ 
+ 
+ 
+Index: doc/html/man/tput.1.html
+--- ncurses-6.3-20220101+/doc/html/man/tput.1.html	2022-01-02 00:19:56.000000000 +0000
++++ ncurses-6.3-20220115/doc/html/man/tput.1.html	2022-01-16 01:45:18.000000000 +0000
+@@ -545,7 +545,7 @@
+

    SEE ALSO

    +        clear(1), stty(1), tabs(1), tset(1), curs_termcap(3x), terminfo(5).
+ 
+-       This describes ncurses version 6.3 (patch 20220101).
++       This describes ncurses version 6.3 (patch 20220115).
+ 
+ 
+ 
+Index: doc/html/man/tset.1.html
+--- ncurses-6.3-20220101+/doc/html/man/tset.1.html	2022-01-02 00:19:56.000000000 +0000
++++ ncurses-6.3-20220115/doc/html/man/tset.1.html	2022-01-16 01:45:19.000000000 +0000
+@@ -391,7 +391,7 @@
+        csh(1),   sh(1),   stty(1),   curs_terminfo(3x),  tty(4),  terminfo(5),
+        ttys(5), environ(7)
+ 
+-       This describes ncurses version 6.3 (patch 20220101).
++       This describes ncurses version 6.3 (patch 20220115).
+ 
+ 
+ 
+Index: man/curs_mouse.3x
+Prereq:  1.57 
+--- ncurses-6.3-20220101+/man/curs_mouse.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220115/man/curs_mouse.3x	2022-01-16 01:40:48.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_mouse.3x,v 1.57 2021/12/25 21:49:32 tom Exp $
++.\" $Id: curs_mouse.3x,v 1.58 2022/01/16 01:40:48 tom Exp $
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+ .ie \n(.g .ds '' \(rq
+@@ -100,14 +100,19 @@
+ .SS mousemask
+ .PP
+ To make mouse events visible, use the \fBmousemask\fP function.
+-This will set
+-the mouse events to be reported.
++This sets the mouse events to be reported.
+ By default, no mouse events are reported.
+-The function will return a mask to indicate which of the specified mouse events
+-can be reported; on complete failure it returns 0.
+-If oldmask is non-NULL,
+-this function fills the indicated location with the previous value of the given
+-window's mouse event mask.
++.bP
++The function returns an updated copy of \fInewmask\fP
++to indicate which of the specified mouse events can be reported.
++.IP
++If the screen has not been initialized,
++or if the terminal does not support mouse-events,
++this function returns 0.
++.bP
++If \fIoldmask\fP is non-NULL,
++this function fills the indicated location with the previous value of the
++current screen's mouse event mask.
+ .PP
+ As a side effect, setting a zero mousemask may turn off the mouse pointer;
+ setting a nonzero mask may turn it on.
+@@ -255,6 +260,9 @@
+ If no mouse driver was initialized, or
+ if the mask parameter is zero,
+ .bP
++It returns an error if a mouse event was detected which did not match the
++current \fImousemask\fP.
++.bP
+ It also returns an error if no more events remain in the queue.
+ .TP 5
+ \fBungetmouse\fP
+@@ -411,6 +419,7 @@
+ such as xterm's private mode 1006.
+ .SH SEE ALSO
+ \fBcurses\fP(3X),
++\fBcurs_inopts\fP(3X),
+ \fBcurs_kernel\fP(3X),
+ \fBcurs_slk\fP(3X),
+ \fBcurs_variables\fP(3X).
+Index: ncurses/base/lib_mouse.c
+Prereq:  1.193 
+--- ncurses-6.3-20220101+/ncurses/base/lib_mouse.c	2021-03-20 12:56:32.000000000 +0000
++++ ncurses-6.3-20220115/ncurses/base/lib_mouse.c	2022-01-16 01:15:47.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
++ * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -85,7 +85,7 @@
+ #define CUR SP_TERMTYPE
+ #endif
+ 
+-MODULE_ID("$Id: lib_mouse.c,v 1.193 2021/03/20 12:56:32 tom Exp $")
++MODULE_ID("$Id: lib_mouse.c,v 1.194 2022/01/16 01:15:47 tom Exp $")
+ 
+ #include 
+ 
+@@ -1569,7 +1569,7 @@
+ 		if (changed) {
+ 		    merge = FALSE;
+ 		    for (b = 1; b <= MAX_BUTTONS; ++b) {
+-			if ((sp->_mouse_mask & MASK_CLICK(b))
++			if ((sp->_mouse_mask2 & MASK_CLICK(b))
+ 			    && (ep->bstate & MASK_PRESS(b))) {
+ 			    next->bstate &= ~MASK_RELEASE(b);
+ 			    next->bstate |= MASK_CLICK(b);
+@@ -1650,7 +1650,7 @@
+ 		&& (next->bstate & BUTTON_CLICKED)) {
+ 		merge = FALSE;
+ 		for (b = 1; b <= MAX_BUTTONS; ++b) {
+-		    if ((sp->_mouse_mask & MASK_DOUBLE_CLICK(b))
++		    if ((sp->_mouse_mask2 & MASK_DOUBLE_CLICK(b))
+ 			&& (ep->bstate & MASK_CLICK(b))
+ 			&& (next->bstate & MASK_CLICK(b))) {
+ 			next->bstate &= ~MASK_CLICK(b);
+@@ -1668,7 +1668,7 @@
+ 		&& (next->bstate & BUTTON_CLICKED)) {
+ 		merge = FALSE;
+ 		for (b = 1; b <= MAX_BUTTONS; ++b) {
+-		    if ((sp->_mouse_mask & MASK_TRIPLE_CLICK(b))
++		    if ((sp->_mouse_mask2 & MASK_TRIPLE_CLICK(b))
+ 			&& (ep->bstate & MASK_DOUBLE_CLICK(b))
+ 			&& (next->bstate & MASK_CLICK(b))) {
+ 			next->bstate &= ~MASK_CLICK(b);
+@@ -1728,7 +1728,8 @@
+ #endif /* TRACE */
+ 
+     /* after all this, do we have a valid event? */
+-    return ValidEvent(PREV(first_invalid));
++    ep = PREV(first_invalid);
++    return ValidEvent(ep) && ((ep->bstate & sp->_mouse_mask) != 0);
+ }
+ 
+ static void
+Index: package/debian-mingw/changelog
+--- ncurses-6.3-20220101+/package/debian-mingw/changelog	2022-01-01 11:46:49.000000000 +0000
++++ ncurses-6.3-20220115/package/debian-mingw/changelog	2022-01-15 14:00:23.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.3+20220101) unstable; urgency=low
++ncurses6 (6.3+20220115) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 01 Jan 2022 06:46:49 -0500
++ -- Thomas E. Dickey   Sat, 15 Jan 2022 09:00:23 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.3-20220101+/package/debian-mingw64/changelog	2022-01-01 11:46:49.000000000 +0000
++++ ncurses-6.3-20220115/package/debian-mingw64/changelog	2022-01-15 14:00:23.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.3+20220101) unstable; urgency=low
++ncurses6 (6.3+20220115) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 01 Jan 2022 06:46:49 -0500
++ -- Thomas E. Dickey   Sat, 15 Jan 2022 09:00:23 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.3-20220101+/package/debian/changelog	2022-01-01 11:46:49.000000000 +0000
++++ ncurses-6.3-20220115/package/debian/changelog	2022-01-15 14:00:23.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.3+20220101) unstable; urgency=low
++ncurses6 (6.3+20220115) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 01 Jan 2022 06:46:49 -0500
++ -- Thomas E. Dickey   Sat, 15 Jan 2022 09:00:23 -0500
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.500 
+--- ncurses-6.3-20220101+/package/mingw-ncurses.nsi	2022-01-01 11:46:49.000000000 +0000
++++ ncurses-6.3-20220115/package/mingw-ncurses.nsi	2022-01-15 14:00:23.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.500 2022/01/01 11:46:49 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.502 2022/01/15 14:00:23 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "3"
+ !define VERSION_YYYY  "2022"
+-!define VERSION_MMDD  "0101"
++!define VERSION_MMDD  "0115"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.3-20220101+/package/mingw-ncurses.spec	2022-01-01 11:46:49.000000000 +0000
++++ ncurses-6.3-20220115/package/mingw-ncurses.spec	2022-01-15 14:00:23.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.3
+-Release: 20220101
++Release: 20220115
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.3-20220101+/package/ncurses.spec	2022-01-01 11:46:49.000000000 +0000
++++ ncurses-6.3-20220115/package/ncurses.spec	2022-01-15 14:00:23.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.3
+-Release: 20220101
++Release: 20220115
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncursest.spec
+--- ncurses-6.3-20220101+/package/ncursest.spec	2022-01-01 11:46:49.000000000 +0000
++++ ncurses-6.3-20220115/package/ncursest.spec	2022-01-15 14:00:23.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.3
+-Release: 20220101
++Release: 20220115
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
diff --git a/system/ncurses/ncurses-6.3-20220122.patch b/system/ncurses/ncurses-6.3-20220122.patch
new file mode 100644
index 000000000..b793cf9c2
--- /dev/null
+++ b/system/ncurses/ncurses-6.3-20220122.patch
@@ -0,0 +1,20217 @@
+# ncurses 6.3 - patch 20220122 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.3 is at
+# 	ftp://ftp.invisible-island.net/ncurses/
+#	https://invisible-mirror.net/archives/ncurses/
+#	https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.3 can be found at
+# 	ftp://ftp.invisible-island.net/ncurses/6.3
+#	https://invisible-mirror.net/archives/ncurses/6.3
+#
+# ------------------------------------------------------------------------------
+# ftp://ftp.invisible-island.net/ncurses/6.3/ncurses-6.3-20220122.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Jan 23 01:58:35 UTC 2022
+# ------------------------------------------------------------------------------
+# Ada95/aclocal.m4                 |   20 
+# Ada95/configure                  |  607 ++--
+# NEWS                             |   11 
+# VERSION                          |    2 
+# aclocal.m4                       |   68 
+# configure                        | 4953 ++++++++++++++++++-------------------
+# configure.in                     |   35 
+# dist.mk                          |    4 
+# package/debian-mingw/changelog   |    4 
+# package/debian-mingw64/changelog |    4 
+# package/debian/changelog         |    4 
+# package/mingw-ncurses.nsi        |    4 
+# package/mingw-ncurses.spec       |    2 
+# package/ncurses.spec             |    2 
+# package/ncursest.spec            |    2 
+# progs/dump_entry.c               |    5 
+# test/aclocal.m4                  |   20 
+# test/configure                   |  299 +-
+# 18 files changed, 3109 insertions(+), 2937 deletions(-)
+# ------------------------------------------------------------------------------
+Index: Ada95/aclocal.m4
+Prereq:  1.191 
+--- ncurses-6.3-20220115+/Ada95/aclocal.m4	2021-11-20 19:58:23.000000000 +0000
++++ ncurses-6.3-20220122/Ada95/aclocal.m4	2022-01-23 00:21:27.000000000 +0000
+@@ -1,5 +1,5 @@
+ dnl***************************************************************************
+-dnl Copyright 2018-2020,2021 Thomas E. Dickey                                *
++dnl Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ dnl Copyright 2010-2017,2018 Free Software Foundation, Inc.                  *
+ dnl                                                                          *
+ dnl Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+-dnl $Id: aclocal.m4,v 1.191 2021/11/20 19:58:23 tom Exp $
++dnl $Id: aclocal.m4,v 1.192 2022/01/23 00:21:27 tom Exp $
+ dnl Macros used in NCURSES Ada95 auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -1329,7 +1329,7 @@
+ 	AC_MSG_RESULT($ADAFLAGS)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_FIX_WARNINGS version: 3 updated: 2020/12/31 18:40:20
++dnl CF_FIX_WARNINGS version: 4 updated: 2021/12/16 18:22:31
+ dnl ---------------
+ dnl Warning flags do not belong in CFLAGS, CPPFLAGS, etc.  Any of gcc's
+ dnl "-Werror" flags can interfere with configure-checks.  Those go into
+@@ -1341,11 +1341,13 @@
+ then
+ 	case [$]$1 in
+ 	(*-Werror=*)
+-		CF_VERBOSE(repairing $1: [$]$1)
+ 		cf_temp_flags=
+ 		for cf_temp_scan in [$]$1
+ 		do
+ 			case "x$cf_temp_scan" in
++			(x-Werror=format*)
++				CF_APPEND_TEXT(cf_temp_flags,$cf_temp_scan)
++				;;
+ 			(x-Werror=*)
+ 				CF_APPEND_TEXT(EXTRA_CFLAGS,$cf_temp_scan)
+ 				;;
+@@ -1354,9 +1356,13 @@
+ 				;;
+ 			esac
+ 		done
+-		$1="$cf_temp_flags"
+-		CF_VERBOSE(... fixed [$]$1)
+-		CF_VERBOSE(... extra $EXTRA_CFLAGS)
++		if test "x[$]$1" != "x$cf_temp_flags"
++		then
++			CF_VERBOSE(repairing $1: [$]$1)
++			$1="$cf_temp_flags"
++			CF_VERBOSE(... fixed [$]$1)
++			CF_VERBOSE(... extra $EXTRA_CFLAGS)
++		fi
+ 		;;
+ 	esac
+ fi
+Index: Ada95/configure
+--- ncurses-6.3-20220115+/Ada95/configure	2021-11-20 19:58:46.000000000 +0000
++++ ncurses-6.3-20220122/Ada95/configure	2022-01-23 00:21:51.000000000 +0000
+@@ -15294,14 +15294,16 @@
+ then
+ 	case $CFLAGS in
+ 	(*-Werror=*)
+-		test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+-
+-echo "${as_me:-configure}:15299: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+-
+ 		cf_temp_flags=
+ 		for cf_temp_scan in $CFLAGS
+ 		do
+ 			case "x$cf_temp_scan" in
++			(x-Werror=format*)
++
++	test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "
++	cf_temp_flags="${cf_temp_flags}$cf_temp_scan"
++
++				;;
+ 			(x-Werror=*)
+ 
+ 	test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "
+@@ -15316,15 +15318,22 @@
+ 				;;
+ 			esac
+ 		done
+-		CFLAGS="$cf_temp_flags"
+-		test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
++		if test "x$CFLAGS" != "x$cf_temp_flags"
++		then
++			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
++
++echo "${as_me:-configure}:15325: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+-echo "${as_me:-configure}:15322: testing ... fixed $CFLAGS ..." 1>&5
++			CFLAGS="$cf_temp_flags"
++			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-		test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
++echo "${as_me:-configure}:15330: testing ... fixed $CFLAGS ..." 1>&5
+ 
+-echo "${as_me:-configure}:15326: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
++echo "${as_me:-configure}:15334: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++
++		fi
+ 		;;
+ 	esac
+ fi
+@@ -15333,14 +15342,16 @@
+ then
+ 	case $CPPFLAGS in
+ 	(*-Werror=*)
+-		test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+-
+-echo "${as_me:-configure}:15338: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+-
+ 		cf_temp_flags=
+ 		for cf_temp_scan in $CPPFLAGS
+ 		do
+ 			case "x$cf_temp_scan" in
++			(x-Werror=format*)
++
++	test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "
++	cf_temp_flags="${cf_temp_flags}$cf_temp_scan"
++
++				;;
+ 			(x-Werror=*)
+ 
+ 	test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "
+@@ -15355,15 +15366,22 @@
+ 				;;
+ 			esac
+ 		done
+-		CPPFLAGS="$cf_temp_flags"
+-		test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
++		if test "x$CPPFLAGS" != "x$cf_temp_flags"
++		then
++			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
++
++echo "${as_me:-configure}:15373: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++
++			CPPFLAGS="$cf_temp_flags"
++			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15361: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:15378: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+-		test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
++			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15365: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15382: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
++		fi
+ 		;;
+ 	esac
+ fi
+@@ -15372,14 +15390,16 @@
+ then
+ 	case $LDFLAGS in
+ 	(*-Werror=*)
+-		test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+-
+-echo "${as_me:-configure}:15377: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+-
+ 		cf_temp_flags=
+ 		for cf_temp_scan in $LDFLAGS
+ 		do
+ 			case "x$cf_temp_scan" in
++			(x-Werror=format*)
++
++	test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "
++	cf_temp_flags="${cf_temp_flags}$cf_temp_scan"
++
++				;;
+ 			(x-Werror=*)
+ 
+ 	test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "
+@@ -15394,20 +15414,27 @@
+ 				;;
+ 			esac
+ 		done
+-		LDFLAGS="$cf_temp_flags"
+-		test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
++		if test "x$LDFLAGS" != "x$cf_temp_flags"
++		then
++			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
++
++echo "${as_me:-configure}:15421: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+-echo "${as_me:-configure}:15400: testing ... fixed $LDFLAGS ..." 1>&5
++			LDFLAGS="$cf_temp_flags"
++			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-		test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
++echo "${as_me:-configure}:15426: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+-echo "${as_me:-configure}:15404: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
++echo "${as_me:-configure}:15430: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++
++		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:15410: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:15437: checking if you want to turn on gcc warnings" >&5
+ echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6
+ 
+ # Check whether --enable-warnings or --disable-warnings was given.
+@@ -15424,7 +15451,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:15427: result: $enable_warnings" >&5
++echo "$as_me:15454: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -15448,7 +15475,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15451 "configure"
++#line 15478 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -15463,26 +15490,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15466: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15493: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15469: \$? = $ac_status" >&5
++  echo "$as_me:15496: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15472: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15499: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15475: \$? = $ac_status" >&5
++  echo "$as_me:15502: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:15478: checking for X11/Xt const-feature" >&5
++echo "$as_me:15505: checking for X11/Xt const-feature" >&5
+ echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
+ if test "${cf_cv_const_x_string+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15485 "configure"
++#line 15512 "configure"
+ #include "confdefs.h"
+ 
+ #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
+@@ -15499,16 +15526,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15502: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15529: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15505: \$? = $ac_status" >&5
++  echo "$as_me:15532: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15508: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15535: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15511: \$? = $ac_status" >&5
++  echo "$as_me:15538: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -15523,7 +15550,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:15526: result: $cf_cv_const_x_string" >&5
++echo "$as_me:15553: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -15552,7 +15579,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <&5
++	{ echo "$as_me:15598: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -15584,12 +15611,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:15587: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:15614: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15590: \$? = $ac_status" >&5
++  echo "$as_me:15617: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:15592: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:15619: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -15597,7 +15624,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:15600: checking for $CC warning options..." >&5
++	{ echo "$as_me:15627: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -15620,12 +15647,12 @@
+ 		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:15623: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:15650: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15626: \$? = $ac_status" >&5
++  echo "$as_me:15653: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:15628: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:15655: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -15633,7 +15660,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:15636: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:15663: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -15643,7 +15670,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:15646: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:15673: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -15676,10 +15703,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:15679: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:15706: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <&5
++		if { (eval echo "$as_me:15758: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15734: \$? = $ac_status" >&5
++  echo "$as_me:15761: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:15736: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:15763: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -15801,7 +15828,7 @@
+ fi
+ 
+ ###	use option --enable-assertions to turn on generation of assertion code
+-echo "$as_me:15804: checking if you want to enable runtime assertions" >&5
++echo "$as_me:15831: checking if you want to enable runtime assertions" >&5
+ echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
+ 
+ # Check whether --enable-assertions or --disable-assertions was given.
+@@ -15811,7 +15838,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:15814: result: $with_assertions" >&5
++echo "$as_me:15841: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -15864,7 +15891,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:15867: checking whether to add trace feature to all models" >&5
++echo "$as_me:15894: checking whether to add trace feature to all models" >&5
+ echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
+ 
+ # Check whether --with-trace or --without-trace was given.
+@@ -15874,7 +15901,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:15877: result: $cf_with_trace" >&5
++echo "$as_me:15904: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "$cf_with_trace" = yes ; then
+@@ -15982,7 +16009,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:15985: checking if we want to use GNAT projects" >&5
++echo "$as_me:16012: checking if we want to use GNAT projects" >&5
+ echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6
+ 
+ # Check whether --enable-gnat-projects or --disable-gnat-projects was given.
+@@ -15999,21 +16026,21 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:16002: result: $enable_gnat_projects" >&5
++echo "$as_me:16029: result: $enable_gnat_projects" >&5
+ echo "${ECHO_T}$enable_gnat_projects" >&6
+ 
+ ###	Checks for libraries.
+ case $cf_cv_system_name in
+ (*mingw32*)
+ 
+-echo "$as_me:16009: checking if ssp library is needed" >&5
++echo "$as_me:16036: checking if ssp library is needed" >&5
+ echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
+ if test "${cf_cv_need_libssp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16016 "configure"
++#line 16043 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16030,16 +16057,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16033: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16060: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16036: \$? = $ac_status" >&5
++  echo "$as_me:16063: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16039: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16066: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16042: \$? = $ac_status" >&5
++  echo "$as_me:16069: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=no
+ else
+@@ -16049,7 +16076,7 @@
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lssp"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16052 "configure"
++#line 16079 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16066,16 +16093,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16069: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16096: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16072: \$? = $ac_status" >&5
++  echo "$as_me:16099: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16075: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16102: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16078: \$? = $ac_status" >&5
++  echo "$as_me:16105: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=yes
+ else
+@@ -16089,7 +16116,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16092: result: $cf_cv_need_libssp" >&5
++echo "$as_me:16119: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+ 
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -16115,13 +16142,13 @@
+ 
+ 	;;
+ (*)
+-echo "$as_me:16118: checking for gettimeofday" >&5
++echo "$as_me:16145: checking for gettimeofday" >&5
+ echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
+ if test "${ac_cv_func_gettimeofday+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16124 "configure"
++#line 16151 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16152,16 +16179,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16155: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16182: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16158: \$? = $ac_status" >&5
++  echo "$as_me:16185: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16161: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16188: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16164: \$? = $ac_status" >&5
++  echo "$as_me:16191: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -16171,7 +16198,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16174: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:16201: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+   cat >>confdefs.h <<\EOF
+@@ -16180,7 +16207,7 @@
+ 
+ else
+ 
+-echo "$as_me:16183: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:16210: checking for gettimeofday in -lbsd" >&5
+ echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16188,7 +16215,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16191 "configure"
++#line 16218 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16207,16 +16234,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16210: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16237: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16213: \$? = $ac_status" >&5
++  echo "$as_me:16240: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16216: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16243: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16219: \$? = $ac_status" >&5
++  echo "$as_me:16246: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -16227,7 +16254,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16230: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:16257: result: $ac_cv_lib_bsd_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
+ if test "$ac_cv_lib_bsd_gettimeofday" = yes; then
+ 
+@@ -16243,13 +16270,13 @@
+ esac
+ 
+ ###	Checks for header files.
+-echo "$as_me:16246: checking for ANSI C header files" >&5
++echo "$as_me:16273: checking for ANSI C header files" >&5
+ echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+ if test "${ac_cv_header_stdc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16252 "configure"
++#line 16279 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -16257,13 +16284,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:16260: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:16287: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:16266: \$? = $ac_status" >&5
++  echo "$as_me:16293: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16285,7 +16312,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16288 "configure"
++#line 16315 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -16303,7 +16330,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16306 "configure"
++#line 16333 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -16324,7 +16351,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16327 "configure"
++#line 16354 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -16350,15 +16377,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:16353: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16380: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16356: \$? = $ac_status" >&5
++  echo "$as_me:16383: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:16358: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16385: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16361: \$? = $ac_status" >&5
++  echo "$as_me:16388: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -16371,7 +16398,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:16374: result: $ac_cv_header_stdc" >&5
++echo "$as_me:16401: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -16387,28 +16414,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:16390: checking for $ac_header" >&5
++echo "$as_me:16417: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16396 "configure"
++#line 16423 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16402: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16429: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16405: \$? = $ac_status" >&5
++  echo "$as_me:16432: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16408: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16435: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16411: \$? = $ac_status" >&5
++  echo "$as_me:16438: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -16418,7 +16445,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16421: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:16448: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:16458: checking for signed char" >&5
+ echo $ECHO_N "checking for signed char... $ECHO_C" >&6
+ if test "${ac_cv_type_signed_char+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16437 "configure"
++#line 16464 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16449,16 +16476,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16452: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16479: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16455: \$? = $ac_status" >&5
++  echo "$as_me:16482: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16458: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16485: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16461: \$? = $ac_status" >&5
++  echo "$as_me:16488: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_signed_char=yes
+ else
+@@ -16468,10 +16495,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16471: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:16498: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+ 
+-echo "$as_me:16474: checking size of signed char" >&5
++echo "$as_me:16501: checking size of signed char" >&5
+ echo $ECHO_N "checking size of signed char... $ECHO_C" >&6
+ if test "${ac_cv_sizeof_signed_char+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16480,7 +16507,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16483 "configure"
++#line 16510 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16492,21 +16519,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16495: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16522: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16498: \$? = $ac_status" >&5
++  echo "$as_me:16525: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16501: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16528: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16504: \$? = $ac_status" >&5
++  echo "$as_me:16531: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16509 "configure"
++#line 16536 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16518,16 +16545,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16521: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16548: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16524: \$? = $ac_status" >&5
++  echo "$as_me:16551: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16527: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16554: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16530: \$? = $ac_status" >&5
++  echo "$as_me:16557: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -16543,7 +16570,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16546 "configure"
++#line 16573 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16555,16 +16582,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16558: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16585: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16561: \$? = $ac_status" >&5
++  echo "$as_me:16588: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16564: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16591: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16567: \$? = $ac_status" >&5
++  echo "$as_me:16594: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -16580,7 +16607,7 @@
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16583 "configure"
++#line 16610 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16592,16 +16619,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16595: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16622: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16598: \$? = $ac_status" >&5
++  echo "$as_me:16625: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16601: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16628: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16604: \$? = $ac_status" >&5
++  echo "$as_me:16631: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -16614,12 +16641,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:16617: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:16644: error: cannot run test program while cross compiling" >&5
+ echo "$as_me: error: cannot run test program while cross compiling" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16622 "configure"
++#line 16649 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16635,15 +16662,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:16638: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16665: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16641: \$? = $ac_status" >&5
++  echo "$as_me:16668: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:16643: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16670: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16646: \$? = $ac_status" >&5
++  echo "$as_me:16673: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -16659,19 +16686,19 @@
+   ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:16662: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:16689: result: $ac_cv_sizeof_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:16695: checking for ANSI C header files" >&5
+ echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+ if test "${ac_cv_header_stdc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16674 "configure"
++#line 16701 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -16679,13 +16706,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:16682: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:16709: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:16688: \$? = $ac_status" >&5
++  echo "$as_me:16715: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16707,7 +16734,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16710 "configure"
++#line 16737 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -16725,7 +16752,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16728 "configure"
++#line 16755 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -16746,7 +16773,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16749 "configure"
++#line 16776 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -16772,15 +16799,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:16775: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16802: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16778: \$? = $ac_status" >&5
++  echo "$as_me:16805: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:16780: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16807: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16783: \$? = $ac_status" >&5
++  echo "$as_me:16810: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -16793,7 +16820,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:16796: result: $ac_cv_header_stdc" >&5
++echo "$as_me:16823: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -16806,13 +16833,13 @@
+ ac_header_dirent=no
+ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
+   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+-echo "$as_me:16809: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:16836: checking for $ac_hdr that defines DIR" >&5
+ echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16815 "configure"
++#line 16842 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$ac_hdr>
+@@ -16827,16 +16854,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16830: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16857: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16833: \$? = $ac_status" >&5
++  echo "$as_me:16860: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16836: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16863: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16839: \$? = $ac_status" >&5
++  echo "$as_me:16866: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -16846,7 +16873,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16849: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:16876: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++  echo "$as_me:16889: checking for opendir in -ldir" >&5
+ echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
+ if test "${ac_cv_lib_dir_opendir+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16867,7 +16894,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16870 "configure"
++#line 16897 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16886,16 +16913,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16889: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16916: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16892: \$? = $ac_status" >&5
++  echo "$as_me:16919: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16895: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16922: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16898: \$? = $ac_status" >&5
++  echo "$as_me:16925: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -16906,14 +16933,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16909: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:16936: result: $ac_cv_lib_dir_opendir" >&5
+ echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
+ if test "$ac_cv_lib_dir_opendir" = yes; then
+   LIBS="$LIBS -ldir"
+ fi
+ 
+ else
+-  echo "$as_me:16916: checking for opendir in -lx" >&5
++  echo "$as_me:16943: checking for opendir in -lx" >&5
+ echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
+ if test "${ac_cv_lib_x_opendir+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16921,7 +16948,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16924 "configure"
++#line 16951 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16940,16 +16967,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16943: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16970: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16946: \$? = $ac_status" >&5
++  echo "$as_me:16973: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16949: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16976: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16952: \$? = $ac_status" >&5
++  echo "$as_me:16979: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -16960,7 +16987,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16963: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:16990: result: $ac_cv_lib_x_opendir" >&5
+ echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
+ if test "$ac_cv_lib_x_opendir" = yes; then
+   LIBS="$LIBS -lx"
+@@ -16968,13 +16995,13 @@
+ 
+ fi
+ 
+-echo "$as_me:16971: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:16998: checking whether time.h and sys/time.h may both be included" >&5
+ echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
+ if test "${ac_cv_header_time+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16977 "configure"
++#line 17004 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -16990,16 +17017,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16993: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17020: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16996: \$? = $ac_status" >&5
++  echo "$as_me:17023: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16999: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17026: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17002: \$? = $ac_status" >&5
++  echo "$as_me:17029: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -17009,7 +17036,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17012: result: $ac_cv_header_time" >&5
++echo "$as_me:17039: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -17027,13 +17054,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:17030: checking for an ANSI C-conforming const" >&5
++echo "$as_me:17057: checking for an ANSI C-conforming const" >&5
+ echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
+ if test "${ac_cv_c_const+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17036 "configure"
++#line 17063 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17091,16 +17118,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17094: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17121: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17097: \$? = $ac_status" >&5
++  echo "$as_me:17124: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17100: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17127: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17103: \$? = $ac_status" >&5
++  echo "$as_me:17130: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -17110,7 +17137,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17113: result: $ac_cv_c_const" >&5
++echo "$as_me:17140: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -17122,7 +17149,7 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:17125: checking if data-only library module links" >&5
++echo "$as_me:17152: checking if data-only library module links" >&5
+ echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
+ if test "${cf_cv_link_dataonly+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17130,20 +17157,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:17163: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17139: \$? = $ac_status" >&5
++  echo "$as_me:17166: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+ 		mv conftest.o data.o && \
+ 		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
+ 	fi
+ 	rm -f conftest.$ac_ext data.o
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:17186: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17162: \$? = $ac_status" >&5
++  echo "$as_me:17189: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+ 		mv conftest.o func.o && \
+ 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -17172,7 +17199,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17175 "configure"
++#line 17202 "configure"
+ #include "confdefs.h"
+ 
+ 	int main(void)
+@@ -17183,15 +17210,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17186: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17213: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17189: \$? = $ac_status" >&5
++  echo "$as_me:17216: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17191: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17218: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17194: \$? = $ac_status" >&5
++  echo "$as_me:17221: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -17206,7 +17233,7 @@
+ 
+ fi
+ 
+-echo "$as_me:17209: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:17236: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -17225,23 +17252,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:17228: checking for $ac_header" >&5
++echo "$as_me:17255: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17234 "configure"
++#line 17261 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:17238: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:17265: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:17244: \$? = $ac_status" >&5
++  echo "$as_me:17271: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17260,7 +17287,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:17263: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:17290: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:17300: checking for working mkstemp" >&5
+ echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
+ if test "${cf_cv_func_mkstemp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17281,7 +17308,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17284 "configure"
++#line 17311 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17322,15 +17349,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17325: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17352: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17328: \$? = $ac_status" >&5
++  echo "$as_me:17355: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17330: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17357: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17333: \$? = $ac_status" >&5
++  echo "$as_me:17360: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -17345,16 +17372,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:17348: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:17375: result: $cf_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
+ if test "x$cf_cv_func_mkstemp" = xmaybe ; then
+-	echo "$as_me:17351: checking for mkstemp" >&5
++	echo "$as_me:17378: checking for mkstemp" >&5
+ echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
+ if test "${ac_cv_func_mkstemp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17357 "configure"
++#line 17384 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17385,16 +17412,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17388: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17415: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17391: \$? = $ac_status" >&5
++  echo "$as_me:17418: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17394: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17421: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17397: \$? = $ac_status" >&5
++  echo "$as_me:17424: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -17404,7 +17431,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17407: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:17434: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -17433,7 +17460,7 @@
+ 	unset cf_TEMP_gnat
+ 	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
+ set dummy $cf_prog_gnat; ac_word=$2
+-echo "$as_me:17436: checking for $ac_word" >&5
++echo "$as_me:17463: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17450,7 +17477,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
+-   echo "$as_me:17453: found $ac_dir/$ac_word" >&5
++   echo "$as_me:17480: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -17462,10 +17489,10 @@
+ cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
+ 
+ if test -n "$cf_TEMP_gnat"; then
+-  echo "$as_me:17465: result: $cf_TEMP_gnat" >&5
++  echo "$as_me:17492: result: $cf_TEMP_gnat" >&5
+ echo "${ECHO_T}$cf_TEMP_gnat" >&6
+ else
+-  echo "$as_me:17468: result: no" >&5
++  echo "$as_me:17495: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -17475,7 +17502,7 @@
+ 		unset cf_cv_gnat_version
+ 		unset cf_TEMP_gnat
+ 
+-echo "$as_me:17478: checking for $cf_prog_gnat version" >&5
++echo "$as_me:17505: checking for $cf_prog_gnat version" >&5
+ echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
+ if test "${cf_cv_gnat_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17486,7 +17513,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:17489: result: $cf_cv_gnat_version" >&5
++echo "$as_me:17516: result: $cf_cv_gnat_version" >&5
+ echo "${ECHO_T}$cf_cv_gnat_version" >&6
+ test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
+ eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
+@@ -17515,7 +17542,7 @@
+ 			cd conftest.src
+ 			for cf_gprconfig in Ada C
+ 			do
+-				echo "$as_me:17518: checking for gprconfig name for $cf_gprconfig" >&5
++				echo "$as_me:17545: checking for gprconfig name for $cf_gprconfig" >&5
+ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
+ 				if test "$cf_gprconfig" = C
+ 				then
+@@ -17534,10 +17561,10 @@
+ 				if test -n "$cf_gprconfig_value"
+ 				then
+ 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
+-					echo "$as_me:17537: result: $cf_gprconfig_value" >&5
++					echo "$as_me:17564: result: $cf_gprconfig_value" >&5
+ echo "${ECHO_T}$cf_gprconfig_value" >&6
+ 				else
+-					echo "$as_me:17540: result: missing" >&5
++					echo "$as_me:17567: result: missing" >&5
+ echo "${ECHO_T}missing" >&6
+ 					cf_ada_config="#"
+ 					break
+@@ -17550,7 +17577,7 @@
+ 	if test "x$cf_ada_config" != "x#"
+ 	then
+ 
+-echo "$as_me:17553: checking for gnat version" >&5
++echo "$as_me:17580: checking for gnat version" >&5
+ echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
+ if test "${cf_cv_gnat_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17561,7 +17588,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:17564: result: $cf_cv_gnat_version" >&5
++echo "$as_me:17591: result: $cf_cv_gnat_version" >&5
+ echo "${ECHO_T}$cf_cv_gnat_version" >&6
+ test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
+ 
+@@ -17570,7 +17597,7 @@
+ 	cf_cv_prog_gnat_correct=yes
+ 	;;
+ (*)
+-	{ echo "$as_me:17573: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
++	{ echo "$as_me:17600: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+ echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
+ 	cf_cv_prog_gnat_correct=no
+ 	;;
+@@ -17578,7 +17605,7 @@
+ 
+ 		# Extract the first word of "m4", so it can be a program name with args.
+ set dummy m4; ac_word=$2
+-echo "$as_me:17581: checking for $ac_word" >&5
++echo "$as_me:17608: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_M4_exists+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17593,7 +17620,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_M4_exists="yes"
+-echo "$as_me:17596: found $ac_dir/$ac_word" >&5
++echo "$as_me:17623: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -17602,20 +17629,20 @@
+ fi
+ M4_exists=$ac_cv_prog_M4_exists
+ if test -n "$M4_exists"; then
+-  echo "$as_me:17605: result: $M4_exists" >&5
++  echo "$as_me:17632: result: $M4_exists" >&5
+ echo "${ECHO_T}$M4_exists" >&6
+ else
+-  echo "$as_me:17608: result: no" >&5
++  echo "$as_me:17635: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ 		if test "$ac_cv_prog_M4_exists" = no; then
+ 			cf_cv_prog_gnat_correct=no
+-			{ echo "$as_me:17614: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
++			{ echo "$as_me:17641: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+ echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
+ 		fi
+ 		if test "$cf_cv_prog_gnat_correct" = yes; then
+-			echo "$as_me:17618: checking if GNAT works" >&5
++			echo "$as_me:17645: checking if GNAT works" >&5
+ echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
+ 
+ rm -rf ./conftest* ./*~conftest*
+@@ -17643,7 +17670,7 @@
+ fi
+ rm -rf ./conftest* ./*~conftest*
+ 
+-			echo "$as_me:17646: result: $cf_cv_prog_gnat_correct" >&5
++			echo "$as_me:17673: result: $cf_cv_prog_gnat_correct" >&5
+ echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
+ 		fi
+ 	else
+@@ -17653,7 +17680,7 @@
+ 
+ 	if test	"$cf_cv_prog_gnat_correct" = yes; then
+ 
+-	echo "$as_me:17656: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:17683: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -17670,10 +17697,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:17673: result: $ADAFLAGS" >&5
++	echo "$as_me:17700: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:17676: checking if GNATPREP supports -T option" >&5
++echo "$as_me:17703: checking if GNATPREP supports -T option" >&5
+ echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6
+ if test "${cf_cv_gnatprep_opt_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17683,11 +17710,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:17686: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:17713: result: $cf_cv_gnatprep_opt_t" >&5
+ echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
+ test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
+ 
+-echo "$as_me:17690: checking if GNAT supports generics" >&5
++echo "$as_me:17717: checking if GNAT supports generics" >&5
+ echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
+ case "$cf_cv_gnat_version" in
+ (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
+@@ -17697,7 +17724,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:17700: result: $cf_gnat_generics" >&5
++echo "$as_me:17727: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -17709,7 +17736,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:17712: checking if GNAT supports SIGINT" >&5
++echo "$as_me:17739: checking if GNAT supports SIGINT" >&5
+ echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
+ if test "${cf_cv_gnat_sigint+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17757,7 +17784,7 @@
+ rm -rf ./conftest* ./*~conftest*
+ 
+ fi
+-echo "$as_me:17760: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:17787: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -17770,7 +17797,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:17773: checking if GNAT supports project files" >&5
++echo "$as_me:17800: checking if GNAT supports project files" >&5
+ echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
+ case "$cf_cv_gnat_version" in
+ (3.[0-9]*)
+@@ -17833,15 +17860,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:17836: result: $cf_gnat_projects" >&5
++echo "$as_me:17863: result: $cf_gnat_projects" >&5
+ echo "${ECHO_T}$cf_gnat_projects" >&6
+ fi # enable_gnat_projects
+ 
+ if test "$cf_gnat_projects" = yes
+ then
+-	echo "$as_me:17842: checking if GNAT supports libraries" >&5
++	echo "$as_me:17869: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:17844: result: $cf_gnat_libraries" >&5
++	echo "$as_me:17871: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -17861,7 +17888,7 @@
+ 	then
+ 		USE_GNAT_MAKE_GPR=""
+ 	else
+-		{ echo "$as_me:17864: WARNING: use old makefile rules since tools are missing" >&5
++		{ echo "$as_me:17891: WARNING: use old makefile rules since tools are missing" >&5
+ echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
+ 	fi
+ fi
+@@ -17873,7 +17900,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:17876: checking for ada-compiler" >&5
++echo "$as_me:17903: checking for ada-compiler" >&5
+ echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -17884,12 +17911,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:17887: result: $cf_ada_compiler" >&5
++echo "$as_me:17914: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 		cf_ada_package=terminal_interface
+ 
+-echo "$as_me:17892: checking for ada-include" >&5
++echo "$as_me:17919: checking for ada-include" >&5
+ echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -17925,7 +17952,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:17928: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:17955: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -17934,10 +17961,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:17937: result: $ADA_INCLUDE" >&5
++echo "$as_me:17964: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:17940: checking for ada-objects" >&5
++echo "$as_me:17967: checking for ada-objects" >&5
+ echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -17973,7 +18000,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:17976: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:18003: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -17982,10 +18009,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:17985: result: $ADA_OBJECTS" >&5
++echo "$as_me:18012: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:17988: checking if an Ada95 shared-library should be built" >&5
++echo "$as_me:18015: checking if an Ada95 shared-library should be built" >&5
+ echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -17995,14 +18022,14 @@
+ else
+   with_ada_sharedlib=no
+ fi;
+-echo "$as_me:17998: result: $with_ada_sharedlib" >&5
++echo "$as_me:18025: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ 
+ if test "x$with_ada_sharedlib" != xno
+ then
+ 	if test "x$cf_gnat_projects" != xyes
+ 	then
+-		{ echo "$as_me:18005: WARNING: disabling shared-library since GNAT projects are not supported" >&5
++		{ echo "$as_me:18032: WARNING: disabling shared-library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;}
+ 		with_ada_sharedlib=no
+ 	fi
+@@ -18022,7 +18049,7 @@
+ 
+ 		# allow the Ada binding to be renamed
+ 
+-echo "$as_me:18025: checking for ada-libname" >&5
++echo "$as_me:18052: checking for ada-libname" >&5
+ echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-libname or --without-ada-libname was given.
+@@ -18038,16 +18065,16 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:18041: result: $ADA_LIBNAME" >&5
++echo "$as_me:18068: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 	else
+-		{ { echo "$as_me:18045: error: No usable Ada compiler found" >&5
++		{ { echo "$as_me:18072: error: No usable Ada compiler found" >&5
+ echo "$as_me: error: No usable Ada compiler found" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+ else
+-	{ { echo "$as_me:18050: error: The Ada compiler is needed for this package" >&5
++	{ { echo "$as_me:18077: error: The Ada compiler is needed for this package" >&5
+ echo "$as_me: error: The Ada compiler is needed for this package" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -18087,7 +18114,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:18090: checking default library suffix" >&5
++echo "$as_me:18117: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -18098,10 +18125,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:18101: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:18128: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:18104: checking default library-dependency suffix" >&5
++echo "$as_me:18131: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -18184,10 +18211,10 @@
+ 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
+ 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
+ 	fi
+-echo "$as_me:18187: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:18214: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:18190: checking default object directory" >&5
++echo "$as_me:18217: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -18203,7 +18230,7 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:18206: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:18233: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ ### Set up low-level terminfo dependencies for makefiles.
+@@ -18345,7 +18372,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:18348: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:18375: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -18524,7 +18551,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:18527: error: ambiguous option: $1
++    { { echo "$as_me:18554: error: ambiguous option: $1
+ Try \`$0 --help' for more information." >&5
+ echo "$as_me: error: ambiguous option: $1
+ Try \`$0 --help' for more information." >&2;}
+@@ -18543,7 +18570,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:18546: error: unrecognized option: $1
++  -*) { { echo "$as_me:18573: error: unrecognized option: $1
+ Try \`$0 --help' for more information." >&5
+ echo "$as_me: error: unrecognized option: $1
+ Try \`$0 --help' for more information." >&2;}
+@@ -18617,7 +18644,7 @@
+   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
+   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
+-  *) { { echo "$as_me:18620: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:18647: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -18977,7 +19004,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:18980: creating $ac_file" >&5
++    { echo "$as_me:19007: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -18995,7 +19022,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:18998: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:19025: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -19008,7 +19035,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:19011: error: cannot find input file: $f" >&5
++           { { echo "$as_me:19038: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -19024,7 +19051,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:19027: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:19054: WARNING: datarootdir was used implicitly but not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: datarootdir was used implicitly but not set:
+ $ac_seen" >&2;}
+@@ -19033,7 +19060,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:19036: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:19063: WARNING: datarootdir was used explicitly but not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: datarootdir was used explicitly but not set:
+ $ac_seen" >&2;}
+@@ -19070,7 +19097,7 @@
+             ac_init=`${EGREP-egrep} '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
+-              { echo "$as_me:19073: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:19100: WARNING: Variable $ac_name is used but was not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Variable $ac_name is used but was not set:
+ $ac_seen" >&2;}
+@@ -19081,7 +19108,7 @@
+     ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out
+     if test -s $tmp/out; then
+       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
+-      { echo "$as_me:19084: WARNING: Some variables may not be substituted:
++      { echo "$as_me:19111: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -19130,7 +19157,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:19133: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:19160: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -19141,7 +19168,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:19144: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:19171: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -19154,7 +19181,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:19157: error: cannot find input file: $f" >&5
++           { { echo "$as_me:19184: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -19212,7 +19239,7 @@
+   rm -f $tmp/in
+   if test x"$ac_file" != x-; then
+     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
+-      { echo "$as_me:19215: $ac_file is unchanged" >&5
++      { echo "$as_me:19242: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+Index: NEWS
+Prereq:  1.3768 
+--- ncurses-6.3-20220115+/NEWS	2022-01-16 01:26:12.000000000 +0000
++++ ncurses-6.3-20220122/NEWS	2022-01-23 00:20:39.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.3768 2022/01/16 01:26:12 tom Exp $
++-- $Id: NEWS,v 1.3771 2022/01/23 00:20:39 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -46,6 +46,15 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20220122
++	+ add ABI 7 defaults to configure script.
++	+ add warning in configure script if file specified for "--with-caps"
++	  does not exist.
++	+ use fix for CF_FIX_WARNINGS from cdk-perl, ignoring error-exit on
++	  format-warnings.
++	+ improve readability of long parameterized expressions with the
++	  infocmp "-f" option by allowing split before a "%p" marker.
++
+ 20220115
+ 	+ improve checks for valid mouse events when an intermediate mouse
+ 	  state is not part of the mousemask specified by the caller (report by
+Index: VERSION
+--- ncurses-6.3-20220115+/VERSION	2022-01-15 14:00:23.000000000 +0000
++++ ncurses-6.3-20220122/VERSION	2022-01-22 15:48:54.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.3	20220115
++5:0:10	6.3	20220122
+Index: aclocal.m4
+Prereq:  1.999 
+--- ncurses-6.3-20220115+/aclocal.m4	2021-12-04 23:30:56.000000000 +0000
++++ ncurses-6.3-20220122/aclocal.m4	2022-01-23 00:15:35.000000000 +0000
+@@ -1,5 +1,5 @@
+ dnl***************************************************************************
+-dnl Copyright 2018-2020,2021 Thomas E. Dickey                                *
++dnl Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ dnl Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
+ dnl                                                                          *
+ dnl Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: aclocal.m4,v 1.999 2021/12/04 23:30:56 tom Exp $
++dnl $Id: aclocal.m4,v 1.1001 2022/01/23 00:15:35 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -65,37 +65,55 @@
+ 	fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_ABI_DEFAULTS version: 2 updated: 2015/06/06 13:49:58
++dnl CF_ABI_DEFAULTS version: 3 updated: 2022/01/22 19:13:38
+ dnl ---------------
+ dnl Provide configure-script defaults for different ncurses ABIs.
+ AC_DEFUN([CF_ABI_DEFAULTS],[
+ AC_REQUIRE([CF_NCURSES_WITH_ABI_VERSION])
++
++# ABI 5 defaults:
++cf_dft_ccharw_max=5
++cf_dft_chtype=auto
++cf_dft_ext_colors=no
++cf_dft_ext_const=no
++cf_dft_ext_mouse=no
++cf_dft_ext_putwin=no
++cf_dft_ext_spfuncs=no
++cf_dft_filter_syms=no
++cf_dft_interop=no
++cf_dft_mmask_t=auto
++cf_dft_opaque_curses=no
++cf_dft_ordinate_type=short
++cf_dft_signed_char=no
++cf_dft_tparm_arg=long
++cf_dft_with_lp64=no
++
++# ABI 6 defaults:
+ case x$cf_cv_abi_version in
+ (x[[6789]])
++	cf_dft_chtype=uint32_t
+ 	cf_dft_ext_colors=yes
+ 	cf_dft_ext_const=yes
+ 	cf_dft_ext_mouse=yes
+ 	cf_dft_ext_putwin=yes
+ 	cf_dft_ext_spfuncs=yes
+ 	cf_dft_filter_syms=yes
+-	cf_dft_chtype=uint32_t
+-	cf_dft_mmask_t=uint32_t
+ 	cf_dft_interop=yes
++	cf_dft_mmask_t=uint32_t
+ 	cf_dft_tparm_arg=intptr_t
+ 	cf_dft_with_lp64=yes
+ 	;;
+-(*)
+-	cf_dft_ext_colors=no
+-	cf_dft_ext_const=no
+-	cf_dft_ext_mouse=no
+-	cf_dft_ext_putwin=no
+-	cf_dft_ext_spfuncs=no
+-	cf_dft_filter_syms=no
+-	cf_dft_chtype=auto
+-	cf_dft_mmask_t=auto
+-	cf_dft_interop=no
+-	cf_dft_tparm_arg=long
+-	cf_dft_with_lp64=no
++esac
++
++# ABI 7 defaults:
++case x$cf_cv_abi_version in
++(x[[789]])
++	cf_dft_ccharw_max=6
++	cf_dft_mmask_t=uint64_t
++	cf_dft_opaque_curses=yes
++	cf_dft_ordinate_type=int
++	cf_dft_signed_char=yes
++	# also: remove the wgetch-events feature in ABI 7
+ 	;;
+ esac
+ ])dnl
+@@ -2423,7 +2441,7 @@
+ 	AC_MSG_RESULT($ADAFLAGS)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_FIX_WARNINGS version: 3 updated: 2020/12/31 18:40:20
++dnl CF_FIX_WARNINGS version: 4 updated: 2021/12/16 18:22:31
+ dnl ---------------
+ dnl Warning flags do not belong in CFLAGS, CPPFLAGS, etc.  Any of gcc's
+ dnl "-Werror" flags can interfere with configure-checks.  Those go into
+@@ -2435,11 +2453,13 @@
+ then
+ 	case [$]$1 in
+ 	(*-Werror=*)
+-		CF_VERBOSE(repairing $1: [$]$1)
+ 		cf_temp_flags=
+ 		for cf_temp_scan in [$]$1
+ 		do
+ 			case "x$cf_temp_scan" in
++			(x-Werror=format*)
++				CF_APPEND_TEXT(cf_temp_flags,$cf_temp_scan)
++				;;
+ 			(x-Werror=*)
+ 				CF_APPEND_TEXT(EXTRA_CFLAGS,$cf_temp_scan)
+ 				;;
+@@ -2448,9 +2468,13 @@
+ 				;;
+ 			esac
+ 		done
+-		$1="$cf_temp_flags"
+-		CF_VERBOSE(... fixed [$]$1)
+-		CF_VERBOSE(... extra $EXTRA_CFLAGS)
++		if test "x[$]$1" != "x$cf_temp_flags"
++		then
++			CF_VERBOSE(repairing $1: [$]$1)
++			$1="$cf_temp_flags"
++			CF_VERBOSE(... fixed [$]$1)
++			CF_VERBOSE(... extra $EXTRA_CFLAGS)
++		fi
+ 		;;
+ 	esac
+ fi
+Index: configure
+--- ncurses-6.3-20220115+/configure	2021-12-04 23:19:34.000000000 +0000
++++ ncurses-6.3-20220122/configure	2022-01-23 00:15:55.000000000 +0000
+@@ -1,5 +1,5 @@
+ #! /bin/sh
+-# From configure.in Revision: 1.737 .
++# From configure.in Revision: 1.741 .
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by Autoconf 2.52.20210509.
+ #
+@@ -1720,32 +1720,49 @@
+ 
+ ### Defaults for ncurses ABI
+ 
++# ABI 5 defaults:
++cf_dft_ccharw_max=5
++cf_dft_chtype=auto
++cf_dft_ext_colors=no
++cf_dft_ext_const=no
++cf_dft_ext_mouse=no
++cf_dft_ext_putwin=no
++cf_dft_ext_spfuncs=no
++cf_dft_filter_syms=no
++cf_dft_interop=no
++cf_dft_mmask_t=auto
++cf_dft_opaque_curses=no
++cf_dft_ordinate_type=short
++cf_dft_signed_char=no
++cf_dft_tparm_arg=long
++cf_dft_with_lp64=no
++
++# ABI 6 defaults:
+ case x$cf_cv_abi_version in
+ (x[6789])
++	cf_dft_chtype=uint32_t
+ 	cf_dft_ext_colors=yes
+ 	cf_dft_ext_const=yes
+ 	cf_dft_ext_mouse=yes
+ 	cf_dft_ext_putwin=yes
+ 	cf_dft_ext_spfuncs=yes
+ 	cf_dft_filter_syms=yes
+-	cf_dft_chtype=uint32_t
+-	cf_dft_mmask_t=uint32_t
+ 	cf_dft_interop=yes
++	cf_dft_mmask_t=uint32_t
+ 	cf_dft_tparm_arg=intptr_t
+ 	cf_dft_with_lp64=yes
+ 	;;
+-(*)
+-	cf_dft_ext_colors=no
+-	cf_dft_ext_const=no
+-	cf_dft_ext_mouse=no
+-	cf_dft_ext_putwin=no
+-	cf_dft_ext_spfuncs=no
+-	cf_dft_filter_syms=no
+-	cf_dft_chtype=auto
+-	cf_dft_mmask_t=auto
+-	cf_dft_interop=no
+-	cf_dft_tparm_arg=long
+-	cf_dft_with_lp64=no
++esac
++
++# ABI 7 defaults:
++case x$cf_cv_abi_version in
++(x[789])
++	cf_dft_ccharw_max=6
++	cf_dft_mmask_t=uint64_t
++	cf_dft_opaque_curses=yes
++	cf_dft_ordinate_type=int
++	cf_dft_signed_char=yes
++	# also: remove the wgetch-events feature in ABI 7
+ 	;;
+ esac
+ 
+@@ -1777,7 +1794,7 @@
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:1780: checking for $ac_word" >&5
++echo "$as_me:1797: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1792,7 +1809,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+-echo "$as_me:1795: found $ac_dir/$ac_word" >&5
++echo "$as_me:1812: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1800,10 +1817,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1803: result: $CC" >&5
++  echo "$as_me:1820: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1806: result: no" >&5
++  echo "$as_me:1823: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1816,7 +1833,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:1819: checking for $ac_word" >&5
++echo "$as_me:1836: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1831,7 +1848,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_CC="$ac_prog"
+-echo "$as_me:1834: found $ac_dir/$ac_word" >&5
++echo "$as_me:1851: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1839,10 +1856,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:1842: result: $ac_ct_CC" >&5
++  echo "$as_me:1859: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:1845: result: no" >&5
++  echo "$as_me:1862: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1852,32 +1869,32 @@
+   CC=$ac_ct_CC
+ fi
+ 
+-test -z "$CC" && { { echo "$as_me:1855: error: no acceptable cc found in \$PATH" >&5
++test -z "$CC" && { { echo "$as_me:1872: error: no acceptable cc found in \$PATH" >&5
+ echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ # Provide some information about the compiler.
+-echo "$as_me:1860:" \
++echo "$as_me:1877:" \
+      "checking for C compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo "$2"`
+-{ (eval echo "$as_me:1863: \"$ac_compiler --version &5\"") >&5
++{ (eval echo "$as_me:1880: \"$ac_compiler --version &5\"") >&5
+   (eval $ac_compiler --version &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1866: \$? = $ac_status" >&5
++  echo "$as_me:1883: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+-{ (eval echo "$as_me:1868: \"$ac_compiler -v &5\"") >&5
++{ (eval echo "$as_me:1885: \"$ac_compiler -v &5\"") >&5
+   (eval $ac_compiler -v &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1871: \$? = $ac_status" >&5
++  echo "$as_me:1888: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+-{ (eval echo "$as_me:1873: \"$ac_compiler -V &5\"") >&5
++{ (eval echo "$as_me:1890: \"$ac_compiler -V &5\"") >&5
+   (eval $ac_compiler -V &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1876: \$? = $ac_status" >&5
++  echo "$as_me:1893: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 1880 "configure"
++#line 1897 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1893,13 +1910,13 @@
+ # Try to create an executable without -o first, disregard a.out.
+ # It will help us diagnose broken compilers, and finding out an intuition
+ # of exeext.
+-echo "$as_me:1896: checking for C compiler default output" >&5
++echo "$as_me:1913: checking for C compiler default output" >&5
+ echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
+ ac_link_default=`echo "$ac_link" | sed 's/ -o *"conftest[^"]*"//'`
+-if { (eval echo "$as_me:1899: \"$ac_link_default\"") >&5
++if { (eval echo "$as_me:1916: \"$ac_link_default\"") >&5
+   (eval $ac_link_default) 2>&5
+   ac_status=$?
+-  echo "$as_me:1902: \$? = $ac_status" >&5
++  echo "$as_me:1919: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+   # Find the output, starting from the most likely.  This scheme is
+ # not robust to junk in `.', hence go to wildcards (a.*) only as a last
+@@ -1922,34 +1939,34 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-{ { echo "$as_me:1925: error: C compiler cannot create executables" >&5
++{ { echo "$as_me:1942: error: C compiler cannot create executables" >&5
+ echo "$as_me: error: C compiler cannot create executables" >&2;}
+    { (exit 77); exit 77; }; }
+ fi
+ 
+ ac_exeext=$ac_cv_exeext
+-echo "$as_me:1931: result: $ac_file" >&5
++echo "$as_me:1948: result: $ac_file" >&5
+ echo "${ECHO_T}$ac_file" >&6
+ 
+ # Check the compiler produces executables we can run.  If not, either
+ # the compiler is broken, or we cross compile.
+-echo "$as_me:1936: checking whether the C compiler works" >&5
++echo "$as_me:1953: checking whether the C compiler works" >&5
+ echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+ # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+ # If not cross compiling, check that we can run a simple program.
+ if test "$cross_compiling" != yes; then
+   if { ac_try='./$ac_file'
+-  { (eval echo "$as_me:1942: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1959: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1945: \$? = $ac_status" >&5
++  echo "$as_me:1962: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+     cross_compiling=no
+   else
+     if test "$cross_compiling" = maybe; then
+ 	cross_compiling=yes
+     else
+-	{ { echo "$as_me:1952: error: cannot run C compiled programs.
++	{ { echo "$as_me:1969: error: cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'." >&5
+ echo "$as_me: error: cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'." >&2;}
+@@ -1957,24 +1974,24 @@
+     fi
+   fi
+ fi
+-echo "$as_me:1960: result: yes" >&5
++echo "$as_me:1977: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+ rm -f a.out a.exe "conftest$ac_cv_exeext"
+ ac_clean_files=$ac_clean_files_save
+ # Check the compiler produces executables we can run.  If not, either
+ # the compiler is broken, or we cross compile.
+-echo "$as_me:1967: checking whether we are cross compiling" >&5
++echo "$as_me:1984: checking whether we are cross compiling" >&5
+ echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "$as_me:1969: result: $cross_compiling" >&5
++echo "$as_me:1986: result: $cross_compiling" >&5
+ echo "${ECHO_T}$cross_compiling" >&6
+ 
+-echo "$as_me:1972: checking for executable suffix" >&5
++echo "$as_me:1989: checking for executable suffix" >&5
+ echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+-if { (eval echo "$as_me:1974: \"$ac_link\"") >&5
++if { (eval echo "$as_me:1991: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:1977: \$? = $ac_status" >&5
++  echo "$as_me:1994: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+   # If both `conftest.exe' and `conftest' are `present' (well, observable)
+ # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+@@ -1990,25 +2007,25 @@
+   esac
+ done
+ else
+-  { { echo "$as_me:1993: error: cannot compute EXEEXT: cannot compile and link" >&5
++  { { echo "$as_me:2010: error: cannot compute EXEEXT: cannot compile and link" >&5
+ echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ rm -f "conftest$ac_cv_exeext"
+-echo "$as_me:1999: result: $ac_cv_exeext" >&5
++echo "$as_me:2016: result: $ac_cv_exeext" >&5
+ echo "${ECHO_T}$ac_cv_exeext" >&6
+ 
+ rm -f "conftest.$ac_ext"
+ EXEEXT=$ac_cv_exeext
+ ac_exeext=$EXEEXT
+-echo "$as_me:2005: checking for object suffix" >&5
++echo "$as_me:2022: checking for object suffix" >&5
+ echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
+ if test "${ac_cv_objext+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2011 "configure"
++#line 2028 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2020,10 +2037,10 @@
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+-if { (eval echo "$as_me:2023: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2040: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2026: \$? = $ac_status" >&5
++  echo "$as_me:2043: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+   case $ac_file in
+@@ -2035,24 +2052,24 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-{ { echo "$as_me:2038: error: cannot compute OBJEXT: cannot compile" >&5
++{ { echo "$as_me:2055: error: cannot compute OBJEXT: cannot compile" >&5
+ echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ rm -f "conftest.$ac_cv_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:2045: result: $ac_cv_objext" >&5
++echo "$as_me:2062: result: $ac_cv_objext" >&5
+ echo "${ECHO_T}$ac_cv_objext" >&6
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-echo "$as_me:2049: checking whether we are using the GNU C compiler" >&5
++echo "$as_me:2066: checking whether we are using the GNU C compiler" >&5
+ echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+ if test "${ac_cv_c_compiler_gnu+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2055 "configure"
++#line 2072 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2067,16 +2084,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2070: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2087: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2073: \$? = $ac_status" >&5
++  echo "$as_me:2090: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2076: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2093: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2079: \$? = $ac_status" >&5
++  echo "$as_me:2096: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_compiler_gnu=yes
+ else
+@@ -2088,19 +2105,19 @@
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:2091: result: $ac_cv_c_compiler_gnu" >&5
++echo "$as_me:2108: result: $ac_cv_c_compiler_gnu" >&5
+ echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+ GCC=`test $ac_compiler_gnu = yes && echo yes`
+ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+ CFLAGS="-g"
+-echo "$as_me:2097: checking whether $CC accepts -g" >&5
++echo "$as_me:2114: checking whether $CC accepts -g" >&5
+ echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+ if test "${ac_cv_prog_cc_g+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2103 "configure"
++#line 2120 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2112,16 +2129,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2115: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2132: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2118: \$? = $ac_status" >&5
++  echo "$as_me:2135: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2121: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2138: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2124: \$? = $ac_status" >&5
++  echo "$as_me:2141: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_prog_cc_g=yes
+ else
+@@ -2131,7 +2148,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:2134: result: $ac_cv_prog_cc_g" >&5
++echo "$as_me:2151: result: $ac_cv_prog_cc_g" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+ if test "$ac_test_CFLAGS" = set; then
+   CFLAGS=$ac_save_CFLAGS
+@@ -2158,16 +2175,16 @@
+ #endif
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2161: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2178: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2164: \$? = $ac_status" >&5
++  echo "$as_me:2181: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2167: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2184: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2170: \$? = $ac_status" >&5
++  echo "$as_me:2187: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   for ac_declaration in \
+    ''\
+@@ -2179,7 +2196,7 @@
+    'void exit (int);'
+ do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2182 "configure"
++#line 2199 "configure"
+ #include "confdefs.h"
+ #include 
+ $ac_declaration
+@@ -2192,16 +2209,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2195: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2212: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2198: \$? = $ac_status" >&5
++  echo "$as_me:2215: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2201: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2218: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2204: \$? = $ac_status" >&5
++  echo "$as_me:2221: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -2211,7 +2228,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2214 "configure"
++#line 2231 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -2223,16 +2240,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2226: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2243: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2229: \$? = $ac_status" >&5
++  echo "$as_me:2246: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2232: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2249: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2235: \$? = $ac_status" >&5
++  echo "$as_me:2252: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -2262,11 +2279,11 @@
+ 
+ GCC_VERSION=none
+ if test "$GCC" = yes ; then
+-	echo "$as_me:2265: checking version of $CC" >&5
++	echo "$as_me:2282: checking version of $CC" >&5
+ echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
+ 	GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+ 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
+-	echo "$as_me:2269: result: $GCC_VERSION" >&5
++	echo "$as_me:2286: result: $GCC_VERSION" >&5
+ echo "${ECHO_T}$GCC_VERSION" >&6
+ fi
+ 
+@@ -2275,12 +2292,12 @@
+ if test "$GCC" = yes ; then
+ 	case "$host_os" in
+ 	(linux*|gnu*)
+-		echo "$as_me:2278: checking if this is really Intel C compiler" >&5
++		echo "$as_me:2295: checking if this is really Intel C compiler" >&5
+ echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
+ 		cf_save_CFLAGS="$CFLAGS"
+ 		CFLAGS="$CFLAGS -no-gcc"
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2283 "configure"
++#line 2300 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2297,16 +2314,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2300: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2317: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2303: \$? = $ac_status" >&5
++  echo "$as_me:2320: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2306: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2323: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2309: \$? = $ac_status" >&5
++  echo "$as_me:2326: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   INTEL_COMPILER=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -2317,7 +2334,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		CFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:2320: result: $INTEL_COMPILER" >&5
++		echo "$as_me:2337: result: $INTEL_COMPILER" >&5
+ echo "${ECHO_T}$INTEL_COMPILER" >&6
+ 		;;
+ 	esac
+@@ -2326,11 +2343,11 @@
+ CLANG_COMPILER=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:2329: checking if this is really Clang C compiler" >&5
++	echo "$as_me:2346: checking if this is really Clang C compiler" >&5
+ echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2333 "configure"
++#line 2350 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2347,16 +2364,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2350: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2367: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2353: \$? = $ac_status" >&5
++  echo "$as_me:2370: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2356: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2373: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2359: \$? = $ac_status" >&5
++  echo "$as_me:2376: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   CLANG_COMPILER=yes
+ 
+@@ -2366,7 +2383,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	CFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:2369: result: $CLANG_COMPILER" >&5
++	echo "$as_me:2386: result: $CLANG_COMPILER" >&5
+ echo "${ECHO_T}$CLANG_COMPILER" >&6
+ fi
+ 
+@@ -2375,30 +2392,30 @@
+ if test "x$CLANG_COMPILER" = "xyes" ; then
+ 	case "$CC" in
+ 	(c[1-9][0-9]|*/c[1-9][0-9])
+-		{ echo "$as_me:2378: WARNING: replacing broken compiler alias $CC" >&5
++		{ echo "$as_me:2395: WARNING: replacing broken compiler alias $CC" >&5
+ echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
+ 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
+ 		CC=clang
+ 		;;
+ 	esac
+ 
+-	echo "$as_me:2385: checking version of $CC" >&5
++	echo "$as_me:2402: checking version of $CC" >&5
+ echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
+ 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+ 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
+-	echo "$as_me:2389: result: $CLANG_VERSION" >&5
++	echo "$as_me:2406: result: $CLANG_VERSION" >&5
+ echo "${ECHO_T}$CLANG_VERSION" >&6
+ 
+ 	for cf_clang_opt in \
+ 		-Qunused-arguments \
+ 		-Wno-error=implicit-function-declaration
+ 	do
+-		echo "$as_me:2396: checking if option $cf_clang_opt works" >&5
++		echo "$as_me:2413: checking if option $cf_clang_opt works" >&5
+ echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
+ 		cf_save_CFLAGS="$CFLAGS"
+ 		CFLAGS="$CFLAGS $cf_clang_opt"
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2401 "configure"
++#line 2418 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -2412,16 +2429,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:2415: \"$ac_link\"") >&5
++if { (eval echo "$as_me:2432: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:2418: \$? = $ac_status" >&5
++  echo "$as_me:2435: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:2421: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2438: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2424: \$? = $ac_status" >&5
++  echo "$as_me:2441: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_clang_optok=yes
+@@ -2432,13 +2449,13 @@
+ 			cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:2435: result: $cf_clang_optok" >&5
++		echo "$as_me:2452: result: $cf_clang_optok" >&5
+ echo "${ECHO_T}$cf_clang_optok" >&6
+ 		CFLAGS="$cf_save_CFLAGS"
+ 		if test "$cf_clang_optok" = yes; then
+ 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
+ 
+-echo "${as_me:-configure}:2441: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:2458: testing adding option $cf_clang_opt ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -2447,7 +2464,7 @@
+ 	done
+ fi
+ 
+-echo "$as_me:2450: checking for $CC option to accept ANSI C" >&5
++echo "$as_me:2467: checking for $CC option to accept ANSI C" >&5
+ echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+ if test "${ac_cv_prog_cc_stdc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2455,7 +2472,7 @@
+   ac_cv_prog_cc_stdc=no
+ ac_save_CC=$CC
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2458 "configure"
++#line 2475 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -2504,16 +2521,16 @@
+ do
+   CC="$ac_save_CC $ac_arg"
+   rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:2507: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2524: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2510: \$? = $ac_status" >&5
++  echo "$as_me:2527: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:2513: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2530: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2516: \$? = $ac_status" >&5
++  echo "$as_me:2533: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_prog_cc_stdc=$ac_arg
+ break
+@@ -2530,10 +2547,10 @@
+ 
+ case "x$ac_cv_prog_cc_stdc" in
+   x|xno)
+-    echo "$as_me:2533: result: none needed" >&5
++    echo "$as_me:2550: result: none needed" >&5
+ echo "${ECHO_T}none needed" >&6 ;;
+   *)
+-    echo "$as_me:2536: result: $ac_cv_prog_cc_stdc" >&5
++    echo "$as_me:2553: result: $ac_cv_prog_cc_stdc" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+     CC="$CC $ac_cv_prog_cc_stdc" ;;
+ esac
+@@ -2541,13 +2558,13 @@
+ # This should have been defined by AC_PROG_CC
+ : "${CC:=cc}"
+ 
+-echo "$as_me:2544: checking \$CFLAGS variable" >&5
++echo "$as_me:2561: checking \$CFLAGS variable" >&5
+ echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
+ case "x$CFLAGS" in
+ (*-[IUD]*)
+-	echo "$as_me:2548: result: broken" >&5
++	echo "$as_me:2565: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+-	{ echo "$as_me:2550: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
++	{ echo "$as_me:2567: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
+ echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;}
+ 	cf_flags="$CFLAGS"
+ 	CFLAGS=
+@@ -2655,18 +2672,18 @@
+ 	done
+ 	;;
+ (*)
+-	echo "$as_me:2658: result: ok" >&5
++	echo "$as_me:2675: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ 	;;
+ esac
+ 
+-echo "$as_me:2663: checking \$CC variable" >&5
++echo "$as_me:2680: checking \$CC variable" >&5
+ echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
+ case "$CC" in
+ (*[\ \	]-*)
+-	echo "$as_me:2667: result: broken" >&5
++	echo "$as_me:2684: result: broken" >&5
+ echo "${ECHO_T}broken" >&6
+-	{ echo "$as_me:2669: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
++	{ echo "$as_me:2686: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+ echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
+ 	# humor him...
+ 	cf_prog=`echo "$CC" | sed -e 's/	/ /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'`
+@@ -2783,19 +2800,19 @@
+ 	done
+ 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
+ 
+-echo "${as_me:-configure}:2786: testing resulting CC: '$CC' ..." 1>&5
++echo "${as_me:-configure}:2803: testing resulting CC: '$CC' ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
+ 
+-echo "${as_me:-configure}:2790: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
++echo "${as_me:-configure}:2807: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
+ 
+-echo "${as_me:-configure}:2794: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
++echo "${as_me:-configure}:2811: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+ 
+ 	;;
+ (*)
+-	echo "$as_me:2798: result: ok" >&5
++	echo "$as_me:2815: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ 	;;
+ esac
+@@ -2806,7 +2823,7 @@
+ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+-echo "$as_me:2809: checking how to run the C preprocessor" >&5
++echo "$as_me:2826: checking how to run the C preprocessor" >&5
+ echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+@@ -2827,18 +2844,18 @@
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp. "Syntax error" is here to catch this case.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2830 "configure"
++#line 2847 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:2835: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2852: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:2841: \$? = $ac_status" >&5
++  echo "$as_me:2858: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2861,17 +2878,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2864 "configure"
++#line 2881 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:2868: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2885: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:2874: \$? = $ac_status" >&5
++  echo "$as_me:2891: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2908,7 +2925,7 @@
+ else
+   ac_cv_prog_CPP=$CPP
+ fi
+-echo "$as_me:2911: result: $CPP" >&5
++echo "$as_me:2928: result: $CPP" >&5
+ echo "${ECHO_T}$CPP" >&6
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+@@ -2918,18 +2935,18 @@
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp. "Syntax error" is here to catch this case.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2921 "configure"
++#line 2938 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:2926: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2943: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:2932: \$? = $ac_status" >&5
++  echo "$as_me:2949: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2952,17 +2969,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 2955 "configure"
++#line 2972 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:2959: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:2976: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:2965: \$? = $ac_status" >&5
++  echo "$as_me:2982: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2990,7 +3007,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:2993: error: C preprocessor \"$CPP\" fails sanity check" >&5
++  { { echo "$as_me:3010: error: C preprocessor \"$CPP\" fails sanity check" >&5
+ echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -3003,14 +3020,14 @@
+ ac_main_return="return"
+ 
+ if test $ac_cv_c_compiler_gnu = yes; then
+-    echo "$as_me:3006: checking whether $CC needs -traditional" >&5
++    echo "$as_me:3023: checking whether $CC needs -traditional" >&5
+ echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
+ if test "${ac_cv_prog_gcc_traditional+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+     ac_pattern="Autoconf.*'x'"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3013 "configure"
++#line 3030 "configure"
+ #include "confdefs.h"
+ #include 
+ int Autoconf = TIOCGETP;
+@@ -3025,7 +3042,7 @@
+ 
+   if test $ac_cv_prog_gcc_traditional = no; then
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3028 "configure"
++#line 3045 "configure"
+ #include "confdefs.h"
+ #include 
+ int Autoconf = TCGETA;
+@@ -3038,14 +3055,14 @@
+ 
+   fi
+ fi
+-echo "$as_me:3041: result: $ac_cv_prog_gcc_traditional" >&5
++echo "$as_me:3058: result: $ac_cv_prog_gcc_traditional" >&5
+ echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
+   if test $ac_cv_prog_gcc_traditional = yes; then
+     CC="$CC -traditional"
+   fi
+ fi
+ 
+-echo "$as_me:3048: checking whether $CC understands -c and -o together" >&5
++echo "$as_me:3065: checking whether $CC understands -c and -o together" >&5
+ echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6
+ if test "${cf_cv_prog_CC_c_o+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3060,15 +3077,15 @@
+ # We do the test twice because some compilers refuse to overwrite an
+ # existing .o file with -o, though they will create one.
+ ac_try='$CC $CFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+-if { (eval echo "$as_me:3063: \"$ac_try\"") >&5
++if { (eval echo "$as_me:3080: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3066: \$? = $ac_status" >&5
++  echo "$as_me:3083: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:3068: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:3085: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3071: \$? = $ac_status" >&5
++  echo "$as_me:3088: \$? = $ac_status" >&5
+   (exit "$ac_status"); };
+ then
+   eval cf_cv_prog_CC_c_o=yes
+@@ -3079,10 +3096,10 @@
+ 
+ fi
+ if test "$cf_cv_prog_CC_c_o" = yes; then
+-  echo "$as_me:3082: result: yes" >&5
++  echo "$as_me:3099: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:3085: result: no" >&5
++  echo "$as_me:3102: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3096,7 +3113,7 @@
+ 	(*) LDPATH=$PATH:/sbin:/usr/sbin
+ 		# Extract the first word of "ldconfig", so it can be a program name with args.
+ set dummy ldconfig; ac_word=$2
+-echo "$as_me:3099: checking for $ac_word" >&5
++echo "$as_me:3116: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_LDCONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3113,7 +3130,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_LDCONFIG="$ac_dir/$ac_word"
+-   echo "$as_me:3116: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3133: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -3124,10 +3141,10 @@
+ LDCONFIG=$ac_cv_path_LDCONFIG
+ 
+ if test -n "$LDCONFIG"; then
+-  echo "$as_me:3127: result: $LDCONFIG" >&5
++  echo "$as_me:3144: result: $LDCONFIG" >&5
+ echo "${ECHO_T}$LDCONFIG" >&6
+ else
+-  echo "$as_me:3130: result: no" >&5
++  echo "$as_me:3147: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3135,7 +3152,7 @@
+ 	esac
+ fi
+ 
+-echo "$as_me:3138: checking if you want to ensure bool is consistent with C++" >&5
++echo "$as_me:3155: checking if you want to ensure bool is consistent with C++" >&5
+ echo $ECHO_N "checking if you want to ensure bool is consistent with C++... $ECHO_C" >&6
+ 
+ # Check whether --with-cxx or --without-cxx was given.
+@@ -3145,7 +3162,7 @@
+ else
+   cf_with_cxx=yes
+ fi;
+-echo "$as_me:3148: result: $cf_with_cxx" >&5
++echo "$as_me:3165: result: $cf_with_cxx" >&5
+ echo "${ECHO_T}$cf_with_cxx" >&6
+ if test "X$cf_with_cxx" = Xno ; then
+ 	CXX=""
+@@ -3163,7 +3180,7 @@
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:3166: checking for $ac_word" >&5
++echo "$as_me:3183: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CXX+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3178,7 +3195,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+-echo "$as_me:3181: found $ac_dir/$ac_word" >&5
++echo "$as_me:3198: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3186,10 +3203,10 @@
+ fi
+ CXX=$ac_cv_prog_CXX
+ if test -n "$CXX"; then
+-  echo "$as_me:3189: result: $CXX" >&5
++  echo "$as_me:3206: result: $CXX" >&5
+ echo "${ECHO_T}$CXX" >&6
+ else
+-  echo "$as_me:3192: result: no" >&5
++  echo "$as_me:3209: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3202,7 +3219,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:3205: checking for $ac_word" >&5
++echo "$as_me:3222: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3217,7 +3234,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_CXX="$ac_prog"
+-echo "$as_me:3220: found $ac_dir/$ac_word" >&5
++echo "$as_me:3237: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3225,10 +3242,10 @@
+ fi
+ ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+ if test -n "$ac_ct_CXX"; then
+-  echo "$as_me:3228: result: $ac_ct_CXX" >&5
++  echo "$as_me:3245: result: $ac_ct_CXX" >&5
+ echo "${ECHO_T}$ac_ct_CXX" >&6
+ else
+-  echo "$as_me:3231: result: no" >&5
++  echo "$as_me:3248: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3240,32 +3257,32 @@
+ fi
+ 
+ # Provide some information about the compiler.
+-echo "$as_me:3243:" \
++echo "$as_me:3260:" \
+      "checking for C++ compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:3246: \"$ac_compiler --version &5\"") >&5
++{ (eval echo "$as_me:3263: \"$ac_compiler --version &5\"") >&5
+   (eval $ac_compiler --version &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:3249: \$? = $ac_status" >&5
++  echo "$as_me:3266: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+-{ (eval echo "$as_me:3251: \"$ac_compiler -v &5\"") >&5
++{ (eval echo "$as_me:3268: \"$ac_compiler -v &5\"") >&5
+   (eval $ac_compiler -v &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:3254: \$? = $ac_status" >&5
++  echo "$as_me:3271: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+-{ (eval echo "$as_me:3256: \"$ac_compiler -V &5\"") >&5
++{ (eval echo "$as_me:3273: \"$ac_compiler -V &5\"") >&5
+   (eval $ac_compiler -V &5) 2>&5
+   ac_status=$?
+-  echo "$as_me:3259: \$? = $ac_status" >&5
++  echo "$as_me:3276: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 
+-echo "$as_me:3262: checking whether we are using the GNU C++ compiler" >&5
++echo "$as_me:3279: checking whether we are using the GNU C++ compiler" >&5
+ echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
+ if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3268 "configure"
++#line 3285 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -3280,16 +3297,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3283: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3300: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3286: \$? = $ac_status" >&5
++  echo "$as_me:3303: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:3289: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3306: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3292: \$? = $ac_status" >&5
++  echo "$as_me:3309: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_compiler_gnu=yes
+ else
+@@ -3301,19 +3318,19 @@
+ ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:3304: result: $ac_cv_cxx_compiler_gnu" >&5
++echo "$as_me:3321: result: $ac_cv_cxx_compiler_gnu" >&5
+ echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
+ GXX=`test $ac_compiler_gnu = yes && echo yes`
+ ac_test_CXXFLAGS=${CXXFLAGS+set}
+ ac_save_CXXFLAGS=$CXXFLAGS
+ CXXFLAGS="-g"
+-echo "$as_me:3310: checking whether $CXX accepts -g" >&5
++echo "$as_me:3327: checking whether $CXX accepts -g" >&5
+ echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
+ if test "${ac_cv_prog_cxx_g+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3316 "configure"
++#line 3333 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -3325,16 +3342,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3328: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3345: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3331: \$? = $ac_status" >&5
++  echo "$as_me:3348: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:3334: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3351: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3337: \$? = $ac_status" >&5
++  echo "$as_me:3354: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_prog_cxx_g=yes
+ else
+@@ -3344,7 +3361,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:3347: result: $ac_cv_prog_cxx_g" >&5
++echo "$as_me:3364: result: $ac_cv_prog_cxx_g" >&5
+ echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
+ if test "$ac_test_CXXFLAGS" = set; then
+   CXXFLAGS=$ac_save_CXXFLAGS
+@@ -3371,7 +3388,7 @@
+    'void exit (int);'
+ do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3374 "configure"
++#line 3391 "configure"
+ #include "confdefs.h"
+ #include 
+ $ac_declaration
+@@ -3384,16 +3401,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3387: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3404: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3390: \$? = $ac_status" >&5
++  echo "$as_me:3407: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:3393: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3410: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3396: \$? = $ac_status" >&5
++  echo "$as_me:3413: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -3403,7 +3420,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3406 "configure"
++#line 3423 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -3415,16 +3432,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3418: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3435: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3421: \$? = $ac_status" >&5
++  echo "$as_me:3438: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:3424: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3441: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3427: \$? = $ac_status" >&5
++  echo "$as_me:3444: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -3458,7 +3475,7 @@
+ 	then
+ 		# Several of the C++ configurations do not work, particularly when
+ 		# cross-compiling (20140913 -TD)
+-		echo "$as_me:3461: checking if $CXX works" >&5
++		echo "$as_me:3478: checking if $CXX works" >&5
+ echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
+ 
+ 		save_CPPFLAGS="$CPPFLAGS"
+@@ -3466,7 +3483,7 @@
+ 		CPPFLAGS="$CPPFLAGS -I${cf_includedir}"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 3469 "configure"
++#line 3486 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -3483,16 +3500,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:3486: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3503: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3489: \$? = $ac_status" >&5
++  echo "$as_me:3506: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:3492: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3509: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3495: \$? = $ac_status" >&5
++  echo "$as_me:3512: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_works=yes
+ else
+@@ -3503,11 +3520,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		CPPFLAGS="$save_CPPFLAGS"
+ 
+-		echo "$as_me:3506: result: $cf_cxx_works" >&5
++		echo "$as_me:3523: result: $cf_cxx_works" >&5
+ echo "${ECHO_T}$cf_cxx_works" >&6
+ 		if test "x$cf_cxx_works" = xno
+ 		then
+-			{ echo "$as_me:3510: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5
++			{ echo "$as_me:3527: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5
+ echo "$as_me: WARNING: Ignore $CXX, since it cannot compile hello-world." >&2;}
+ 			cf_with_cxx=no; CXX=""; GXX="";
+ 		fi
+@@ -3523,7 +3540,7 @@
+ 	if test "$CXX" = "g++" ; then
+ 		# Extract the first word of "g++", so it can be a program name with args.
+ set dummy g++; ac_word=$2
+-echo "$as_me:3526: checking for $ac_word" >&5
++echo "$as_me:3543: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_CXX+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3540,7 +3557,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_CXX="$ac_dir/$ac_word"
+-   echo "$as_me:3543: found $ac_dir/$ac_word" >&5
++   echo "$as_me:3560: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -3551,17 +3568,17 @@
+ CXX=$ac_cv_path_CXX
+ 
+ if test -n "$CXX"; then
+-  echo "$as_me:3554: result: $CXX" >&5
++  echo "$as_me:3571: result: $CXX" >&5
+ echo "${ECHO_T}$CXX" >&6
+ else
+-  echo "$as_me:3557: result: no" >&5
++  echo "$as_me:3574: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ 	fi
+ 	case "x$CXX" in
+ 	(x|xg++)
+-		{ echo "$as_me:3564: WARNING: You don't have any C++ compiler, too bad" >&5
++		{ echo "$as_me:3581: WARNING: You don't have any C++ compiler, too bad" >&5
+ echo "$as_me: WARNING: You don't have any C++ compiler, too bad" >&2;}
+ 		cf_with_cxx=no; CXX=""; GXX="";
+ 		;;
+@@ -3570,7 +3587,7 @@
+ 
+ GXX_VERSION=none
+ if test "$GXX" = yes; then
+-	echo "$as_me:3573: checking version of ${CXX:-g++}" >&5
++	echo "$as_me:3590: checking version of ${CXX:-g++}" >&5
+ echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6
+ 	GXX_VERSION="`${CXX:-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+ 	if test -z "$GXX_VERSION"
+@@ -3578,7 +3595,7 @@
+ 		GXX_VERSION=unknown
+ 		GXX=no
+ 	fi
+-	echo "$as_me:3581: result: $GXX_VERSION" >&5
++	echo "$as_me:3598: result: $GXX_VERSION" >&5
+ echo "${ECHO_T}$GXX_VERSION" >&6
+ fi
+ 
+@@ -3586,12 +3603,12 @@
+ ([1-9][0-9].*)
+ 	;;
+ (1.*|2.[0-6]*)
+-	{ echo "$as_me:3589: WARNING: templates do not work" >&5
++	{ echo "$as_me:3606: WARNING: templates do not work" >&5
+ echo "$as_me: WARNING: templates do not work" >&2;}
+ 	;;
+ esac
+ 
+-echo "$as_me:3594: checking if you want to build C++ binding and demo" >&5
++echo "$as_me:3611: checking if you want to build C++ binding and demo" >&5
+ echo $ECHO_N "checking if you want to build C++ binding and demo... $ECHO_C" >&6
+ 
+ # Check whether --with-cxx-binding or --without-cxx-binding was given.
+@@ -3601,15 +3618,15 @@
+ else
+   cf_with_cxx_binding=$cf_with_cxx
+ fi;
+-echo "$as_me:3604: result: $cf_with_cxx_binding" >&5
++echo "$as_me:3621: result: $cf_with_cxx_binding" >&5
+ echo "${ECHO_T}$cf_with_cxx_binding" >&6
+ 
+-echo "$as_me:3607: checking if you want to build with Ada" >&5
++echo "$as_me:3624: checking if you want to build with Ada" >&5
+ echo $ECHO_N "checking if you want to build with Ada... $ECHO_C" >&6
+-echo "$as_me:3609: result: $cf_with_ada" >&5
++echo "$as_me:3626: result: $cf_with_ada" >&5
+ echo "${ECHO_T}$cf_with_ada" >&6
+ 
+-echo "$as_me:3612: checking if you want to install terminal database" >&5
++echo "$as_me:3629: checking if you want to install terminal database" >&5
+ echo $ECHO_N "checking if you want to install terminal database... $ECHO_C" >&6
+ 
+ # Check whether --enable-db-install or --disable-db-install was given.
+@@ -3619,10 +3636,10 @@
+ else
+   cf_with_db_install=yes
+ fi;
+-echo "$as_me:3622: result: $cf_with_db_install" >&5
++echo "$as_me:3639: result: $cf_with_db_install" >&5
+ echo "${ECHO_T}$cf_with_db_install" >&6
+ 
+-echo "$as_me:3625: checking if you want to install manpages" >&5
++echo "$as_me:3642: checking if you want to install manpages" >&5
+ echo $ECHO_N "checking if you want to install manpages... $ECHO_C" >&6
+ 
+ # Check whether --with-manpages or --without-manpages was given.
+@@ -3632,10 +3649,10 @@
+ else
+   cf_with_manpages=yes
+ fi;
+-echo "$as_me:3635: result: $cf_with_manpages" >&5
++echo "$as_me:3652: result: $cf_with_manpages" >&5
+ echo "${ECHO_T}$cf_with_manpages" >&6
+ 
+-echo "$as_me:3638: checking if you want to build programs such as tic" >&5
++echo "$as_me:3655: checking if you want to build programs such as tic" >&5
+ echo $ECHO_N "checking if you want to build programs such as tic... $ECHO_C" >&6
+ 
+ # Check whether --with-progs or --without-progs was given.
+@@ -3645,18 +3662,18 @@
+ else
+   cf_with_progs=yes
+ fi;
+-echo "$as_me:3648: result: $cf_with_progs" >&5
++echo "$as_me:3665: result: $cf_with_progs" >&5
+ echo "${ECHO_T}$cf_with_progs" >&6
+ 
+ if test -f "$srcdir/tack/tack.h" ; then
+ 	if test "x$cross_compiling" = xyes ; then
+ 		test -n "$verbose" && echo "	ignoring tack because we are cross-compiling" 1>&6
+ 
+-echo "${as_me:-configure}:3655: testing ignoring tack because we are cross-compiling ..." 1>&5
++echo "${as_me:-configure}:3672: testing ignoring tack because we are cross-compiling ..." 1>&5
+ 
+ 		cf_with_tack=no
+ 	else
+-		echo "$as_me:3659: checking if you want to build the tack program" >&5
++		echo "$as_me:3676: checking if you want to build the tack program" >&5
+ echo $ECHO_N "checking if you want to build the tack program... $ECHO_C" >&6
+ 
+ # Check whether --with-tack or --without-tack was given.
+@@ -3666,14 +3683,14 @@
+ else
+   cf_with_tack=$cf_with_progs
+ fi;
+-		echo "$as_me:3669: result: $cf_with_tack" >&5
++		echo "$as_me:3686: result: $cf_with_tack" >&5
+ echo "${ECHO_T}$cf_with_tack" >&6
+ 	fi
+ else
+ 	cf_with_tack=no
+ fi
+ 
+-echo "$as_me:3676: checking if you want to build test-programs" >&5
++echo "$as_me:3693: checking if you want to build test-programs" >&5
+ echo $ECHO_N "checking if you want to build test-programs... $ECHO_C" >&6
+ 
+ # Check whether --with-tests or --without-tests was given.
+@@ -3683,10 +3700,10 @@
+ else
+   cf_with_tests=yes
+ fi;
+-echo "$as_me:3686: result: $cf_with_tests" >&5
++echo "$as_me:3703: result: $cf_with_tests" >&5
+ echo "${ECHO_T}$cf_with_tests" >&6
+ 
+-echo "$as_me:3689: checking if you wish to install curses.h" >&5
++echo "$as_me:3706: checking if you wish to install curses.h" >&5
+ echo $ECHO_N "checking if you wish to install curses.h... $ECHO_C" >&6
+ 
+ # Check whether --with-curses-h or --without-curses-h was given.
+@@ -3696,7 +3713,7 @@
+ else
+   with_curses_h=yes
+ fi;
+-echo "$as_me:3699: result: $with_curses_h" >&5
++echo "$as_me:3716: result: $with_curses_h" >&5
+ echo "${ECHO_T}$with_curses_h" >&6
+ 
+ modules_to_build="ncurses"
+@@ -3721,7 +3738,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:3724: checking for $ac_word" >&5
++echo "$as_me:3741: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_AWK+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3736,7 +3753,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_AWK="$ac_prog"
+-echo "$as_me:3739: found $ac_dir/$ac_word" >&5
++echo "$as_me:3756: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3744,17 +3761,17 @@
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+-  echo "$as_me:3747: result: $AWK" >&5
++  echo "$as_me:3764: result: $AWK" >&5
+ echo "${ECHO_T}$AWK" >&6
+ else
+-  echo "$as_me:3750: result: no" >&5
++  echo "$as_me:3767: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+   test -n "$AWK" && break
+ done
+ 
+-test -z "$AWK" && { { echo "$as_me:3757: error: No awk program found" >&5
++test -z "$AWK" && { { echo "$as_me:3774: error: No awk program found" >&5
+ echo "$as_me: error: No awk program found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -3770,7 +3787,7 @@
+ # AFS /usr/afsws/bin/install, which mishandles nonexistent args
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+-echo "$as_me:3773: checking for a BSD compatible install" >&5
++echo "$as_me:3790: checking for a BSD compatible install" >&5
+ echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
+ if test -z "$INSTALL"; then
+ if test "${ac_cv_path_install+set}" = set; then
+@@ -3819,7 +3836,7 @@
+     INSTALL=$ac_install_sh
+   fi
+ fi
+-echo "$as_me:3822: result: $INSTALL" >&5
++echo "$as_me:3839: result: $INSTALL" >&5
+ echo "${ECHO_T}$INSTALL" >&6
+ 
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+@@ -3844,7 +3861,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:3847: checking for $ac_word" >&5
++echo "$as_me:3864: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_LINT+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3859,7 +3876,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LINT="$ac_prog"
+-echo "$as_me:3862: found $ac_dir/$ac_word" >&5
++echo "$as_me:3879: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3867,10 +3884,10 @@
+ fi
+ LINT=$ac_cv_prog_LINT
+ if test -n "$LINT"; then
+-  echo "$as_me:3870: result: $LINT" >&5
++  echo "$as_me:3887: result: $LINT" >&5
+ echo "${ECHO_T}$LINT" >&6
+ else
+-  echo "$as_me:3873: result: no" >&5
++  echo "$as_me:3890: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3883,18 +3900,18 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:3886: checking whether ln -s works" >&5
++echo "$as_me:3903: checking whether ln -s works" >&5
+ echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
+ LN_S=$as_ln_s
+ if test "$LN_S" = "ln -s"; then
+-  echo "$as_me:3890: result: yes" >&5
++  echo "$as_me:3907: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:3893: result: no, using $LN_S" >&5
++  echo "$as_me:3910: result: no, using $LN_S" >&5
+ echo "${ECHO_T}no, using $LN_S" >&6
+ fi
+ 
+-echo "$as_me:3897: checking if $LN_S -f options work" >&5
++echo "$as_me:3914: checking if $LN_S -f options work" >&5
+ echo $ECHO_N "checking if $LN_S -f options work... $ECHO_C" >&6
+ 
+ rm -f conf$$.src conf$$dst
+@@ -3906,12 +3923,12 @@
+ 	cf_prog_ln_sf=no
+ fi
+ rm -f conf$$.dst conf$$src
+-echo "$as_me:3909: result: $cf_prog_ln_sf" >&5
++echo "$as_me:3926: result: $cf_prog_ln_sf" >&5
+ echo "${ECHO_T}$cf_prog_ln_sf" >&6
+ 
+ test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
+ 
+-echo "$as_me:3914: checking for long file names" >&5
++echo "$as_me:3931: checking for long file names" >&5
+ echo $ECHO_N "checking for long file names... $ECHO_C" >&6
+ if test "${ac_cv_sys_long_file_names+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3950,7 +3967,7 @@
+   rm -rf "$ac_xdir" 2>/dev/null
+ done
+ fi
+-echo "$as_me:3953: result: $ac_cv_sys_long_file_names" >&5
++echo "$as_me:3970: result: $ac_cv_sys_long_file_names" >&5
+ echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6
+ if test "$ac_cv_sys_long_file_names" = yes; then
+ 
+@@ -3969,7 +3986,7 @@
+   withval="$with_config_suffix"
+   case "x$withval" in
+ 	(xyes|xno)
+-		{ echo "$as_me:3972: WARNING: expected a value for config-suffix option" >&5
++		{ echo "$as_me:3989: WARNING: expected a value for config-suffix option" >&5
+ echo "$as_me: WARNING: expected a value for config-suffix option" >&2;}
+ 		;;
+ 	(*)	cf_config_suffix="$withval"
+@@ -3979,7 +3996,7 @@
+ 
+ # If we find pkg-config, check if we should install the ".pc" files.
+ 
+-echo "$as_me:3982: checking if you want to use pkg-config" >&5
++echo "$as_me:3999: checking if you want to use pkg-config" >&5
+ echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6
+ 
+ # Check whether --with-pkg-config or --without-pkg-config was given.
+@@ -3989,7 +4006,7 @@
+ else
+   cf_pkg_config=yes
+ fi;
+-echo "$as_me:3992: result: $cf_pkg_config" >&5
++echo "$as_me:4009: result: $cf_pkg_config" >&5
+ echo "${ECHO_T}$cf_pkg_config" >&6
+ 
+ case "$cf_pkg_config" in
+@@ -4001,7 +4018,7 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+-echo "$as_me:4004: checking for $ac_word" >&5
++echo "$as_me:4021: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4018,7 +4035,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
+-   echo "$as_me:4021: found $ac_dir/$ac_word" >&5
++   echo "$as_me:4038: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -4029,10 +4046,10 @@
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ 
+ if test -n "$PKG_CONFIG"; then
+-  echo "$as_me:4032: result: $PKG_CONFIG" >&5
++  echo "$as_me:4049: result: $PKG_CONFIG" >&5
+ echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+-  echo "$as_me:4035: result: no" >&5
++  echo "$as_me:4052: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4041,7 +4058,7 @@
+   ac_pt_PKG_CONFIG=$PKG_CONFIG
+   # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+-echo "$as_me:4044: checking for $ac_word" >&5
++echo "$as_me:4061: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4058,7 +4075,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
+-   echo "$as_me:4061: found $ac_dir/$ac_word" >&5
++   echo "$as_me:4078: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -4070,10 +4087,10 @@
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+ 
+ if test -n "$ac_pt_PKG_CONFIG"; then
+-  echo "$as_me:4073: result: $ac_pt_PKG_CONFIG" >&5
++  echo "$as_me:4090: result: $ac_pt_PKG_CONFIG" >&5
+ echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+ else
+-  echo "$as_me:4076: result: no" >&5
++  echo "$as_me:4093: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4116,24 +4133,24 @@
+ 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:4119: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++	{ { echo "$as_me:4136: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ esac
+ 
+ elif test "x$cf_pkg_config" != xno ; then
+-	{ echo "$as_me:4126: WARNING: pkg-config is not installed" >&5
++	{ echo "$as_me:4143: WARNING: pkg-config is not installed" >&5
+ echo "$as_me: WARNING: pkg-config is not installed" >&2;}
+ fi
+ 
+ case "$PKG_CONFIG" in
+ (no|none|yes)
+-	echo "$as_me:4132: checking for pkg-config library directory" >&5
++	echo "$as_me:4149: checking for pkg-config library directory" >&5
+ echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
+ 	;;
+ (*)
+-	echo "$as_me:4136: checking for $PKG_CONFIG library directory" >&5
++	echo "$as_me:4153: checking for $PKG_CONFIG library directory" >&5
+ echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
+ 	;;
+ esac
+@@ -4154,7 +4171,7 @@
+ case x$cf_search_path in
+ (xlibdir)
+ 	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
+-	echo "$as_me:4157: result: $PKG_CONFIG_LIBDIR" >&5
++	echo "$as_me:4174: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	cf_search_path=
+ 	;;
+@@ -4162,16 +4179,16 @@
+ 	;;
+ (x/*)
+ 	PKG_CONFIG_LIBDIR="$cf_search_path"
+-	echo "$as_me:4165: result: $PKG_CONFIG_LIBDIR" >&5
++	echo "$as_me:4182: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	cf_search_path=
+ 	;;
+ (xyes|xauto)
+-	echo "$as_me:4170: result: auto" >&5
++	echo "$as_me:4187: result: auto" >&5
+ echo "${ECHO_T}auto" >&6
+ 	cf_search_path=
+ 	# Look for the library directory using the same prefix as the executable
+-	echo "$as_me:4174: checking for search-list" >&5
++	echo "$as_me:4191: checking for search-list" >&5
+ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
+ 	if test "x$PKG_CONFIG" != xnone
+ 	then
+@@ -4198,11 +4215,11 @@
+ "`
+ 	fi
+ 
+-	echo "$as_me:4201: result: $cf_search_path" >&5
++	echo "$as_me:4218: result: $cf_search_path" >&5
+ echo "${ECHO_T}$cf_search_path" >&6
+ 	;;
+ (*)
+-	{ { echo "$as_me:4205: error: Unexpected option value: $cf_search_path" >&5
++	{ { echo "$as_me:4222: error: Unexpected option value: $cf_search_path" >&5
+ echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -4210,7 +4227,7 @@
+ 
+ if test -n "$cf_search_path"
+ then
+-	echo "$as_me:4213: checking for first directory" >&5
++	echo "$as_me:4230: checking for first directory" >&5
+ echo $ECHO_N "checking for first directory... $ECHO_C" >&6
+ 	cf_pkg_config_path=none
+ 	for cf_config in $cf_search_path
+@@ -4221,7 +4238,7 @@
+ 			break
+ 		fi
+ 	done
+-	echo "$as_me:4224: result: $cf_pkg_config_path" >&5
++	echo "$as_me:4241: result: $cf_pkg_config_path" >&5
+ echo "${ECHO_T}$cf_pkg_config_path" >&6
+ 
+ 	if test "x$cf_pkg_config_path" != xnone ; then
+@@ -4231,7 +4248,7 @@
+ 
+ 	if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
+ 	then
+-		echo "$as_me:4234: checking for workaround" >&5
++		echo "$as_me:4251: checking for workaround" >&5
+ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
+ 		if test "$prefix" = "NONE" ; then
+ 			cf_prefix="$ac_default_prefix"
+@@ -4254,17 +4271,17 @@
+ 			esac
+ 		done
+ 		test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
+-		echo "$as_me:4257: result: $PKG_CONFIG_LIBDIR" >&5
++		echo "$as_me:4274: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	fi
+ fi
+ 
+ if test "x$PKG_CONFIG" != xnone
+ then
+-	echo "$as_me:4264: checking if we should install .pc files for $PKG_CONFIG" >&5
++	echo "$as_me:4281: checking if we should install .pc files for $PKG_CONFIG" >&5
+ echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6
+ else
+-	echo "$as_me:4267: checking if we should install .pc files" >&5
++	echo "$as_me:4284: checking if we should install .pc files" >&5
+ echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6
+ fi
+ 
+@@ -4275,7 +4292,7 @@
+ else
+   enable_pc_files=no
+ fi;
+-echo "$as_me:4278: result: $enable_pc_files" >&5
++echo "$as_me:4295: result: $enable_pc_files" >&5
+ echo "${ECHO_T}$enable_pc_files" >&6
+ 
+ if test "x$enable_pc_files" != xno
+@@ -4283,7 +4300,7 @@
+ 	MAKE_PC_FILES=
+ 	case "x$PKG_CONFIG_LIBDIR" in
+ 	(xno|xnone|xyes|x)
+-		{ echo "$as_me:4286: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
++		{ echo "$as_me:4303: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
+ echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
+ 		;;
+ 	(*)
+@@ -4314,7 +4331,7 @@
+ 	cf_pkg_config_libdir=`echo "$cf_pkg_config_libdir" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:4317: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
++	{ { echo "$as_me:4334: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -4328,7 +4345,7 @@
+ 
+ if test -z "$MAKE_PC_FILES"
+ then
+-	echo "$as_me:4331: checking for suffix to add to pc-files" >&5
++	echo "$as_me:4348: checking for suffix to add to pc-files" >&5
+ echo $ECHO_N "checking for suffix to add to pc-files... $ECHO_C" >&6
+ 
+ # Check whether --with-pc-suffix or --without-pc-suffix was given.
+@@ -4343,13 +4360,13 @@
+ 	esac
+ fi;
+ 	test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none
+-	echo "$as_me:4346: result: $PC_MODULE_SUFFIX" >&5
++	echo "$as_me:4363: result: $PC_MODULE_SUFFIX" >&5
+ echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
+ 	test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
+ 
+ fi
+ 
+-echo "$as_me:4352: checking if we should assume mixed-case filenames" >&5
++echo "$as_me:4369: checking if we should assume mixed-case filenames" >&5
+ echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6
+ 
+ # Check whether --enable-mixed-case or --disable-mixed-case was given.
+@@ -4359,11 +4376,11 @@
+ else
+   enable_mixedcase=auto
+ fi;
+-echo "$as_me:4362: result: $enable_mixedcase" >&5
++echo "$as_me:4379: result: $enable_mixedcase" >&5
+ echo "${ECHO_T}$enable_mixedcase" >&6
+ if test "$enable_mixedcase" = "auto" ; then
+ 
+-echo "$as_me:4366: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:4383: checking if filesystem supports mixed-case filenames" >&5
+ echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
+ if test "${cf_cv_mixedcase+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4390,7 +4407,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:4393: result: $cf_cv_mixedcase" >&5
++echo "$as_me:4410: result: $cf_cv_mixedcase" >&5
+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
+ test "$cf_cv_mixedcase" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -4409,7 +4426,7 @@
+ fi
+ 
+ # do this after mixed-case option (tags/TAGS is not as important as tic).
+-echo "$as_me:4412: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:4429: checking whether ${MAKE-make} sets \${MAKE}" >&5
+ echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
+ set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
+ if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+@@ -4429,16 +4446,16 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "$as_me:4432: result: yes" >&5
++  echo "$as_me:4449: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+   SET_MAKE=
+ else
+-  echo "$as_me:4436: result: no" >&5
++  echo "$as_me:4453: result: no" >&5
+ echo "${ECHO_T}no" >&6
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+ 
+-echo "$as_me:4441: checking for \".PHONY\" make-support" >&5
++echo "$as_me:4458: checking for \".PHONY\" make-support" >&5
+ echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6
+ if test "${cf_cv_make_PHONY+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4493,7 +4510,7 @@
+ 	rm -rf conftest*
+ 
+ fi
+-echo "$as_me:4496: result: $cf_cv_make_PHONY" >&5
++echo "$as_me:4513: result: $cf_cv_make_PHONY" >&5
+ echo "${ECHO_T}$cf_cv_make_PHONY" >&6
+ MAKE_NO_PHONY="#"
+ MAKE_PHONY="#"
+@@ -4504,7 +4521,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:4507: checking for $ac_word" >&5
++echo "$as_me:4524: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CTAGS+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4519,7 +4536,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CTAGS="$ac_prog"
+-echo "$as_me:4522: found $ac_dir/$ac_word" >&5
++echo "$as_me:4539: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4527,10 +4544,10 @@
+ fi
+ CTAGS=$ac_cv_prog_CTAGS
+ if test -n "$CTAGS"; then
+-  echo "$as_me:4530: result: $CTAGS" >&5
++  echo "$as_me:4547: result: $CTAGS" >&5
+ echo "${ECHO_T}$CTAGS" >&6
+ else
+-  echo "$as_me:4533: result: no" >&5
++  echo "$as_me:4550: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4541,7 +4558,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:4544: checking for $ac_word" >&5
++echo "$as_me:4561: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ETAGS+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4556,7 +4573,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ETAGS="$ac_prog"
+-echo "$as_me:4559: found $ac_dir/$ac_word" >&5
++echo "$as_me:4576: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4564,10 +4581,10 @@
+ fi
+ ETAGS=$ac_cv_prog_ETAGS
+ if test -n "$ETAGS"; then
+-  echo "$as_me:4567: result: $ETAGS" >&5
++  echo "$as_me:4584: result: $ETAGS" >&5
+ echo "${ECHO_T}$ETAGS" >&6
+ else
+-  echo "$as_me:4570: result: no" >&5
++  echo "$as_me:4587: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4576,7 +4593,7 @@
+ 
+ # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
+ set dummy ${CTAGS:-ctags}; ac_word=$2
+-echo "$as_me:4579: checking for $ac_word" >&5
++echo "$as_me:4596: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4591,7 +4608,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_MAKE_LOWER_TAGS="yes"
+-echo "$as_me:4594: found $ac_dir/$ac_word" >&5
++echo "$as_me:4611: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4600,17 +4617,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+-  echo "$as_me:4603: result: $MAKE_LOWER_TAGS" >&5
++  echo "$as_me:4620: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+-  echo "$as_me:4606: result: no" >&5
++  echo "$as_me:4623: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ if test "$cf_cv_mixedcase" = yes ; then
+ 	# Extract the first word of "${ETAGS:-etags}", so it can be a program name with args.
+ set dummy ${ETAGS:-etags}; ac_word=$2
+-echo "$as_me:4613: checking for $ac_word" >&5
++echo "$as_me:4630: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4625,7 +4642,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_MAKE_UPPER_TAGS="yes"
+-echo "$as_me:4628: found $ac_dir/$ac_word" >&5
++echo "$as_me:4645: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4634,10 +4651,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+-  echo "$as_me:4637: result: $MAKE_UPPER_TAGS" >&5
++  echo "$as_me:4654: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+-  echo "$as_me:4640: result: no" >&5
++  echo "$as_me:4657: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4657,7 +4674,7 @@
+ 	MAKE_LOWER_TAGS="#"
+ fi
+ 
+-echo "$as_me:4660: checking for makeflags variable" >&5
++echo "$as_me:4677: checking for makeflags variable" >&5
+ echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6
+ if test "${cf_cv_makeflags+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4687,7 +4704,7 @@
+ 			;;
+ 		(*)
+ 
+-echo "${as_me:-configure}:4690: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
++echo "${as_me:-configure}:4707: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+ 
+ 			;;
+ 		esac
+@@ -4695,13 +4712,13 @@
+ 	rm -f cf_makeflags.tmp
+ 
+ fi
+-echo "$as_me:4698: result: $cf_cv_makeflags" >&5
++echo "$as_me:4715: result: $cf_cv_makeflags" >&5
+ echo "${ECHO_T}$cf_cv_makeflags" >&6
+ 
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+-echo "$as_me:4704: checking for $ac_word" >&5
++echo "$as_me:4721: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_RANLIB+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4716,7 +4733,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+-echo "$as_me:4719: found $ac_dir/$ac_word" >&5
++echo "$as_me:4736: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4724,10 +4741,10 @@
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+-  echo "$as_me:4727: result: $RANLIB" >&5
++  echo "$as_me:4744: result: $RANLIB" >&5
+ echo "${ECHO_T}$RANLIB" >&6
+ else
+-  echo "$as_me:4730: result: no" >&5
++  echo "$as_me:4747: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4736,7 +4753,7 @@
+   ac_ct_RANLIB=$RANLIB
+   # Extract the first word of "ranlib", so it can be a program name with args.
+ set dummy ranlib; ac_word=$2
+-echo "$as_me:4739: checking for $ac_word" >&5
++echo "$as_me:4756: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4751,7 +4768,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_RANLIB="ranlib"
+-echo "$as_me:4754: found $ac_dir/$ac_word" >&5
++echo "$as_me:4771: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4760,10 +4777,10 @@
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+-  echo "$as_me:4763: result: $ac_ct_RANLIB" >&5
++  echo "$as_me:4780: result: $ac_ct_RANLIB" >&5
+ echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ else
+-  echo "$as_me:4766: result: no" >&5
++  echo "$as_me:4783: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4775,7 +4792,7 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ld; ac_word=$2
+-echo "$as_me:4778: checking for $ac_word" >&5
++echo "$as_me:4795: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_LD+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4790,7 +4807,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LD="${ac_tool_prefix}ld"
+-echo "$as_me:4793: found $ac_dir/$ac_word" >&5
++echo "$as_me:4810: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4798,10 +4815,10 @@
+ fi
+ LD=$ac_cv_prog_LD
+ if test -n "$LD"; then
+-  echo "$as_me:4801: result: $LD" >&5
++  echo "$as_me:4818: result: $LD" >&5
+ echo "${ECHO_T}$LD" >&6
+ else
+-  echo "$as_me:4804: result: no" >&5
++  echo "$as_me:4821: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4810,7 +4827,7 @@
+   ac_ct_LD=$LD
+   # Extract the first word of "ld", so it can be a program name with args.
+ set dummy ld; ac_word=$2
+-echo "$as_me:4813: checking for $ac_word" >&5
++echo "$as_me:4830: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4825,7 +4842,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_LD="ld"
+-echo "$as_me:4828: found $ac_dir/$ac_word" >&5
++echo "$as_me:4845: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4834,10 +4851,10 @@
+ fi
+ ac_ct_LD=$ac_cv_prog_ac_ct_LD
+ if test -n "$ac_ct_LD"; then
+-  echo "$as_me:4837: result: $ac_ct_LD" >&5
++  echo "$as_me:4854: result: $ac_ct_LD" >&5
+ echo "${ECHO_T}$ac_ct_LD" >&6
+ else
+-  echo "$as_me:4840: result: no" >&5
++  echo "$as_me:4857: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4849,7 +4866,7 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ar; ac_word=$2
+-echo "$as_me:4852: checking for $ac_word" >&5
++echo "$as_me:4869: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_AR+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4864,7 +4881,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_AR="${ac_tool_prefix}ar"
+-echo "$as_me:4867: found $ac_dir/$ac_word" >&5
++echo "$as_me:4884: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4872,10 +4889,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:4875: result: $AR" >&5
++  echo "$as_me:4892: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:4878: result: no" >&5
++  echo "$as_me:4895: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4884,7 +4901,7 @@
+   ac_ct_AR=$AR
+   # Extract the first word of "ar", so it can be a program name with args.
+ set dummy ar; ac_word=$2
+-echo "$as_me:4887: checking for $ac_word" >&5
++echo "$as_me:4904: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4899,7 +4916,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_AR="ar"
+-echo "$as_me:4902: found $ac_dir/$ac_word" >&5
++echo "$as_me:4919: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4908,10 +4925,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:4911: result: $ac_ct_AR" >&5
++  echo "$as_me:4928: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:4914: result: no" >&5
++  echo "$as_me:4931: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4923,7 +4940,7 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}nm; ac_word=$2
+-echo "$as_me:4926: checking for $ac_word" >&5
++echo "$as_me:4943: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_NM+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4938,7 +4955,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_NM="${ac_tool_prefix}nm"
+-echo "$as_me:4941: found $ac_dir/$ac_word" >&5
++echo "$as_me:4958: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4946,10 +4963,10 @@
+ fi
+ NM=$ac_cv_prog_NM
+ if test -n "$NM"; then
+-  echo "$as_me:4949: result: $NM" >&5
++  echo "$as_me:4966: result: $NM" >&5
+ echo "${ECHO_T}$NM" >&6
+ else
+-  echo "$as_me:4952: result: no" >&5
++  echo "$as_me:4969: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4958,7 +4975,7 @@
+   ac_ct_NM=$NM
+   # Extract the first word of "nm", so it can be a program name with args.
+ set dummy nm; ac_word=$2
+-echo "$as_me:4961: checking for $ac_word" >&5
++echo "$as_me:4978: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_NM+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4973,7 +4990,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_NM="nm"
+-echo "$as_me:4976: found $ac_dir/$ac_word" >&5
++echo "$as_me:4993: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4982,10 +4999,10 @@
+ fi
+ ac_ct_NM=$ac_cv_prog_ac_ct_NM
+ if test -n "$ac_ct_NM"; then
+-  echo "$as_me:4985: result: $ac_ct_NM" >&5
++  echo "$as_me:5002: result: $ac_ct_NM" >&5
+ echo "${ECHO_T}$ac_ct_NM" >&6
+ else
+-  echo "$as_me:4988: result: no" >&5
++  echo "$as_me:5005: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4997,7 +5014,7 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ar; ac_word=$2
+-echo "$as_me:5000: checking for $ac_word" >&5
++echo "$as_me:5017: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_AR+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5012,7 +5029,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_AR="${ac_tool_prefix}ar"
+-echo "$as_me:5015: found $ac_dir/$ac_word" >&5
++echo "$as_me:5032: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5020,10 +5037,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:5023: result: $AR" >&5
++  echo "$as_me:5040: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:5026: result: no" >&5
++  echo "$as_me:5043: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5032,7 +5049,7 @@
+   ac_ct_AR=$AR
+   # Extract the first word of "ar", so it can be a program name with args.
+ set dummy ar; ac_word=$2
+-echo "$as_me:5035: checking for $ac_word" >&5
++echo "$as_me:5052: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5047,7 +5064,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_AR="ar"
+-echo "$as_me:5050: found $ac_dir/$ac_word" >&5
++echo "$as_me:5067: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5056,10 +5073,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:5059: result: $ac_ct_AR" >&5
++  echo "$as_me:5076: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:5062: result: no" >&5
++  echo "$as_me:5079: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5068,7 +5085,7 @@
+   AR="$ac_cv_prog_AR"
+ fi
+ 
+-echo "$as_me:5071: checking for options to update archives" >&5
++echo "$as_me:5088: checking for options to update archives" >&5
+ echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6
+ if test "${cf_cv_ar_flags+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5105,13 +5122,13 @@
+ 			rm -f conftest.a
+ 
+ 			cat >"conftest.$ac_ext" <&5
++			if { (eval echo "$as_me:5128: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5114: \$? = $ac_status" >&5
++  echo "$as_me:5131: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+ 				echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5
+ 				$AR $ARFLAGS "$cf_ar_flags" conftest.a "conftest.$ac_cv_objext" 2>&5 1>/dev/null
+@@ -5122,7 +5139,7 @@
+ 			else
+ 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
+ 
+-echo "${as_me:-configure}:5125: testing cannot compile test-program ..." 1>&5
++echo "${as_me:-configure}:5142: testing cannot compile test-program ..." 1>&5
+ 
+ 				break
+ 			fi
+@@ -5132,7 +5149,7 @@
+ 	esac
+ 
+ fi
+-echo "$as_me:5135: result: $cf_cv_ar_flags" >&5
++echo "$as_me:5152: result: $cf_cv_ar_flags" >&5
+ echo "${ECHO_T}$cf_cv_ar_flags" >&6
+ 
+ if test -n "$ARFLAGS" ; then
+@@ -5143,7 +5160,7 @@
+ 	ARFLAGS=$cf_cv_ar_flags
+ fi
+ 
+-echo "$as_me:5146: checking if you have specified an install-prefix" >&5
++echo "$as_me:5163: checking if you have specified an install-prefix" >&5
+ echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6
+ 
+ # Check whether --with-install-prefix or --without-install-prefix was given.
+@@ -5156,7 +5173,7 @@
+ 		;;
+ 	esac
+ fi;
+-echo "$as_me:5159: result: $DESTDIR" >&5
++echo "$as_me:5176: result: $DESTDIR" >&5
+ echo "${ECHO_T}$DESTDIR" >&6
+ 
+ ###############################################################################
+@@ -5191,7 +5208,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:5194: checking for $ac_word" >&5
++echo "$as_me:5211: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_BUILD_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5206,7 +5223,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_BUILD_CC="$ac_prog"
+-echo "$as_me:5209: found $ac_dir/$ac_word" >&5
++echo "$as_me:5226: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5214,10 +5231,10 @@
+ fi
+ BUILD_CC=$ac_cv_prog_BUILD_CC
+ if test -n "$BUILD_CC"; then
+-  echo "$as_me:5217: result: $BUILD_CC" >&5
++  echo "$as_me:5234: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ else
+-  echo "$as_me:5220: result: no" >&5
++  echo "$as_me:5237: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5226,12 +5243,12 @@
+ test -n "$BUILD_CC" || BUILD_CC="none"
+ 
+ fi;
+-	echo "$as_me:5229: checking for native build C compiler" >&5
++	echo "$as_me:5246: checking for native build C compiler" >&5
+ echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
+-	echo "$as_me:5231: result: $BUILD_CC" >&5
++	echo "$as_me:5248: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ 
+-	echo "$as_me:5234: checking for native build C preprocessor" >&5
++	echo "$as_me:5251: checking for native build C preprocessor" >&5
+ echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6
+ 
+ # Check whether --with-build-cpp or --without-build-cpp was given.
+@@ -5241,10 +5258,10 @@
+ else
+   BUILD_CPP='${BUILD_CC} -E'
+ fi;
+-	echo "$as_me:5244: result: $BUILD_CPP" >&5
++	echo "$as_me:5261: result: $BUILD_CPP" >&5
+ echo "${ECHO_T}$BUILD_CPP" >&6
+ 
+-	echo "$as_me:5247: checking for native build C flags" >&5
++	echo "$as_me:5264: checking for native build C flags" >&5
+ echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6
+ 
+ # Check whether --with-build-cflags or --without-build-cflags was given.
+@@ -5252,10 +5269,10 @@
+   withval="$with_build_cflags"
+   BUILD_CFLAGS="$withval"
+ fi;
+-	echo "$as_me:5255: result: $BUILD_CFLAGS" >&5
++	echo "$as_me:5272: result: $BUILD_CFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CFLAGS" >&6
+ 
+-	echo "$as_me:5258: checking for native build C preprocessor-flags" >&5
++	echo "$as_me:5275: checking for native build C preprocessor-flags" >&5
+ echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6
+ 
+ # Check whether --with-build-cppflags or --without-build-cppflags was given.
+@@ -5263,10 +5280,10 @@
+   withval="$with_build_cppflags"
+   BUILD_CPPFLAGS="$withval"
+ fi;
+-	echo "$as_me:5266: result: $BUILD_CPPFLAGS" >&5
++	echo "$as_me:5283: result: $BUILD_CPPFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
+ 
+-	echo "$as_me:5269: checking for native build linker-flags" >&5
++	echo "$as_me:5286: checking for native build linker-flags" >&5
+ echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6
+ 
+ # Check whether --with-build-ldflags or --without-build-ldflags was given.
+@@ -5274,10 +5291,10 @@
+   withval="$with_build_ldflags"
+   BUILD_LDFLAGS="$withval"
+ fi;
+-	echo "$as_me:5277: result: $BUILD_LDFLAGS" >&5
++	echo "$as_me:5294: result: $BUILD_LDFLAGS" >&5
+ echo "${ECHO_T}$BUILD_LDFLAGS" >&6
+ 
+-	echo "$as_me:5280: checking for native build linker-libraries" >&5
++	echo "$as_me:5297: checking for native build linker-libraries" >&5
+ echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6
+ 
+ # Check whether --with-build-libs or --without-build-libs was given.
+@@ -5285,7 +5302,7 @@
+   withval="$with_build_libs"
+   BUILD_LIBS="$withval"
+ fi;
+-	echo "$as_me:5288: result: $BUILD_LIBS" >&5
++	echo "$as_me:5305: result: $BUILD_LIBS" >&5
+ echo "${ECHO_T}$BUILD_LIBS" >&6
+ 
+ 	# this assumes we're on Unix.
+@@ -5295,7 +5312,7 @@
+ 	: ${BUILD_CC:='${CC}'}
+ 
+ 	if { test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}'; } ; then
+-		{ { echo "$as_me:5298: error: Cross-build requires two compilers.
++		{ { echo "$as_me:5315: error: Cross-build requires two compilers.
+ Use --with-build-cc to specify the native compiler." >&5
+ echo "$as_me: error: Cross-build requires two compilers.
+ Use --with-build-cc to specify the native compiler." >&2;}
+@@ -5320,7 +5337,7 @@
+ ### shared, for example.
+ cf_list_models=""
+ 
+-echo "$as_me:5323: checking if libtool -version-number should be used" >&5
++echo "$as_me:5340: checking if libtool -version-number should be used" >&5
+ echo $ECHO_N "checking if libtool -version-number should be used... $ECHO_C" >&6
+ 
+ # Check whether --enable-libtool-version or --disable-libtool-version was given.
+@@ -5337,7 +5354,7 @@
+ 	cf_libtool_version=yes
+ 
+ fi;
+-echo "$as_me:5340: result: $cf_libtool_version" >&5
++echo "$as_me:5357: result: $cf_libtool_version" >&5
+ echo "${ECHO_T}$cf_libtool_version" >&6
+ 
+ if test "$cf_libtool_version" = yes ; then
+@@ -5346,25 +5363,25 @@
+ 	LIBTOOL_VERSION="-version-info"
+ 	case "x$VERSION" in
+ 	(x)
+-		{ echo "$as_me:5349: WARNING: VERSION was not set" >&5
++		{ echo "$as_me:5366: WARNING: VERSION was not set" >&5
+ echo "$as_me: WARNING: VERSION was not set" >&2;}
+ 		;;
+ 	(x*.*.*)
+ 		ABI_VERSION="$VERSION"
+ 		test -n "$verbose" && echo "	ABI_VERSION: $ABI_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:5356: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:5373: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+ 
+ 		;;
+ 	(x*:*:*)
+ 		ABI_VERSION=`echo "$VERSION" | sed -e 's/:/./g'`
+ 		test -n "$verbose" && echo "	ABI_VERSION: $ABI_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:5363: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:5380: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+ 
+ 		;;
+ 	(*)
+-		{ echo "$as_me:5367: WARNING: unexpected VERSION value: $VERSION" >&5
++		{ echo "$as_me:5384: WARNING: unexpected VERSION value: $VERSION" >&5
+ echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
+ 		;;
+ 	esac
+@@ -5386,7 +5403,7 @@
+ LIB_INSTALL=
+ LIB_UNINSTALL=
+ 
+-echo "$as_me:5389: checking if you want to build libraries with libtool" >&5
++echo "$as_me:5406: checking if you want to build libraries with libtool" >&5
+ echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6
+ 
+ # Check whether --with-libtool or --without-libtool was given.
+@@ -5396,7 +5413,7 @@
+ else
+   with_libtool=no
+ fi;
+-echo "$as_me:5399: result: $with_libtool" >&5
++echo "$as_me:5416: result: $with_libtool" >&5
+ echo "${ECHO_T}$with_libtool" >&6
+ if test "$with_libtool" != "no"; then
+ 
+@@ -5427,7 +5444,7 @@
+ 	with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:5430: error: expected a pathname, not \"$with_libtool\"" >&5
++	{ { echo "$as_me:5447: error: expected a pathname, not \"$with_libtool\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -5440,7 +5457,7 @@
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:5443: checking for $ac_word" >&5
++echo "$as_me:5460: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_LIBTOOL+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5455,7 +5472,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
+-echo "$as_me:5458: found $ac_dir/$ac_word" >&5
++echo "$as_me:5475: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5463,10 +5480,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+-  echo "$as_me:5466: result: $LIBTOOL" >&5
++  echo "$as_me:5483: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+-  echo "$as_me:5469: result: no" >&5
++  echo "$as_me:5486: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5479,7 +5496,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:5482: checking for $ac_word" >&5
++echo "$as_me:5499: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5494,7 +5511,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
+-echo "$as_me:5497: found $ac_dir/$ac_word" >&5
++echo "$as_me:5514: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5502,10 +5519,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+-  echo "$as_me:5505: result: $ac_ct_LIBTOOL" >&5
++  echo "$as_me:5522: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+-  echo "$as_me:5508: result: no" >&5
++  echo "$as_me:5525: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5536,7 +5553,7 @@
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:5539: checking for $ac_word" >&5
++echo "$as_me:5556: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_LIBTOOL+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5551,7 +5568,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
+-echo "$as_me:5554: found $ac_dir/$ac_word" >&5
++echo "$as_me:5571: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5559,10 +5576,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+-  echo "$as_me:5562: result: $LIBTOOL" >&5
++  echo "$as_me:5579: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+-  echo "$as_me:5565: result: no" >&5
++  echo "$as_me:5582: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5575,7 +5592,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:5578: checking for $ac_word" >&5
++echo "$as_me:5595: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5590,7 +5607,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
+-echo "$as_me:5593: found $ac_dir/$ac_word" >&5
++echo "$as_me:5610: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5598,10 +5615,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+-  echo "$as_me:5601: result: $ac_ct_LIBTOOL" >&5
++  echo "$as_me:5618: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+-  echo "$as_me:5604: result: no" >&5
++  echo "$as_me:5621: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5623,7 +5640,7 @@
+ 		fi
+ 	fi
+ 	if test -z "$LIBTOOL" ; then
+-		{ { echo "$as_me:5626: error: Cannot find libtool" >&5
++		{ { echo "$as_me:5643: error: Cannot find libtool" >&5
+ echo "$as_me: error: Cannot find libtool" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -5639,7 +5656,7 @@
+ 
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+ then
+-	echo "$as_me:5642: checking version of $LIBTOOL" >&5
++	echo "$as_me:5659: checking version of $LIBTOOL" >&5
+ echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
+ 
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+@@ -5650,7 +5667,7 @@
+ fi
+ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
+ 
+-	echo "$as_me:5653: result: $cf_cv_libtool_version" >&5
++	echo "$as_me:5670: result: $cf_cv_libtool_version" >&5
+ echo "${ECHO_T}$cf_cv_libtool_version" >&6
+ 	if test -n "$cf_cv_libtool_version"
+ 	then
+@@ -5659,18 +5676,18 @@
+ 		(*...GNU-libtool...*)
+ 			;;
+ 		(*)
+-			{ { echo "$as_me:5662: error: This is not GNU libtool" >&5
++			{ { echo "$as_me:5679: error: This is not GNU libtool" >&5
+ echo "$as_me: error: This is not GNU libtool" >&2;}
+    { (exit 1); exit 1; }; }
+ 			;;
+ 		esac
+ 	else
+-		{ { echo "$as_me:5668: error: No version found for $LIBTOOL" >&5
++		{ { echo "$as_me:5685: error: No version found for $LIBTOOL" >&5
+ echo "$as_me: error: No version found for $LIBTOOL" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+ else
+-	{ { echo "$as_me:5673: error: GNU libtool has not been found" >&5
++	{ { echo "$as_me:5690: error: GNU libtool has not been found" >&5
+ echo "$as_me: error: GNU libtool has not been found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -5706,7 +5723,7 @@
+ 
+ else
+ 
+-echo "$as_me:5709: checking if you want to build shared libraries" >&5
++echo "$as_me:5726: checking if you want to build shared libraries" >&5
+ echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6
+ 
+ # Check whether --with-shared or --without-shared was given.
+@@ -5716,11 +5733,11 @@
+ else
+   with_shared=no
+ fi;
+-echo "$as_me:5719: result: $with_shared" >&5
++echo "$as_me:5736: result: $with_shared" >&5
+ echo "${ECHO_T}$with_shared" >&6
+ test "x$with_shared" = "xyes" && cf_list_models="$cf_list_models shared"
+ 
+-echo "$as_me:5723: checking if you want to build static libraries" >&5
++echo "$as_me:5740: checking if you want to build static libraries" >&5
+ echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6
+ 
+ # Check whether --with-normal or --without-normal was given.
+@@ -5730,11 +5747,11 @@
+ else
+   with_normal=yes
+ fi;
+-echo "$as_me:5733: result: $with_normal" >&5
++echo "$as_me:5750: result: $with_normal" >&5
+ echo "${ECHO_T}$with_normal" >&6
+ test "x$with_normal" = "xyes" && cf_list_models="$cf_list_models normal"
+ 
+-echo "$as_me:5737: checking if you want to build debug libraries" >&5
++echo "$as_me:5754: checking if you want to build debug libraries" >&5
+ echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6
+ 
+ # Check whether --with-debug or --without-debug was given.
+@@ -5744,11 +5761,11 @@
+ else
+   with_debug=yes
+ fi;
+-echo "$as_me:5747: result: $with_debug" >&5
++echo "$as_me:5764: result: $with_debug" >&5
+ echo "${ECHO_T}$with_debug" >&6
+ test "x$with_debug" = "xyes" && cf_list_models="$cf_list_models debug"
+ 
+-echo "$as_me:5751: checking if you want to build profiling libraries" >&5
++echo "$as_me:5768: checking if you want to build profiling libraries" >&5
+ echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6
+ 
+ # Check whether --with-profile or --without-profile was given.
+@@ -5758,7 +5775,7 @@
+ else
+   with_profile=no
+ fi;
+-echo "$as_me:5761: result: $with_profile" >&5
++echo "$as_me:5778: result: $with_profile" >&5
+ echo "${ECHO_T}$with_profile" >&6
+ test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
+ 
+@@ -5766,7 +5783,7 @@
+ 
+ if test "X$cf_with_cxx_binding" != Xno; then
+ if test "x$with_shared" = "xyes"; then
+-echo "$as_me:5769: checking if you want to build C++ shared libraries" >&5
++echo "$as_me:5786: checking if you want to build C++ shared libraries" >&5
+ echo $ECHO_N "checking if you want to build C++ shared libraries... $ECHO_C" >&6
+ 
+ # Check whether --with-cxx-shared or --without-cxx-shared was given.
+@@ -5776,26 +5793,26 @@
+ else
+   with_shared_cxx=no
+ fi;
+-echo "$as_me:5779: result: $with_shared_cxx" >&5
++echo "$as_me:5796: result: $with_shared_cxx" >&5
+ echo "${ECHO_T}$with_shared_cxx" >&6
+ fi
+ fi
+ 
+ ###############################################################################
+ 
+-echo "$as_me:5786: checking for specified models" >&5
++echo "$as_me:5803: checking for specified models" >&5
+ echo $ECHO_N "checking for specified models... $ECHO_C" >&6
+ test -z "$cf_list_models" && cf_list_models=normal
+ test "$with_libtool" != "no" && cf_list_models=libtool
+-echo "$as_me:5790: result: $cf_list_models" >&5
++echo "$as_me:5807: result: $cf_list_models" >&5
+ echo "${ECHO_T}$cf_list_models" >&6
+ 
+ ### Use the first model as the default, and save its suffix for use in building
+ ### up test-applications.
+-echo "$as_me:5795: checking for default model" >&5
++echo "$as_me:5812: checking for default model" >&5
+ echo $ECHO_N "checking for default model... $ECHO_C" >&6
+ DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'`
+-echo "$as_me:5798: result: $DFT_LWR_MODEL" >&5
++echo "$as_me:5815: result: $DFT_LWR_MODEL" >&5
+ echo "${ECHO_T}$DFT_LWR_MODEL" >&6
+ 
+ DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+@@ -5809,7 +5826,7 @@
+ LIB_DIR=../lib
+ LIB_2ND=../../lib
+ 
+-echo "$as_me:5812: checking if you want to have a library-prefix" >&5
++echo "$as_me:5829: checking if you want to have a library-prefix" >&5
+ echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6
+ 
+ # Check whether --with-lib-prefix or --without-lib-prefix was given.
+@@ -5819,7 +5836,7 @@
+ else
+   with_lib_prefix=auto
+ fi;
+-echo "$as_me:5822: result: $with_lib_prefix" >&5
++echo "$as_me:5839: result: $with_lib_prefix" >&5
+ echo "${ECHO_T}$with_lib_prefix" >&6
+ 
+ if test "$with_lib_prefix" = auto
+@@ -5850,19 +5867,19 @@
+ 
+ LIB_SUFFIX=
+ 
+-	echo "$as_me:5853: checking for PATH separator" >&5
++	echo "$as_me:5870: checking for PATH separator" >&5
+ echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6
+ 	case "$cf_cv_system_name" in
+ 	(os2*)	PATH_SEPARATOR=';'  ;;
+ 	(*)	${PATH_SEPARATOR:=':'}  ;;
+ 	esac
+ 
+-	echo "$as_me:5860: result: $PATH_SEPARATOR" >&5
++	echo "$as_me:5877: result: $PATH_SEPARATOR" >&5
+ echo "${ECHO_T}$PATH_SEPARATOR" >&6
+ 
+ ###############################################################################
+ 
+-echo "$as_me:5865: checking if you want to build a separate terminfo library" >&5
++echo "$as_me:5882: checking if you want to build a separate terminfo library" >&5
+ echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6
+ 
+ # Check whether --with-termlib or --without-termlib was given.
+@@ -5872,10 +5889,10 @@
+ else
+   with_termlib=no
+ fi;
+-echo "$as_me:5875: result: $with_termlib" >&5
++echo "$as_me:5892: result: $with_termlib" >&5
+ echo "${ECHO_T}$with_termlib" >&6
+ 
+-echo "$as_me:5878: checking if you want to build a separate tic library" >&5
++echo "$as_me:5895: checking if you want to build a separate tic library" >&5
+ echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6
+ 
+ # Check whether --with-ticlib or --without-ticlib was given.
+@@ -5885,7 +5902,7 @@
+ else
+   with_ticlib=no
+ fi;
+-echo "$as_me:5888: result: $with_ticlib" >&5
++echo "$as_me:5905: result: $with_ticlib" >&5
+ echo "${ECHO_T}$with_ticlib" >&6
+ 
+ if test X"$CC_G_OPT" = X"" ; then
+@@ -5898,7 +5915,7 @@
+ 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
+ fi
+ 
+-echo "$as_me:5901: checking for default loader flags" >&5
++echo "$as_me:5918: checking for default loader flags" >&5
+ echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
+ case "$DFT_LWR_MODEL" in
+ (libtool) LD_MODEL=''   ;;
+@@ -5907,13 +5924,13 @@
+ (profile) LD_MODEL='-pg';;
+ (shared)  LD_MODEL=''   ;;
+ esac
+-echo "$as_me:5910: result: $LD_MODEL" >&5
++echo "$as_me:5927: result: $LD_MODEL" >&5
+ echo "${ECHO_T}$LD_MODEL" >&6
+ 
+ case "$DFT_LWR_MODEL" in
+ (shared)
+ 
+-echo "$as_me:5916: checking if rpath option should be used" >&5
++echo "$as_me:5933: checking if rpath option should be used" >&5
+ echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6
+ 
+ # Check whether --enable-rpath or --disable-rpath was given.
+@@ -5923,10 +5940,10 @@
+ else
+   cf_cv_enable_rpath=no
+ fi;
+-echo "$as_me:5926: result: $cf_cv_enable_rpath" >&5
++echo "$as_me:5943: result: $cf_cv_enable_rpath" >&5
+ echo "${ECHO_T}$cf_cv_enable_rpath" >&6
+ 
+-echo "$as_me:5929: checking if shared libraries should be relinked during install" >&5
++echo "$as_me:5946: checking if shared libraries should be relinked during install" >&5
+ echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6
+ 
+ # Check whether --enable-relink or --disable-relink was given.
+@@ -5936,7 +5953,7 @@
+ else
+   cf_cv_do_relink=yes
+ fi;
+-echo "$as_me:5939: result: $cf_cv_do_relink" >&5
++echo "$as_me:5956: result: $cf_cv_do_relink" >&5
+ echo "${ECHO_T}$cf_cv_do_relink" >&6
+ 	;;
+ esac
+@@ -5947,7 +5964,7 @@
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+-	echo "$as_me:5950: checking for an rpath option" >&5
++	echo "$as_me:5967: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ 	case "$cf_cv_system_name" in
+ 	(irix*)
+@@ -5978,12 +5995,12 @@
+ 	(*)
+ 		;;
+ 	esac
+-	echo "$as_me:5981: result: $LD_RPATH_OPT" >&5
++	echo "$as_me:5998: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ 	case "x$LD_RPATH_OPT" in
+ 	(x-R*)
+-		echo "$as_me:5986: checking if we need a space after rpath option" >&5
++		echo "$as_me:6003: checking if we need a space after rpath option" >&5
+ echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
+ 		cf_save_LIBS="$LIBS"
+ 
+@@ -6004,7 +6021,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6007 "configure"
++#line 6024 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -6016,16 +6033,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6019: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6036: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6022: \$? = $ac_status" >&5
++  echo "$as_me:6039: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6025: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6042: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6028: \$? = $ac_status" >&5
++  echo "$as_me:6045: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_rpath_space=no
+ else
+@@ -6035,7 +6052,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:6038: result: $cf_rpath_space" >&5
++		echo "$as_me:6055: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ 		;;
+@@ -6057,7 +6074,7 @@
+ 	cf_ld_rpath_opt=
+ 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
+ 
+-	echo "$as_me:6060: checking if release/abi version should be used for shared libs" >&5
++	echo "$as_me:6077: checking if release/abi version should be used for shared libs" >&5
+ echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6
+ 
+ # Check whether --with-shlib-version or --without-shlib-version was given.
+@@ -6072,9 +6089,9 @@
+ 		cf_cv_shlib_version=$withval
+ 		;;
+ 	(*)
+-		echo "$as_me:6075: result: $withval" >&5
++		echo "$as_me:6092: result: $withval" >&5
+ echo "${ECHO_T}$withval" >&6
+-		{ { echo "$as_me:6077: error: option value must be one of: rel, abi, or auto" >&5
++		{ { echo "$as_me:6094: error: option value must be one of: rel, abi, or auto" >&5
+ echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
+    { (exit 1); exit 1; }; }
+ 		;;
+@@ -6083,7 +6100,7 @@
+ else
+   cf_cv_shlib_version=auto
+ fi;
+-	echo "$as_me:6086: result: $cf_cv_shlib_version" >&5
++	echo "$as_me:6103: result: $cf_cv_shlib_version" >&5
+ echo "${ECHO_T}$cf_cv_shlib_version" >&6
+ 
+ 	cf_cv_rm_so_locs=no
+@@ -6106,14 +6123,14 @@
+ 
+ 	if test "$cf_try_fPIC" = yes
+ 	then
+-		echo "$as_me:6109: checking which $CC option to use" >&5
++		echo "$as_me:6126: checking which $CC option to use" >&5
+ echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
+ 		cf_save_CFLAGS="$CFLAGS"
+ 		for CC_SHARED_OPTS in -fPIC -fpic ''
+ 		do
+ 			CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS"
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6116 "configure"
++#line 6133 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6125,16 +6142,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6128: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6145: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6131: \$? = $ac_status" >&5
++  echo "$as_me:6148: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6134: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6151: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6137: \$? = $ac_status" >&5
++  echo "$as_me:6154: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -6143,7 +6160,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		done
+-		echo "$as_me:6146: result: $CC_SHARED_OPTS" >&5
++		echo "$as_me:6163: result: $CC_SHARED_OPTS" >&5
+ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+ 		CFLAGS="$cf_save_CFLAGS"
+ 	fi
+@@ -6214,7 +6231,7 @@
+ 		MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
+ 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
+ 		cf_cv_shlib_version_infix=yes
+-		echo "$as_me:6217: checking if ld -search_paths_first works" >&5
++		echo "$as_me:6234: checking if ld -search_paths_first works" >&5
+ echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6
+ if test "${cf_cv_ldflags_search_paths_first+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6223,7 +6240,7 @@
+ 			cf_save_LDFLAGS=$LDFLAGS
+ 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6226 "configure"
++#line 6243 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -6235,16 +6252,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6238: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6255: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6241: \$? = $ac_status" >&5
++  echo "$as_me:6258: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6244: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6261: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6247: \$? = $ac_status" >&5
++  echo "$as_me:6264: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ldflags_search_paths_first=yes
+ else
+@@ -6255,7 +6272,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 				LDFLAGS=$cf_save_LDFLAGS
+ fi
+-echo "$as_me:6258: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:6275: result: $cf_cv_ldflags_search_paths_first" >&5
+ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
+ 		if test "$cf_cv_ldflags_search_paths_first" = yes; then
+ 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+@@ -6605,7 +6622,7 @@
+ 			do
+ 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6608 "configure"
++#line 6625 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6617,16 +6634,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6620: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6637: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6623: \$? = $ac_status" >&5
++  echo "$as_me:6640: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6626: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6643: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6629: \$? = $ac_status" >&5
++  echo "$as_me:6646: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -6663,7 +6680,7 @@
+ 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ 			;;
+ 		(*)
+-			{ echo "$as_me:6666: WARNING: ignored --with-shlib-version" >&5
++			{ echo "$as_me:6683: WARNING: ignored --with-shlib-version" >&5
+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ 			;;
+ 		esac
+@@ -6673,7 +6690,7 @@
+ 	if test -n "$cf_try_cflags"
+ 	then
+ cat > conftest.$ac_ext <
+ int main(int argc, char *argv[])
+ {
+@@ -6685,18 +6702,18 @@
+ 		for cf_opt in $cf_try_cflags
+ 		do
+ 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
+-			echo "$as_me:6688: checking if CFLAGS option -$cf_opt works" >&5
++			echo "$as_me:6705: checking if CFLAGS option -$cf_opt works" >&5
+ echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6
+-			if { (eval echo "$as_me:6690: \"$ac_compile\"") >&5
++			if { (eval echo "$as_me:6707: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6693: \$? = $ac_status" >&5
++  echo "$as_me:6710: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-				echo "$as_me:6695: result: yes" >&5
++				echo "$as_me:6712: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 				cf_save_CFLAGS="$CFLAGS"
+ 			else
+-				echo "$as_me:6699: result: no" >&5
++				echo "$as_me:6716: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 			fi
+ 		done
+@@ -6711,17 +6728,17 @@
+ 
+ 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
+ 
+-echo "${as_me:-configure}:6714: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++echo "${as_me:-configure}:6731: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
+ 
+-echo "${as_me:-configure}:6718: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:6735: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ for model in $cf_list_models ; do
+ 	case "$model" in
+ 	(libtool)
+ 
+-echo "$as_me:6724: checking for additional libtool options" >&5
++echo "$as_me:6741: checking for additional libtool options" >&5
+ echo $ECHO_N "checking for additional libtool options... $ECHO_C" >&6
+ 
+ # Check whether --with-libtool-opts or --without-libtool-opts was given.
+@@ -6731,7 +6748,7 @@
+ else
+   with_libtool_opts=no
+ fi;
+-echo "$as_me:6734: result: $with_libtool_opts" >&5
++echo "$as_me:6751: result: $with_libtool_opts" >&5
+ echo "${ECHO_T}$with_libtool_opts" >&6
+ 
+ case .$with_libtool_opts in
+@@ -6742,7 +6759,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:6745: checking if exported-symbols file should be used" >&5
++echo "$as_me:6762: checking if exported-symbols file should be used" >&5
+ echo $ECHO_N "checking if exported-symbols file should be used... $ECHO_C" >&6
+ 
+ # Check whether --with-export-syms or --without-export-syms was given.
+@@ -6757,7 +6774,7 @@
+ 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
+ 
+ fi
+-echo "$as_me:6760: result: $with_export_syms" >&5
++echo "$as_me:6777: result: $with_export_syms" >&5
+ echo "${ECHO_T}$with_export_syms" >&6
+ if test "x$with_export_syms" != xno
+ then
+@@ -6768,15 +6785,15 @@
+ 		;;
+ 	(shared)
+ 		if test "$CC_SHARED_OPTS" = "unknown"; then
+-			{ { echo "$as_me:6771: error: Shared libraries are not supported in this version" >&5
++			{ { echo "$as_me:6788: error: Shared libraries are not supported in this version" >&5
+ echo "$as_me: error: Shared libraries are not supported in this version" >&2;}
+    { (exit 1); exit 1; }; }
+ 		fi
+ 		# workaround for inept transition to PIE vs PIC...
+-		echo "$as_me:6776: checking if current CFLAGS link properly" >&5
++		echo "$as_me:6793: checking if current CFLAGS link properly" >&5
+ echo $ECHO_N "checking if current CFLAGS link properly... $ECHO_C" >&6
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6779 "configure"
++#line 6796 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6788,16 +6805,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6791: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6808: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6794: \$? = $ac_status" >&5
++  echo "$as_me:6811: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6797: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6814: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6800: \$? = $ac_status" >&5
++  echo "$as_me:6817: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cflags_work=yes
+ else
+@@ -6806,18 +6823,18 @@
+ cf_cflags_work=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:6809: result: $cf_cflags_work" >&5
++		echo "$as_me:6826: result: $cf_cflags_work" >&5
+ echo "${ECHO_T}$cf_cflags_work" >&6
+ 		if test "$cf_cflags_work" = no
+ 		then
+ 			test -n "$verbose" && echo "	try to work around by appending shared-options" 1>&6
+ 
+-echo "${as_me:-configure}:6815: testing try to work around by appending shared-options ..." 1>&5
++echo "${as_me:-configure}:6832: testing try to work around by appending shared-options ..." 1>&5
+ 
+ 			CFLAGS="$CFLAGS $CC_SHARED_OPTS"
+ 		fi
+ 
+-echo "$as_me:6820: checking if versioned-symbols file should be used" >&5
++echo "$as_me:6837: checking if versioned-symbols file should be used" >&5
+ echo $ECHO_N "checking if versioned-symbols file should be used... $ECHO_C" >&6
+ 
+ # Check whether --with-versioned-syms or --without-versioned-syms was given.
+@@ -6835,18 +6852,18 @@
+ (xno)
+ 	;;
+ (x/*)
+-	test -f "$with_versioned_syms" || { { echo "$as_me:6838: error: expected a filename: $with_versioned_syms" >&5
++	test -f "$with_versioned_syms" || { { echo "$as_me:6855: error: expected a filename: $with_versioned_syms" >&5
+ echo "$as_me: error: expected a filename: $with_versioned_syms" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ (*)
+-	test -f "$with_versioned_syms" || { { echo "$as_me:6843: error: expected a filename: $with_versioned_syms" >&5
++	test -f "$with_versioned_syms" || { { echo "$as_me:6860: error: expected a filename: $with_versioned_syms" >&5
+ echo "$as_me: error: expected a filename: $with_versioned_syms" >&2;}
+    { (exit 1); exit 1; }; }
+ 	with_versioned_syms=`pwd`/"$with_versioned_syms"
+ 	;;
+ esac
+-echo "$as_me:6849: result: $with_versioned_syms" >&5
++echo "$as_me:6866: result: $with_versioned_syms" >&5
+ echo "${ECHO_T}$with_versioned_syms" >&6
+ 
+ RESULTING_SYMS=
+@@ -6862,7 +6879,7 @@
+ 		MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-Wl,%\\${VERSIONED_SYMS} -Wl,%"`
+ 		test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
+ 
+-echo "${as_me:-configure}:6865: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:6882: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ 		;;
+ 	(*-dy\ *)
+@@ -6870,11 +6887,11 @@
+ 		MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-dy%\\${VERSIONED_SYMS} -dy%"`
+ 		test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
+ 
+-echo "${as_me:-configure}:6873: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:6890: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ 		;;
+ 	(*)
+-		{ echo "$as_me:6877: WARNING: this system does not support versioned-symbols" >&5
++		{ echo "$as_me:6894: WARNING: this system does not support versioned-symbols" >&5
+ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
+ 		;;
+ 	esac
+@@ -6886,7 +6903,7 @@
+ 	# symbols.
+ 	if test "x$VERSIONED_SYMS" != "x"
+ 	then
+-		echo "$as_me:6889: checking if wildcards can be used to selectively omit symbols" >&5
++		echo "$as_me:6906: checking if wildcards can be used to selectively omit symbols" >&5
+ echo $ECHO_N "checking if wildcards can be used to selectively omit symbols... $ECHO_C" >&6
+ 		WILDCARD_SYMS=no
+ 
+@@ -6923,7 +6940,7 @@
+ } submodule_1.0;
+ EOF
+ 		cat >conftest.$ac_ext <&5
++		echo "$as_me:6974: result: $WILDCARD_SYMS" >&5
+ echo "${ECHO_T}$WILDCARD_SYMS" >&6
+ 		rm -f conftest.*
+ 	fi
+@@ -6967,7 +6984,7 @@
+ ### Checks for special libraries, must be done up-front.
+ SHLIB_LIST=""
+ 
+-echo "$as_me:6970: checking if you want to link with the GPM mouse library" >&5
++echo "$as_me:6987: checking if you want to link with the GPM mouse library" >&5
+ echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6
+ 
+ # Check whether --with-gpm or --without-gpm was given.
+@@ -6977,27 +6994,27 @@
+ else
+   with_gpm=maybe
+ fi;
+-echo "$as_me:6980: result: $with_gpm" >&5
++echo "$as_me:6997: result: $with_gpm" >&5
+ echo "${ECHO_T}$with_gpm" >&6
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:6984: checking for gpm.h" >&5
++	echo "$as_me:7001: checking for gpm.h" >&5
+ echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6
+ if test "${ac_cv_header_gpm_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6990 "configure"
++#line 7007 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:6994: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7011: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:7000: \$? = $ac_status" >&5
++  echo "$as_me:7017: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7016,7 +7033,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7019: result: $ac_cv_header_gpm_h" >&5
++echo "$as_me:7036: result: $ac_cv_header_gpm_h" >&5
+ echo "${ECHO_T}$ac_cv_header_gpm_h" >&6
+ if test "$ac_cv_header_gpm_h" = yes; then
+ 
+@@ -7027,7 +7044,7 @@
+ 		if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then
+ 			test -n "$verbose" && echo "	assuming we really have GPM library" 1>&6
+ 
+-echo "${as_me:-configure}:7030: testing assuming we really have GPM library ..." 1>&5
++echo "${as_me:-configure}:7047: testing assuming we really have GPM library ..." 1>&5
+ 
+ cat >>confdefs.h <<\EOF
+ #define HAVE_LIBGPM 1
+@@ -7035,7 +7052,7 @@
+ 
+ 			with_gpm=yes
+ 		else
+-			echo "$as_me:7038: checking for Gpm_Open in -lgpm" >&5
++			echo "$as_me:7055: checking for Gpm_Open in -lgpm" >&5
+ echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
+ if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7043,7 +7060,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7046 "configure"
++#line 7063 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7062,16 +7079,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7065: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7082: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7068: \$? = $ac_status" >&5
++  echo "$as_me:7085: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7071: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7088: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7074: \$? = $ac_status" >&5
++  echo "$as_me:7091: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -7082,18 +7099,18 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7085: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:7102: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
+ if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then
+   with_gpm=yes
+ else
+ 
+ 				if test "$with_gpm" = maybe; then
+-					{ echo "$as_me:7092: WARNING: Cannot link with GPM library" >&5
++					{ echo "$as_me:7109: WARNING: Cannot link with GPM library" >&5
+ echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
+ 					with_gpm=no
+ 				else
+-					{ { echo "$as_me:7096: error: Cannot link with GPM library" >&5
++					{ { echo "$as_me:7113: error: Cannot link with GPM library" >&5
+ echo "$as_me: error: Cannot link with GPM library" >&2;}
+    { (exit 1); exit 1; }; }
+ 				fi
+@@ -7104,7 +7121,7 @@
+ 
+ else
+ 
+-		test "$with_gpm" != maybe && { echo "$as_me:7107: WARNING: Cannot find GPM header" >&5
++		test "$with_gpm" != maybe && { echo "$as_me:7124: WARNING: Cannot find GPM header" >&5
+ echo "$as_me: WARNING: Cannot find GPM header" >&2;}
+ 		with_gpm=no
+ 
+@@ -7113,7 +7130,7 @@
+ fi
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:7116: checking if you want to load GPM dynamically" >&5
++	echo "$as_me:7133: checking if you want to load GPM dynamically" >&5
+ echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6
+ 
+ # Check whether --with-dlsym or --without-dlsym was given.
+@@ -7123,18 +7140,18 @@
+ else
+   with_dlsym=yes
+ fi;
+-	echo "$as_me:7126: result: $with_dlsym" >&5
++	echo "$as_me:7143: result: $with_dlsym" >&5
+ echo "${ECHO_T}$with_dlsym" >&6
+ 	if test "x$with_dlsym" = xyes ; then
+ 
+ cf_have_dlsym=no
+-echo "$as_me:7131: checking for dlsym" >&5
++echo "$as_me:7148: checking for dlsym" >&5
+ echo $ECHO_N "checking for dlsym... $ECHO_C" >&6
+ if test "${ac_cv_func_dlsym+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7137 "configure"
++#line 7154 "configure"
+ #include "confdefs.h"
+ #define dlsym autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -7165,16 +7182,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7168: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7185: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7171: \$? = $ac_status" >&5
++  echo "$as_me:7188: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7174: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7191: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7177: \$? = $ac_status" >&5
++  echo "$as_me:7194: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_dlsym=yes
+ else
+@@ -7184,14 +7201,14 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:7187: result: $ac_cv_func_dlsym" >&5
++echo "$as_me:7204: result: $ac_cv_func_dlsym" >&5
+ echo "${ECHO_T}$ac_cv_func_dlsym" >&6
+ if test "$ac_cv_func_dlsym" = yes; then
+   cf_have_dlsym=yes
+ else
+ 
+ cf_have_libdl=no
+-echo "$as_me:7194: checking for dlsym in -ldl" >&5
++echo "$as_me:7211: checking for dlsym in -ldl" >&5
+ echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6
+ if test "${ac_cv_lib_dl_dlsym+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7199,7 +7216,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7202 "configure"
++#line 7219 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7218,16 +7235,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7221: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7238: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7224: \$? = $ac_status" >&5
++  echo "$as_me:7241: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7227: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7244: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7230: \$? = $ac_status" >&5
++  echo "$as_me:7247: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dl_dlsym=yes
+ else
+@@ -7238,7 +7255,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7241: result: $ac_cv_lib_dl_dlsym" >&5
++echo "$as_me:7258: result: $ac_cv_lib_dl_dlsym" >&5
+ echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6
+ if test "$ac_cv_lib_dl_dlsym" = yes; then
+ 
+@@ -7267,10 +7284,10 @@
+ LIBS="$cf_add_libs"
+  }
+ 
+-	echo "$as_me:7270: checking whether able to link to dl*() functions" >&5
++	echo "$as_me:7287: checking whether able to link to dl*() functions" >&5
+ echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7273 "configure"
++#line 7290 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -7288,16 +7305,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7291: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7308: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7294: \$? = $ac_status" >&5
++  echo "$as_me:7311: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7297: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7314: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7300: \$? = $ac_status" >&5
++  echo "$as_me:7317: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ cat >>confdefs.h <<\EOF
+@@ -7308,15 +7325,15 @@
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ 
+-		{ { echo "$as_me:7311: error: Cannot link test program for libdl" >&5
++		{ { echo "$as_me:7328: error: Cannot link test program for libdl" >&5
+ echo "$as_me: error: Cannot link test program for libdl" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-	echo "$as_me:7316: result: ok" >&5
++	echo "$as_me:7333: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ else
+-	{ { echo "$as_me:7319: error: Cannot find dlsym function" >&5
++	{ { echo "$as_me:7336: error: Cannot find dlsym function" >&5
+ echo "$as_me: error: Cannot find dlsym function" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -7324,12 +7341,12 @@
+ 		if test "x$with_gpm" != xyes ; then
+ 			test -n "$verbose" && echo "	assuming soname for gpm is $with_gpm" 1>&6
+ 
+-echo "${as_me:-configure}:7327: testing assuming soname for gpm is $with_gpm ..." 1>&5
++echo "${as_me:-configure}:7344: testing assuming soname for gpm is $with_gpm ..." 1>&5
+ 
+ 			cf_cv_gpm_soname="$with_gpm"
+ 		else
+ 
+-echo "$as_me:7332: checking for soname of gpm library" >&5
++echo "$as_me:7349: checking for soname of gpm library" >&5
+ echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6
+ if test "${cf_cv_gpm_soname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7363,15 +7380,15 @@
+ done
+ LIBS="$cf_add_libs"
+ 
+-	if { (eval echo "$as_me:7366: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:7383: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7369: \$? = $ac_status" >&5
++  echo "$as_me:7386: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+-		if { (eval echo "$as_me:7371: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:7388: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7374: \$? = $ac_status" >&5
++  echo "$as_me:7391: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+ 			cf_cv_gpm_soname="`ldd \"conftest$ac_exeext\" 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | ${FGREP-fgrep} libgpm.`"
+ 			test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
+@@ -7382,7 +7399,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:7385: result: $cf_cv_gpm_soname" >&5
++echo "$as_me:7402: result: $cf_cv_gpm_soname" >&5
+ echo "${ECHO_T}$cf_cv_gpm_soname" >&6
+ 
+ 		fi
+@@ -7450,7 +7467,7 @@
+ #define HAVE_LIBGPM 1
+ EOF
+ 
+-echo "$as_me:7453: checking for Gpm_Wgetch in -lgpm" >&5
++echo "$as_me:7470: checking for Gpm_Wgetch in -lgpm" >&5
+ echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6
+ if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7458,7 +7475,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7461 "configure"
++#line 7478 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7477,16 +7494,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7480: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7497: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7483: \$? = $ac_status" >&5
++  echo "$as_me:7500: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7486: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7503: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7489: \$? = $ac_status" >&5
++  echo "$as_me:7506: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Wgetch=yes
+ else
+@@ -7497,11 +7514,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7500: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
++echo "$as_me:7517: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6
+ if test "$ac_cv_lib_gpm_Gpm_Wgetch" = yes; then
+ 
+-echo "$as_me:7504: checking if GPM is weakly bound to curses library" >&5
++echo "$as_me:7521: checking if GPM is weakly bound to curses library" >&5
+ echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6
+ if test "${cf_cv_check_gpm_wgetch+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7525,15 +7542,15 @@
+ 	# to rely on the static library, noting that some packagers may not
+ 	# include it.
+ 	LIBS="-static -lgpm -dynamic $LIBS"
+-	if { (eval echo "$as_me:7528: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:7545: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7531: \$? = $ac_status" >&5
++  echo "$as_me:7548: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+-		if { (eval echo "$as_me:7533: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:7550: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7536: \$? = $ac_status" >&5
++  echo "$as_me:7553: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+ 			cf_cv_check_gpm_wgetch="`nm \"conftest$ac_exeext\" | ${EGREP-egrep} '\' | ${EGREP-egrep} '\<[vVwW]\>'`"
+ 			test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
+@@ -7545,11 +7562,11 @@
+ fi
+ 
+ fi
+-echo "$as_me:7548: result: $cf_cv_check_gpm_wgetch" >&5
++echo "$as_me:7565: result: $cf_cv_check_gpm_wgetch" >&5
+ echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6
+ 
+ if test "$cf_cv_check_gpm_wgetch" != yes ; then
+-	{ echo "$as_me:7552: WARNING: GPM library is already linked with curses - read the FAQ" >&5
++	{ echo "$as_me:7569: WARNING: GPM library is already linked with curses - read the FAQ" >&5
+ echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;}
+ fi
+ 
+@@ -7557,7 +7574,7 @@
+ 
+ fi
+ 
+-echo "$as_me:7560: checking if you want to use PCRE2 for regular-expressions" >&5
++echo "$as_me:7577: checking if you want to use PCRE2 for regular-expressions" >&5
+ echo $ECHO_N "checking if you want to use PCRE2 for regular-expressions... $ECHO_C" >&6
+ 
+ # Check whether --with-pcre2 or --without-pcre2 was given.
+@@ -7566,7 +7583,7 @@
+ 
+ fi;
+ test -z "$with_pcre2" && with_pcre2=no
+-echo "$as_me:7569: result: $with_pcre2" >&5
++echo "$as_me:7586: result: $with_pcre2" >&5
+ echo "${ECHO_T}$with_pcre2" >&6
+ 
+ if test "x$with_pcre2" != xno ; then
+@@ -7577,17 +7594,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then
+ 	test -n "$verbose" && echo "	found package $cf_with_pcre2" 1>&6
+ 
+-echo "${as_me:-configure}:7580: testing found package $cf_with_pcre2 ..." 1>&5
++echo "${as_me:-configure}:7597: testing found package $cf_with_pcre2 ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_with_pcre2" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "$cf_with_pcre2" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:7586: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:7603: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:7590: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:7607: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -7711,7 +7728,7 @@
+ fi
+ 
+ 	done
+-	cf_with_pcre2_ok=yes || { { echo "$as_me:7714: error: Cannot find PCRE2 library" >&5
++	cf_with_pcre2_ok=yes || { { echo "$as_me:7731: error: Cannot find PCRE2 library" >&5
+ echo "$as_me: error: Cannot find PCRE2 library" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -7724,7 +7741,7 @@
+ 	(*pcre2-posix*|*pcreposix*)
+ 		;;
+ 	(*)
+-		echo "$as_me:7727: checking for regcomp in -lpcre2-posix" >&5
++		echo "$as_me:7744: checking for regcomp in -lpcre2-posix" >&5
+ echo $ECHO_N "checking for regcomp in -lpcre2-posix... $ECHO_C" >&6
+ if test "${ac_cv_lib_pcre2_posix_regcomp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7732,7 +7749,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcre2-posix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7735 "configure"
++#line 7752 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7751,16 +7768,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7754: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7771: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7757: \$? = $ac_status" >&5
++  echo "$as_me:7774: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7760: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7777: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7763: \$? = $ac_status" >&5
++  echo "$as_me:7780: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_pcre2_posix_regcomp=yes
+ else
+@@ -7771,7 +7788,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7774: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
++echo "$as_me:7791: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
+ echo "${ECHO_T}$ac_cv_lib_pcre2_posix_regcomp" >&6
+ if test "$ac_cv_lib_pcre2_posix_regcomp" = yes; then
+ 
+@@ -7792,7 +7809,7 @@
+ LIBS="$cf_add_libs"
+ 
+ else
+-  echo "$as_me:7795: checking for regcomp in -lpcreposix" >&5
++  echo "$as_me:7812: checking for regcomp in -lpcreposix" >&5
+ echo $ECHO_N "checking for regcomp in -lpcreposix... $ECHO_C" >&6
+ if test "${ac_cv_lib_pcreposix_regcomp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7800,7 +7817,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcreposix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7803 "configure"
++#line 7820 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7819,16 +7836,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7822: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7839: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7825: \$? = $ac_status" >&5
++  echo "$as_me:7842: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7828: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7845: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7831: \$? = $ac_status" >&5
++  echo "$as_me:7848: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_pcreposix_regcomp=yes
+ else
+@@ -7839,7 +7856,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7842: result: $ac_cv_lib_pcreposix_regcomp" >&5
++echo "$as_me:7859: result: $ac_cv_lib_pcreposix_regcomp" >&5
+ echo "${ECHO_T}$ac_cv_lib_pcreposix_regcomp" >&6
+ if test "$ac_cv_lib_pcreposix_regcomp" = yes; then
+ 
+@@ -7860,7 +7877,7 @@
+ LIBS="$cf_add_libs"
+ 
+ else
+-  { { echo "$as_me:7863: error: Cannot find PCRE2 POSIX library" >&5
++  { { echo "$as_me:7880: error: Cannot find PCRE2 POSIX library" >&5
+ echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -7875,23 +7892,23 @@
+ for ac_header in pcre2posix.h pcreposix.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:7878: checking for $ac_header" >&5
++echo "$as_me:7895: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7884 "configure"
++#line 7901 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:7888: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7905: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:7894: \$? = $ac_status" >&5
++  echo "$as_me:7911: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7910,7 +7927,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7913: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:7930: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:7943: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7932 "configure"
++#line 7949 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -7960,16 +7977,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7963: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7980: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7966: \$? = $ac_status" >&5
++  echo "$as_me:7983: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7969: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7986: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7972: \$? = $ac_status" >&5
++  echo "$as_me:7989: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -7979,7 +7996,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:7982: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:7999: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
+   cat >>confdefs.h </dev/null ; then
+-echo "$as_me:7996: checking if you want to use sysmouse" >&5
++echo "$as_me:8013: checking if you want to use sysmouse" >&5
+ echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6
+ 
+ # Check whether --with-sysmouse or --without-sysmouse was given.
+@@ -8005,7 +8022,7 @@
+ fi;
+ 	if test "$cf_with_sysmouse" != no ; then
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8008 "configure"
++#line 8025 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8028,16 +8045,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8031: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8048: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8034: \$? = $ac_status" >&5
++  echo "$as_me:8051: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8037: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8054: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8040: \$? = $ac_status" >&5
++  echo "$as_me:8057: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_with_sysmouse=yes
+ else
+@@ -8047,7 +8064,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	fi
+-echo "$as_me:8050: result: $cf_with_sysmouse" >&5
++echo "$as_me:8067: result: $cf_with_sysmouse" >&5
+ echo "${ECHO_T}$cf_with_sysmouse" >&6
+ test "$cf_with_sysmouse" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -8057,7 +8074,7 @@
+ fi
+ 
+ # pretend that ncurses==ncursesw==ncursest
+-echo "$as_me:8060: checking if you want to disable library suffixes" >&5
++echo "$as_me:8077: checking if you want to disable library suffixes" >&5
+ echo $ECHO_N "checking if you want to disable library suffixes... $ECHO_C" >&6
+ 
+ # Check whether --enable-lib-suffixes or --disable-lib-suffixes was given.
+@@ -8074,13 +8091,13 @@
+ 	disable_lib_suffixes=no
+ 
+ fi;
+-echo "$as_me:8077: result: $disable_lib_suffixes" >&5
++echo "$as_me:8094: result: $disable_lib_suffixes" >&5
+ echo "${ECHO_T}$disable_lib_suffixes" >&6
+ 
+ ### If we're building with rpath, try to link non-standard libs that way too.
+ if test "$DFT_LWR_MODEL" = "shared" && test "x$cf_cv_enable_rpath" != xno; then
+ 
+-echo "$as_me:8083: checking if rpath-hack should be disabled" >&5
++echo "$as_me:8100: checking if rpath-hack should be disabled" >&5
+ echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
+ 
+ # Check whether --enable-rpath-hack or --disable-rpath-hack was given.
+@@ -8098,22 +8115,22 @@
+ 
+ fi;
+ if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
+-echo "$as_me:8101: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:8118: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+ 
+ if test "$enable_rpath_hack" = yes ; then
+ 
+-echo "$as_me:8106: checking for updated LDFLAGS" >&5
++echo "$as_me:8123: checking for updated LDFLAGS" >&5
+ echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
+ if test -n "$LD_RPATH_OPT" ; then
+-	echo "$as_me:8109: result: maybe" >&5
++	echo "$as_me:8126: result: maybe" >&5
+ echo "${ECHO_T}maybe" >&6
+ 
+ 	for ac_prog in ldd
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:8116: checking for $ac_word" >&5
++echo "$as_me:8133: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8128,7 +8145,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_cf_ldd_prog="$ac_prog"
+-echo "$as_me:8131: found $ac_dir/$ac_word" >&5
++echo "$as_me:8148: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8136,10 +8153,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+-  echo "$as_me:8139: result: $cf_ldd_prog" >&5
++  echo "$as_me:8156: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+-  echo "$as_me:8142: result: no" >&5
++  echo "$as_me:8159: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8153,7 +8170,7 @@
+ 		cf_rpath_oops=
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8156 "configure"
++#line 8173 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8165,16 +8182,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8168: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8185: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8171: \$? = $ac_status" >&5
++  echo "$as_me:8188: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8174: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8191: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8177: \$? = $ac_status" >&5
++  echo "$as_me:8194: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
+ 		 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
+@@ -8202,7 +8219,7 @@
+ 					then
+ 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+ 
+-echo "${as_me:-configure}:8205: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:8222: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+ 
+ 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ 						break
+@@ -8214,11 +8231,11 @@
+ 
+ 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:8217: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:8234: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:8221: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:8238: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -8255,7 +8272,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:8258: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:8275: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -8268,11 +8285,11 @@
+ 
+ test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:8271: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:8288: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:8275: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:8292: testing ...checking LIBS $LIBS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -8309,7 +8326,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:8312: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:8329: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -8322,14 +8339,14 @@
+ 
+ test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:8325: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:8342: testing ...checked LIBS $LIBS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:8329: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:8346: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ else
+-	echo "$as_me:8332: result: no" >&5
++	echo "$as_me:8349: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8343,7 +8360,7 @@
+ EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
+ if test -n "$EXTRA_PKG_LDFLAGS"
+ then
+-	echo "$as_me:8346: checking if you want to disable extra LDFLAGS for package-scripts" >&5
++	echo "$as_me:8363: checking if you want to disable extra LDFLAGS for package-scripts" >&5
+ echo $ECHO_N "checking if you want to disable extra LDFLAGS for package-scripts... $ECHO_C" >&6
+ 
+ # Check whether --enable-pkg-ldflags or --disable-pkg-ldflags was given.
+@@ -8360,7 +8377,7 @@
+ 	disable_pkg_ldflags=no
+ 
+ fi;
+-	echo "$as_me:8363: result: $disable_pkg_ldflags" >&5
++	echo "$as_me:8380: result: $disable_pkg_ldflags" >&5
+ echo "${ECHO_T}$disable_pkg_ldflags" >&6
+ 	test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
+ fi
+@@ -8368,7 +8385,7 @@
+ ###############################################################################
+ 
+ ###	use option --with-extra-suffix to append suffix to headers and libraries
+-echo "$as_me:8371: checking if you wish to append extra suffix to header/library paths" >&5
++echo "$as_me:8388: checking if you wish to append extra suffix to header/library paths" >&5
+ echo $ECHO_N "checking if you wish to append extra suffix to header/library paths... $ECHO_C" >&6
+ EXTRA_SUFFIX=
+ 
+@@ -8387,11 +8404,11 @@
+ 	esac
+ 
+ fi;
+-echo "$as_me:8390: result: $EXTRA_SUFFIX" >&5
++echo "$as_me:8407: result: $EXTRA_SUFFIX" >&5
+ echo "${ECHO_T}$EXTRA_SUFFIX" >&6
+ 
+ ###	use option --disable-overwrite to leave out the link to -lcurses
+-echo "$as_me:8394: checking if you wish to install ncurses overwriting curses" >&5
++echo "$as_me:8411: checking if you wish to install ncurses overwriting curses" >&5
+ echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6
+ 
+ # Check whether --enable-overwrite or --disable-overwrite was given.
+@@ -8401,10 +8418,10 @@
+ else
+   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
+ fi;
+-echo "$as_me:8404: result: $with_overwrite" >&5
++echo "$as_me:8421: result: $with_overwrite" >&5
+ echo "${ECHO_T}$with_overwrite" >&6
+ 
+-echo "$as_me:8407: checking if external terminfo-database is used" >&5
++echo "$as_me:8424: checking if external terminfo-database is used" >&5
+ echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6
+ 
+ # Check whether --enable-database or --disable-database was given.
+@@ -8414,7 +8431,7 @@
+ else
+   use_database=yes
+ fi;
+-echo "$as_me:8417: result: $use_database" >&5
++echo "$as_me:8434: result: $use_database" >&5
+ echo "${ECHO_T}$use_database" >&6
+ 
+ case "$host_os" in
+@@ -8430,7 +8447,7 @@
+ if test "$use_database" != no ; then
+ 	NCURSES_USE_DATABASE=1
+ 
+-	echo "$as_me:8433: checking which terminfo source-file will be installed" >&5
++	echo "$as_me:8450: checking which terminfo source-file will be installed" >&5
+ echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6
+ 
+ # Check whether --with-database or --without-database was given.
+@@ -8438,10 +8455,10 @@
+   withval="$with_database"
+   TERMINFO_SRC=$withval
+ fi;
+-	echo "$as_me:8441: result: $TERMINFO_SRC" >&5
++	echo "$as_me:8458: result: $TERMINFO_SRC" >&5
+ echo "${ECHO_T}$TERMINFO_SRC" >&6
+ 
+-	echo "$as_me:8444: checking whether to use hashed database instead of directory/tree" >&5
++	echo "$as_me:8461: checking whether to use hashed database instead of directory/tree" >&5
+ echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6
+ 
+ # Check whether --with-hashed-db or --without-hashed-db was given.
+@@ -8451,13 +8468,13 @@
+ else
+   with_hashed_db=no
+ fi;
+-	echo "$as_me:8454: result: $with_hashed_db" >&5
++	echo "$as_me:8471: result: $with_hashed_db" >&5
+ echo "${ECHO_T}$with_hashed_db" >&6
+ else
+ 	with_hashed_db=no
+ fi
+ 
+-echo "$as_me:8460: checking for list of fallback descriptions" >&5
++echo "$as_me:8477: checking for list of fallback descriptions" >&5
+ echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6
+ 
+ # Check whether --with-fallbacks or --without-fallbacks was given.
+@@ -8467,7 +8484,7 @@
+ else
+   with_fallback=
+ fi;
+-echo "$as_me:8470: result: $with_fallback" >&5
++echo "$as_me:8487: result: $with_fallback" >&5
+ echo "${ECHO_T}$with_fallback" >&6
+ 
+ case ".$with_fallback" in
+@@ -8475,7 +8492,7 @@
+ 	FALLBACK_LIST=
+ 	;;
+ (.yes)
+-	{ echo "$as_me:8478: WARNING: expected a list of terminal descriptions" >&5
++	{ echo "$as_me:8495: WARNING: expected a list of terminal descriptions" >&5
+ echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
+ 	;;
+ (*)
+@@ -8491,7 +8508,7 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}tic", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}tic; ac_word=$2
+-echo "$as_me:8494: checking for $ac_word" >&5
++echo "$as_me:8511: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_TIC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8506,7 +8523,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_TIC="${ac_tool_prefix}tic"
+-echo "$as_me:8509: found $ac_dir/$ac_word" >&5
++echo "$as_me:8526: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8514,10 +8531,10 @@
+ fi
+ TIC=$ac_cv_prog_TIC
+ if test -n "$TIC"; then
+-  echo "$as_me:8517: result: $TIC" >&5
++  echo "$as_me:8534: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+-  echo "$as_me:8520: result: no" >&5
++  echo "$as_me:8537: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8526,7 +8543,7 @@
+   ac_ct_TIC=$TIC
+   # Extract the first word of "tic", so it can be a program name with args.
+ set dummy tic; ac_word=$2
+-echo "$as_me:8529: checking for $ac_word" >&5
++echo "$as_me:8546: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_TIC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8541,7 +8558,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_TIC="tic"
+-echo "$as_me:8544: found $ac_dir/$ac_word" >&5
++echo "$as_me:8561: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8549,10 +8566,10 @@
+ fi
+ ac_ct_TIC=$ac_cv_prog_ac_ct_TIC
+ if test -n "$ac_ct_TIC"; then
+-  echo "$as_me:8552: result: $ac_ct_TIC" >&5
++  echo "$as_me:8569: result: $ac_ct_TIC" >&5
+ echo "${ECHO_T}$ac_ct_TIC" >&6
+ else
+-  echo "$as_me:8555: result: no" >&5
++  echo "$as_me:8572: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8564,7 +8581,7 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}infocmp", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}infocmp; ac_word=$2
+-echo "$as_me:8567: checking for $ac_word" >&5
++echo "$as_me:8584: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_INFOCMP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8579,7 +8596,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_INFOCMP="${ac_tool_prefix}infocmp"
+-echo "$as_me:8582: found $ac_dir/$ac_word" >&5
++echo "$as_me:8599: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8587,10 +8604,10 @@
+ fi
+ INFOCMP=$ac_cv_prog_INFOCMP
+ if test -n "$INFOCMP"; then
+-  echo "$as_me:8590: result: $INFOCMP" >&5
++  echo "$as_me:8607: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+-  echo "$as_me:8593: result: no" >&5
++  echo "$as_me:8610: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8599,7 +8616,7 @@
+   ac_ct_INFOCMP=$INFOCMP
+   # Extract the first word of "infocmp", so it can be a program name with args.
+ set dummy infocmp; ac_word=$2
+-echo "$as_me:8602: checking for $ac_word" >&5
++echo "$as_me:8619: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_INFOCMP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8614,7 +8631,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_INFOCMP="infocmp"
+-echo "$as_me:8617: found $ac_dir/$ac_word" >&5
++echo "$as_me:8634: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8622,10 +8639,10 @@
+ fi
+ ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP
+ if test -n "$ac_ct_INFOCMP"; then
+-  echo "$as_me:8625: result: $ac_ct_INFOCMP" >&5
++  echo "$as_me:8642: result: $ac_ct_INFOCMP" >&5
+ echo "${ECHO_T}$ac_ct_INFOCMP" >&6
+ else
+-  echo "$as_me:8628: result: no" >&5
++  echo "$as_me:8645: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8640,10 +8657,10 @@
+ # Check whether --with-tic-path or --without-tic-path was given.
+ if test "${with_tic_path+set}" = set; then
+   withval="$with_tic_path"
+-  echo "$as_me:8643: checking for tic program for fallbacks" >&5
++  echo "$as_me:8660: checking for tic program for fallbacks" >&5
+ echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
+ 		TIC=$withval
+-		echo "$as_me:8646: result: $TIC" >&5
++		echo "$as_me:8663: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ 
+ if test "x$prefix" != xNONE; then
+@@ -8671,7 +8688,7 @@
+ 	TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:8674: error: expected a pathname, not \"$TIC\"" >&5
++	{ { echo "$as_me:8691: error: expected a pathname, not \"$TIC\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -8684,7 +8701,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:8687: checking for $ac_word" >&5
++echo "$as_me:8704: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_TIC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8701,7 +8718,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_TIC="$ac_dir/$ac_word"
+-   echo "$as_me:8704: found $ac_dir/$ac_word" >&5
++   echo "$as_me:8721: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -8712,10 +8729,10 @@
+ TIC=$ac_cv_path_TIC
+ 
+ if test -n "$TIC"; then
+-  echo "$as_me:8715: result: $TIC" >&5
++  echo "$as_me:8732: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+-  echo "$as_me:8718: result: no" >&5
++  echo "$as_me:8735: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8774,7 +8791,7 @@
+ 
+ if test -n "$cf_path_prog" ; then
+ 
+-echo "${as_me:-configure}:8777: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:8794: testing defining path for ${cf_path_prog} ..." 1>&5
+ 
+ cat >>confdefs.h <&5
++			{ echo "$as_me:8809: WARNING: no tic program found for fallbacks" >&5
+ echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
+ 		fi
+ 
+@@ -8798,10 +8815,10 @@
+ # Check whether --with-infocmp-path or --without-infocmp-path was given.
+ if test "${with_infocmp_path+set}" = set; then
+   withval="$with_infocmp_path"
+-  echo "$as_me:8801: checking for infocmp program for fallbacks" >&5
++  echo "$as_me:8818: checking for infocmp program for fallbacks" >&5
+ echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
+ 		INFOCMP=$withval
+-		echo "$as_me:8804: result: $INFOCMP" >&5
++		echo "$as_me:8821: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ 
+ if test "x$prefix" != xNONE; then
+@@ -8829,7 +8846,7 @@
+ 	INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:8832: error: expected a pathname, not \"$INFOCMP\"" >&5
++	{ { echo "$as_me:8849: error: expected a pathname, not \"$INFOCMP\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -8842,7 +8859,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:8845: checking for $ac_word" >&5
++echo "$as_me:8862: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_INFOCMP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8859,7 +8876,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_INFOCMP="$ac_dir/$ac_word"
+-   echo "$as_me:8862: found $ac_dir/$ac_word" >&5
++   echo "$as_me:8879: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -8870,10 +8887,10 @@
+ INFOCMP=$ac_cv_path_INFOCMP
+ 
+ if test -n "$INFOCMP"; then
+-  echo "$as_me:8873: result: $INFOCMP" >&5
++  echo "$as_me:8890: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+-  echo "$as_me:8876: result: no" >&5
++  echo "$as_me:8893: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8932,7 +8949,7 @@
+ 
+ if test -n "$cf_path_prog" ; then
+ 
+-echo "${as_me:-configure}:8935: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:8952: testing defining path for ${cf_path_prog} ..." 1>&5
+ 
+ cat >>confdefs.h <&5
++			{ echo "$as_me:8967: WARNING: no infocmp program found for fallbacks" >&5
+ echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
+ 		fi
+ 
+@@ -8957,7 +8974,7 @@
+ 	test -z "$INFOCMP" && FALLBACK_LIST=
+ 	if test -z "$FALLBACK_LIST"
+ 	then
+-		{ echo "$as_me:8960: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
++		{ echo "$as_me:8977: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
+ echo "$as_me: WARNING: ignoring fallback option because tic/infocmp are not available" >&2;}
+ 	fi
+ fi
+@@ -8965,7 +8982,7 @@
+ USE_FALLBACKS=
+ test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
+ 
+-echo "$as_me:8968: checking if you want modern xterm or antique" >&5
++echo "$as_me:8985: checking if you want modern xterm or antique" >&5
+ echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6
+ 
+ # Check whether --with-xterm-new or --without-xterm-new was given.
+@@ -8979,11 +8996,11 @@
+ (no) with_xterm_new=xterm-old;;
+ (*)	 with_xterm_new=xterm-new;;
+ esac
+-echo "$as_me:8982: result: $with_xterm_new" >&5
++echo "$as_me:8999: result: $with_xterm_new" >&5
+ echo "${ECHO_T}$with_xterm_new" >&6
+ WHICH_XTERM=$with_xterm_new
+ 
+-echo "$as_me:8986: checking if xterm backspace sends BS or DEL" >&5
++echo "$as_me:9003: checking if xterm backspace sends BS or DEL" >&5
+ echo $ECHO_N "checking if xterm backspace sends BS or DEL... $ECHO_C" >&6
+ 
+ # Check whether --with-xterm-kbs or --without-xterm-kbs was given.
+@@ -9004,7 +9021,7 @@
+ 	with_xterm_kbs=$withval
+ 	;;
+ esac
+-echo "$as_me:9007: result: $with_xterm_kbs" >&5
++echo "$as_me:9024: result: $with_xterm_kbs" >&5
+ echo "${ECHO_T}$with_xterm_kbs" >&6
+ XTERM_KBS=$with_xterm_kbs
+ 
+@@ -9014,7 +9031,7 @@
+ 	MAKE_TERMINFO="#"
+ else
+ 
+-echo "$as_me:9017: checking for list of terminfo directories" >&5
++echo "$as_me:9034: checking for list of terminfo directories" >&5
+ echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6
+ 
+ # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given.
+@@ -9054,7 +9071,7 @@
+ 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9057: error: expected a pathname, not \"$cf_src_path\"" >&5
++	{ { echo "$as_me:9074: error: expected a pathname, not \"$cf_src_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -9077,7 +9094,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:9080: result: $TERMINFO_DIRS" >&5
++echo "$as_me:9097: result: $TERMINFO_DIRS" >&5
+ echo "${ECHO_T}$TERMINFO_DIRS" >&6
+ test -n "$TERMINFO_DIRS" &&
+ cat >>confdefs.h <&5
++	{ echo "$as_me:9106: WARNING: ignoring non-directory/file TERMINFO value" >&5
+ echo "$as_me: WARNING: ignoring non-directory/file TERMINFO value" >&2;}
+ 	unset TERMINFO
+ 	;;
+ esac
+ 
+-echo "$as_me:9095: checking for default terminfo directory" >&5
++echo "$as_me:9112: checking for default terminfo directory" >&5
+ echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6
+ 
+ # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given.
+@@ -9128,7 +9145,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9131: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:9148: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -9137,7 +9154,7 @@
+ fi
+ eval TERMINFO="$withval"
+ 
+-echo "$as_me:9140: result: $TERMINFO" >&5
++echo "$as_me:9157: result: $TERMINFO" >&5
+ echo "${ECHO_T}$TERMINFO" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:9168: checking if big-core option selected" >&5
+ echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6
+ 
+ # Check whether --enable-big-core or --disable-big-core was given.
+@@ -9160,7 +9177,7 @@
+   with_big_core=no
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9163 "configure"
++#line 9180 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -9174,15 +9191,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:9177: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9194: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9180: \$? = $ac_status" >&5
++  echo "$as_me:9197: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:9182: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9199: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9185: \$? = $ac_status" >&5
++  echo "$as_me:9202: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_big_core=yes
+ else
+@@ -9194,7 +9211,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi;
+-echo "$as_me:9197: result: $with_big_core" >&5
++echo "$as_me:9214: result: $with_big_core" >&5
+ echo "${ECHO_T}$with_big_core" >&6
+ test "x$with_big_core" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -9204,7 +9221,7 @@
+ ### ISO C only guarantees 512-char strings, we have tables which load faster
+ ### when constructed using "big" strings.  More than the C compiler, the awk
+ ### program is a limit on most vendor UNIX systems.  Check that we can build.
+-echo "$as_me:9207: checking if big-strings option selected" >&5
++echo "$as_me:9224: checking if big-strings option selected" >&5
+ echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6
+ 
+ # Check whether --enable-big-strings or --disable-big-strings was given.
+@@ -9228,14 +9245,14 @@
+ 	esac
+ 
+ fi;
+-echo "$as_me:9231: result: $with_big_strings" >&5
++echo "$as_me:9248: result: $with_big_strings" >&5
+ echo "${ECHO_T}$with_big_strings" >&6
+ 
+ USE_BIG_STRINGS=0
+ test "x$with_big_strings" = "xyes" && USE_BIG_STRINGS=1
+ 
+ ###	use option --enable-termcap to compile in the termcap fallback support
+-echo "$as_me:9238: checking if you want termcap-fallback support" >&5
++echo "$as_me:9255: checking if you want termcap-fallback support" >&5
+ echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6
+ 
+ # Check whether --enable-termcap or --disable-termcap was given.
+@@ -9245,14 +9262,14 @@
+ else
+   with_termcap=no
+ fi;
+-echo "$as_me:9248: result: $with_termcap" >&5
++echo "$as_me:9265: result: $with_termcap" >&5
+ echo "${ECHO_T}$with_termcap" >&6
+ 
+ NCURSES_USE_TERMCAP=0
+ if test "x$with_termcap" != "xyes" ; then
+ 	if test "$use_database" = no ; then
+ 		if test -z "$with_fallback" ; then
+-			{ { echo "$as_me:9255: error: You have disabled the database w/o specifying fallbacks" >&5
++			{ { echo "$as_me:9272: error: You have disabled the database w/o specifying fallbacks" >&5
+ echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;}
+    { (exit 1); exit 1; }; }
+ 		fi
+@@ -9265,13 +9282,13 @@
+ else
+ 
+ 	if test "$with_ticlib" != no ; then
+-		{ { echo "$as_me:9268: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
++		{ { echo "$as_me:9285: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
+ echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+ 
+ 	NCURSES_USE_TERMCAP=1
+-	echo "$as_me:9274: checking for list of termcap files" >&5
++	echo "$as_me:9291: checking for list of termcap files" >&5
+ echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6
+ 
+ # Check whether --with-termpath or --without-termpath was given.
+@@ -9311,7 +9328,7 @@
+ 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9314: error: expected a pathname, not \"$cf_src_path\"" >&5
++	{ { echo "$as_me:9331: error: expected a pathname, not \"$cf_src_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -9334,7 +9351,7 @@
+ 	;;
+ esac
+ 
+-	echo "$as_me:9337: result: $TERMPATH" >&5
++	echo "$as_me:9354: result: $TERMPATH" >&5
+ echo "${ECHO_T}$TERMPATH" >&6
+ 	test -n "$TERMPATH" &&
+ cat >>confdefs.h <&5
++	echo "$as_me:9362: checking if fast termcap-loader is needed" >&5
+ echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6
+ 
+ # Check whether --enable-getcap or --disable-getcap was given.
+@@ -9352,14 +9369,14 @@
+ else
+   with_getcap=no
+ fi;
+-	echo "$as_me:9355: result: $with_getcap" >&5
++	echo "$as_me:9372: result: $with_getcap" >&5
+ echo "${ECHO_T}$with_getcap" >&6
+ 	test "x$with_getcap" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+ #define USE_GETCAP 1
+ EOF
+ 
+-	echo "$as_me:9362: checking if translated termcaps will be cached in ~/.terminfo" >&5
++	echo "$as_me:9379: checking if translated termcaps will be cached in ~/.terminfo" >&5
+ echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6
+ 
+ # Check whether --enable-getcap-cache or --disable-getcap-cache was given.
+@@ -9369,7 +9386,7 @@
+ else
+   with_getcap_cache=no
+ fi;
+-	echo "$as_me:9372: result: $with_getcap_cache" >&5
++	echo "$as_me:9389: result: $with_getcap_cache" >&5
+ echo "${ECHO_T}$with_getcap_cache" >&6
+ 	test "x$with_getcap_cache" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -9379,7 +9396,7 @@
+ fi
+ 
+ ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
+-echo "$as_me:9382: checking if ~/.terminfo is wanted" >&5
++echo "$as_me:9399: checking if ~/.terminfo is wanted" >&5
+ echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6
+ 
+ # Check whether --enable-home-terminfo or --disable-home-terminfo was given.
+@@ -9389,14 +9406,14 @@
+ else
+   with_home_terminfo=yes
+ fi;
+-echo "$as_me:9392: result: $with_home_terminfo" >&5
++echo "$as_me:9409: result: $with_home_terminfo" >&5
+ echo "${ECHO_T}$with_home_terminfo" >&6
+ test "x$with_home_terminfo" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+ #define USE_HOME_TERMINFO 1
+ EOF
+ 
+-echo "$as_me:9399: checking if you want to permit root to use ncurses environment variables" >&5
++echo "$as_me:9416: checking if you want to permit root to use ncurses environment variables" >&5
+ echo $ECHO_N "checking if you want to permit root to use ncurses environment variables... $ECHO_C" >&6
+ 
+ # Check whether --enable-root-environ or --disable-root-environ was given.
+@@ -9406,14 +9423,14 @@
+ else
+   with_root_environ=yes
+ fi;
+-echo "$as_me:9409: result: $with_root_environ" >&5
++echo "$as_me:9426: result: $with_root_environ" >&5
+ echo "${ECHO_T}$with_root_environ" >&6
+ test "x$with_root_environ" = xyes &&
+ cat >>confdefs.h <<\EOF
+ #define USE_ROOT_ENVIRON 1
+ EOF
+ 
+-echo "$as_me:9416: checking if you want to permit setuid programs to access all files" >&5
++echo "$as_me:9433: checking if you want to permit setuid programs to access all files" >&5
+ echo $ECHO_N "checking if you want to permit setuid programs to access all files... $ECHO_C" >&6
+ 
+ # Check whether --enable-root-environ or --disable-root-environ was given.
+@@ -9423,7 +9440,7 @@
+ else
+   with_root_access=yes
+ fi;
+-echo "$as_me:9426: result: $with_root_access" >&5
++echo "$as_me:9443: result: $with_root_access" >&5
+ echo "${ECHO_T}$with_root_access" >&6
+ test "x$with_root_access" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -9438,23 +9455,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:9441: checking for $ac_header" >&5
++echo "$as_me:9458: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9447 "configure"
++#line 9464 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:9451: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:9468: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:9457: \$? = $ac_status" >&5
++  echo "$as_me:9474: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -9473,7 +9490,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:9476: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:9493: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:9508: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9497 "configure"
++#line 9514 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -9525,16 +9542,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9528: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9545: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9531: \$? = $ac_status" >&5
++  echo "$as_me:9548: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9534: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9551: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9537: \$? = $ac_status" >&5
++  echo "$as_me:9554: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -9544,7 +9561,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:9547: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:9564: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:9581: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9570 "configure"
++#line 9587 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -9598,16 +9615,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9601: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9618: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9604: \$? = $ac_status" >&5
++  echo "$as_me:9621: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9607: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9624: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9610: \$? = $ac_status" >&5
++  echo "$as_me:9627: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -9617,7 +9634,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:9620: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:9637: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
+   cat >>confdefs.h <&5
++	echo "$as_me:9648: checking if link/symlink functions work" >&5
+ echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6
+ if test "${cf_cv_link_funcs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9641,7 +9658,7 @@
+ 			eval 'ac_cv_func_'$cf_func'=error'
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9644 "configure"
++#line 9661 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -9679,15 +9696,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:9682: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9699: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9685: \$? = $ac_status" >&5
++  echo "$as_me:9702: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:9687: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9704: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9690: \$? = $ac_status" >&5
++  echo "$as_me:9707: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
+@@ -9705,7 +9722,7 @@
+ 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
+ 
+ fi
+-echo "$as_me:9708: result: $cf_cv_link_funcs" >&5
++echo "$as_me:9725: result: $cf_cv_link_funcs" >&5
+ echo "${ECHO_T}$cf_cv_link_funcs" >&6
+ 	test "$ac_cv_func_link"    = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -9725,7 +9742,7 @@
+ # soft links (symbolic links) are useful for some systems where hard links do
+ # not work, or to make it simpler to copy terminfo trees around.
+ if test "x$ac_cv_func_symlink" = xyes ; then
+-	echo "$as_me:9728: checking if tic should use symbolic links" >&5
++	echo "$as_me:9745: checking if tic should use symbolic links" >&5
+ echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6
+ 
+ # Check whether --enable-symlinks or --disable-symlinks was given.
+@@ -9735,21 +9752,21 @@
+ else
+   with_symlinks=no
+ fi;
+-	echo "$as_me:9738: result: $with_symlinks" >&5
++	echo "$as_me:9755: result: $with_symlinks" >&5
+ echo "${ECHO_T}$with_symlinks" >&6
+ fi
+ 
+ # If we have hard links and did not choose to use soft links instead, there is
+ # no reason to make this choice optional - use the hard links.
+ if test "$with_symlinks" = no ; then
+-	echo "$as_me:9745: checking if tic should use hard links" >&5
++	echo "$as_me:9762: checking if tic should use hard links" >&5
+ echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6
+ 	if test "x$ac_cv_func_link" = xyes ; then
+ 		with_links=yes
+ 	else
+ 		with_links=no
+ 	fi
+-	echo "$as_me:9752: result: $with_links" >&5
++	echo "$as_me:9769: result: $with_links" >&5
+ echo "${ECHO_T}$with_links" >&6
+ fi
+ 
+@@ -9765,7 +9782,7 @@
+ 
+ ###   use option --enable-broken-linker to force on use of broken-linker support
+ 
+-echo "$as_me:9768: checking if you want broken-linker support code" >&5
++echo "$as_me:9785: checking if you want broken-linker support code" >&5
+ echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6
+ 
+ # Check whether --enable-broken_linker or --disable-broken_linker was given.
+@@ -9775,7 +9792,7 @@
+ else
+   with_broken_linker=no
+ fi;
+-echo "$as_me:9778: result: $with_broken_linker" >&5
++echo "$as_me:9795: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+ 
+ : "${BROKEN_LINKER:=0}"
+@@ -9789,7 +9806,7 @@
+ fi
+ 
+ ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
+-echo "$as_me:9792: checking if tputs should process BSD-style prefix padding" >&5
++echo "$as_me:9809: checking if tputs should process BSD-style prefix padding" >&5
+ echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6
+ 
+ # Check whether --enable-bsdpad or --disable-bsdpad was given.
+@@ -9799,7 +9816,7 @@
+ else
+   with_bsdpad=no
+ fi;
+-echo "$as_me:9802: result: $with_bsdpad" >&5
++echo "$as_me:9819: result: $with_bsdpad" >&5
+ echo "${ECHO_T}$with_bsdpad" >&6
+ test "x$with_bsdpad" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -9818,14 +9835,14 @@
+ # Check to define _XOPEN_SOURCE "automatically"
+ CPPFLAGS_before_XOPEN="$CPPFLAGS"
+ 
+-echo "$as_me:9821: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:9838: checking if the POSIX test-macros are already defined" >&5
+ echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6
+ if test "${cf_cv_posix_visible+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9828 "configure"
++#line 9845 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9844,16 +9861,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9847: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9864: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9850: \$? = $ac_status" >&5
++  echo "$as_me:9867: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9853: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9870: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9856: \$? = $ac_status" >&5
++  echo "$as_me:9873: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_visible=no
+ else
+@@ -9864,7 +9881,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:9867: result: $cf_cv_posix_visible" >&5
++echo "$as_me:9884: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+ 
+ if test "$cf_cv_posix_visible" = no; then
+@@ -9909,14 +9926,14 @@
+ 
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+ 
+-echo "$as_me:9912: checking if this is the GNU C library" >&5
++echo "$as_me:9929: checking if this is the GNU C library" >&5
+ echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6
+ if test "${cf_cv_gnu_library+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9919 "configure"
++#line 9936 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9935,16 +9952,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9938: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9955: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9941: \$? = $ac_status" >&5
++  echo "$as_me:9958: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9944: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9961: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9947: \$? = $ac_status" >&5
++  echo "$as_me:9964: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library=yes
+ else
+@@ -9955,7 +9972,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:9958: result: $cf_cv_gnu_library" >&5
++echo "$as_me:9975: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+ 
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -9963,7 +9980,7 @@
+ 	# With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE
+ 	# was changed to help a little.  newlib incorporated the change about 4
+ 	# years later.
+-	echo "$as_me:9966: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++	echo "$as_me:9983: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+ echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6
+ if test "${cf_cv_gnu_library_219+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9975,7 +9992,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9978 "configure"
++#line 9995 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9994,16 +10011,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9997: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10014: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10000: \$? = $ac_status" >&5
++  echo "$as_me:10017: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10003: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10020: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10006: \$? = $ac_status" >&5
++  echo "$as_me:10023: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library_219=yes
+ else
+@@ -10015,12 +10032,12 @@
+ 		CPPFLAGS="$cf_save"
+ 
+ fi
+-echo "$as_me:10018: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:10035: result: $cf_cv_gnu_library_219" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library_219" >&6
+ 
+ 	if test "x$cf_cv_gnu_library_219" = xyes; then
+ 		cf_save="$CPPFLAGS"
+-		echo "$as_me:10023: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++		echo "$as_me:10040: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+ echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_gnu_dftsrc_219+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10125,7 +10142,7 @@
+ fi
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10128 "configure"
++#line 10145 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -10145,16 +10162,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10148: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10165: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10151: \$? = $ac_status" >&5
++  echo "$as_me:10168: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10154: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10171: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10157: \$? = $ac_status" >&5
++  echo "$as_me:10174: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -10165,7 +10182,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10168: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:10185: result: $cf_cv_gnu_dftsrc_219" >&5
+ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
+ 		test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save"
+ 	else
+@@ -10174,14 +10191,14 @@
+ 
+ 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+ 
+-		echo "$as_me:10177: checking if we must define _GNU_SOURCE" >&5
++		echo "$as_me:10194: checking if we must define _GNU_SOURCE" >&5
+ echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_gnu_source+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10184 "configure"
++#line 10201 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10196,16 +10213,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10199: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10216: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10202: \$? = $ac_status" >&5
++  echo "$as_me:10219: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10205: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10222: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10208: \$? = $ac_status" >&5
++  echo "$as_me:10225: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -10312,7 +10329,7 @@
+ fi
+ 
+ 			 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10315 "configure"
++#line 10332 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10327,16 +10344,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10330: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10347: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10333: \$? = $ac_status" >&5
++  echo "$as_me:10350: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10336: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10353: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10339: \$? = $ac_status" >&5
++  echo "$as_me:10356: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -10351,12 +10368,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10354: result: $cf_cv_gnu_source" >&5
++echo "$as_me:10371: result: $cf_cv_gnu_source" >&5
+ echo "${ECHO_T}$cf_cv_gnu_source" >&6
+ 
+ 		if test "$cf_cv_gnu_source" = yes
+ 		then
+-		echo "$as_me:10359: checking if we should also define _DEFAULT_SOURCE" >&5
++		echo "$as_me:10376: checking if we should also define _DEFAULT_SOURCE" >&5
+ echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_default_source+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10366,7 +10383,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10369 "configure"
++#line 10386 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10381,16 +10398,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10384: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10401: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10387: \$? = $ac_status" >&5
++  echo "$as_me:10404: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10390: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10407: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10393: \$? = $ac_status" >&5
++  echo "$as_me:10410: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_default_source=no
+ else
+@@ -10401,7 +10418,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10404: result: $cf_cv_default_source" >&5
++echo "$as_me:10421: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ 			if test "$cf_cv_default_source" = yes
+ 			then
+@@ -10438,16 +10455,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:10441: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:10458: checking if we should define _POSIX_C_SOURCE" >&5
+ echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_posix_c_source+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-echo "${as_me:-configure}:10447: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:10464: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10450 "configure"
++#line 10467 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10462,16 +10479,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10465: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10482: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10468: \$? = $ac_status" >&5
++  echo "$as_me:10485: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10471: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10488: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10474: \$? = $ac_status" >&5
++  echo "$as_me:10491: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -10492,7 +10509,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10495 "configure"
++#line 10512 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10507,16 +10524,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10510: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10527: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10513: \$? = $ac_status" >&5
++  echo "$as_me:10530: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10516: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10533: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10519: \$? = $ac_status" >&5
++  echo "$as_me:10536: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -10527,7 +10544,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:10530: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:10547: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -10535,10 +10552,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:10538: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:10555: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10541 "configure"
++#line 10558 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10553,16 +10570,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10556: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10573: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10559: \$? = $ac_status" >&5
++  echo "$as_me:10576: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10562: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10579: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10565: \$? = $ac_status" >&5
++  echo "$as_me:10582: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -10578,7 +10595,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10581: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:10598: result: $cf_cv_posix_c_source" >&5
+ echo "${ECHO_T}$cf_cv_posix_c_source" >&6
+ 
+ if test "$cf_cv_posix_c_source" != no ; then
+@@ -10695,7 +10712,7 @@
+ 	# OpenBSD 6.x has broken locale support, both compile-time and runtime.
+ 	# see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
+ 	# Abusing the conformance level is a workaround.
+-	{ echo "$as_me:10698: WARNING: this system does not provide usable locale support" >&5
++	{ echo "$as_me:10715: WARNING: this system does not provide usable locale support" >&5
+ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
+ 	cf_xopen_source="-D_BSD_SOURCE"
+ 	cf_XOPEN_SOURCE=700
+@@ -10727,14 +10744,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:10730: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:10747: checking if we should define _XOPEN_SOURCE" >&5
+ echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_xopen_source+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10737 "configure"
++#line 10754 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -10753,16 +10770,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10756: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10773: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10759: \$? = $ac_status" >&5
++  echo "$as_me:10776: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10762: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10779: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10765: \$? = $ac_status" >&5
++  echo "$as_me:10782: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -10774,7 +10791,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10777 "configure"
++#line 10794 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -10793,16 +10810,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10796: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10813: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10799: \$? = $ac_status" >&5
++  echo "$as_me:10816: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10802: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10819: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10805: \$? = $ac_status" >&5
++  echo "$as_me:10822: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -10817,7 +10834,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10820: result: $cf_cv_xopen_source" >&5
++echo "$as_me:10837: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -10975,16 +10992,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:10978: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:10995: checking if we should define _POSIX_C_SOURCE" >&5
+ echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_posix_c_source+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-echo "${as_me:-configure}:10984: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:11001: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10987 "configure"
++#line 11004 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10999,16 +11016,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11002: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11019: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11005: \$? = $ac_status" >&5
++  echo "$as_me:11022: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11008: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11025: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11011: \$? = $ac_status" >&5
++  echo "$as_me:11028: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -11029,7 +11046,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11032 "configure"
++#line 11049 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11044,16 +11061,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11047: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11064: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11050: \$? = $ac_status" >&5
++  echo "$as_me:11067: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11053: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11070: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11056: \$? = $ac_status" >&5
++  echo "$as_me:11073: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11064,7 +11081,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:11067: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:11084: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -11072,10 +11089,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:11075: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:11092: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11078 "configure"
++#line 11095 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11090,16 +11107,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11093: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11110: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11096: \$? = $ac_status" >&5
++  echo "$as_me:11113: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11099: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11116: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11102: \$? = $ac_status" >&5
++  echo "$as_me:11119: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11115,7 +11132,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11118: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:11135: result: $cf_cv_posix_c_source" >&5
+ echo "${ECHO_T}$cf_cv_posix_c_source" >&6
+ 
+ if test "$cf_cv_posix_c_source" != no ; then
+@@ -11241,7 +11258,7 @@
+ 	test "$CFLAGS" != "$cf_old_cflag" || break
+ 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:11244: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:11261: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+ 
+ 	CFLAGS="$cf_old_cflag"
+ done
+@@ -11253,7 +11270,7 @@
+ 	test "$CPPFLAGS" != "$cf_old_cflag" || break
+ 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:11256: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:11273: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+ 
+ 	CPPFLAGS="$cf_old_cflag"
+ done
+@@ -11341,7 +11358,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:11344: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:11361: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -11351,7 +11368,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:11354: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:11371: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -11361,7 +11378,7 @@
+ if test -n "$cf_new_extra_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:11364: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:11381: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+ 
+ 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+ 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+@@ -11373,10 +11390,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:11376: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:11393: checking if _XOPEN_SOURCE really is set" >&5
+ echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11379 "configure"
++#line 11396 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11391,16 +11408,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11394: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11411: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11397: \$? = $ac_status" >&5
++  echo "$as_me:11414: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11400: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11417: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11403: \$? = $ac_status" >&5
++  echo "$as_me:11420: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -11409,12 +11426,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:11412: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:11429: result: $cf_XOPEN_SOURCE_set" >&5
+ echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
+ 	if test "$cf_XOPEN_SOURCE_set" = yes
+ 	then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11417 "configure"
++#line 11434 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11429,16 +11446,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11432: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11449: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11435: \$? = $ac_status" >&5
++  echo "$as_me:11452: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11438: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11455: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11441: \$? = $ac_status" >&5
++  echo "$as_me:11458: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -11449,19 +11466,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		if test "$cf_XOPEN_SOURCE_set_ok" = no
+ 		then
+-			{ echo "$as_me:11452: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:11469: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:11457: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:11474: checking if we should define _XOPEN_SOURCE" >&5
+ echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_xopen_source+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11464 "configure"
++#line 11481 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -11480,16 +11497,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11483: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11500: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11486: \$? = $ac_status" >&5
++  echo "$as_me:11503: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11489: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11506: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11492: \$? = $ac_status" >&5
++  echo "$as_me:11509: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -11501,7 +11518,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11504 "configure"
++#line 11521 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -11520,16 +11537,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11523: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11540: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11526: \$? = $ac_status" >&5
++  echo "$as_me:11543: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11529: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11546: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11532: \$? = $ac_status" >&5
++  echo "$as_me:11549: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -11544,7 +11561,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11547: result: $cf_cv_xopen_source" >&5
++echo "$as_me:11564: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -11695,14 +11712,14 @@
+ 
+ # Work around breakage on OS X
+ 
+-echo "$as_me:11698: checking if SIGWINCH is defined" >&5
++echo "$as_me:11715: checking if SIGWINCH is defined" >&5
+ echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6
+ if test "${cf_cv_define_sigwinch+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11705 "configure"
++#line 11722 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -11717,23 +11734,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11720: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11737: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11723: \$? = $ac_status" >&5
++  echo "$as_me:11740: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11726: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11743: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11729: \$? = $ac_status" >&5
++  echo "$as_me:11746: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_define_sigwinch=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11736 "configure"
++#line 11753 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -11751,16 +11768,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11754: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11771: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11757: \$? = $ac_status" >&5
++  echo "$as_me:11774: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11760: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11777: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11763: \$? = $ac_status" >&5
++  echo "$as_me:11780: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_define_sigwinch=maybe
+ else
+@@ -11774,11 +11791,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11777: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:11794: result: $cf_cv_define_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_define_sigwinch" >&6
+ 
+ if test "$cf_cv_define_sigwinch" = maybe ; then
+-echo "$as_me:11781: checking for actual SIGWINCH definition" >&5
++echo "$as_me:11798: checking for actual SIGWINCH definition" >&5
+ echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6
+ if test "${cf_cv_fixup_sigwinch+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11789,7 +11806,7 @@
+ while test "$cf_sigwinch" != 1
+ do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11792 "configure"
++#line 11809 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -11811,16 +11828,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11814: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11831: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11817: \$? = $ac_status" >&5
++  echo "$as_me:11834: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11820: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11837: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11823: \$? = $ac_status" >&5
++  echo "$as_me:11840: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fixup_sigwinch=$cf_sigwinch
+ 	 break
+@@ -11834,7 +11851,7 @@
+ done
+ 
+ fi
+-echo "$as_me:11837: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:11854: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+ 
+ 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -11844,13 +11861,13 @@
+ 
+ # Checks for CODESET support.
+ 
+-echo "$as_me:11847: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:11864: checking for nl_langinfo and CODESET" >&5
+ echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
+ if test "${am_cv_langinfo_codeset+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11853 "configure"
++#line 11870 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11862,16 +11879,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11865: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11882: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11868: \$? = $ac_status" >&5
++  echo "$as_me:11885: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11871: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11888: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11874: \$? = $ac_status" >&5
++  echo "$as_me:11891: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   am_cv_langinfo_codeset=yes
+ else
+@@ -11882,7 +11899,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11885: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:11902: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ 	if test "$am_cv_langinfo_codeset" = yes; then
+ 
+@@ -11896,7 +11913,7 @@
+ NCURSES_OK_WCHAR_T=
+ NCURSES_OK_WINT_T=
+ 
+-echo "$as_me:11899: checking if you want wide-character code" >&5
++echo "$as_me:11916: checking if you want wide-character code" >&5
+ echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6
+ 
+ # Check whether --enable-widec or --disable-widec was given.
+@@ -11906,7 +11923,7 @@
+ else
+   with_widec=no
+ fi;
+-echo "$as_me:11909: result: $with_widec" >&5
++echo "$as_me:11926: result: $with_widec" >&5
+ echo "${ECHO_T}$with_widec" >&6
+ 
+ NCURSES_WCWIDTH_GRAPHICS=1
+@@ -11930,23 +11947,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:11933: checking for $ac_header" >&5
++echo "$as_me:11950: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11939 "configure"
++#line 11956 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:11943: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:11960: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:11949: \$? = $ac_status" >&5
++  echo "$as_me:11966: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -11965,7 +11982,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:11968: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:11985: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:11995: checking if wchar.h can be used as is" >&5
+ echo $ECHO_N "checking if wchar.h can be used as is... $ECHO_C" >&6
+ if test "${cf_cv_wchar_h_okay+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11985 "configure"
++#line 12002 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12004,16 +12021,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12007: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12024: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12010: \$? = $ac_status" >&5
++  echo "$as_me:12027: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12013: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12030: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12016: \$? = $ac_status" >&5
++  echo "$as_me:12033: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_h_okay=yes
+ else
+@@ -12023,16 +12040,16 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12026: result: $cf_cv_wchar_h_okay" >&5
++echo "$as_me:12043: result: $cf_cv_wchar_h_okay" >&5
+ echo "${ECHO_T}$cf_cv_wchar_h_okay" >&6
+ 
+ if test "$cf_cv_wchar_h_okay" = no
+ then
+ 
+-echo "$as_me:12032: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
++echo "$as_me:12049: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+ echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12035 "configure"
++#line 12052 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -12048,16 +12065,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12051: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12068: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12054: \$? = $ac_status" >&5
++  echo "$as_me:12071: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12057: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12074: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12060: \$? = $ac_status" >&5
++  echo "$as_me:12077: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=no
+ else
+@@ -12066,16 +12083,16 @@
+ cf_result=yes
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:12069: result: $cf_result" >&5
++echo "$as_me:12086: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ if test "$cf_result" = yes ; then
+ 	CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
+ elif test "x" != "x" ; then
+-	echo "$as_me:12075: checking checking for compatible value versus " >&5
++	echo "$as_me:12092: checking checking for compatible value versus " >&5
+ echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12078 "configure"
++#line 12095 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -12091,16 +12108,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12094: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12111: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12097: \$? = $ac_status" >&5
++  echo "$as_me:12114: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12100: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12117: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12103: \$? = $ac_status" >&5
++  echo "$as_me:12120: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -12109,7 +12126,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:12112: result: $cf_result" >&5
++	echo "$as_me:12129: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" = no ; then
+ 		# perhaps we can override it - try...
+@@ -12119,7 +12136,7 @@
+ 
+ fi
+ 
+-echo "$as_me:12122: checking if wcwidth agrees graphics are single-width" >&5
++echo "$as_me:12139: checking if wcwidth agrees graphics are single-width" >&5
+ echo $ECHO_N "checking if wcwidth agrees graphics are single-width... $ECHO_C" >&6
+ if test "${cf_cv_wcwidth_graphics+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12190,7 +12207,7 @@
+   cf_cv_wcwidth_graphics=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12193 "configure"
++#line 12210 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12234,15 +12251,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:12237: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12254: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12240: \$? = $ac_status" >&5
++  echo "$as_me:12257: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:12242: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12259: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12245: \$? = $ac_status" >&5
++  echo "$as_me:12262: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wcwidth_graphics=yes
+ else
+@@ -12255,7 +12272,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:12258: result: $cf_cv_wcwidth_graphics" >&5
++echo "$as_me:12275: result: $cf_cv_wcwidth_graphics" >&5
+ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
+ 
+ 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
+@@ -12266,13 +12283,13 @@
+ for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:12269: checking for $ac_func" >&5
++echo "$as_me:12286: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12275 "configure"
++#line 12292 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -12303,16 +12320,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12306: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12323: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12309: \$? = $ac_status" >&5
++  echo "$as_me:12326: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12312: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12329: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12315: \$? = $ac_status" >&5
++  echo "$as_me:12332: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -12322,7 +12339,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12325: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:12342: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:12357: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12346 "configure"
++#line 12363 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:12350: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:12367: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:12356: \$? = $ac_status" >&5
++  echo "$as_me:12373: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12372,7 +12389,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:12375: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:12392: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:12402: checking for multibyte character support" >&5
+ echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6
+ if test "${cf_cv_utf8_lib+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12390,7 +12407,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12393 "configure"
++#line 12410 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12408,16 +12425,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12411: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12428: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12414: \$? = $ac_status" >&5
++  echo "$as_me:12431: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12417: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12434: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12420: \$? = $ac_status" >&5
++  echo "$as_me:12437: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -12429,12 +12446,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:12432: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:12449: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12437 "configure"
++#line 12454 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12447,16 +12464,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12450: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12467: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12453: \$? = $ac_status" >&5
++  echo "$as_me:12470: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12456: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12473: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12459: \$? = $ac_status" >&5
++  echo "$as_me:12476: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -12470,7 +12487,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12473 "configure"
++#line 12490 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12483,16 +12500,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12486: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12503: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12489: \$? = $ac_status" >&5
++  echo "$as_me:12506: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12492: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12509: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12495: \$? = $ac_status" >&5
++  echo "$as_me:12512: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -12509,9 +12526,9 @@
+ 
+ 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:12512: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:12529: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:12514: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:12531: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -12602,7 +12619,7 @@
+ 		if test -d "$cf_cv_header_path_utf8" ; then
+ 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
+ 
+-echo "${as_me:-configure}:12605: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:12622: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+@@ -12610,7 +12627,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12613 "configure"
++#line 12630 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12623,21 +12640,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12626: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12643: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12629: \$? = $ac_status" >&5
++  echo "$as_me:12646: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12632: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12649: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12635: \$? = $ac_status" >&5
++  echo "$as_me:12652: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 				test -n "$verbose" && echo "	... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
+ 
+-echo "${as_me:-configure}:12640: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:12657: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 				cf_cv_find_linkage_utf8=maybe
+ 				cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -12655,7 +12672,7 @@
+ 
+ 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:12658: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:12675: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 		cf_save_LIBS="$LIBS"
+ 		cf_save_LDFLAGS="$LDFLAGS"
+@@ -12730,13 +12747,13 @@
+ 				if test -d "$cf_cv_library_path_utf8" ; then
+ 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
+ 
+-echo "${as_me:-configure}:12733: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:12750: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					CPPFLAGS="$cf_test_CPPFLAGS"
+ 					LIBS="-lutf8  $cf_save_LIBS"
+ 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8"
+ 					cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12739 "configure"
++#line 12756 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12749,21 +12766,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12752: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12769: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12755: \$? = $ac_status" >&5
++  echo "$as_me:12772: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12758: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12775: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12761: \$? = $ac_status" >&5
++  echo "$as_me:12778: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 					test -n "$verbose" && echo "	... found utf8 library in $cf_cv_library_path_utf8" 1>&6
+ 
+-echo "${as_me:-configure}:12766: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:12783: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					cf_cv_find_linkage_utf8=yes
+ 					cf_cv_library_file_utf8="-lutf8"
+@@ -12805,7 +12822,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12808: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:12825: result: $cf_cv_utf8_lib" >&5
+ echo "${ECHO_T}$cf_cv_utf8_lib" >&6
+ 
+ # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
+@@ -12843,7 +12860,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12846 "configure"
++#line 12863 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12855,16 +12872,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12858: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12875: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12861: \$? = $ac_status" >&5
++  echo "$as_me:12878: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12864: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12881: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12867: \$? = $ac_status" >&5
++  echo "$as_me:12884: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -12881,7 +12898,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:12884: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:12901: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -12917,7 +12934,7 @@
+ 			if test "$cf_have_libdir" = no ; then
+ 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+ 
+-echo "${as_me:-configure}:12920: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:12937: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -12949,14 +12966,14 @@
+ 	fi
+ 
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:12952: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:12969: checking if we must include wchar.h to declare mbstate_t" >&5
+ echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
+ if test "${cf_cv_mbstate_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12959 "configure"
++#line 12976 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12974,23 +12991,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12977: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12994: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12980: \$? = $ac_status" >&5
++  echo "$as_me:12997: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12983: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13000: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12986: \$? = $ac_status" >&5
++  echo "$as_me:13003: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_mbstate_t=no
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12993 "configure"
++#line 13010 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13009,16 +13026,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13012: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13029: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13015: \$? = $ac_status" >&5
++  echo "$as_me:13032: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13018: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13035: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13021: \$? = $ac_status" >&5
++  echo "$as_me:13038: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_mbstate_t=yes
+ else
+@@ -13030,7 +13047,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13033: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:13050: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+ 
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -13048,14 +13065,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:13051: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:13068: checking if we must include wchar.h to declare wchar_t" >&5
+ echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
+ if test "${cf_cv_wchar_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13058 "configure"
++#line 13075 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13073,23 +13090,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13076: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13093: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13079: \$? = $ac_status" >&5
++  echo "$as_me:13096: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13082: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13099: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13085: \$? = $ac_status" >&5
++  echo "$as_me:13102: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_t=no
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13092 "configure"
++#line 13109 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13108,16 +13125,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13111: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13128: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13114: \$? = $ac_status" >&5
++  echo "$as_me:13131: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13117: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13134: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13120: \$? = $ac_status" >&5
++  echo "$as_me:13137: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_t=yes
+ else
+@@ -13129,7 +13146,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13132: result: $cf_cv_wchar_t" >&5
++echo "$as_me:13149: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+ 
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -13152,14 +13169,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:13155: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:13172: checking if we must include wchar.h to declare wint_t" >&5
+ echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
+ if test "${cf_cv_wint_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13162 "configure"
++#line 13179 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13177,23 +13194,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13180: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13197: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13183: \$? = $ac_status" >&5
++  echo "$as_me:13200: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13186: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13203: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13189: \$? = $ac_status" >&5
++  echo "$as_me:13206: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wint_t=no
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13196 "configure"
++#line 13213 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13212,16 +13229,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13215: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13232: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13218: \$? = $ac_status" >&5
++  echo "$as_me:13235: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13221: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13238: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13224: \$? = $ac_status" >&5
++  echo "$as_me:13241: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wint_t=yes
+ else
+@@ -13233,7 +13250,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13236: result: $cf_cv_wint_t" >&5
++echo "$as_me:13253: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+ 
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -13265,7 +13282,7 @@
+ fi
+ 
+ ###   use option --disable-lp64 to allow long chtype
+-echo "$as_me:13268: checking whether to enable _LP64 definition in curses.h" >&5
++echo "$as_me:13285: checking whether to enable _LP64 definition in curses.h" >&5
+ echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6
+ 
+ # Check whether --enable-lp64 or --disable-lp64 was given.
+@@ -13275,7 +13292,7 @@
+ else
+   with_lp64=$cf_dft_with_lp64
+ fi;
+-echo "$as_me:13278: result: $with_lp64" >&5
++echo "$as_me:13295: result: $with_lp64" >&5
+ echo "${ECHO_T}$with_lp64" >&6
+ 
+ if test "x$with_lp64" = xyes ; then
+@@ -13291,7 +13308,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+ 
+-  echo "$as_me:13294: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:13311: checking for special C compiler options needed for large files" >&5
+ echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
+ if test "${ac_cv_sys_largefile_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13303,7 +13320,7 @@
+      	 # IRIX 6.2 and later do not support large files by default,
+      	 # so use the C compiler's -n32 option if that helps.
+          cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13306 "configure"
++#line 13323 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -13323,16 +13340,16 @@
+ }
+ _ACEOF
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13326: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13343: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13329: \$? = $ac_status" >&5
++  echo "$as_me:13346: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13332: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13349: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13335: \$? = $ac_status" >&5
++  echo "$as_me:13352: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -13342,16 +13359,16 @@
+ rm -f "conftest.$ac_objext"
+      	 CC="$CC -n32"
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13345: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13362: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13348: \$? = $ac_status" >&5
++  echo "$as_me:13365: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13351: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13368: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13354: \$? = $ac_status" >&5
++  echo "$as_me:13371: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -13365,13 +13382,13 @@
+        rm -f "conftest.$ac_ext"
+     fi
+ fi
+-echo "$as_me:13368: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:13385: result: $ac_cv_sys_largefile_CC" >&5
+ echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
+   if test "$ac_cv_sys_largefile_CC" != no; then
+     CC=$CC$ac_cv_sys_largefile_CC
+   fi
+ 
+-  echo "$as_me:13374: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:13391: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+ echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
+ if test "${ac_cv_sys_file_offset_bits+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13379,7 +13396,7 @@
+   while :; do
+   ac_cv_sys_file_offset_bits=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13382 "configure"
++#line 13399 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -13399,16 +13416,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13402: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13419: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13405: \$? = $ac_status" >&5
++  echo "$as_me:13422: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13408: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13425: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13411: \$? = $ac_status" >&5
++  echo "$as_me:13428: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -13417,7 +13434,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13420 "configure"
++#line 13437 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include 
+@@ -13438,16 +13455,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13441: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13458: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13444: \$? = $ac_status" >&5
++  echo "$as_me:13461: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13447: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13464: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13450: \$? = $ac_status" >&5
++  echo "$as_me:13467: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -13458,7 +13475,7 @@
+   break
+ done
+ fi
+-echo "$as_me:13461: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:13478: result: $ac_cv_sys_file_offset_bits" >&5
+ echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
+ if test "$ac_cv_sys_file_offset_bits" != no; then
+ 
+@@ -13468,7 +13485,7 @@
+ 
+ fi
+ rm -rf conftest*
+-  echo "$as_me:13471: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:13488: checking for _LARGE_FILES value needed for large files" >&5
+ echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
+ if test "${ac_cv_sys_large_files+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13476,7 +13493,7 @@
+   while :; do
+   ac_cv_sys_large_files=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13479 "configure"
++#line 13496 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -13496,16 +13513,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13499: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13516: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13502: \$? = $ac_status" >&5
++  echo "$as_me:13519: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13505: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13522: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13508: \$? = $ac_status" >&5
++  echo "$as_me:13525: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -13514,7 +13531,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13517 "configure"
++#line 13534 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include 
+@@ -13535,16 +13552,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13538: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13555: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13541: \$? = $ac_status" >&5
++  echo "$as_me:13558: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13544: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13561: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13547: \$? = $ac_status" >&5
++  echo "$as_me:13564: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_large_files=1; break
+ else
+@@ -13555,7 +13572,7 @@
+   break
+ done
+ fi
+-echo "$as_me:13558: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:13575: result: $ac_cv_sys_large_files" >&5
+ echo "${ECHO_T}$ac_cv_sys_large_files" >&6
+ if test "$ac_cv_sys_large_files" != no; then
+ 
+@@ -13568,7 +13585,7 @@
+ fi
+ 
+ 	if test "$enable_largefile" != no ; then
+-	echo "$as_me:13571: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++	echo "$as_me:13588: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+ echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
+ if test "${ac_cv_sys_largefile_source+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13576,7 +13593,7 @@
+   while :; do
+   ac_cv_sys_largefile_source=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13579 "configure"
++#line 13596 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13588,16 +13605,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13591: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13608: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13594: \$? = $ac_status" >&5
++  echo "$as_me:13611: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13597: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13614: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13600: \$? = $ac_status" >&5
++  echo "$as_me:13617: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -13606,7 +13623,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13609 "configure"
++#line 13626 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include 
+@@ -13619,16 +13636,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13622: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13639: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13625: \$? = $ac_status" >&5
++  echo "$as_me:13642: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13628: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13645: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13631: \$? = $ac_status" >&5
++  echo "$as_me:13648: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_source=1; break
+ else
+@@ -13639,7 +13656,7 @@
+   break
+ done
+ fi
+-echo "$as_me:13642: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:13659: result: $ac_cv_sys_largefile_source" >&5
+ echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
+ if test "$ac_cv_sys_largefile_source" != no; then
+ 
+@@ -13653,13 +13670,13 @@
+ # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
+ # in glibc 2.1.3, but that breaks too many other things.
+ # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
+-echo "$as_me:13656: checking for fseeko" >&5
++echo "$as_me:13673: checking for fseeko" >&5
+ echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
+ if test "${ac_cv_func_fseeko+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13662 "configure"
++#line 13679 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13671,16 +13688,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13674: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13691: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13677: \$? = $ac_status" >&5
++  echo "$as_me:13694: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13680: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13697: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13683: \$? = $ac_status" >&5
++  echo "$as_me:13700: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fseeko=yes
+ else
+@@ -13690,7 +13707,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13693: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:13710: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+ 
+@@ -13729,14 +13746,14 @@
+ 
+ 	fi
+ 
+-	echo "$as_me:13732: checking whether to use struct dirent64" >&5
++	echo "$as_me:13749: checking whether to use struct dirent64" >&5
+ echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6
+ if test "${cf_cv_struct_dirent64+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13739 "configure"
++#line 13756 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -13759,16 +13776,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13762: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13779: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13765: \$? = $ac_status" >&5
++  echo "$as_me:13782: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13768: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13785: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13771: \$? = $ac_status" >&5
++  echo "$as_me:13788: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_struct_dirent64=yes
+ else
+@@ -13779,7 +13796,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13782: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:13799: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ 	test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -13789,7 +13806,7 @@
+ 	fi
+ 
+ ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
+-echo "$as_me:13792: checking if you want tparm not to use X/Open fixed-parameter list" >&5
++echo "$as_me:13809: checking if you want tparm not to use X/Open fixed-parameter list" >&5
+ echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6
+ 
+ # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given.
+@@ -13799,14 +13816,14 @@
+ else
+   with_tparm_varargs=yes
+ fi;
+-echo "$as_me:13802: result: $with_tparm_varargs" >&5
++echo "$as_me:13819: result: $with_tparm_varargs" >&5
+ echo "${ECHO_T}$with_tparm_varargs" >&6
+ NCURSES_TPARM_VARARGS=0
+ test "x$with_tparm_varargs" = xyes && NCURSES_TPARM_VARARGS=1
+ 
+ ###   use option --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw
+ if test "$with_ticlib" != no ; then
+-echo "$as_me:13809: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
++echo "$as_me:13826: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
+ echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6
+ 
+ # Check whether --enable-tic-depends or --disable-tic-depends was given.
+@@ -13816,14 +13833,14 @@
+ else
+   with_tic_depends=yes
+ fi;
+-echo "$as_me:13819: result: $with_tic_depends" >&5
++echo "$as_me:13836: result: $with_tic_depends" >&5
+ echo "${ECHO_T}$with_tic_depends" >&6
+ else
+ 	with_tic_depends=no
+ fi
+ 
+ ###   use option --enable-wattr-macros to enable wattr* macros in curses.h
+-echo "$as_me:13826: checking if you want to enable wattr* macros" >&5
++echo "$as_me:13843: checking if you want to enable wattr* macros" >&5
+ echo $ECHO_N "checking if you want to enable wattr* macros... $ECHO_C" >&6
+ 
+ # Check whether --enable-wattr-macros or --disable-wattr-macros was given.
+@@ -13835,15 +13852,15 @@
+ fi;
+ if [ "x$with_wattr_macros" != xyes ]; then
+ 	NCURSES_WATTR_MACROS=0
+-	echo "$as_me:13838: result: no" >&5
++	echo "$as_me:13855: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ else
+ 	NCURSES_WATTR_MACROS=1
+-	echo "$as_me:13842: result: yes" >&5
++	echo "$as_me:13859: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ fi
+ 
+-echo "$as_me:13846: checking for X11 rgb file" >&5
++echo "$as_me:13863: checking for X11 rgb file" >&5
+ echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6
+ 
+ # Check whether --with-x11-rgb or --without-x11-rgb was given.
+@@ -13907,7 +13924,7 @@
+ 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:13910: error: expected a pathname, not \"$cf_path\"" >&5
++	{ { echo "$as_me:13927: error: expected a pathname, not \"$cf_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -13915,7 +13932,7 @@
+ 
+ fi
+ 
+-echo "$as_me:13918: result: $RGB_PATH" >&5
++echo "$as_me:13935: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:13949: checking for type of bool" >&5
+ echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
+ 
+ # Check whether --with-bool or --without-bool was given.
+@@ -13939,10 +13956,10 @@
+ else
+   NCURSES_BOOL=auto
+ fi;
+-echo "$as_me:13942: result: $NCURSES_BOOL" >&5
++echo "$as_me:13959: result: $NCURSES_BOOL" >&5
+ echo "${ECHO_T}$NCURSES_BOOL" >&6
+ 
+-echo "$as_me:13945: checking for alternate terminal capabilities file" >&5
++echo "$as_me:13962: checking for alternate terminal capabilities file" >&5
+ echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6
+ 
+ # Check whether --with-caps or --without-caps was given.
+@@ -13952,12 +13969,17 @@
+ else
+   TERMINFO_CAPS=Caps
+ fi;
+-test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
+-echo "$as_me:13956: result: $TERMINFO_CAPS" >&5
++if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
++then
++	{ echo "$as_me:13974: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
++echo "$as_me: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&2;}
++	TERMINFO_CAPS=Caps
++fi
++echo "$as_me:13978: result: $TERMINFO_CAPS" >&5
+ echo "${ECHO_T}$TERMINFO_CAPS" >&6
+ 
+ ###   use option --with-chtype to override chtype's type
+-echo "$as_me:13960: checking for type of chtype" >&5
++echo "$as_me:13982: checking for type of chtype" >&5
+ echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
+ 
+ # Check whether --with-chtype or --without-chtype was given.
+@@ -13967,11 +13989,11 @@
+ else
+   NCURSES_CHTYPE=$cf_dft_chtype
+ fi;
+-echo "$as_me:13970: result: $NCURSES_CHTYPE" >&5
++echo "$as_me:13992: result: $NCURSES_CHTYPE" >&5
+ echo "${ECHO_T}$NCURSES_CHTYPE" >&6
+ 
+ ###   use option --with-ospeed to override ospeed's type
+-echo "$as_me:13974: checking for type of ospeed" >&5
++echo "$as_me:13996: checking for type of ospeed" >&5
+ echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6
+ 
+ # Check whether --with-ospeed or --without-ospeed was given.
+@@ -13981,11 +14003,11 @@
+ else
+   NCURSES_OSPEED=short
+ fi;
+-echo "$as_me:13984: result: $NCURSES_OSPEED" >&5
++echo "$as_me:14006: result: $NCURSES_OSPEED" >&5
+ echo "${ECHO_T}$NCURSES_OSPEED" >&6
+ 
+ ###   use option --with-mmask-t to override mmask_t's type
+-echo "$as_me:13988: checking for type of mmask_t" >&5
++echo "$as_me:14010: checking for type of mmask_t" >&5
+ echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6
+ 
+ # Check whether --with-mmask-t or --without-mmask-t was given.
+@@ -13995,11 +14017,11 @@
+ else
+   NCURSES_MMASK_T=$cf_dft_mmask_t
+ fi;
+-echo "$as_me:13998: result: $NCURSES_MMASK_T" >&5
++echo "$as_me:14020: result: $NCURSES_MMASK_T" >&5
+ echo "${ECHO_T}$NCURSES_MMASK_T" >&6
+ 
+ ###   use option --with-ccharw-max to override CCHARW_MAX size
+-echo "$as_me:14002: checking for size CCHARW_MAX" >&5
++echo "$as_me:14024: checking for size CCHARW_MAX" >&5
+ echo $ECHO_N "checking for size CCHARW_MAX... $ECHO_C" >&6
+ 
+ # Check whether --with-ccharw-max or --without-ccharw-max was given.
+@@ -14007,18 +14029,18 @@
+   withval="$with_ccharw_max"
+   NCURSES_CCHARW_MAX="$withval"
+ else
+-  NCURSES_CCHARW_MAX=5
++  NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
+ fi;
+-echo "$as_me:14012: result: $NCURSES_CCHARW_MAX" >&5
++echo "$as_me:14034: result: $NCURSES_CCHARW_MAX" >&5
+ echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
+ 
+-echo "$as_me:14015: checking for ANSI C header files" >&5
++echo "$as_me:14037: checking for ANSI C header files" >&5
+ echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+ if test "${ac_cv_header_stdc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14021 "configure"
++#line 14043 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -14026,13 +14048,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:14029: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:14051: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:14035: \$? = $ac_status" >&5
++  echo "$as_me:14057: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -14054,7 +14076,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14057 "configure"
++#line 14079 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -14072,7 +14094,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14075 "configure"
++#line 14097 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -14093,7 +14115,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14096 "configure"
++#line 14118 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -14119,15 +14141,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:14122: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14144: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14125: \$? = $ac_status" >&5
++  echo "$as_me:14147: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:14127: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14149: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14130: \$? = $ac_status" >&5
++  echo "$as_me:14152: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -14140,7 +14162,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:14143: result: $ac_cv_header_stdc" >&5
++echo "$as_me:14165: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -14156,28 +14178,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:14159: checking for $ac_header" >&5
++echo "$as_me:14181: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14165 "configure"
++#line 14187 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14171: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14193: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14174: \$? = $ac_status" >&5
++  echo "$as_me:14196: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14177: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14199: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14180: \$? = $ac_status" >&5
++  echo "$as_me:14202: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -14187,7 +14209,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14190: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:14212: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:14222: checking for signed char" >&5
+ echo $ECHO_N "checking for signed char... $ECHO_C" >&6
+ if test "${ac_cv_type_signed_char+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14206 "configure"
++#line 14228 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14218,16 +14240,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14221: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14243: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14224: \$? = $ac_status" >&5
++  echo "$as_me:14246: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14227: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14249: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14230: \$? = $ac_status" >&5
++  echo "$as_me:14252: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_signed_char=yes
+ else
+@@ -14237,10 +14259,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14240: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:14262: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+ 
+-echo "$as_me:14243: checking size of signed char" >&5
++echo "$as_me:14265: checking size of signed char" >&5
+ echo $ECHO_N "checking size of signed char... $ECHO_C" >&6
+ if test "${ac_cv_sizeof_signed_char+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14249,7 +14271,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14252 "configure"
++#line 14274 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14261,21 +14283,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14264: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14286: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14267: \$? = $ac_status" >&5
++  echo "$as_me:14289: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14270: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14292: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14273: \$? = $ac_status" >&5
++  echo "$as_me:14295: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14278 "configure"
++#line 14300 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14287,16 +14309,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14290: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14312: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14293: \$? = $ac_status" >&5
++  echo "$as_me:14315: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14296: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14318: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14299: \$? = $ac_status" >&5
++  echo "$as_me:14321: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -14312,7 +14334,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14315 "configure"
++#line 14337 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14324,16 +14346,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14327: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14349: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14330: \$? = $ac_status" >&5
++  echo "$as_me:14352: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14333: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14355: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14336: \$? = $ac_status" >&5
++  echo "$as_me:14358: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -14349,7 +14371,7 @@
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14352 "configure"
++#line 14374 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14361,16 +14383,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14364: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14386: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14367: \$? = $ac_status" >&5
++  echo "$as_me:14389: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14370: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14392: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14373: \$? = $ac_status" >&5
++  echo "$as_me:14395: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -14383,12 +14405,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:14386: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:14408: error: cannot run test program while cross compiling" >&5
+ echo "$as_me: error: cannot run test program while cross compiling" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14391 "configure"
++#line 14413 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14404,15 +14426,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:14407: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14429: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14410: \$? = $ac_status" >&5
++  echo "$as_me:14432: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:14412: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14434: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14415: \$? = $ac_status" >&5
++  echo "$as_me:14437: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -14428,7 +14450,7 @@
+   ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:14431: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:14453: result: $ac_cv_sizeof_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:14464: checking if you want to use signed Boolean array in term.h" >&5
+ echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6
+ 
+ # Check whether --enable-signed-char or --disable-signed-char was given.
+@@ -14447,14 +14469,14 @@
+   enableval="$enable_signed_char"
+   with_signed_char=$enableval
+ else
+-  with_signed_char=no
++  with_signed_char=$cf_dft_signed_char
+ fi;
+-echo "$as_me:14452: result: $with_signed_char" >&5
++echo "$as_me:14474: result: $with_signed_char" >&5
+ echo "${ECHO_T}$with_signed_char" >&6
+ test "x$with_signed_char" != xyes && NCURSES_SBOOL="char"
+ 
+ ###   use option --with-tparm-arg to override tparm's argument type
+-echo "$as_me:14457: checking for type of tparm args" >&5
++echo "$as_me:14479: checking for type of tparm args" >&5
+ echo $ECHO_N "checking for type of tparm args... $ECHO_C" >&6
+ 
+ # Check whether --with-tparm-arg or --without-tparm-arg was given.
+@@ -14464,11 +14486,11 @@
+ else
+   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
+ fi;
+-echo "$as_me:14467: result: $NCURSES_TPARM_ARG" >&5
++echo "$as_me:14489: result: $NCURSES_TPARM_ARG" >&5
+ echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
+ 
+ ### Enable compiling-in rcs id's
+-echo "$as_me:14471: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:14493: checking if RCS identifiers should be compiled-in" >&5
+ echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6
+ 
+ # Check whether --with-rcs-ids or --without-rcs-ids was given.
+@@ -14478,7 +14500,7 @@
+ else
+   with_rcs_ids=no
+ fi;
+-echo "$as_me:14481: result: $with_rcs_ids" >&5
++echo "$as_me:14503: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "x$with_rcs_ids" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -14487,7 +14509,7 @@
+ 
+ ###############################################################################
+ 
+-echo "$as_me:14490: checking format of man-pages" >&5
++echo "$as_me:14512: checking format of man-pages" >&5
+ echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6
+ 
+ # Check whether --with-manpage-format or --without-manpage-format was given.
+@@ -14576,14 +14598,14 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:14579: result: $MANPAGE_FORMAT" >&5
++echo "$as_me:14601: result: $MANPAGE_FORMAT" >&5
+ echo "${ECHO_T}$MANPAGE_FORMAT" >&6
+ if test -n "$cf_unknown" ; then
+-	{ echo "$as_me:14582: WARNING: Unexpected manpage-format $cf_unknown" >&5
++	{ echo "$as_me:14604: WARNING: Unexpected manpage-format $cf_unknown" >&5
+ echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
+ fi
+ 
+-echo "$as_me:14586: checking for manpage renaming" >&5
++echo "$as_me:14608: checking for manpage renaming" >&5
+ echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6
+ 
+ # Check whether --with-manpage-renames or --without-manpage-renames was given.
+@@ -14611,7 +14633,7 @@
+ 	if test -f "$srcdir/man/$MANPAGE_RENAMES" ; then
+ 		MANPAGE_RENAMES=`cd "$srcdir/man" && pwd`/$MANPAGE_RENAMES
+ 	elif test ! -f "$MANPAGE_RENAMES" ; then
+-		{ { echo "$as_me:14614: error: not a filename: $MANPAGE_RENAMES" >&5
++		{ { echo "$as_me:14636: error: not a filename: $MANPAGE_RENAMES" >&5
+ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -14625,10 +14647,10 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:14628: result: $MANPAGE_RENAMES" >&5
++echo "$as_me:14650: result: $MANPAGE_RENAMES" >&5
+ echo "${ECHO_T}$MANPAGE_RENAMES" >&6
+ 
+-echo "$as_me:14631: checking if manpage aliases will be installed" >&5
++echo "$as_me:14653: checking if manpage aliases will be installed" >&5
+ echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6
+ 
+ # Check whether --with-manpage-aliases or --without-manpage-aliases was given.
+@@ -14639,7 +14661,7 @@
+   MANPAGE_ALIASES=yes
+ fi;
+ 
+-echo "$as_me:14642: result: $MANPAGE_ALIASES" >&5
++echo "$as_me:14664: result: $MANPAGE_ALIASES" >&5
+ echo "${ECHO_T}$MANPAGE_ALIASES" >&6
+ 
+ case "x$LN_S" in
+@@ -14653,7 +14675,7 @@
+ 
+ MANPAGE_SYMLINKS=no
+ if test "$MANPAGE_ALIASES" = yes ; then
+-echo "$as_me:14656: checking if manpage symlinks should be used" >&5
++echo "$as_me:14678: checking if manpage symlinks should be used" >&5
+ echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6
+ 
+ # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given.
+@@ -14666,17 +14688,17 @@
+ 
+ if test "$$cf_use_symlinks" = no; then
+ if test "$MANPAGE_SYMLINKS" = yes ; then
+-	{ echo "$as_me:14669: WARNING: cannot make symlinks" >&5
++	{ echo "$as_me:14691: WARNING: cannot make symlinks" >&5
+ echo "$as_me: WARNING: cannot make symlinks" >&2;}
+ 	MANPAGE_SYMLINKS=no
+ fi
+ fi
+ 
+-echo "$as_me:14675: result: $MANPAGE_SYMLINKS" >&5
++echo "$as_me:14697: result: $MANPAGE_SYMLINKS" >&5
+ echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
+ fi
+ 
+-echo "$as_me:14679: checking for manpage tbl" >&5
++echo "$as_me:14701: checking for manpage tbl" >&5
+ echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6
+ 
+ # Check whether --with-manpage-tbl or --without-manpage-tbl was given.
+@@ -14687,7 +14709,7 @@
+   MANPAGE_TBL=no
+ fi;
+ 
+-echo "$as_me:14690: result: $MANPAGE_TBL" >&5
++echo "$as_me:14712: result: $MANPAGE_TBL" >&5
+ echo "${ECHO_T}$MANPAGE_TBL" >&6
+ 
+ if test "$prefix" = "NONE" ; then
+@@ -15020,7 +15042,7 @@
+ ###############################################################################
+ 
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:15023: checking if you want to build with function extensions" >&5
++echo "$as_me:15045: checking if you want to build with function extensions" >&5
+ echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6
+ 
+ # Check whether --enable-ext-funcs or --disable-ext-funcs was given.
+@@ -15030,7 +15052,7 @@
+ else
+   with_ext_funcs=yes
+ fi;
+-echo "$as_me:15033: result: $with_ext_funcs" >&5
++echo "$as_me:15055: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "x$with_ext_funcs" = xyes ; then
+ 	NCURSES_EXT_FUNCS=1
+@@ -15090,7 +15112,7 @@
+ 	GENERATED_EXT_FUNCS=
+ fi
+ 
+-echo "$as_me:15093: checking if you want to build with SCREEN extensions" >&5
++echo "$as_me:15115: checking if you want to build with SCREEN extensions" >&5
+ echo $ECHO_N "checking if you want to build with SCREEN extensions... $ECHO_C" >&6
+ 
+ # Check whether --enable-sp-funcs or --disable-sp-funcs was given.
+@@ -15100,7 +15122,7 @@
+ else
+   with_sp_funcs=$cf_dft_ext_spfuncs
+ fi;
+-echo "$as_me:15103: result: $with_sp_funcs" >&5
++echo "$as_me:15125: result: $with_sp_funcs" >&5
+ echo "${ECHO_T}$with_sp_funcs" >&6
+ if test "x$with_sp_funcs" = xyes ; then
+ 	NCURSES_SP_FUNCS=1
+@@ -15119,7 +15141,7 @@
+ 	GENERATED_SP_FUNCS=
+ fi
+ 
+-echo "$as_me:15122: checking if you want to build with terminal-driver" >&5
++echo "$as_me:15144: checking if you want to build with terminal-driver" >&5
+ echo $ECHO_N "checking if you want to build with terminal-driver... $ECHO_C" >&6
+ 
+ # Check whether --enable-term-driver or --disable-term-driver was given.
+@@ -15129,7 +15151,7 @@
+ else
+   with_term_driver=no
+ fi;
+-echo "$as_me:15132: result: $with_term_driver" >&5
++echo "$as_me:15154: result: $with_term_driver" >&5
+ echo "${ECHO_T}$with_term_driver" >&6
+ if test "x$with_term_driver" = xyes ; then
+ 
+@@ -15138,19 +15160,19 @@
+ EOF
+ 
+ 	if test "x$with_termlib" != xno ; then
+-		{ { echo "$as_me:15141: error: The term-driver option conflicts with the termlib option" >&5
++		{ { echo "$as_me:15163: error: The term-driver option conflicts with the termlib option" >&5
+ echo "$as_me: error: The term-driver option conflicts with the termlib option" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+ 	if test "x$with_sp_funcs" != xyes ; then
+-		{ { echo "$as_me:15146: error: The term-driver option relies upon sp-funcs" >&5
++		{ { echo "$as_me:15168: error: The term-driver option relies upon sp-funcs" >&5
+ echo "$as_me: error: The term-driver option relies upon sp-funcs" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+ fi
+ 
+ ###   use option --enable-const to turn on use of const beyond that in XSI.
+-echo "$as_me:15153: checking for extended use of const keyword" >&5
++echo "$as_me:15175: checking for extended use of const keyword" >&5
+ echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
+ 
+ # Check whether --enable-const or --disable-const was given.
+@@ -15160,7 +15182,7 @@
+ else
+   with_ext_const=$cf_dft_ext_const
+ fi;
+-echo "$as_me:15163: result: $with_ext_const" >&5
++echo "$as_me:15185: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "x$with_ext_const" = xyes ; then
+@@ -15168,7 +15190,7 @@
+ fi
+ 
+ ###   use option --enable-ext-colors to turn on use of colors beyond 16.
+-echo "$as_me:15171: checking if you want to use extended colors" >&5
++echo "$as_me:15193: checking if you want to use extended colors" >&5
+ echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6
+ 
+ # Check whether --enable-ext-colors or --disable-ext-colors was given.
+@@ -15178,12 +15200,12 @@
+ else
+   with_ext_colors=$cf_dft_ext_colors
+ fi;
+-echo "$as_me:15181: result: $with_ext_colors" >&5
++echo "$as_me:15203: result: $with_ext_colors" >&5
+ echo "${ECHO_T}$with_ext_colors" >&6
+ NCURSES_EXT_COLORS=0
+ if test "x$with_ext_colors" = xyes ; then
+ 	if test "x$with_widec" != xyes ; then
+-		{ echo "$as_me:15186: WARNING: This option applies only to wide-character library" >&5
++		{ echo "$as_me:15208: WARNING: This option applies only to wide-character library" >&5
+ echo "$as_me: WARNING: This option applies only to wide-character library" >&2;}
+ 	else
+ 		# cannot be ABI 5 since it changes sizeof(cchar_t)
+@@ -15193,7 +15215,7 @@
+ 	(5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:15196: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:15218: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -15221,7 +15243,7 @@
+ fi
+ 
+ ###   use option --enable-ext-mouse to modify coding to support 5-button mice
+-echo "$as_me:15224: checking if you want to use extended mouse encoding" >&5
++echo "$as_me:15246: checking if you want to use extended mouse encoding" >&5
+ echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6
+ 
+ # Check whether --enable-ext-mouse or --disable-ext-mouse was given.
+@@ -15231,18 +15253,16 @@
+ else
+   with_ext_mouse=$cf_dft_ext_mouse
+ fi;
+-echo "$as_me:15234: result: $with_ext_mouse" >&5
++echo "$as_me:15256: result: $with_ext_mouse" >&5
+ echo "${ECHO_T}$with_ext_mouse" >&6
+-NCURSES_MOUSE_VERSION=1
+ if test "x$with_ext_mouse" = xyes ; then
+-	NCURSES_MOUSE_VERSION=2
+ 
+ if test "${with_abi_version+set}" != set; then
+ 	case "$cf_cv_rel_version" in
+ 	(5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:15245: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:15265: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -15250,8 +15270,20 @@
+ 
+ fi
+ 
++case $cf_cv_abi_version in
++(5)
++	NCURSES_MOUSE_VERSION=1
++	;;
++(6)
++	NCURSES_MOUSE_VERSION=2
++	;;
++(789)
++	NCURSES_MOUSE_VERSION=3
++	;;
++esac
++
+ ###   use option --enable-ext-putwin to turn on extended screendumps
+-echo "$as_me:15254: checking if you want to use extended putwin/screendump" >&5
++echo "$as_me:15286: checking if you want to use extended putwin/screendump" >&5
+ echo $ECHO_N "checking if you want to use extended putwin/screendump... $ECHO_C" >&6
+ 
+ # Check whether --enable-ext-putwin or --disable-ext-putwin was given.
+@@ -15261,7 +15293,7 @@
+ else
+   with_ext_putwin=$cf_dft_ext_putwin
+ fi;
+-echo "$as_me:15264: result: $with_ext_putwin" >&5
++echo "$as_me:15296: result: $with_ext_putwin" >&5
+ echo "${ECHO_T}$with_ext_putwin" >&6
+ if test "x$with_ext_putwin" = xyes ; then
+ 
+@@ -15271,7 +15303,7 @@
+ 
+ fi
+ 
+-echo "$as_me:15274: checking if you want \$NCURSES_NO_PADDING code" >&5
++echo "$as_me:15306: checking if you want \$NCURSES_NO_PADDING code" >&5
+ echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6
+ 
+ # Check whether --enable-no-padding or --disable-no-padding was given.
+@@ -15281,7 +15313,7 @@
+ else
+   with_no_padding=$with_ext_funcs
+ fi;
+-echo "$as_me:15284: result: $with_no_padding" >&5
++echo "$as_me:15316: result: $with_no_padding" >&5
+ echo "${ECHO_T}$with_no_padding" >&6
+ test "x$with_no_padding" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15289,7 +15321,7 @@
+ EOF
+ 
+ ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
+-echo "$as_me:15292: checking if you want SIGWINCH handler" >&5
++echo "$as_me:15324: checking if you want SIGWINCH handler" >&5
+ echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6
+ 
+ # Check whether --enable-sigwinch or --disable-sigwinch was given.
+@@ -15299,7 +15331,7 @@
+ else
+   with_sigwinch=$with_ext_funcs
+ fi;
+-echo "$as_me:15302: result: $with_sigwinch" >&5
++echo "$as_me:15334: result: $with_sigwinch" >&5
+ echo "${ECHO_T}$with_sigwinch" >&6
+ test "x$with_sigwinch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15307,7 +15339,7 @@
+ EOF
+ 
+ ###   use option --enable-tcap-names to allow user to define new capabilities
+-echo "$as_me:15310: checking if you want user-definable terminal capabilities like termcap" >&5
++echo "$as_me:15342: checking if you want user-definable terminal capabilities like termcap" >&5
+ echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6
+ 
+ # Check whether --enable-tcap-names or --disable-tcap-names was given.
+@@ -15317,14 +15349,14 @@
+ else
+   with_tcap_names=$with_ext_funcs
+ fi;
+-echo "$as_me:15320: result: $with_tcap_names" >&5
++echo "$as_me:15352: result: $with_tcap_names" >&5
+ echo "${ECHO_T}$with_tcap_names" >&6
+ NCURSES_XNAMES=0
+ test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1
+ 
+ ##############################################################################
+ 
+-echo "$as_me:15327: checking if you want to link with the pthread library" >&5
++echo "$as_me:15359: checking if you want to link with the pthread library" >&5
+ echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6
+ 
+ # Check whether --with-pthread or --without-pthread was given.
+@@ -15334,27 +15366,27 @@
+ else
+   with_pthread=no
+ fi;
+-echo "$as_me:15337: result: $with_pthread" >&5
++echo "$as_me:15369: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+ if test "$with_pthread" != no ; then
+-	echo "$as_me:15341: checking for pthread.h" >&5
++	echo "$as_me:15373: checking for pthread.h" >&5
+ echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
+ if test "${ac_cv_header_pthread_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15347 "configure"
++#line 15379 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:15351: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:15383: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:15357: \$? = $ac_status" >&5
++  echo "$as_me:15389: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -15373,7 +15405,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:15376: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:15408: result: $ac_cv_header_pthread_h" >&5
+ echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
+ if test "$ac_cv_header_pthread_h" = yes; then
+ 
+@@ -15383,7 +15415,7 @@
+ 
+ 	for cf_lib_pthread in pthread c_r
+ 	do
+-	    echo "$as_me:15386: checking if we can link with the $cf_lib_pthread library" >&5
++	    echo "$as_me:15418: checking if we can link with the $cf_lib_pthread library" >&5
+ echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6
+ 	    cf_save_LIBS="$LIBS"
+ 
+@@ -15404,7 +15436,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	    cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15407 "configure"
++#line 15439 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -15421,16 +15453,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15424: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15456: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15427: \$? = $ac_status" >&5
++  echo "$as_me:15459: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15430: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15462: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15433: \$? = $ac_status" >&5
++  echo "$as_me:15465: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_pthread=yes
+ else
+@@ -15440,7 +15472,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	    LIBS="$cf_save_LIBS"
+-	    echo "$as_me:15443: result: $with_pthread" >&5
++	    echo "$as_me:15475: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 	    test "$with_pthread" = yes && break
+ 	done
+@@ -15468,7 +15500,7 @@
+ EOF
+ 
+ 	else
+-	    { { echo "$as_me:15471: error: Cannot link with pthread library" >&5
++	    { { echo "$as_me:15503: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -15478,13 +15510,13 @@
+ fi
+ 
+ if test "x$with_pthread" != xno; then
+-	echo "$as_me:15481: checking for pthread_kill" >&5
++	echo "$as_me:15513: checking for pthread_kill" >&5
+ echo $ECHO_N "checking for pthread_kill... $ECHO_C" >&6
+ if test "${ac_cv_func_pthread_kill+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15487 "configure"
++#line 15519 "configure"
+ #include "confdefs.h"
+ #define pthread_kill autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -15515,16 +15547,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15518: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15550: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15521: \$? = $ac_status" >&5
++  echo "$as_me:15553: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15524: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15556: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15527: \$? = $ac_status" >&5
++  echo "$as_me:15559: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_pthread_kill=yes
+ else
+@@ -15534,11 +15566,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15537: result: $ac_cv_func_pthread_kill" >&5
++echo "$as_me:15569: result: $ac_cv_func_pthread_kill" >&5
+ echo "${ECHO_T}$ac_cv_func_pthread_kill" >&6
+ if test "$ac_cv_func_pthread_kill" = yes; then
+ 
+-		echo "$as_me:15541: checking if you want to allow EINTR in wgetch with pthreads" >&5
++		echo "$as_me:15573: checking if you want to allow EINTR in wgetch with pthreads" >&5
+ echo $ECHO_N "checking if you want to allow EINTR in wgetch with pthreads... $ECHO_C" >&6
+ 
+ # Check whether --enable-pthreads-eintr or --disable-pthreads-eintr was given.
+@@ -15548,7 +15580,7 @@
+ else
+   use_pthreads_eintr=no
+ fi;
+-		echo "$as_me:15551: result: $use_pthreads_eintr" >&5
++		echo "$as_me:15583: result: $use_pthreads_eintr" >&5
+ echo "${ECHO_T}$use_pthreads_eintr" >&6
+ 		if test "x$use_pthreads_eintr" = xyes ; then
+ 
+@@ -15559,7 +15591,7 @@
+ 		fi
+ fi
+ 
+-	echo "$as_me:15562: checking if you want to use weak-symbols for pthreads" >&5
++	echo "$as_me:15594: checking if you want to use weak-symbols for pthreads" >&5
+ echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6
+ 
+ # Check whether --enable-weak-symbols or --disable-weak-symbols was given.
+@@ -15569,18 +15601,18 @@
+ else
+   use_weak_symbols=no
+ fi;
+-	echo "$as_me:15572: result: $use_weak_symbols" >&5
++	echo "$as_me:15604: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ 	if test "x$use_weak_symbols" = xyes ; then
+ 
+-echo "$as_me:15576: checking if $CC supports weak symbols" >&5
++echo "$as_me:15608: checking if $CC supports weak symbols" >&5
+ echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6
+ if test "${cf_cv_weak_symbols+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15583 "configure"
++#line 15615 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -15606,16 +15638,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15609: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15641: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15612: \$? = $ac_status" >&5
++  echo "$as_me:15644: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15615: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15647: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15618: \$? = $ac_status" >&5
++  echo "$as_me:15650: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_weak_symbols=yes
+ else
+@@ -15626,7 +15658,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:15629: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:15661: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+ 
+ 	else
+@@ -15676,7 +15708,7 @@
+ # opaque outside of that, so there is no --enable-opaque option.  We can use
+ # this option without --with-pthreads, but this will be always set for
+ # pthreads.
+-echo "$as_me:15679: checking if you want reentrant code" >&5
++echo "$as_me:15711: checking if you want reentrant code" >&5
+ echo $ECHO_N "checking if you want reentrant code... $ECHO_C" >&6
+ 
+ # Check whether --enable-reentrant or --disable-reentrant was given.
+@@ -15686,7 +15718,7 @@
+ else
+   with_reentrant=no
+ fi;
+-echo "$as_me:15689: result: $with_reentrant" >&5
++echo "$as_me:15721: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "x$with_reentrant" = xyes ; then
+ 	cf_cv_enable_reentrant=1
+@@ -15774,7 +15806,7 @@
+ 	(5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:15777: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:15809: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -15783,10 +15815,10 @@
+ else
+ 	cf_cv_enable_reentrant=0
+ 	cf_cv_enable_opaque="NCURSES_OPAQUE"
+-	NCURSES_SIZE_T=short
++	NCURSES_SIZE_T=$cf_dft_ordinate_type
+ fi
+ 
+-echo "$as_me:15789: checking if you want opaque curses-library structures" >&5
++echo "$as_me:15821: checking if you want opaque curses-library structures" >&5
+ echo $ECHO_N "checking if you want opaque curses-library structures... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
+@@ -15798,26 +15830,26 @@
+ 	else
+ 
+ 	 test "$cf_cv_enable_reentrant" = 1 && enable_opaque_curses=yes
+-	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=no
++	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
+ 
+ 	fi
+ else
+   enableval=no
+ 
+ 	 test "$cf_cv_enable_reentrant" = 1 && enable_opaque_curses=yes
+-	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=no
++	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:15811: result: $enable_opaque_curses" >&5
++echo "$as_me:15843: result: $enable_opaque_curses" >&5
+ echo "${ECHO_T}$enable_opaque_curses" >&6
+ 
+ test "$cf_cv_enable_reentrant" = 1 && \
+ test "$enable_opaque_curses" = no && \
+-{ { echo "$as_me:15816: error: reentrant configuration requires opaque library" >&5
++{ { echo "$as_me:15848: error: reentrant configuration requires opaque library" >&5
+ echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:15820: checking if you want opaque form-library structures" >&5
++echo "$as_me:15852: checking if you want opaque form-library structures" >&5
+ echo $ECHO_N "checking if you want opaque form-library structures... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-form or --disable-opaque-form was given.
+@@ -15827,10 +15859,10 @@
+ else
+   enable_opaque_form=no
+ fi;
+-echo "$as_me:15830: result: $enable_opaque_form" >&5
++echo "$as_me:15862: result: $enable_opaque_form" >&5
+ echo "${ECHO_T}$enable_opaque_form" >&6
+ 
+-echo "$as_me:15833: checking if you want opaque menu-library structures" >&5
++echo "$as_me:15865: checking if you want opaque menu-library structures" >&5
+ echo $ECHO_N "checking if you want opaque menu-library structures... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
+@@ -15840,10 +15872,10 @@
+ else
+   enable_opaque_menu=no
+ fi;
+-echo "$as_me:15843: result: $enable_opaque_menu" >&5
++echo "$as_me:15875: result: $enable_opaque_menu" >&5
+ echo "${ECHO_T}$enable_opaque_menu" >&6
+ 
+-echo "$as_me:15846: checking if you want opaque panel-library structures" >&5
++echo "$as_me:15878: checking if you want opaque panel-library structures" >&5
+ echo $ECHO_N "checking if you want opaque panel-library structures... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
+@@ -15853,7 +15885,7 @@
+ else
+   enable_opaque_panel=no
+ fi;
+-echo "$as_me:15856: result: $enable_opaque_panel" >&5
++echo "$as_me:15888: result: $enable_opaque_panel" >&5
+ echo "${ECHO_T}$enable_opaque_panel" >&6
+ 
+ NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
+@@ -15863,7 +15895,7 @@
+ 
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+-	echo "$as_me:15866: checking for prefix used to wrap public variables" >&5
++	echo "$as_me:15898: checking for prefix used to wrap public variables" >&5
+ echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6
+ 
+ # Check whether --with-wrap-prefix or --without-wrap-prefix was given.
+@@ -15873,7 +15905,7 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-	echo "$as_me:15876: result: $NCURSES_WRAP_PREFIX" >&5
++	echo "$as_me:15908: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ 	NCURSES_WRAP_PREFIX=_nc_
+@@ -15886,7 +15918,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+ 
+-echo "$as_me:15889: checking if you want all development code" >&5
++echo "$as_me:15921: checking if you want all development code" >&5
+ echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
+ 
+ # Check whether --with-develop or --without-develop was given.
+@@ -15896,11 +15928,11 @@
+ else
+   with_develop=no
+ fi;
+-echo "$as_me:15899: result: $with_develop" >&5
++echo "$as_me:15931: result: $with_develop" >&5
+ echo "${ECHO_T}$with_develop" >&6
+ 
+ ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
+-echo "$as_me:15903: checking if you want hard-tabs code" >&5
++echo "$as_me:15935: checking if you want hard-tabs code" >&5
+ echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6
+ 
+ # Check whether --enable-hard-tabs or --disable-hard-tabs was given.
+@@ -15910,7 +15942,7 @@
+ else
+   enable_hard_tabs=$with_develop
+ fi;
+-echo "$as_me:15913: result: $enable_hard_tabs" >&5
++echo "$as_me:15945: result: $enable_hard_tabs" >&5
+ echo "${ECHO_T}$enable_hard_tabs" >&6
+ test "x$enable_hard_tabs" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15918,7 +15950,7 @@
+ EOF
+ 
+ ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
+-echo "$as_me:15921: checking if you want limited support for xmc" >&5
++echo "$as_me:15953: checking if you want limited support for xmc" >&5
+ echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6
+ 
+ # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given.
+@@ -15928,7 +15960,7 @@
+ else
+   enable_xmc_glitch=$with_develop
+ fi;
+-echo "$as_me:15931: result: $enable_xmc_glitch" >&5
++echo "$as_me:15963: result: $enable_xmc_glitch" >&5
+ echo "${ECHO_T}$enable_xmc_glitch" >&6
+ test "x$enable_xmc_glitch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15938,7 +15970,7 @@
+ ###############################################################################
+ # These are just experimental, probably should not be in a package:
+ 
+-echo "$as_me:15941: checking if you do not want to assume colors are white-on-black" >&5
++echo "$as_me:15973: checking if you do not want to assume colors are white-on-black" >&5
+ echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6
+ 
+ # Check whether --enable-assumed-color or --disable-assumed-color was given.
+@@ -15948,7 +15980,7 @@
+ else
+   with_assumed_color=yes
+ fi;
+-echo "$as_me:15951: result: $with_assumed_color" >&5
++echo "$as_me:15983: result: $with_assumed_color" >&5
+ echo "${ECHO_T}$with_assumed_color" >&6
+ test "x$with_assumed_color" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15956,7 +15988,7 @@
+ EOF
+ 
+ ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
+-echo "$as_me:15959: checking if you want hashmap scrolling-optimization code" >&5
++echo "$as_me:15991: checking if you want hashmap scrolling-optimization code" >&5
+ echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6
+ 
+ # Check whether --enable-hashmap or --disable-hashmap was given.
+@@ -15966,7 +15998,7 @@
+ else
+   with_hashmap=yes
+ fi;
+-echo "$as_me:15969: result: $with_hashmap" >&5
++echo "$as_me:16001: result: $with_hashmap" >&5
+ echo "${ECHO_T}$with_hashmap" >&6
+ test "x$with_hashmap" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15974,7 +16006,7 @@
+ EOF
+ 
+ ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
+-echo "$as_me:15977: checking if you want colorfgbg code" >&5
++echo "$as_me:16009: checking if you want colorfgbg code" >&5
+ echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6
+ 
+ # Check whether --enable-colorfgbg or --disable-colorfgbg was given.
+@@ -15984,7 +16016,7 @@
+ else
+   with_colorfgbg=no
+ fi;
+-echo "$as_me:15987: result: $with_colorfgbg" >&5
++echo "$as_me:16019: result: $with_colorfgbg" >&5
+ echo "${ECHO_T}$with_colorfgbg" >&6
+ test "x$with_colorfgbg" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15992,7 +16024,7 @@
+ EOF
+ 
+ ###   use option --enable-fvisibility to turn on use of gcc-specific feature
+-echo "$as_me:15995: checking if you want to use gcc -fvisibility option" >&5
++echo "$as_me:16027: checking if you want to use gcc -fvisibility option" >&5
+ echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6
+ 
+ # Check whether --enable-fvisibility or --disable-fvisibility was given.
+@@ -16002,14 +16034,14 @@
+ else
+   cf_with_fvisibility=no
+ fi;
+-echo "$as_me:16005: result: $cf_with_fvisibility" >&5
++echo "$as_me:16037: result: $cf_with_fvisibility" >&5
+ echo "${ECHO_T}$cf_with_fvisibility" >&6
+ 
+ NCURSES_IMPEXP=
+ NCURSES_CXX_IMPEXP=
+ if test "x$cf_with_fvisibility" = xyes; then
+ 
+-echo "$as_me:16012: checking if $CC -fvisibility=hidden option works" >&5
++echo "$as_me:16044: checking if $CC -fvisibility=hidden option works" >&5
+ echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6
+ if test "${cf_cv_fvisibility_hidden+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16018,7 +16050,7 @@
+     cf_save_cflags="$CFLAGS"
+     CFLAGS="$CFLAGS -fvisibility=hidden"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16021 "configure"
++#line 16053 "configure"
+ #include "confdefs.h"
+ 
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -16034,16 +16066,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16037: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16069: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16040: \$? = $ac_status" >&5
++  echo "$as_me:16072: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16043: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16075: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16046: \$? = $ac_status" >&5
++  echo "$as_me:16078: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fvisibility_hidden=yes
+ else
+@@ -16055,7 +16087,7 @@
+     CFLAGS=$cf_save_cflags
+ 
+ fi
+-echo "$as_me:16058: result: $cf_cv_fvisibility_hidden" >&5
++echo "$as_me:16090: result: $cf_cv_fvisibility_hidden" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
+ 
+ 	if test "x$cf_cv_fvisibility_hidden" = xyes
+@@ -16170,7 +16202,7 @@
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:16173: checking if $CXX -fvisibility=hidden option works" >&5
++echo "$as_me:16205: checking if $CXX -fvisibility=hidden option works" >&5
+ echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6
+ if test "${cf_cv_fvisibility_hidden2+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16179,7 +16211,7 @@
+     cf_save_cflags="$CXXFLAGS"
+     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16182 "configure"
++#line 16214 "configure"
+ #include "confdefs.h"
+ 
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -16195,16 +16227,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16198: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16230: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16201: \$? = $ac_status" >&5
++  echo "$as_me:16233: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16204: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16236: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16207: \$? = $ac_status" >&5
++  echo "$as_me:16239: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fvisibility_hidden2=yes
+ else
+@@ -16216,7 +16248,7 @@
+     CXXFLAGS=$cf_save_cflags
+ 
+ fi
+-echo "$as_me:16219: result: $cf_cv_fvisibility_hidden2" >&5
++echo "$as_me:16251: result: $cf_cv_fvisibility_hidden2" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
+ 
+ 		if test "x$cf_cv_fvisibility_hidden2" = xyes
+@@ -16339,7 +16371,7 @@
+ fi
+ 
+ ###   use option --enable-interop to turn on use of bindings used for interop
+-echo "$as_me:16342: checking if you want interop bindings" >&5
++echo "$as_me:16374: checking if you want interop bindings" >&5
+ echo $ECHO_N "checking if you want interop bindings... $ECHO_C" >&6
+ 
+ # Check whether --enable-interop or --disable-interop was given.
+@@ -16349,13 +16381,13 @@
+ else
+   with_exp_interop=$cf_dft_interop
+ fi;
+-echo "$as_me:16352: result: $with_exp_interop" >&5
++echo "$as_me:16384: result: $with_exp_interop" >&5
+ echo "${ECHO_T}$with_exp_interop" >&6
+ 
+ NCURSES_INTEROP_FUNCS=0
+ test "x$with_exp_interop" = xyes && NCURSES_INTEROP_FUNCS=1
+ 
+-echo "$as_me:16358: checking if you want experimental safe-sprintf code" >&5
++echo "$as_me:16390: checking if you want experimental safe-sprintf code" >&5
+ echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6
+ 
+ # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given.
+@@ -16365,13 +16397,13 @@
+ else
+   with_safe_sprintf=no
+ fi;
+-echo "$as_me:16368: result: $with_safe_sprintf" >&5
++echo "$as_me:16400: result: $with_safe_sprintf" >&5
+ echo "${ECHO_T}$with_safe_sprintf" >&6
+ 
+ ###   use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
+ # when hashmap is used scroll hints are useless
+ if test "$with_hashmap" = no ; then
+-echo "$as_me:16374: checking if you want to experiment without scrolling-hints code" >&5
++echo "$as_me:16406: checking if you want to experiment without scrolling-hints code" >&5
+ echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6
+ 
+ # Check whether --enable-scroll-hints or --disable-scroll-hints was given.
+@@ -16381,7 +16413,7 @@
+ else
+   with_scroll_hints=yes
+ fi;
+-echo "$as_me:16384: result: $with_scroll_hints" >&5
++echo "$as_me:16416: result: $with_scroll_hints" >&5
+ echo "${ECHO_T}$with_scroll_hints" >&6
+ test "x$with_scroll_hints" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16390,7 +16422,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16393: checking if you want wgetch-events code" >&5
++echo "$as_me:16425: checking if you want wgetch-events code" >&5
+ echo $ECHO_N "checking if you want wgetch-events code... $ECHO_C" >&6
+ 
+ # Check whether --enable-wgetch-events or --disable-wgetch-events was given.
+@@ -16400,7 +16432,7 @@
+ else
+   with_wgetch_events=no
+ fi;
+-echo "$as_me:16403: result: $with_wgetch_events" >&5
++echo "$as_me:16435: result: $with_wgetch_events" >&5
+ echo "${ECHO_T}$with_wgetch_events" >&6
+ if test "x$with_wgetch_events" = xyes ; then
+ 
+@@ -16415,7 +16447,7 @@
+ 
+ case "$cf_cv_system_name" in
+ (*mingw32*|*mingw64*|*-msvc*)
+-	echo "$as_me:16418: checking if you want experimental-Windows driver" >&5
++	echo "$as_me:16450: checking if you want experimental-Windows driver" >&5
+ echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6
+ 
+ # Check whether --enable-exp-win32 or --disable-exp-win32 was given.
+@@ -16425,7 +16457,7 @@
+ else
+   with_exp_win32=no
+ fi;
+-	echo "$as_me:16428: result: $with_exp_win32" >&5
++	echo "$as_me:16460: result: $with_exp_win32" >&5
+ echo "${ECHO_T}$with_exp_win32" >&6
+ 	if test "x$with_exp_win32" = xyes
+ 	then
+@@ -16451,7 +16483,7 @@
+ 
+ ###	use option --disable-echo to suppress full display compiling commands
+ 
+-echo "$as_me:16454: checking if you want to see long compiling messages" >&5
++echo "$as_me:16486: checking if you want to see long compiling messages" >&5
+ echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
+ 
+ # Check whether --enable-echo or --disable-echo was given.
+@@ -16485,7 +16517,7 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:16488: result: $enableval" >&5
++echo "$as_me:16520: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+ if test "x$enable_echo" = xyes; then
+@@ -16498,7 +16530,7 @@
+ 
+ # --disable-stripping is used for debugging
+ 
+-echo "$as_me:16501: checking if you want to install stripped executables" >&5
++echo "$as_me:16533: checking if you want to install stripped executables" >&5
+ echo $ECHO_N "checking if you want to install stripped executables... $ECHO_C" >&6
+ 
+ # Check whether --enable-stripping or --disable-stripping was given.
+@@ -16515,7 +16547,7 @@
+ 	enable_stripping=yes
+ 
+ fi;
+-echo "$as_me:16518: result: $enable_stripping" >&5
++echo "$as_me:16550: result: $enable_stripping" >&5
+ echo "${ECHO_T}$enable_stripping" >&6
+ 
+ if test "$enable_stripping" = yes
+@@ -16526,7 +16558,7 @@
+ fi
+ 
+ : "${INSTALL:=install}"
+-echo "$as_me:16529: checking if install accepts -p option" >&5
++echo "$as_me:16561: checking if install accepts -p option" >&5
+ echo $ECHO_N "checking if install accepts -p option... $ECHO_C" >&6
+ if test "${cf_cv_install_p+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16557,10 +16589,10 @@
+ 	rm -rf ./conftest*
+ 
+ fi
+-echo "$as_me:16560: result: $cf_cv_install_p" >&5
++echo "$as_me:16592: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+ 
+-echo "$as_me:16563: checking if install needs to be told about ownership" >&5
++echo "$as_me:16595: checking if install needs to be told about ownership" >&5
+ echo $ECHO_N "checking if install needs to be told about ownership... $ECHO_C" >&6
+ case `$ac_config_guess` in
+ (*minix)
+@@ -16571,7 +16603,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:16574: result: $with_install_o" >&5
++echo "$as_me:16606: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -16596,7 +16628,7 @@
+ 
+ ###	use option --enable-warnings to turn on all gcc warnings
+ 
+-echo "$as_me:16599: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:16631: checking if you want to use C11 _Noreturn feature" >&5
+ echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
+ 
+ # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
+@@ -16613,17 +16645,17 @@
+ 	enable_stdnoreturn=no
+ 
+ fi;
+-echo "$as_me:16616: result: $enable_stdnoreturn" >&5
++echo "$as_me:16648: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+ 
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:16620: checking for C11 _Noreturn feature" >&5
++echo "$as_me:16652: checking for C11 _Noreturn feature" >&5
+ echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
+ if test "${cf_cv_c11_noreturn+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16626 "configure"
++#line 16658 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16640,16 +16672,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16643: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16675: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16646: \$? = $ac_status" >&5
++  echo "$as_me:16678: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16649: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16681: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16652: \$? = $ac_status" >&5
++  echo "$as_me:16684: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_c11_noreturn=yes
+ else
+@@ -16660,7 +16692,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16663: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:16695: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ 	cf_cv_c11_noreturn=no,
+@@ -16688,14 +16720,16 @@
+ then
+ 	case $CFLAGS in
+ 	(*-Werror=*)
+-		test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+-
+-echo "${as_me:-configure}:16693: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+-
+ 		cf_temp_flags=
+ 		for cf_temp_scan in $CFLAGS
+ 		do
+ 			case "x$cf_temp_scan" in
++			(x-Werror=format*)
++
++	test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "
++	cf_temp_flags="${cf_temp_flags}$cf_temp_scan"
++
++				;;
+ 			(x-Werror=*)
+ 
+ 	test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "
+@@ -16710,15 +16744,22 @@
+ 				;;
+ 			esac
+ 		done
+-		CFLAGS="$cf_temp_flags"
+-		test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
++		if test "x$CFLAGS" != "x$cf_temp_flags"
++		then
++			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16716: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16751: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+-		test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
++			CFLAGS="$cf_temp_flags"
++			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16720: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16756: testing ... fixed $CFLAGS ..." 1>&5
+ 
++			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
++
++echo "${as_me:-configure}:16760: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++
++		fi
+ 		;;
+ 	esac
+ fi
+@@ -16727,14 +16768,16 @@
+ then
+ 	case $CPPFLAGS in
+ 	(*-Werror=*)
+-		test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+-
+-echo "${as_me:-configure}:16732: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+-
+ 		cf_temp_flags=
+ 		for cf_temp_scan in $CPPFLAGS
+ 		do
+ 			case "x$cf_temp_scan" in
++			(x-Werror=format*)
++
++	test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "
++	cf_temp_flags="${cf_temp_flags}$cf_temp_scan"
++
++				;;
+ 			(x-Werror=*)
+ 
+ 	test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "
+@@ -16749,15 +16792,22 @@
+ 				;;
+ 			esac
+ 		done
+-		CPPFLAGS="$cf_temp_flags"
+-		test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
++		if test "x$CPPFLAGS" != "x$cf_temp_flags"
++		then
++			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
++
++echo "${as_me:-configure}:16799: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++
++			CPPFLAGS="$cf_temp_flags"
++			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16755: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:16804: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+-		test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
++			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16759: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16808: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
++		fi
+ 		;;
+ 	esac
+ fi
+@@ -16766,14 +16816,16 @@
+ then
+ 	case $LDFLAGS in
+ 	(*-Werror=*)
+-		test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+-
+-echo "${as_me:-configure}:16771: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+-
+ 		cf_temp_flags=
+ 		for cf_temp_scan in $LDFLAGS
+ 		do
+ 			case "x$cf_temp_scan" in
++			(x-Werror=format*)
++
++	test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "
++	cf_temp_flags="${cf_temp_flags}$cf_temp_scan"
++
++				;;
+ 			(x-Werror=*)
+ 
+ 	test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "
+@@ -16788,20 +16840,27 @@
+ 				;;
+ 			esac
+ 		done
+-		LDFLAGS="$cf_temp_flags"
+-		test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
++		if test "x$LDFLAGS" != "x$cf_temp_flags"
++		then
++			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
++
++echo "${as_me:-configure}:16847: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+-echo "${as_me:-configure}:16794: testing ... fixed $LDFLAGS ..." 1>&5
++			LDFLAGS="$cf_temp_flags"
++			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-		test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
++echo "${as_me:-configure}:16852: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+-echo "${as_me:-configure}:16798: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
++echo "${as_me:-configure}:16856: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++
++		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:16804: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:16863: checking if you want to turn on gcc warnings" >&5
+ echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6
+ 
+ # Check whether --enable-warnings or --disable-warnings was given.
+@@ -16818,7 +16877,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:16821: result: $enable_warnings" >&5
++echo "$as_me:16880: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -16842,7 +16901,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16845 "configure"
++#line 16904 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16857,26 +16916,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16860: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16919: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16863: \$? = $ac_status" >&5
++  echo "$as_me:16922: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16866: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16925: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16869: \$? = $ac_status" >&5
++  echo "$as_me:16928: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:16872: checking for X11/Xt const-feature" >&5
++echo "$as_me:16931: checking for X11/Xt const-feature" >&5
+ echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
+ if test "${cf_cv_const_x_string+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16879 "configure"
++#line 16938 "configure"
+ #include "confdefs.h"
+ 
+ #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
+@@ -16893,16 +16952,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16896: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16955: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16899: \$? = $ac_status" >&5
++  echo "$as_me:16958: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16902: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16961: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16905: \$? = $ac_status" >&5
++  echo "$as_me:16964: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -16917,7 +16976,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16920: result: $cf_cv_const_x_string" >&5
++echo "$as_me:16979: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -16946,7 +17005,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <&5
++	{ echo "$as_me:17024: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -16978,12 +17037,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:16981: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17040: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16984: \$? = $ac_status" >&5
++  echo "$as_me:17043: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:16986: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17045: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -16991,7 +17050,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:16994: checking for $CC warning options..." >&5
++	{ echo "$as_me:17053: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -17014,12 +17073,12 @@
+ 		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:17017: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17076: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17020: \$? = $ac_status" >&5
++  echo "$as_me:17079: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17022: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17081: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -17027,7 +17086,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:17030: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17089: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -17037,7 +17096,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:17040: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17099: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -17070,10 +17129,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:17073: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:17132: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <&5
++		if { (eval echo "$as_me:17184: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17128: \$? = $ac_status" >&5
++  echo "$as_me:17187: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17130: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:17189: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -17199,12 +17258,12 @@
+ if test "$GCC" = yes ; then
+ 	case "$host_os" in
+ 	(linux*|gnu*)
+-		echo "$as_me:17202: checking if this is really Intel C++ compiler" >&5
++		echo "$as_me:17261: checking if this is really Intel C++ compiler" >&5
+ echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6
+ 		cf_save_CFLAGS="$CXXFLAGS"
+ 		CXXFLAGS="$CXXFLAGS -no-gcc"
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17207 "configure"
++#line 17266 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17221,16 +17280,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17224: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17283: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17227: \$? = $ac_status" >&5
++  echo "$as_me:17286: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17230: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17289: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17233: \$? = $ac_status" >&5
++  echo "$as_me:17292: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   INTEL_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -17241,7 +17300,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		CXXFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:17244: result: $INTEL_CPLUSPLUS" >&5
++		echo "$as_me:17303: result: $INTEL_CPLUSPLUS" >&5
+ echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
+ 		;;
+ 	esac
+@@ -17250,11 +17309,11 @@
+ CLANG_CPLUSPLUS=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:17253: checking if this is really Clang C++ compiler" >&5
++	echo "$as_me:17312: checking if this is really Clang C++ compiler" >&5
+ echo $ECHO_N "checking if this is really Clang C++ compiler... $ECHO_C" >&6
+ 	cf_save_CFLAGS="$CXXFLAGS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17257 "configure"
++#line 17316 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17271,16 +17330,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17274: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17333: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17277: \$? = $ac_status" >&5
++  echo "$as_me:17336: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17280: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17339: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17283: \$? = $ac_status" >&5
++  echo "$as_me:17342: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   CLANG_CPLUSPLUS=yes
+ 
+@@ -17290,7 +17349,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	CXXFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:17293: result: $CLANG_CPLUSPLUS" >&5
++	echo "$as_me:17352: result: $CLANG_CPLUSPLUS" >&5
+ echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
+ fi
+ 
+@@ -17299,30 +17358,30 @@
+ if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
+ 	case "$CC" in
+ 	(c[1-9][0-9]|*/c[1-9][0-9])
+-		{ echo "$as_me:17302: WARNING: replacing broken compiler alias $CC" >&5
++		{ echo "$as_me:17361: WARNING: replacing broken compiler alias $CC" >&5
+ echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
+ 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
+ 		CC=clang
+ 		;;
+ 	esac
+ 
+-	echo "$as_me:17309: checking version of $CC" >&5
++	echo "$as_me:17368: checking version of $CC" >&5
+ echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
+ 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+ 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
+-	echo "$as_me:17313: result: $CLANG_VERSION" >&5
++	echo "$as_me:17372: result: $CLANG_VERSION" >&5
+ echo "${ECHO_T}$CLANG_VERSION" >&6
+ 
+ 	for cf_clang_opt in \
+ 		-Qunused-arguments \
+ 		-Wno-error=implicit-function-declaration
+ 	do
+-		echo "$as_me:17320: checking if option $cf_clang_opt works" >&5
++		echo "$as_me:17379: checking if option $cf_clang_opt works" >&5
+ echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
+ 		cf_save_CFLAGS="$CFLAGS"
+ 		CFLAGS="$CFLAGS $cf_clang_opt"
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17325 "configure"
++#line 17384 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -17336,16 +17395,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17339: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17398: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17342: \$? = $ac_status" >&5
++  echo "$as_me:17401: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17345: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17404: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17348: \$? = $ac_status" >&5
++  echo "$as_me:17407: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_clang_optok=yes
+@@ -17356,13 +17415,13 @@
+ 			cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:17359: result: $cf_clang_optok" >&5
++		echo "$as_me:17418: result: $cf_clang_optok" >&5
+ echo "${ECHO_T}$cf_clang_optok" >&6
+ 		CFLAGS="$cf_save_CFLAGS"
+ 		if test "$cf_clang_optok" = yes; then
+ 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
+ 
+-echo "${as_me:-configure}:17365: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:17424: testing adding option $cf_clang_opt ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -17379,7 +17438,7 @@
+ ac_main_return="return"
+ 
+ cat > conftest.$ac_ext <&5
++	{ echo "$as_me:17459: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-Wall"
+@@ -17414,12 +17473,12 @@
+ 		wd981
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:17417: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17476: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17420: \$? = $ac_status" >&5
++  echo "$as_me:17479: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17422: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17481: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		fi
+@@ -17428,7 +17487,7 @@
+ 
+ elif test "$GXX" = yes
+ then
+-	{ echo "$as_me:17431: checking for $CXX warning options..." >&5
++	{ echo "$as_me:17490: checking for $CXX warning options..." >&5
+ echo "$as_me: checking for $CXX warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-W -Wall"
+@@ -17458,16 +17517,16 @@
+ 		Wundef $cf_gxx_extra_warnings Wno-unused
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
+-		if { (eval echo "$as_me:17461: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17520: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17464: \$? = $ac_status" >&5
++  echo "$as_me:17523: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17466: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17525: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		else
+-			test -n "$verbose" && echo "$as_me:17470: result: ... no -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17529: result: ... no -$cf_opt" >&5
+ echo "${ECHO_T}... no -$cf_opt" >&6
+ 		fi
+ 	done
+@@ -17485,7 +17544,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:17488: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:17547: checking if you want to work around bogus compiler/loader warnings" >&5
+ echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6
+ 
+ # Check whether --enable-string-hacks or --disable-string-hacks was given.
+@@ -17495,7 +17554,7 @@
+ else
+   enable_string_hacks=no
+ fi;
+-echo "$as_me:17498: result: $enable_string_hacks" >&5
++echo "$as_me:17557: result: $enable_string_hacks" >&5
+ echo "${ECHO_T}$enable_string_hacks" >&6
+ 
+ if test "x$enable_string_hacks" = "xyes"; then
+@@ -17504,15 +17563,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+ 
+-	{ echo "$as_me:17507: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++	{ echo "$as_me:17566: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+ echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;}
+-	echo "$as_me:17509: checking for strlcat" >&5
++	echo "$as_me:17568: checking for strlcat" >&5
+ echo $ECHO_N "checking for strlcat... $ECHO_C" >&6
+ if test "${ac_cv_func_strlcat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17515 "configure"
++#line 17574 "configure"
+ #include "confdefs.h"
+ #define strlcat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17543,16 +17602,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17546: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17605: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17549: \$? = $ac_status" >&5
++  echo "$as_me:17608: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17552: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17611: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17555: \$? = $ac_status" >&5
++  echo "$as_me:17614: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_strlcat=yes
+ else
+@@ -17562,7 +17621,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17565: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:17624: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test "$ac_cv_func_strlcat" = yes; then
+ 
+@@ -17572,7 +17631,7 @@
+ 
+ else
+ 
+-		echo "$as_me:17575: checking for strlcat in -lbsd" >&5
++		echo "$as_me:17634: checking for strlcat in -lbsd" >&5
+ echo $ECHO_N "checking for strlcat in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_strlcat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17580,7 +17639,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17583 "configure"
++#line 17642 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17599,16 +17658,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17602: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17661: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17605: \$? = $ac_status" >&5
++  echo "$as_me:17664: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17608: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17667: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17611: \$? = $ac_status" >&5
++  echo "$as_me:17670: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -17619,7 +17678,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17622: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:17681: result: $ac_cv_lib_bsd_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6
+ if test "$ac_cv_lib_bsd_strlcat" = yes; then
+ 
+@@ -17642,23 +17701,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:17645: checking for $ac_header" >&5
++echo "$as_me:17704: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17651 "configure"
++#line 17710 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:17655: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:17714: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:17661: \$? = $ac_status" >&5
++  echo "$as_me:17720: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17677,7 +17736,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:17680: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:17739: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:17760: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17707 "configure"
++#line 17766 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17735,16 +17794,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17738: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17797: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17741: \$? = $ac_status" >&5
++  echo "$as_me:17800: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17744: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17803: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17747: \$? = $ac_status" >&5
++  echo "$as_me:17806: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -17754,7 +17813,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17757: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:17816: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:17829: checking if you want to enable runtime assertions" >&5
+ echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
+ 
+ # Check whether --enable-assertions or --disable-assertions was given.
+@@ -17777,7 +17836,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:17780: result: $with_assertions" >&5
++echo "$as_me:17839: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -17793,7 +17852,7 @@
+ 
+ ###	use option --disable-leaks to suppress "permanent" leaks, for testing
+ 
+-echo "$as_me:17796: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:17855: checking if you want to use dmalloc for testing" >&5
+ echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
+ 
+ # Check whether --with-dmalloc or --without-dmalloc was given.
+@@ -17815,7 +17874,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:17818: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:17877: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -17929,23 +17988,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:17932: checking for dmalloc.h" >&5
++	echo "$as_me:17991: checking for dmalloc.h" >&5
+ echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
+ if test "${ac_cv_header_dmalloc_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17938 "configure"
++#line 17997 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:17942: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18001: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:17948: \$? = $ac_status" >&5
++  echo "$as_me:18007: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17964,11 +18023,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:17967: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:18026: result: $ac_cv_header_dmalloc_h" >&5
+ echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
+ if test "$ac_cv_header_dmalloc_h" = yes; then
+ 
+-echo "$as_me:17971: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:18030: checking for dmalloc_debug in -ldmalloc" >&5
+ echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
+ if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17976,7 +18035,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17979 "configure"
++#line 18038 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17995,16 +18054,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17998: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18057: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18001: \$? = $ac_status" >&5
++  echo "$as_me:18060: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18004: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18063: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18007: \$? = $ac_status" >&5
++  echo "$as_me:18066: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -18015,7 +18074,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18018: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:18077: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+ echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
+ if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:18092: checking if you want to use dbmalloc for testing" >&5
+ echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
+ 
+ # Check whether --with-dbmalloc or --without-dbmalloc was given.
+@@ -18052,7 +18111,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:18055: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:18114: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -18166,23 +18225,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:18169: checking for dbmalloc.h" >&5
++	echo "$as_me:18228: checking for dbmalloc.h" >&5
+ echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
+ if test "${ac_cv_header_dbmalloc_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18175 "configure"
++#line 18234 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:18179: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18238: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:18185: \$? = $ac_status" >&5
++  echo "$as_me:18244: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18201,11 +18260,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18204: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:18263: result: $ac_cv_header_dbmalloc_h" >&5
+ echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
+ if test "$ac_cv_header_dbmalloc_h" = yes; then
+ 
+-echo "$as_me:18208: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:18267: checking for debug_malloc in -ldbmalloc" >&5
+ echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
+ if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18213,7 +18272,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18216 "configure"
++#line 18275 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18232,16 +18291,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18235: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18294: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18238: \$? = $ac_status" >&5
++  echo "$as_me:18297: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18241: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18300: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18244: \$? = $ac_status" >&5
++  echo "$as_me:18303: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -18252,7 +18311,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18255: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:18314: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+ echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
+ if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:18329: checking if you want to use valgrind for testing" >&5
+ echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
+ 
+ # Check whether --with-valgrind or --without-valgrind was given.
+@@ -18289,7 +18348,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:18292: result: ${with_valgrind:-no}" >&5
++echo "$as_me:18351: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -18402,7 +18461,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:18405: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:18464: checking if you want to perform memory-leak testing" >&5
+ echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
+ 
+ # Check whether --enable-leaks or --disable-leaks was given.
+@@ -18413,7 +18472,7 @@
+   enable_leaks=yes
+ fi;
+ if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
+-echo "$as_me:18416: result: $with_no_leaks" >&5
++echo "$as_me:18475: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$enable_leaks" = no ; then
+@@ -18465,7 +18524,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:18468: checking whether to add trace feature to all models" >&5
++echo "$as_me:18527: checking whether to add trace feature to all models" >&5
+ echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
+ 
+ # Check whether --with-trace or --without-trace was given.
+@@ -18475,7 +18534,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:18478: result: $cf_with_trace" >&5
++echo "$as_me:18537: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "x$cf_with_trace" = xyes ; then
+@@ -18589,7 +18648,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:18592: checking if we want to use GNAT projects" >&5
++echo "$as_me:18651: checking if we want to use GNAT projects" >&5
+ echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6
+ 
+ # Check whether --enable-gnat-projects or --disable-gnat-projects was given.
+@@ -18606,7 +18665,7 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:18609: result: $enable_gnat_projects" >&5
++echo "$as_me:18668: result: $enable_gnat_projects" >&5
+ echo "${ECHO_T}$enable_gnat_projects" >&6
+ 
+ ###	Checks for libraries.
+@@ -18619,14 +18678,14 @@
+ 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
+ 	fi
+ 
+-echo "$as_me:18622: checking if ssp library is needed" >&5
++echo "$as_me:18681: checking if ssp library is needed" >&5
+ echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
+ if test "${cf_cv_need_libssp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18629 "configure"
++#line 18688 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -18643,16 +18702,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18646: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18705: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18649: \$? = $ac_status" >&5
++  echo "$as_me:18708: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18652: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18711: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18655: \$? = $ac_status" >&5
++  echo "$as_me:18714: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=no
+ else
+@@ -18662,7 +18721,7 @@
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lssp"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18665 "configure"
++#line 18724 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -18679,16 +18738,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18682: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18741: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18685: \$? = $ac_status" >&5
++  echo "$as_me:18744: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18688: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18747: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18691: \$? = $ac_status" >&5
++  echo "$as_me:18750: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=yes
+ else
+@@ -18702,7 +18761,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18705: result: $cf_cv_need_libssp" >&5
++echo "$as_me:18764: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+ 
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -18728,13 +18787,13 @@
+ 
+ 	;;
+ (*)
+-echo "$as_me:18731: checking for gettimeofday" >&5
++echo "$as_me:18790: checking for gettimeofday" >&5
+ echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
+ if test "${ac_cv_func_gettimeofday+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18737 "configure"
++#line 18796 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18765,16 +18824,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18768: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18827: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18771: \$? = $ac_status" >&5
++  echo "$as_me:18830: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18774: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18833: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18777: \$? = $ac_status" >&5
++  echo "$as_me:18836: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -18784,7 +18843,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18787: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:18846: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+ 
+@@ -18794,7 +18853,7 @@
+ 
+ else
+ 
+-echo "$as_me:18797: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:18856: checking for gettimeofday in -lbsd" >&5
+ echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18802,7 +18861,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18805 "configure"
++#line 18864 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18821,16 +18880,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18824: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18883: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18827: \$? = $ac_status" >&5
++  echo "$as_me:18886: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18830: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18889: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18833: \$? = $ac_status" >&5
++  echo "$as_me:18892: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -18841,7 +18900,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18844: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:18903: result: $ac_cv_lib_bsd_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
+ if test "$ac_cv_lib_bsd_gettimeofday" = yes; then
+ 
+@@ -18871,14 +18930,14 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:18874: checking if -lm needed for math functions" >&5
++echo "$as_me:18933: checking if -lm needed for math functions" >&5
+ echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6
+ if test "${cf_cv_need_libm+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18881 "configure"
++#line 18940 "configure"
+ #include "confdefs.h"
+ 
+ 	#include 
+@@ -18894,16 +18953,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18897: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18956: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18900: \$? = $ac_status" >&5
++  echo "$as_me:18959: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18903: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18962: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18906: \$? = $ac_status" >&5
++  echo "$as_me:18965: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libm=no
+ else
+@@ -18913,7 +18972,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18916: result: $cf_cv_need_libm" >&5
++echo "$as_me:18975: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+ if test "$cf_cv_need_libm" = yes
+ then
+@@ -18921,13 +18980,13 @@
+ fi
+ 
+ ###	Checks for header files.
+-echo "$as_me:18924: checking for ANSI C header files" >&5
++echo "$as_me:18983: checking for ANSI C header files" >&5
+ echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+ if test "${ac_cv_header_stdc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18930 "configure"
++#line 18989 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -18935,13 +18994,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:18938: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18997: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:18944: \$? = $ac_status" >&5
++  echo "$as_me:19003: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18963,7 +19022,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18966 "configure"
++#line 19025 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -18981,7 +19040,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18984 "configure"
++#line 19043 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -19002,7 +19061,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19005 "configure"
++#line 19064 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -19028,15 +19087,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:19031: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19090: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19034: \$? = $ac_status" >&5
++  echo "$as_me:19093: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:19036: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19095: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19039: \$? = $ac_status" >&5
++  echo "$as_me:19098: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -19049,7 +19108,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:19052: result: $ac_cv_header_stdc" >&5
++echo "$as_me:19111: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -19062,13 +19121,13 @@
+ ac_header_dirent=no
+ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
+   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+-echo "$as_me:19065: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:19124: checking for $ac_hdr that defines DIR" >&5
+ echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19071 "configure"
++#line 19130 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$ac_hdr>
+@@ -19083,16 +19142,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19086: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19145: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19089: \$? = $ac_status" >&5
++  echo "$as_me:19148: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19092: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19151: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19095: \$? = $ac_status" >&5
++  echo "$as_me:19154: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -19102,7 +19161,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19105: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:19164: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++  echo "$as_me:19177: checking for opendir in -ldir" >&5
+ echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
+ if test "${ac_cv_lib_dir_opendir+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19123,7 +19182,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19126 "configure"
++#line 19185 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19142,16 +19201,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19145: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19204: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19148: \$? = $ac_status" >&5
++  echo "$as_me:19207: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19151: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19210: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19154: \$? = $ac_status" >&5
++  echo "$as_me:19213: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -19162,14 +19221,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19165: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:19224: result: $ac_cv_lib_dir_opendir" >&5
+ echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
+ if test "$ac_cv_lib_dir_opendir" = yes; then
+   LIBS="$LIBS -ldir"
+ fi
+ 
+ else
+-  echo "$as_me:19172: checking for opendir in -lx" >&5
++  echo "$as_me:19231: checking for opendir in -lx" >&5
+ echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
+ if test "${ac_cv_lib_x_opendir+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19177,7 +19236,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19180 "configure"
++#line 19239 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19196,16 +19255,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19199: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19258: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19202: \$? = $ac_status" >&5
++  echo "$as_me:19261: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19205: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19264: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19208: \$? = $ac_status" >&5
++  echo "$as_me:19267: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -19216,7 +19275,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19219: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:19278: result: $ac_cv_lib_x_opendir" >&5
+ echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
+ if test "$ac_cv_lib_x_opendir" = yes; then
+   LIBS="$LIBS -lx"
+@@ -19224,13 +19283,13 @@
+ 
+ fi
+ 
+-echo "$as_me:19227: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:19286: checking whether time.h and sys/time.h may both be included" >&5
+ echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
+ if test "${ac_cv_header_time+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19233 "configure"
++#line 19292 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -19246,16 +19305,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19249: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19308: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19252: \$? = $ac_status" >&5
++  echo "$as_me:19311: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19255: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19314: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19258: \$? = $ac_status" >&5
++  echo "$as_me:19317: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -19265,7 +19324,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19268: result: $ac_cv_header_time" >&5
++echo "$as_me:19327: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -19280,7 +19339,7 @@
+ case "$host_os" in
+ (mingw*)
+ 	# -lsystre -ltre -lintl -liconv
+-	echo "$as_me:19283: checking for regcomp in -lsystre" >&5
++	echo "$as_me:19342: checking for regcomp in -lsystre" >&5
+ echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6
+ if test "${ac_cv_lib_systre_regcomp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19288,7 +19347,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsystre  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19291 "configure"
++#line 19350 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19307,16 +19366,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19310: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19369: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19313: \$? = $ac_status" >&5
++  echo "$as_me:19372: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19316: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19375: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19319: \$? = $ac_status" >&5
++  echo "$as_me:19378: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_systre_regcomp=yes
+ else
+@@ -19327,11 +19386,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19330: result: $ac_cv_lib_systre_regcomp" >&5
++echo "$as_me:19389: result: $ac_cv_lib_systre_regcomp" >&5
+ echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6
+ if test "$ac_cv_lib_systre_regcomp" = yes; then
+ 
+-		echo "$as_me:19334: checking for libiconv_open in -liconv" >&5
++		echo "$as_me:19393: checking for libiconv_open in -liconv" >&5
+ echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
+ if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19339,7 +19398,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-liconv  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19342 "configure"
++#line 19401 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19358,16 +19417,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19361: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19420: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19364: \$? = $ac_status" >&5
++  echo "$as_me:19423: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19367: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19426: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19370: \$? = $ac_status" >&5
++  echo "$as_me:19429: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_iconv_libiconv_open=yes
+ else
+@@ -19378,7 +19437,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19381: result: $ac_cv_lib_iconv_libiconv_open" >&5
++echo "$as_me:19440: result: $ac_cv_lib_iconv_libiconv_open" >&5
+ echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6
+ if test "$ac_cv_lib_iconv_libiconv_open" = yes; then
+ 
+@@ -19400,7 +19459,7 @@
+ 
+ fi
+ 
+-		echo "$as_me:19403: checking for libintl_gettext in -lintl" >&5
++		echo "$as_me:19462: checking for libintl_gettext in -lintl" >&5
+ echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6
+ if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19408,7 +19467,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19411 "configure"
++#line 19470 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19427,16 +19486,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19430: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19489: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19433: \$? = $ac_status" >&5
++  echo "$as_me:19492: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19436: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19495: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19439: \$? = $ac_status" >&5
++  echo "$as_me:19498: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_intl_libintl_gettext=yes
+ else
+@@ -19447,7 +19506,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19450: result: $ac_cv_lib_intl_libintl_gettext" >&5
++echo "$as_me:19509: result: $ac_cv_lib_intl_libintl_gettext" >&5
+ echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6
+ if test "$ac_cv_lib_intl_libintl_gettext" = yes; then
+ 
+@@ -19469,7 +19528,7 @@
+ 
+ fi
+ 
+-		echo "$as_me:19472: checking for tre_regcomp in -ltre" >&5
++		echo "$as_me:19531: checking for tre_regcomp in -ltre" >&5
+ echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6
+ if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19477,7 +19536,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ltre  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19480 "configure"
++#line 19539 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19496,16 +19555,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19499: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19558: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19502: \$? = $ac_status" >&5
++  echo "$as_me:19561: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19505: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19564: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19508: \$? = $ac_status" >&5
++  echo "$as_me:19567: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_tre_tre_regcomp=yes
+ else
+@@ -19516,7 +19575,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19519: result: $ac_cv_lib_tre_tre_regcomp" >&5
++echo "$as_me:19578: result: $ac_cv_lib_tre_tre_regcomp" >&5
+ echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6
+ if test "$ac_cv_lib_tre_tre_regcomp" = yes; then
+ 
+@@ -19558,7 +19617,7 @@
+ 
+ else
+ 
+-		echo "$as_me:19561: checking for regcomp in -lgnurx" >&5
++		echo "$as_me:19620: checking for regcomp in -lgnurx" >&5
+ echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6
+ if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19566,7 +19625,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgnurx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19569 "configure"
++#line 19628 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19585,16 +19644,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19588: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19647: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19591: \$? = $ac_status" >&5
++  echo "$as_me:19650: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19594: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19653: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19597: \$? = $ac_status" >&5
++  echo "$as_me:19656: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gnurx_regcomp=yes
+ else
+@@ -19605,7 +19664,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19608: result: $ac_cv_lib_gnurx_regcomp" >&5
++echo "$as_me:19667: result: $ac_cv_lib_gnurx_regcomp" >&5
+ echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6
+ if test "$ac_cv_lib_gnurx_regcomp" = yes; then
+ 
+@@ -19633,13 +19692,13 @@
+ 	;;
+ (*)
+ 	cf_regex_libs="regex re"
+-	echo "$as_me:19636: checking for regcomp" >&5
++	echo "$as_me:19695: checking for regcomp" >&5
+ echo $ECHO_N "checking for regcomp... $ECHO_C" >&6
+ if test "${ac_cv_func_regcomp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19642 "configure"
++#line 19701 "configure"
+ #include "confdefs.h"
+ #define regcomp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19670,16 +19729,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19673: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19732: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19676: \$? = $ac_status" >&5
++  echo "$as_me:19735: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19679: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19738: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19682: \$? = $ac_status" >&5
++  echo "$as_me:19741: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_regcomp=yes
+ else
+@@ -19689,7 +19748,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19692: result: $ac_cv_func_regcomp" >&5
++echo "$as_me:19751: result: $ac_cv_func_regcomp" >&5
+ echo "${ECHO_T}$ac_cv_func_regcomp" >&6
+ if test "$ac_cv_func_regcomp" = yes; then
+   cf_regex_func=regcomp
+@@ -19698,7 +19757,7 @@
+ 		for cf_regex_lib in $cf_regex_libs
+ 		do
+ 			as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh`
+-echo "$as_me:19701: checking for regcomp in -l$cf_regex_lib" >&5
++echo "$as_me:19760: checking for regcomp in -l$cf_regex_lib" >&5
+ echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19706,7 +19765,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_regex_lib  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19709 "configure"
++#line 19768 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19725,16 +19784,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19728: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19787: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19731: \$? = $ac_status" >&5
++  echo "$as_me:19790: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19734: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19793: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19737: \$? = $ac_status" >&5
++  echo "$as_me:19796: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -19745,7 +19804,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19748: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:19807: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then
+ 
+@@ -19777,13 +19836,13 @@
+ esac
+ 
+ if test "$cf_regex_func" = no ; then
+-	echo "$as_me:19780: checking for compile" >&5
++	echo "$as_me:19839: checking for compile" >&5
+ echo $ECHO_N "checking for compile... $ECHO_C" >&6
+ if test "${ac_cv_func_compile+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19786 "configure"
++#line 19845 "configure"
+ #include "confdefs.h"
+ #define compile autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19814,16 +19873,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19817: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19876: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19820: \$? = $ac_status" >&5
++  echo "$as_me:19879: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19823: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19882: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19826: \$? = $ac_status" >&5
++  echo "$as_me:19885: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_compile=yes
+ else
+@@ -19833,13 +19892,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19836: result: $ac_cv_func_compile" >&5
++echo "$as_me:19895: result: $ac_cv_func_compile" >&5
+ echo "${ECHO_T}$ac_cv_func_compile" >&6
+ if test "$ac_cv_func_compile" = yes; then
+   cf_regex_func=compile
+ else
+ 
+-		echo "$as_me:19842: checking for compile in -lgen" >&5
++		echo "$as_me:19901: checking for compile in -lgen" >&5
+ echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6
+ if test "${ac_cv_lib_gen_compile+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19847,7 +19906,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgen  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19850 "configure"
++#line 19909 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19866,16 +19925,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19869: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19928: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19872: \$? = $ac_status" >&5
++  echo "$as_me:19931: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19875: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19934: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19878: \$? = $ac_status" >&5
++  echo "$as_me:19937: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gen_compile=yes
+ else
+@@ -19886,7 +19945,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19889: result: $ac_cv_lib_gen_compile" >&5
++echo "$as_me:19948: result: $ac_cv_lib_gen_compile" >&5
+ echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6
+ if test "$ac_cv_lib_gen_compile" = yes; then
+ 
+@@ -19914,11 +19973,11 @@
+ fi
+ 
+ if test "$cf_regex_func" = no ; then
+-	{ echo "$as_me:19917: WARNING: cannot find regular expression library" >&5
++	{ echo "$as_me:19976: WARNING: cannot find regular expression library" >&5
+ echo "$as_me: WARNING: cannot find regular expression library" >&2;}
+ fi
+ 
+-echo "$as_me:19921: checking for regular-expression headers" >&5
++echo "$as_me:19980: checking for regular-expression headers" >&5
+ echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
+ if test "${cf_cv_regex_hdrs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19930,7 +19989,7 @@
+ 	for cf_regex_hdr in regexp.h regexpr.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19933 "configure"
++#line 19992 "configure"
+ #include "confdefs.h"
+ #include <$cf_regex_hdr>
+ int
+@@ -19947,16 +20006,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19950: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20009: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19953: \$? = $ac_status" >&5
++  echo "$as_me:20012: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19956: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20015: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19959: \$? = $ac_status" >&5
++  echo "$as_me:20018: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -19973,7 +20032,7 @@
+ 	for cf_regex_hdr in regex.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19976 "configure"
++#line 20035 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$cf_regex_hdr>
+@@ -19993,16 +20052,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19996: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20055: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19999: \$? = $ac_status" >&5
++  echo "$as_me:20058: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20002: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20061: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20005: \$? = $ac_status" >&5
++  echo "$as_me:20064: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20018,11 +20077,11 @@
+ esac
+ 
+ fi
+-echo "$as_me:20021: result: $cf_cv_regex_hdrs" >&5
++echo "$as_me:20080: result: $cf_cv_regex_hdrs" >&5
+ echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
+ 
+ case "$cf_cv_regex_hdrs" in
+-	(no)		{ echo "$as_me:20025: WARNING: no regular expression header found" >&5
++	(no)		{ echo "$as_me:20084: WARNING: no regular expression header found" >&5
+ echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
+ 	(regex.h)
+ cat >>confdefs.h <<\EOF
+@@ -20059,23 +20118,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:20062: checking for $ac_header" >&5
++echo "$as_me:20121: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20068 "configure"
++#line 20127 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20072: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20131: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:20078: \$? = $ac_status" >&5
++  echo "$as_me:20137: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20094,7 +20153,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20097: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20156: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:20169: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20116 "configure"
++#line 20175 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20120: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20179: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:20126: \$? = $ac_status" >&5
++  echo "$as_me:20185: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20142,7 +20201,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20145: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20204: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:20214: checking for header declaring getopt variables" >&5
+ echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6
+ if test "${cf_cv_getopt_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20162,7 +20221,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20165 "configure"
++#line 20224 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -20175,16 +20234,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20178: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20237: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20181: \$? = $ac_status" >&5
++  echo "$as_me:20240: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20184: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20243: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20187: \$? = $ac_status" >&5
++  echo "$as_me:20246: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_getopt_header=$cf_header
+  break
+@@ -20196,7 +20255,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20199: result: $cf_cv_getopt_header" >&5
++echo "$as_me:20258: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test "$cf_cv_getopt_header" != none ; then
+ 
+@@ -20213,14 +20272,14 @@
+ 
+ fi
+ 
+-echo "$as_me:20216: checking if external environ is declared" >&5
++echo "$as_me:20275: checking if external environ is declared" >&5
+ echo $ECHO_N "checking if external environ is declared... $ECHO_C" >&6
+ if test "${cf_cv_dcl_environ+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20223 "configure"
++#line 20282 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_STDLIB_H
+@@ -20236,16 +20295,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20239: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20298: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20242: \$? = $ac_status" >&5
++  echo "$as_me:20301: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20245: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20304: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20248: \$? = $ac_status" >&5
++  echo "$as_me:20307: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_environ=yes
+ else
+@@ -20256,7 +20315,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20259: result: $cf_cv_dcl_environ" >&5
++echo "$as_me:20318: result: $cf_cv_dcl_environ" >&5
+ echo "${ECHO_T}$cf_cv_dcl_environ" >&6
+ 
+ if test "$cf_cv_dcl_environ" = no ; then
+@@ -20271,14 +20330,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:20274: checking if external environ exists" >&5
++echo "$as_me:20333: checking if external environ exists" >&5
+ echo $ECHO_N "checking if external environ exists... $ECHO_C" >&6
+ if test "${cf_cv_have_environ+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20281 "configure"
++#line 20340 "configure"
+ #include "confdefs.h"
+ 
+ #undef environ
+@@ -20293,16 +20352,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20296: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20355: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20299: \$? = $ac_status" >&5
++  echo "$as_me:20358: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20302: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20361: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20305: \$? = $ac_status" >&5
++  echo "$as_me:20364: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_environ=yes
+ else
+@@ -20313,7 +20372,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20316: result: $cf_cv_have_environ" >&5
++echo "$as_me:20375: result: $cf_cv_have_environ" >&5
+ echo "${ECHO_T}$cf_cv_have_environ" >&6
+ 
+ if test "$cf_cv_have_environ" = yes ; then
+@@ -20326,13 +20385,13 @@
+ 
+ fi
+ 
+-echo "$as_me:20329: checking for getenv" >&5
++echo "$as_me:20388: checking for getenv" >&5
+ echo $ECHO_N "checking for getenv... $ECHO_C" >&6
+ if test "${ac_cv_func_getenv+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20335 "configure"
++#line 20394 "configure"
+ #include "confdefs.h"
+ #define getenv autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20363,16 +20422,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20366: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20425: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20369: \$? = $ac_status" >&5
++  echo "$as_me:20428: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20372: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20431: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20375: \$? = $ac_status" >&5
++  echo "$as_me:20434: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_getenv=yes
+ else
+@@ -20382,19 +20441,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20385: result: $ac_cv_func_getenv" >&5
++echo "$as_me:20444: result: $ac_cv_func_getenv" >&5
+ echo "${ECHO_T}$ac_cv_func_getenv" >&6
+ 
+ for ac_func in putenv setenv strdup
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:20391: checking for $ac_func" >&5
++echo "$as_me:20450: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20397 "configure"
++#line 20456 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20425,16 +20484,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20428: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20487: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20431: \$? = $ac_status" >&5
++  echo "$as_me:20490: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20434: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20493: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20437: \$? = $ac_status" >&5
++  echo "$as_me:20496: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -20444,7 +20503,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20447: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:20506: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:20516: checking if getenv returns consistent values" >&5
+ echo $ECHO_N "checking if getenv returns consistent values... $ECHO_C" >&6
+ if test "${cf_cv_consistent_getenv+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20464,7 +20523,7 @@
+   cf_cv_consistent_getenv=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20467 "configure"
++#line 20526 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20573,15 +20632,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:20576: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20635: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20579: \$? = $ac_status" >&5
++  echo "$as_me:20638: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:20581: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20640: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20584: \$? = $ac_status" >&5
++  echo "$as_me:20643: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_consistent_getenv=yes
+ else
+@@ -20594,7 +20653,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:20597: result: $cf_cv_consistent_getenv" >&5
++echo "$as_me:20656: result: $cf_cv_consistent_getenv" >&5
+ echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
+ 
+ if test "x$cf_cv_consistent_getenv" = xno
+@@ -20609,18 +20668,18 @@
+ if test "x$cf_cv_consistent_getenv" = xno && \
+ 	test "x$cf_with_trace" = xyes
+ then
+-	{ echo "$as_me:20612: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
++	{ echo "$as_me:20671: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
+ echo "$as_me: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&2;}
+ fi
+ 
+-echo "$as_me:20616: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:20675: checking if sys/time.h works with sys/select.h" >&5
+ echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
+ if test "${cf_cv_sys_time_select+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20623 "configure"
++#line 20682 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20640,16 +20699,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20643: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20702: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20646: \$? = $ac_status" >&5
++  echo "$as_me:20705: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20649: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20708: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20652: \$? = $ac_status" >&5
++  echo "$as_me:20711: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -20661,7 +20720,7 @@
+ 
+ fi
+ 
+-echo "$as_me:20664: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:20723: result: $cf_cv_sys_time_select" >&5
+ echo "${ECHO_T}$cf_cv_sys_time_select" >&6
+ test "$cf_cv_sys_time_select" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -20676,13 +20735,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:20679: checking for an ANSI C-conforming const" >&5
++echo "$as_me:20738: checking for an ANSI C-conforming const" >&5
+ echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
+ if test "${ac_cv_c_const+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20685 "configure"
++#line 20744 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -20740,16 +20799,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20743: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20802: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20746: \$? = $ac_status" >&5
++  echo "$as_me:20805: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20749: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20808: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20752: \$? = $ac_status" >&5
++  echo "$as_me:20811: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -20759,7 +20818,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20762: result: $ac_cv_c_const" >&5
++echo "$as_me:20821: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -20769,7 +20828,7 @@
+ 
+ fi
+ 
+-echo "$as_me:20772: checking for inline" >&5
++echo "$as_me:20831: checking for inline" >&5
+ echo $ECHO_N "checking for inline... $ECHO_C" >&6
+ if test "${ac_cv_c_inline+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20777,7 +20836,7 @@
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20780 "configure"
++#line 20839 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo () {return 0; }
+@@ -20786,16 +20845,16 @@
+ 
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20789: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20848: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20792: \$? = $ac_status" >&5
++  echo "$as_me:20851: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20795: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20854: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20798: \$? = $ac_status" >&5
++  echo "$as_me:20857: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -20806,7 +20865,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20809: result: $ac_cv_c_inline" >&5
++echo "$as_me:20868: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -20832,7 +20891,7 @@
+ 		:
+ 	elif test "$GCC" = yes
+ 	then
+-		echo "$as_me:20835: checking if $CC supports options to tune inlining" >&5
++		echo "$as_me:20894: checking if $CC supports options to tune inlining" >&5
+ echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6
+ if test "${cf_cv_gcc_inline+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20841,7 +20900,7 @@
+ 		cf_save_CFLAGS=$CFLAGS
+ 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20844 "configure"
++#line 20903 "configure"
+ #include "confdefs.h"
+ inline int foo(void) { return 1; }
+ int
+@@ -20853,16 +20912,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20856: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20915: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20859: \$? = $ac_status" >&5
++  echo "$as_me:20918: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20862: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20921: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20865: \$? = $ac_status" >&5
++  echo "$as_me:20924: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gcc_inline=yes
+ else
+@@ -20874,7 +20933,7 @@
+ 		CFLAGS=$cf_save_CFLAGS
+ 
+ fi
+-echo "$as_me:20877: result: $cf_cv_gcc_inline" >&5
++echo "$as_me:20936: result: $cf_cv_gcc_inline" >&5
+ echo "${ECHO_T}$cf_cv_gcc_inline" >&6
+ 		if test "$cf_cv_gcc_inline" = yes ; then
+ 
+@@ -20980,7 +21039,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:20983: checking for signal global datatype" >&5
++echo "$as_me:21042: checking for signal global datatype" >&5
+ echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6
+ if test "${cf_cv_sig_atomic_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20992,7 +21051,7 @@
+ 		"int"
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20995 "configure"
++#line 21054 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21016,16 +21075,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21019: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21078: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21022: \$? = $ac_status" >&5
++  echo "$as_me:21081: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21025: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21084: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21028: \$? = $ac_status" >&5
++  echo "$as_me:21087: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -21039,7 +21098,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21042: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:21101: result: $cf_cv_sig_atomic_t" >&5
+ echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
+ test "$cf_cv_sig_atomic_t" != no &&
+ cat >>confdefs.h <&5
++echo "$as_me:21110: checking for type of chtype" >&5
+ echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
+ if test "${cf_cv_typeof_chtype+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21058,7 +21117,7 @@
+   cf_cv_typeof_chtype=long
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21061 "configure"
++#line 21120 "configure"
+ #include "confdefs.h"
+ 
+ #define WANT_BITS 31
+@@ -21093,15 +21152,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21096: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21155: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21099: \$? = $ac_status" >&5
++  echo "$as_me:21158: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21101: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21160: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21104: \$? = $ac_status" >&5
++  echo "$as_me:21163: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_typeof_chtype=`cat cf_test.out`
+ else
+@@ -21116,7 +21175,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21119: result: $cf_cv_typeof_chtype" >&5
++echo "$as_me:21178: result: $cf_cv_typeof_chtype" >&5
+ echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:21190: checking if unsigned literals are legal" >&5
+ echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6
+ if test "${cf_cv_unsigned_literals+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21138 "configure"
++#line 21197 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21147,16 +21206,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21150: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21209: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21153: \$? = $ac_status" >&5
++  echo "$as_me:21212: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21156: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21215: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21159: \$? = $ac_status" >&5
++  echo "$as_me:21218: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_unsigned_literals=yes
+ else
+@@ -21168,7 +21227,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21171: result: $cf_cv_unsigned_literals" >&5
++echo "$as_me:21230: result: $cf_cv_unsigned_literals" >&5
+ echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
+ 
+ cf_cv_1UL="1"
+@@ -21184,14 +21243,14 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:21187: checking if external errno is declared" >&5
++echo "$as_me:21246: checking if external errno is declared" >&5
+ echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6
+ if test "${cf_cv_dcl_errno+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21194 "configure"
++#line 21253 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_STDLIB_H
+@@ -21209,16 +21268,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21212: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21271: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21215: \$? = $ac_status" >&5
++  echo "$as_me:21274: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21218: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21277: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21221: \$? = $ac_status" >&5
++  echo "$as_me:21280: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_errno=yes
+ else
+@@ -21229,7 +21288,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21232: result: $cf_cv_dcl_errno" >&5
++echo "$as_me:21291: result: $cf_cv_dcl_errno" >&5
+ echo "${ECHO_T}$cf_cv_dcl_errno" >&6
+ 
+ if test "$cf_cv_dcl_errno" = no ; then
+@@ -21244,14 +21303,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:21247: checking if external errno exists" >&5
++echo "$as_me:21306: checking if external errno exists" >&5
+ echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6
+ if test "${cf_cv_have_errno+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21254 "configure"
++#line 21313 "configure"
+ #include "confdefs.h"
+ 
+ #undef errno
+@@ -21266,16 +21325,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21269: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21328: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21272: \$? = $ac_status" >&5
++  echo "$as_me:21331: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21275: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21334: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21278: \$? = $ac_status" >&5
++  echo "$as_me:21337: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_errno=yes
+ else
+@@ -21286,7 +21345,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21289: result: $cf_cv_have_errno" >&5
++echo "$as_me:21348: result: $cf_cv_have_errno" >&5
+ echo "${ECHO_T}$cf_cv_have_errno" >&6
+ 
+ if test "$cf_cv_have_errno" = yes ; then
+@@ -21299,7 +21358,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21302: checking if data-only library module links" >&5
++echo "$as_me:21361: checking if data-only library module links" >&5
+ echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
+ if test "${cf_cv_link_dataonly+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21307,20 +21366,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:21372: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21316: \$? = $ac_status" >&5
++  echo "$as_me:21375: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+ 		mv conftest.o data.o && \
+ 		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
+ 	fi
+ 	rm -f conftest.$ac_ext data.o
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:21395: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21339: \$? = $ac_status" >&5
++  echo "$as_me:21398: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+ 		mv conftest.o func.o && \
+ 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -21349,7 +21408,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21352 "configure"
++#line 21411 "configure"
+ #include "confdefs.h"
+ 
+ 	int main(void)
+@@ -21360,15 +21419,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21363: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21422: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21366: \$? = $ac_status" >&5
++  echo "$as_me:21425: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21368: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21427: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21371: \$? = $ac_status" >&5
++  echo "$as_me:21430: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -21383,7 +21442,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21386: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:21445: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -21426,13 +21485,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:21429: checking for $ac_func" >&5
++echo "$as_me:21488: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21435 "configure"
++#line 21494 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21463,16 +21522,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21466: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21525: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21469: \$? = $ac_status" >&5
++  echo "$as_me:21528: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21472: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21531: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21475: \$? = $ac_status" >&5
++  echo "$as_me:21534: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -21482,7 +21541,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21485: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:21544: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:21554: checking if _PATH_TTYS is defined in ttyent.h" >&5
+ echo $ECHO_N "checking if _PATH_TTYS is defined in ttyent.h... $ECHO_C" >&6
+ if test "${cf_cv_PATH_TTYS+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21502 "configure"
++#line 21561 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21514,16 +21573,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21517: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21576: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21520: \$? = $ac_status" >&5
++  echo "$as_me:21579: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21523: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21582: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21526: \$? = $ac_status" >&5
++  echo "$as_me:21585: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_PATH_TTYS=yes
+ else
+@@ -21533,7 +21592,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21536: result: $cf_cv_PATH_TTYS" >&5
++echo "$as_me:21595: result: $cf_cv_PATH_TTYS" >&5
+ echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
+ 
+ if test $cf_cv_PATH_TTYS = no
+@@ -21555,7 +21614,7 @@
+ 
+ if test $cf_cv_PATH_TTYS != no
+ then
+-	echo "$as_me:21558: checking if _PATH_TTYS file exists" >&5
++	echo "$as_me:21617: checking if _PATH_TTYS file exists" >&5
+ echo $ECHO_N "checking if _PATH_TTYS file exists... $ECHO_C" >&6
+ if test "${cf_cv_have_PATH_TTYS+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21565,7 +21624,7 @@
+   cf_cv_have_PATH_TTYS=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21568 "configure"
++#line 21627 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21576,15 +21635,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21579: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21638: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21582: \$? = $ac_status" >&5
++  echo "$as_me:21641: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21584: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21643: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21587: \$? = $ac_status" >&5
++  echo "$as_me:21646: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_PATH_TTYS=yes
+ else
+@@ -21596,7 +21655,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:21599: result: $cf_cv_have_PATH_TTYS" >&5
++echo "$as_me:21658: result: $cf_cv_have_PATH_TTYS" >&5
+ echo "${ECHO_T}$cf_cv_have_PATH_TTYS" >&6
+ 	test "$cf_cv_have_PATH_TTYS" = no && cf_cv_PATH_TTYS=no
+ fi
+@@ -21608,14 +21667,14 @@
+ #define HAVE_PATH_TTYS 1
+ EOF
+ 
+-	echo "$as_me:21611: checking for getttynam" >&5
++	echo "$as_me:21670: checking for getttynam" >&5
+ echo $ECHO_N "checking for getttynam... $ECHO_C" >&6
+ if test "${cf_cv_func_getttynam+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21618 "configure"
++#line 21677 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -21627,16 +21686,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21630: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21689: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21633: \$? = $ac_status" >&5
++  echo "$as_me:21692: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21636: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21695: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21639: \$? = $ac_status" >&5
++  echo "$as_me:21698: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_getttynam=yes
+ else
+@@ -21646,7 +21705,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21649: result: $cf_cv_func_getttynam" >&5
++echo "$as_me:21708: result: $cf_cv_func_getttynam" >&5
+ echo "${ECHO_T}$cf_cv_func_getttynam" >&6
+ 	test "$cf_cv_func_getttynam" = yes && cat >>confdefs.h <<\EOF
+ #define HAVE_GETTTYNAM 1
+@@ -21656,7 +21715,7 @@
+ 
+ if test "x$ac_cv_func_getopt" = xno && \
+    test "x$cf_with_progs$cf_with_tests" != xnono; then
+-	{ { echo "$as_me:21659: error: getopt is required for building programs" >&5
++	{ { echo "$as_me:21718: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -21665,7 +21724,7 @@
+ then
+ 	if test "x$ac_cv_func_vsnprintf" = xyes
+ 	then
+-		{ echo "$as_me:21668: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
++		{ echo "$as_me:21727: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+ echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
+ 	else
+ 
+@@ -21678,14 +21737,14 @@
+ 
+ if test "x$with_getcap" = "xyes" ; then
+ 
+-echo "$as_me:21681: checking for terminal-capability database functions" >&5
++echo "$as_me:21740: checking for terminal-capability database functions" >&5
+ echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6
+ if test "${cf_cv_cgetent+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21688 "configure"
++#line 21747 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21705,16 +21764,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21708: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21767: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21711: \$? = $ac_status" >&5
++  echo "$as_me:21770: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21714: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21773: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21717: \$? = $ac_status" >&5
++  echo "$as_me:21776: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent=yes
+ else
+@@ -21725,7 +21784,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21728: result: $cf_cv_cgetent" >&5
++echo "$as_me:21787: result: $cf_cv_cgetent" >&5
+ echo "${ECHO_T}$cf_cv_cgetent" >&6
+ 
+ if test "$cf_cv_cgetent" = yes
+@@ -21735,14 +21794,14 @@
+ #define HAVE_BSD_CGETENT 1
+ EOF
+ 
+-echo "$as_me:21738: checking if cgetent uses const parameter" >&5
++echo "$as_me:21797: checking if cgetent uses const parameter" >&5
+ echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6
+ if test "${cf_cv_cgetent_const+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21745 "configure"
++#line 21804 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
+@@ -21765,16 +21824,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21768: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21827: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21771: \$? = $ac_status" >&5
++  echo "$as_me:21830: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21774: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21833: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21777: \$? = $ac_status" >&5
++  echo "$as_me:21836: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent_const=yes
+ else
+@@ -21785,7 +21844,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21788: result: $cf_cv_cgetent_const" >&5
++echo "$as_me:21847: result: $cf_cv_cgetent_const" >&5
+ echo "${ECHO_T}$cf_cv_cgetent_const" >&6
+ 	if test "$cf_cv_cgetent_const" = yes
+ 	then
+@@ -21799,14 +21858,14 @@
+ 
+ fi
+ 
+-echo "$as_me:21802: checking for isascii" >&5
++echo "$as_me:21861: checking for isascii" >&5
+ echo $ECHO_N "checking for isascii... $ECHO_C" >&6
+ if test "${cf_cv_have_isascii+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21809 "configure"
++#line 21868 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -21818,16 +21877,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21821: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21880: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21824: \$? = $ac_status" >&5
++  echo "$as_me:21883: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21827: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21886: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21830: \$? = $ac_status" >&5
++  echo "$as_me:21889: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_isascii=yes
+ else
+@@ -21838,7 +21897,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21841: result: $cf_cv_have_isascii" >&5
++echo "$as_me:21900: result: $cf_cv_have_isascii" >&5
+ echo "${ECHO_T}$cf_cv_have_isascii" >&6
+ test "$cf_cv_have_isascii" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -21846,10 +21905,10 @@
+ EOF
+ 
+ if test "$ac_cv_func_sigaction" = yes; then
+-echo "$as_me:21849: checking whether sigaction needs _POSIX_SOURCE" >&5
++echo "$as_me:21908: checking whether sigaction needs _POSIX_SOURCE" >&5
+ echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21852 "configure"
++#line 21911 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21863,16 +21922,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21866: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21925: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21869: \$? = $ac_status" >&5
++  echo "$as_me:21928: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21872: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21931: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21875: \$? = $ac_status" >&5
++  echo "$as_me:21934: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=no
+ else
+@@ -21880,7 +21939,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21883 "configure"
++#line 21942 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -21895,16 +21954,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21898: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21957: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21901: \$? = $ac_status" >&5
++  echo "$as_me:21960: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21904: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21963: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21907: \$? = $ac_status" >&5
++  echo "$as_me:21966: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=yes
+ 
+@@ -21920,11 +21979,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21923: result: $sigact_bad" >&5
++echo "$as_me:21982: result: $sigact_bad" >&5
+ echo "${ECHO_T}$sigact_bad" >&6
+ fi
+ 
+-echo "$as_me:21927: checking if nanosleep really works" >&5
++echo "$as_me:21986: checking if nanosleep really works" >&5
+ echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6
+ if test "${cf_cv_func_nanosleep+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21934,7 +21993,7 @@
+   cf_cv_func_nanosleep=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21937 "configure"
++#line 21996 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21959,15 +22018,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21962: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22021: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21965: \$? = $ac_status" >&5
++  echo "$as_me:22024: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21967: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22026: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21970: \$? = $ac_status" >&5
++  echo "$as_me:22029: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_nanosleep=yes
+ else
+@@ -21979,7 +22038,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:21982: result: $cf_cv_func_nanosleep" >&5
++echo "$as_me:22041: result: $cf_cv_func_nanosleep" >&5
+ echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
+ 
+ test "$cf_cv_func_nanosleep" = "yes" &&
+@@ -21996,23 +22055,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:21999: checking for $ac_header" >&5
++echo "$as_me:22058: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22005 "configure"
++#line 22064 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:22009: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:22068: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:22015: \$? = $ac_status" >&5
++  echo "$as_me:22074: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -22031,7 +22090,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:22034: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:22093: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++	echo "$as_me:22110: checking whether termios.h needs _POSIX_SOURCE" >&5
+ echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22054 "configure"
++#line 22113 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22063,16 +22122,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22066: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22125: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22069: \$? = $ac_status" >&5
++  echo "$as_me:22128: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22072: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22131: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22075: \$? = $ac_status" >&5
++  echo "$as_me:22134: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=no
+ else
+@@ -22080,7 +22139,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22083 "configure"
++#line 22142 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -22094,16 +22153,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22097: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22156: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22100: \$? = $ac_status" >&5
++  echo "$as_me:22159: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22103: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22162: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22106: \$? = $ac_status" >&5
++  echo "$as_me:22165: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=unknown
+ else
+@@ -22119,19 +22178,19 @@
+ 
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:22122: result: $termios_bad" >&5
++	echo "$as_me:22181: result: $termios_bad" >&5
+ echo "${ECHO_T}$termios_bad" >&6
+ 	fi
+ fi
+ 
+-echo "$as_me:22127: checking for tcgetattr" >&5
++echo "$as_me:22186: checking for tcgetattr" >&5
+ echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6
+ if test "${cf_cv_have_tcgetattr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22134 "configure"
++#line 22193 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22159,16 +22218,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22162: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22221: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22165: \$? = $ac_status" >&5
++  echo "$as_me:22224: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22168: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22227: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22171: \$? = $ac_status" >&5
++  echo "$as_me:22230: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_tcgetattr=yes
+ else
+@@ -22178,21 +22237,21 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22181: result: $cf_cv_have_tcgetattr" >&5
++echo "$as_me:22240: result: $cf_cv_have_tcgetattr" >&5
+ echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6
+ test "$cf_cv_have_tcgetattr" = yes &&
+ cat >>confdefs.h <<\EOF
+ #define HAVE_TCGETATTR 1
+ EOF
+ 
+-echo "$as_me:22188: checking for vsscanf function or workaround" >&5
++echo "$as_me:22247: checking for vsscanf function or workaround" >&5
+ echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6
+ if test "${cf_cv_func_vsscanf+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22195 "configure"
++#line 22254 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22208,16 +22267,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22211: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22270: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22214: \$? = $ac_status" >&5
++  echo "$as_me:22273: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22217: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22276: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22220: \$? = $ac_status" >&5
++  echo "$as_me:22279: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vsscanf
+ else
+@@ -22225,7 +22284,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22228 "configure"
++#line 22287 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22247,16 +22306,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22250: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22309: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22253: \$? = $ac_status" >&5
++  echo "$as_me:22312: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22256: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22315: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22259: \$? = $ac_status" >&5
++  echo "$as_me:22318: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vfscanf
+ else
+@@ -22264,7 +22323,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22267 "configure"
++#line 22326 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22286,16 +22345,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22289: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22348: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22292: \$? = $ac_status" >&5
++  echo "$as_me:22351: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22295: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22354: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22298: \$? = $ac_status" >&5
++  echo "$as_me:22357: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=_doscan
+ else
+@@ -22310,7 +22369,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22313: result: $cf_cv_func_vsscanf" >&5
++echo "$as_me:22372: result: $cf_cv_func_vsscanf" >&5
+ echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
+ 
+ case "$cf_cv_func_vsscanf" in
+@@ -22336,23 +22395,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:22339: checking for $ac_header" >&5
++echo "$as_me:22398: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22345 "configure"
++#line 22404 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:22349: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:22408: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:22355: \$? = $ac_status" >&5
++  echo "$as_me:22414: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -22371,7 +22430,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:22374: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:22433: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:22443: checking for working mkstemp" >&5
+ echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
+ if test "${cf_cv_func_mkstemp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22392,7 +22451,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22395 "configure"
++#line 22454 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22433,15 +22492,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22436: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22495: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22439: \$? = $ac_status" >&5
++  echo "$as_me:22498: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22441: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22500: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22444: \$? = $ac_status" >&5
++  echo "$as_me:22503: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -22456,16 +22515,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:22459: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:22518: result: $cf_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
+ if test "x$cf_cv_func_mkstemp" = xmaybe ; then
+-	echo "$as_me:22462: checking for mkstemp" >&5
++	echo "$as_me:22521: checking for mkstemp" >&5
+ echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
+ if test "${ac_cv_func_mkstemp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22468 "configure"
++#line 22527 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22496,16 +22555,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22499: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22558: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22502: \$? = $ac_status" >&5
++  echo "$as_me:22561: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22505: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22564: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22508: \$? = $ac_status" >&5
++  echo "$as_me:22567: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -22515,7 +22574,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22518: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:22577: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -22536,21 +22595,21 @@
+ fi
+ 
+ if test "x$cross_compiling" = xyes ; then
+-	{ echo "$as_me:22539: WARNING: cross compiling: assume setvbuf params not reversed" >&5
++	{ echo "$as_me:22598: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+ echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;}
+ else
+-	echo "$as_me:22542: checking whether setvbuf arguments are reversed" >&5
++	echo "$as_me:22601: checking whether setvbuf arguments are reversed" >&5
+ echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6
+ if test "${ac_cv_func_setvbuf_reversed+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:22548: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:22607: error: cannot run test program while cross compiling" >&5
+ echo "$as_me: error: cannot run test program while cross compiling" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22553 "configure"
++#line 22612 "configure"
+ #include "confdefs.h"
+ #include 
+ /* If setvbuf has the reversed format, exit 0. */
+@@ -22567,15 +22626,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22570: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22629: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22573: \$? = $ac_status" >&5
++  echo "$as_me:22632: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22575: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22634: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22578: \$? = $ac_status" >&5
++  echo "$as_me:22637: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_setvbuf_reversed=yes
+ else
+@@ -22588,7 +22647,7 @@
+ fi
+ rm -f core ./core.* ./*.core
+ fi
+-echo "$as_me:22591: result: $ac_cv_func_setvbuf_reversed" >&5
++echo "$as_me:22650: result: $ac_cv_func_setvbuf_reversed" >&5
+ echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6
+ if test $ac_cv_func_setvbuf_reversed = yes; then
+ 
+@@ -22599,13 +22658,13 @@
+ fi
+ 
+ fi
+-echo "$as_me:22602: checking for intptr_t" >&5
++echo "$as_me:22661: checking for intptr_t" >&5
+ echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6
+ if test "${ac_cv_type_intptr_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22608 "configure"
++#line 22667 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -22620,16 +22679,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22623: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22682: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22626: \$? = $ac_status" >&5
++  echo "$as_me:22685: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22629: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22688: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22632: \$? = $ac_status" >&5
++  echo "$as_me:22691: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_intptr_t=yes
+ else
+@@ -22639,7 +22698,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22642: result: $ac_cv_type_intptr_t" >&5
++echo "$as_me:22701: result: $ac_cv_type_intptr_t" >&5
+ echo "${ECHO_T}$ac_cv_type_intptr_t" >&6
+ if test "$ac_cv_type_intptr_t" = yes; then
+   :
+@@ -22651,13 +22710,13 @@
+ 
+ fi
+ 
+-echo "$as_me:22654: checking for ssize_t" >&5
++echo "$as_me:22713: checking for ssize_t" >&5
+ echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
+ if test "${ac_cv_type_ssize_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22660 "configure"
++#line 22719 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -22672,16 +22731,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22675: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22734: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22678: \$? = $ac_status" >&5
++  echo "$as_me:22737: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22681: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22740: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22684: \$? = $ac_status" >&5
++  echo "$as_me:22743: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_ssize_t=yes
+ else
+@@ -22691,7 +22750,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22694: result: $ac_cv_type_ssize_t" >&5
++echo "$as_me:22753: result: $ac_cv_type_ssize_t" >&5
+ echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
+ if test "$ac_cv_type_ssize_t" = yes; then
+   :
+@@ -22703,14 +22762,14 @@
+ 
+ fi
+ 
+-echo "$as_me:22706: checking for type sigaction_t" >&5
++echo "$as_me:22765: checking for type sigaction_t" >&5
+ echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6
+ if test "${cf_cv_type_sigaction+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22713 "configure"
++#line 22772 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22723,16 +22782,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22726: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22785: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22729: \$? = $ac_status" >&5
++  echo "$as_me:22788: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22732: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22791: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22735: \$? = $ac_status" >&5
++  echo "$as_me:22794: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_type_sigaction=yes
+ else
+@@ -22743,14 +22802,14 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ 
+-echo "$as_me:22746: result: $cf_cv_type_sigaction" >&5
++echo "$as_me:22805: result: $cf_cv_type_sigaction" >&5
+ echo "${ECHO_T}$cf_cv_type_sigaction" >&6
+ test "$cf_cv_type_sigaction" = yes &&
+ cat >>confdefs.h <<\EOF
+ #define HAVE_TYPE_SIGACTION 1
+ EOF
+ 
+-echo "$as_me:22753: checking declaration of size-change" >&5
++echo "$as_me:22812: checking declaration of size-change" >&5
+ echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6
+ if test "${cf_cv_sizechange+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22771,7 +22830,7 @@
+ 
+ 	fi
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22774 "configure"
++#line 22833 "configure"
+ #include "confdefs.h"
+ #include 
+ #ifdef HAVE_TERMIOS_H
+@@ -22821,16 +22880,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22824: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22883: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22827: \$? = $ac_status" >&5
++  echo "$as_me:22886: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22830: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22889: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22833: \$? = $ac_status" >&5
++  echo "$as_me:22892: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sizechange=yes
+ else
+@@ -22849,7 +22908,7 @@
+ done
+ 
+ fi
+-echo "$as_me:22852: result: $cf_cv_sizechange" >&5
++echo "$as_me:22911: result: $cf_cv_sizechange" >&5
+ echo "${ECHO_T}$cf_cv_sizechange" >&6
+ if test "$cf_cv_sizechange" != no ; then
+ 
+@@ -22867,13 +22926,13 @@
+ 	esac
+ fi
+ 
+-echo "$as_me:22870: checking for memmove" >&5
++echo "$as_me:22929: checking for memmove" >&5
+ echo $ECHO_N "checking for memmove... $ECHO_C" >&6
+ if test "${ac_cv_func_memmove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22876 "configure"
++#line 22935 "configure"
+ #include "confdefs.h"
+ #define memmove autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22904,16 +22963,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22907: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22966: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22910: \$? = $ac_status" >&5
++  echo "$as_me:22969: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22913: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22972: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22916: \$? = $ac_status" >&5
++  echo "$as_me:22975: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_memmove=yes
+ else
+@@ -22923,19 +22982,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22926: result: $ac_cv_func_memmove" >&5
++echo "$as_me:22985: result: $ac_cv_func_memmove" >&5
+ echo "${ECHO_T}$ac_cv_func_memmove" >&6
+ if test "$ac_cv_func_memmove" = yes; then
+   :
+ else
+ 
+-echo "$as_me:22932: checking for bcopy" >&5
++echo "$as_me:22991: checking for bcopy" >&5
+ echo $ECHO_N "checking for bcopy... $ECHO_C" >&6
+ if test "${ac_cv_func_bcopy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22938 "configure"
++#line 22997 "configure"
+ #include "confdefs.h"
+ #define bcopy autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22966,16 +23025,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22969: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23028: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22972: \$? = $ac_status" >&5
++  echo "$as_me:23031: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22975: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23034: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22978: \$? = $ac_status" >&5
++  echo "$as_me:23037: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_bcopy=yes
+ else
+@@ -22985,11 +23044,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22988: result: $ac_cv_func_bcopy" >&5
++echo "$as_me:23047: result: $ac_cv_func_bcopy" >&5
+ echo "${ECHO_T}$ac_cv_func_bcopy" >&6
+ if test "$ac_cv_func_bcopy" = yes; then
+ 
+-	echo "$as_me:22992: checking if bcopy does overlapping moves" >&5
++	echo "$as_me:23051: checking if bcopy does overlapping moves" >&5
+ echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6
+ if test "${cf_cv_good_bcopy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22999,7 +23058,7 @@
+   cf_cv_good_bcopy=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23002 "configure"
++#line 23061 "configure"
+ #include "confdefs.h"
+ 
+ int main(void) {
+@@ -23013,15 +23072,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23016: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23075: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23019: \$? = $ac_status" >&5
++  echo "$as_me:23078: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23021: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23080: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23024: \$? = $ac_status" >&5
++  echo "$as_me:23083: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_good_bcopy=yes
+ else
+@@ -23034,7 +23093,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:23037: result: $cf_cv_good_bcopy" >&5
++echo "$as_me:23096: result: $cf_cv_good_bcopy" >&5
+ echo "${ECHO_T}$cf_cv_good_bcopy" >&6
+ 
+ else
+@@ -23061,13 +23120,13 @@
+ for ac_func in posix_openpt
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:23064: checking for $ac_func" >&5
++echo "$as_me:23123: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23070 "configure"
++#line 23129 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23098,16 +23157,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23101: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23160: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23104: \$? = $ac_status" >&5
++  echo "$as_me:23163: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23107: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23166: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23110: \$? = $ac_status" >&5
++  echo "$as_me:23169: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -23117,7 +23176,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23120: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:23179: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:23189: checking if poll really works" >&5
+ echo $ECHO_N "checking if poll really works... $ECHO_C" >&6
+ if test "${cf_cv_working_poll+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -23137,7 +23196,7 @@
+   cf_cv_working_poll=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23140 "configure"
++#line 23199 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23189,15 +23248,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23192: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23251: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23195: \$? = $ac_status" >&5
++  echo "$as_me:23254: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23197: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23256: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23200: \$? = $ac_status" >&5
++  echo "$as_me:23259: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_working_poll=yes
+ else
+@@ -23209,21 +23268,21 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:23212: result: $cf_cv_working_poll" >&5
++echo "$as_me:23271: result: $cf_cv_working_poll" >&5
+ echo "${ECHO_T}$cf_cv_working_poll" >&6
+ test "$cf_cv_working_poll" = "yes" &&
+ cat >>confdefs.h <<\EOF
+ #define HAVE_WORKING_POLL 1
+ EOF
+ 
+-echo "$as_me:23219: checking for va_copy" >&5
++echo "$as_me:23278: checking for va_copy" >&5
+ echo $ECHO_N "checking for va_copy... $ECHO_C" >&6
+ if test "${cf_cv_have_va_copy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23226 "configure"
++#line 23285 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23240,16 +23299,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23243: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23302: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23246: \$? = $ac_status" >&5
++  echo "$as_me:23305: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23249: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23308: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23252: \$? = $ac_status" >&5
++  echo "$as_me:23311: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_va_copy=yes
+ else
+@@ -23259,7 +23318,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23262: result: $cf_cv_have_va_copy" >&5
++echo "$as_me:23321: result: $cf_cv_have_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have_va_copy" >&6
+ 
+ if test "$cf_cv_have_va_copy" = yes;
+@@ -23271,14 +23330,14 @@
+ 
+ else # !cf_cv_have_va_copy
+ 
+-echo "$as_me:23274: checking for __va_copy" >&5
++echo "$as_me:23333: checking for __va_copy" >&5
+ echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6
+ if test "${cf_cv_have___va_copy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23281 "configure"
++#line 23340 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23295,16 +23354,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23298: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23357: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23301: \$? = $ac_status" >&5
++  echo "$as_me:23360: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23304: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23363: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23307: \$? = $ac_status" >&5
++  echo "$as_me:23366: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___va_copy=yes
+ else
+@@ -23314,7 +23373,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23317: result: $cf_cv_have___va_copy" >&5
++echo "$as_me:23376: result: $cf_cv_have___va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___va_copy" >&6
+ 
+ if test "$cf_cv_have___va_copy" = yes
+@@ -23326,14 +23385,14 @@
+ 
+ else # !cf_cv_have___va_copy
+ 
+-echo "$as_me:23329: checking for __builtin_va_copy" >&5
++echo "$as_me:23388: checking for __builtin_va_copy" >&5
+ echo $ECHO_N "checking for __builtin_va_copy... $ECHO_C" >&6
+ if test "${cf_cv_have___builtin_va_copy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23336 "configure"
++#line 23395 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23350,16 +23409,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23353: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23412: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23356: \$? = $ac_status" >&5
++  echo "$as_me:23415: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23359: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23418: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23362: \$? = $ac_status" >&5
++  echo "$as_me:23421: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___builtin_va_copy=yes
+ else
+@@ -23369,7 +23428,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23372: result: $cf_cv_have___builtin_va_copy" >&5
++echo "$as_me:23431: result: $cf_cv_have___builtin_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___builtin_va_copy" >&6
+ 
+ test "$cf_cv_have___builtin_va_copy" = yes &&
+@@ -23387,14 +23446,14 @@
+ 	;;
+ 
+ (*)
+-	echo "$as_me:23390: checking if we can simply copy va_list" >&5
++	echo "$as_me:23449: checking if we can simply copy va_list" >&5
+ echo $ECHO_N "checking if we can simply copy va_list... $ECHO_C" >&6
+ if test "${cf_cv_pointer_va_list+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23397 "configure"
++#line 23456 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23411,16 +23470,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23414: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23473: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23417: \$? = $ac_status" >&5
++  echo "$as_me:23476: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23420: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23479: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23423: \$? = $ac_status" >&5
++  echo "$as_me:23482: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_pointer_va_list=yes
+ else
+@@ -23430,19 +23489,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23433: result: $cf_cv_pointer_va_list" >&5
++echo "$as_me:23492: result: $cf_cv_pointer_va_list" >&5
+ echo "${ECHO_T}$cf_cv_pointer_va_list" >&6
+ 
+ 	if test "$cf_cv_pointer_va_list" = no
+ 	then
+-		echo "$as_me:23438: checking if we can copy va_list indirectly" >&5
++		echo "$as_me:23497: checking if we can copy va_list indirectly" >&5
+ echo $ECHO_N "checking if we can copy va_list indirectly... $ECHO_C" >&6
+ if test "${cf_cv_array_va_list+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23445 "configure"
++#line 23504 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23459,16 +23518,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23462: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23521: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23465: \$? = $ac_status" >&5
++  echo "$as_me:23524: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23468: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23527: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23471: \$? = $ac_status" >&5
++  echo "$as_me:23530: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_array_va_list=yes
+ else
+@@ -23478,7 +23537,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23481: result: $cf_cv_array_va_list" >&5
++echo "$as_me:23540: result: $cf_cv_array_va_list" >&5
+ echo "${ECHO_T}$cf_cv_array_va_list" >&6
+ 		test "$cf_cv_array_va_list" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -23489,13 +23548,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:23492: checking for pid_t" >&5
++echo "$as_me:23551: checking for pid_t" >&5
+ echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
+ if test "${ac_cv_type_pid_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23498 "configure"
++#line 23557 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23510,16 +23569,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23513: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23572: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23516: \$? = $ac_status" >&5
++  echo "$as_me:23575: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23519: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23578: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23522: \$? = $ac_status" >&5
++  echo "$as_me:23581: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_pid_t=yes
+ else
+@@ -23529,7 +23588,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23532: result: $ac_cv_type_pid_t" >&5
++echo "$as_me:23591: result: $ac_cv_type_pid_t" >&5
+ echo "${ECHO_T}$ac_cv_type_pid_t" >&6
+ if test "$ac_cv_type_pid_t" = yes; then
+   :
+@@ -23544,23 +23603,23 @@
+ for ac_header in unistd.h vfork.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:23547: checking for $ac_header" >&5
++echo "$as_me:23606: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23553 "configure"
++#line 23612 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:23557: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23616: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:23563: \$? = $ac_status" >&5
++  echo "$as_me:23622: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23579,7 +23638,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23582: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:23641: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:23654: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23601 "configure"
++#line 23660 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23629,16 +23688,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23632: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23691: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23635: \$? = $ac_status" >&5
++  echo "$as_me:23694: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23638: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23697: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23641: \$? = $ac_status" >&5
++  echo "$as_me:23700: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -23648,7 +23707,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23651: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:23710: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
+   cat >>confdefs.h <&5
++  echo "$as_me:23722: checking for working fork" >&5
+ echo $ECHO_N "checking for working fork... $ECHO_C" >&6
+ if test "${ac_cv_func_fork_works+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -23683,15 +23742,15 @@
+       }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23686: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23745: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23689: \$? = $ac_status" >&5
++  echo "$as_me:23748: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23691: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23750: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23694: \$? = $ac_status" >&5
++  echo "$as_me:23753: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fork_works=yes
+ else
+@@ -23703,7 +23762,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:23706: result: $ac_cv_func_fork_works" >&5
++echo "$as_me:23765: result: $ac_cv_func_fork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+ 
+ fi
+@@ -23717,12 +23776,12 @@
+       ac_cv_func_fork_works=yes
+       ;;
+   esac
+-  { echo "$as_me:23720: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:23779: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+ echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;}
+ fi
+ ac_cv_func_vfork_works=$ac_cv_func_vfork
+ if test "x$ac_cv_func_vfork" = xyes; then
+-  echo "$as_me:23725: checking for working vfork" >&5
++  echo "$as_me:23784: checking for working vfork" >&5
+ echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
+ if test "${ac_cv_func_vfork_works+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -23731,7 +23790,7 @@
+   ac_cv_func_vfork_works=cross
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23734 "configure"
++#line 23793 "configure"
+ #include "confdefs.h"
+ /* Thanks to Paul Eggert for this test.  */
+ #include 
+@@ -23828,15 +23887,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23831: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23890: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23834: \$? = $ac_status" >&5
++  echo "$as_me:23893: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23836: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23895: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23839: \$? = $ac_status" >&5
++  echo "$as_me:23898: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_vfork_works=yes
+ else
+@@ -23848,13 +23907,13 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:23851: result: $ac_cv_func_vfork_works" >&5
++echo "$as_me:23910: result: $ac_cv_func_vfork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
+ 
+ fi;
+ if test "x$ac_cv_func_fork_works" = xcross; then
+   ac_cv_func_vfork_works=ac_cv_func_vfork
+-  { echo "$as_me:23857: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:23916: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+ echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;}
+ fi
+ 
+@@ -23879,7 +23938,7 @@
+ 
+ fi
+ 
+-echo "$as_me:23882: checking if fopen accepts explicit binary mode" >&5
++echo "$as_me:23941: checking if fopen accepts explicit binary mode" >&5
+ echo $ECHO_N "checking if fopen accepts explicit binary mode... $ECHO_C" >&6
+ if test "${cf_cv_fopen_bin_r+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -23889,7 +23948,7 @@
+   cf_cv_fopen_bin_r=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23892 "configure"
++#line 23951 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23922,15 +23981,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23925: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23984: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23928: \$? = $ac_status" >&5
++  echo "$as_me:23987: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23930: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23989: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23933: \$? = $ac_status" >&5
++  echo "$as_me:23992: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fopen_bin_r=yes
+ else
+@@ -23943,7 +24002,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:23946: result: $cf_cv_fopen_bin_r" >&5
++echo "$as_me:24005: result: $cf_cv_fopen_bin_r" >&5
+ echo "${ECHO_T}$cf_cv_fopen_bin_r" >&6
+ test "x$cf_cv_fopen_bin_r" != xno &&
+ cat >>confdefs.h <<\EOF
+@@ -23952,7 +24011,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:23955: checking for openpty in -lutil" >&5
++echo "$as_me:24014: checking for openpty in -lutil" >&5
+ echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
+ if test "${ac_cv_lib_util_openpty+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -23960,7 +24019,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23963 "configure"
++#line 24022 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -23979,16 +24038,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23982: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24041: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23985: \$? = $ac_status" >&5
++  echo "$as_me:24044: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23988: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24047: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23991: \$? = $ac_status" >&5
++  echo "$as_me:24050: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -23999,7 +24058,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:24002: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:24061: result: $ac_cv_lib_util_openpty" >&5
+ echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
+ if test "$ac_cv_lib_util_openpty" = yes; then
+   cf_cv_lib_util=yes
+@@ -24007,7 +24066,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:24010: checking for openpty header" >&5
++echo "$as_me:24069: checking for openpty header" >&5
+ echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
+ if test "${cf_cv_func_openpty+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -24034,7 +24093,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24037 "configure"
++#line 24096 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -24051,16 +24110,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24054: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24113: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24057: \$? = $ac_status" >&5
++  echo "$as_me:24116: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24060: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24119: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24063: \$? = $ac_status" >&5
++  echo "$as_me:24122: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -24078,7 +24137,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:24081: result: $cf_cv_func_openpty" >&5
++echo "$as_me:24140: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -24151,7 +24210,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24154 "configure"
++#line 24213 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -24163,16 +24222,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24166: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24225: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24169: \$? = $ac_status" >&5
++  echo "$as_me:24228: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24172: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24231: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24175: \$? = $ac_status" >&5
++  echo "$as_me:24234: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -24189,7 +24248,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:24192: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:24251: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -24225,7 +24284,7 @@
+ 			if test "$cf_have_libdir" = no ; then
+ 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+ 
+-echo "${as_me:-configure}:24228: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:24287: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -24236,7 +24295,7 @@
+ 	else
+ 		case "$with_hashed_db" in
+ 		(./*|../*|/*)
+-			{ echo "$as_me:24239: WARNING: no such directory $with_hashed_db" >&5
++			{ echo "$as_me:24298: WARNING: no such directory $with_hashed_db" >&5
+ echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
+ 			;;
+ 		(*)
+@@ -24308,7 +24367,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24311 "configure"
++#line 24370 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -24320,16 +24379,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24323: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24382: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24326: \$? = $ac_status" >&5
++  echo "$as_me:24385: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24329: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24388: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24332: \$? = $ac_status" >&5
++  echo "$as_me:24391: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -24346,7 +24405,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:24349: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:24408: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -24426,7 +24485,7 @@
+ 			if test "$cf_have_libdir" = no ; then
+ 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+ 
+-echo "${as_me:-configure}:24429: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:24488: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -24443,23 +24502,23 @@
+ 	fi
+ esac
+ 
+-echo "$as_me:24446: checking for db.h" >&5
++echo "$as_me:24505: checking for db.h" >&5
+ echo $ECHO_N "checking for db.h... $ECHO_C" >&6
+ if test "${ac_cv_header_db_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24452 "configure"
++#line 24511 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:24456: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:24515: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:24462: \$? = $ac_status" >&5
++  echo "$as_me:24521: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -24478,11 +24537,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:24481: result: $ac_cv_header_db_h" >&5
++echo "$as_me:24540: result: $ac_cv_header_db_h" >&5
+ echo "${ECHO_T}$ac_cv_header_db_h" >&6
+ if test "$ac_cv_header_db_h" = yes; then
+ 
+-echo "$as_me:24485: checking for version of db" >&5
++echo "$as_me:24544: checking for version of db" >&5
+ echo $ECHO_N "checking for version of db... $ECHO_C" >&6
+ if test "${cf_cv_hashed_db_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -24493,10 +24552,10 @@
+ for cf_db_version in 1 2 3 4 5 6
+ do
+ 
+-echo "${as_me:-configure}:24496: testing checking for db version $cf_db_version ..." 1>&5
++echo "${as_me:-configure}:24555: testing checking for db version $cf_db_version ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24499 "configure"
++#line 24558 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24526,16 +24585,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24529: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24588: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24532: \$? = $ac_status" >&5
++  echo "$as_me:24591: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24535: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24594: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24538: \$? = $ac_status" >&5
++  echo "$as_me:24597: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_hashed_db_version=$cf_db_version
+@@ -24549,16 +24608,16 @@
+ done
+ 
+ fi
+-echo "$as_me:24552: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:24611: result: $cf_cv_hashed_db_version" >&5
+ echo "${ECHO_T}$cf_cv_hashed_db_version" >&6
+ 
+ if test "$cf_cv_hashed_db_version" = unknown ; then
+-	{ { echo "$as_me:24556: error: Cannot determine version of db" >&5
++	{ { echo "$as_me:24615: error: Cannot determine version of db" >&5
+ echo "$as_me: error: Cannot determine version of db" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+ 
+-echo "$as_me:24561: checking for db libraries" >&5
++echo "$as_me:24620: checking for db libraries" >&5
+ echo $ECHO_N "checking for db libraries... $ECHO_C" >&6
+ if test "${cf_cv_hashed_db_libs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -24588,10 +24647,10 @@
+ 
+ 	fi
+ 
+-echo "${as_me:-configure}:24591: testing checking for library $cf_db_libs ..." 1>&5
++echo "${as_me:-configure}:24650: testing checking for library $cf_db_libs ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24594 "configure"
++#line 24653 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24646,16 +24705,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24649: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24708: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24652: \$? = $ac_status" >&5
++  echo "$as_me:24711: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24655: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24714: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24658: \$? = $ac_status" >&5
++  echo "$as_me:24717: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	if test -n "$cf_db_libs" ; then
+@@ -24675,11 +24734,11 @@
+ done
+ 
+ fi
+-echo "$as_me:24678: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:24737: result: $cf_cv_hashed_db_libs" >&5
+ echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6
+ 
+ 	if test "$cf_cv_hashed_db_libs" = unknown ; then
+-		{ { echo "$as_me:24682: error: Cannot determine library for db" >&5
++		{ { echo "$as_me:24741: error: Cannot determine library for db" >&5
+ echo "$as_me: error: Cannot determine library for db" >&2;}
+    { (exit 1); exit 1; }; }
+ 	elif test "$cf_cv_hashed_db_libs" != default ; then
+@@ -24705,7 +24764,7 @@
+ 
+ else
+ 
+-	{ { echo "$as_me:24708: error: Cannot find db.h" >&5
++	{ { echo "$as_me:24767: error: Cannot find db.h" >&5
+ echo "$as_me: error: Cannot find db.h" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -24720,7 +24779,7 @@
+ 
+ # Just in case, check if the C compiler has a bool type.
+ 
+-echo "$as_me:24723: checking if we should include stdbool.h" >&5
++echo "$as_me:24782: checking if we should include stdbool.h" >&5
+ echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
+ 
+ if test "${cf_cv_header_stdbool_h+set}" = set; then
+@@ -24728,7 +24787,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24731 "configure"
++#line 24790 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -24740,23 +24799,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24743: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24802: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24746: \$? = $ac_status" >&5
++  echo "$as_me:24805: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24749: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24808: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24752: \$? = $ac_status" >&5
++  echo "$as_me:24811: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=0
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24759 "configure"
++#line 24818 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -24772,16 +24831,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24775: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24834: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24778: \$? = $ac_status" >&5
++  echo "$as_me:24837: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24781: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24840: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24784: \$? = $ac_status" >&5
++  echo "$as_me:24843: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -24795,13 +24854,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:24798: result: yes" >&5
++then	echo "$as_me:24857: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:24800: result: no" >&5
++else	echo "$as_me:24859: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:24804: checking for builtin bool type" >&5
++echo "$as_me:24863: checking for builtin bool type" >&5
+ echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
+ 
+ if test "${cf_cv_cc_bool_type+set}" = set; then
+@@ -24809,7 +24868,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24812 "configure"
++#line 24871 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24824,16 +24883,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24827: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24886: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24830: \$? = $ac_status" >&5
++  echo "$as_me:24889: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24833: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24892: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24836: \$? = $ac_status" >&5
++  echo "$as_me:24895: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cc_bool_type=1
+ else
+@@ -24846,9 +24905,9 @@
+ fi
+ 
+ if test "$cf_cv_cc_bool_type" = 1
+-then	echo "$as_me:24849: result: yes" >&5
++then	echo "$as_me:24908: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:24851: result: no" >&5
++else	echo "$as_me:24910: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -24865,10 +24924,10 @@
+ 
+ 	cf_save="$LIBS"
+ 	LIBS="$LIBS $CXXLIBS"
+-	echo "$as_me:24868: checking if we already have C++ library" >&5
++	echo "$as_me:24927: checking if we already have C++ library" >&5
+ echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24871 "configure"
++#line 24930 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -24882,16 +24941,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24885: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24944: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24888: \$? = $ac_status" >&5
++  echo "$as_me:24947: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24891: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24950: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24894: \$? = $ac_status" >&5
++  echo "$as_me:24953: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_libstdcpp=yes
+ else
+@@ -24900,7 +24959,7 @@
+ cf_have_libstdcpp=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-	echo "$as_me:24903: result: $cf_have_libstdcpp" >&5
++	echo "$as_me:24962: result: $cf_have_libstdcpp" >&5
+ echo "${ECHO_T}$cf_have_libstdcpp" >&6
+ 	LIBS="$cf_save"
+ 
+@@ -24919,7 +24978,7 @@
+ 			;;
+ 		esac
+ 
+-		echo "$as_me:24922: checking for library $cf_stdcpp_libname" >&5
++		echo "$as_me:24981: checking for library $cf_stdcpp_libname" >&5
+ echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6
+ if test "${cf_cv_libstdcpp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -24945,7 +25004,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24948 "configure"
++#line 25007 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -24959,16 +25018,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24962: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25021: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24965: \$? = $ac_status" >&5
++  echo "$as_me:25024: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24968: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25027: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24971: \$? = $ac_status" >&5
++  echo "$as_me:25030: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_libstdcpp=yes
+ else
+@@ -24980,7 +25039,7 @@
+ 			LIBS="$cf_save"
+ 
+ fi
+-echo "$as_me:24983: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:25042: result: $cf_cv_libstdcpp" >&5
+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
+ 		test "$cf_cv_libstdcpp" = yes && {
+ cf_add_libs="$CXXLIBS"
+@@ -25002,7 +25061,7 @@
+ 	fi
+ fi
+ 
+-	echo "$as_me:25005: checking whether $CXX understands -c and -o together" >&5
++	echo "$as_me:25064: checking whether $CXX understands -c and -o together" >&5
+ echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6
+ if test "${cf_cv_prog_CXX_c_o+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -25017,15 +25076,15 @@
+ # We do the test twice because some compilers refuse to overwrite an
+ # existing .o file with -o, though they will create one.
+ ac_try='$CXX $CXXFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+-if { (eval echo "$as_me:25020: \"$ac_try\"") >&5
++if { (eval echo "$as_me:25079: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25023: \$? = $ac_status" >&5
++  echo "$as_me:25082: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:25025: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:25084: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25028: \$? = $ac_status" >&5
++  echo "$as_me:25087: \$? = $ac_status" >&5
+   (exit "$ac_status"); };
+ then
+   eval cf_cv_prog_CXX_c_o=yes
+@@ -25036,10 +25095,10 @@
+ 
+ fi
+ if test "$cf_cv_prog_CXX_c_o" = yes; then
+-  echo "$as_me:25039: result: yes" >&5
++  echo "$as_me:25098: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:25042: result: no" >&5
++  echo "$as_me:25101: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -25059,7 +25118,7 @@
+ 	;;
+ esac
+ if test "$GXX" = yes; then
+-	echo "$as_me:25062: checking for lib$cf_gpp_libname" >&5
++	echo "$as_me:25121: checking for lib$cf_gpp_libname" >&5
+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
+ 	cf_save="$LIBS"
+ 
+@@ -25080,7 +25139,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25083 "configure"
++#line 25142 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_gpp_libname/builtin.h>
+@@ -25094,16 +25153,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25097: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25156: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25100: \$? = $ac_status" >&5
++  echo "$as_me:25159: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25103: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25162: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25106: \$? = $ac_status" >&5
++  echo "$as_me:25165: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -25140,7 +25199,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25143 "configure"
++#line 25202 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -25154,16 +25213,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25157: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25216: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25160: \$? = $ac_status" >&5
++  echo "$as_me:25219: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25163: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25222: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25166: \$? = $ac_status" >&5
++  echo "$as_me:25225: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -25196,7 +25255,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	LIBS="$cf_save"
+-	echo "$as_me:25199: result: $cf_cxx_library" >&5
++	echo "$as_me:25258: result: $cf_cxx_library" >&5
+ echo "${ECHO_T}$cf_cxx_library" >&6
+ fi
+ 
+@@ -25212,7 +25271,7 @@
+ ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ ac_main_return="return"
+-echo "$as_me:25215: checking how to run the C++ preprocessor" >&5
++echo "$as_me:25274: checking how to run the C++ preprocessor" >&5
+ echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
+ if test -z "$CXXCPP"; then
+   if test "${ac_cv_prog_CXXCPP+set}" = set; then
+@@ -25229,18 +25288,18 @@
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp. "Syntax error" is here to catch this case.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25232 "configure"
++#line 25291 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:25237: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25296: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:25243: \$? = $ac_status" >&5
++  echo "$as_me:25302: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25263,17 +25322,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25266 "configure"
++#line 25325 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:25270: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25329: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:25276: \$? = $ac_status" >&5
++  echo "$as_me:25335: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25310,7 +25369,7 @@
+ else
+   ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:25313: result: $CXXCPP" >&5
++echo "$as_me:25372: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -25320,18 +25379,18 @@
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp. "Syntax error" is here to catch this case.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25323 "configure"
++#line 25382 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:25328: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25387: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:25334: \$? = $ac_status" >&5
++  echo "$as_me:25393: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25354,17 +25413,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25357 "configure"
++#line 25416 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:25361: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25420: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:25367: \$? = $ac_status" >&5
++  echo "$as_me:25426: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25392,7 +25451,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:25395: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++  { { echo "$as_me:25454: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -25407,23 +25466,23 @@
+ for ac_header in typeinfo
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:25410: checking for $ac_header" >&5
++echo "$as_me:25469: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25416 "configure"
++#line 25475 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:25420: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25479: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:25426: \$? = $ac_status" >&5
++  echo "$as_me:25485: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25442,7 +25501,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:25445: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:25504: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:25517: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25464 "configure"
++#line 25523 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:25468: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25527: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:25474: \$? = $ac_status" >&5
++  echo "$as_me:25533: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25490,7 +25549,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:25493: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:25552: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++	echo "$as_me:25563: checking if iostream uses std-namespace" >&5
+ echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25507 "configure"
++#line 25566 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -25521,16 +25580,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25524: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25583: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25527: \$? = $ac_status" >&5
++  echo "$as_me:25586: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25530: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25589: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25533: \$? = $ac_status" >&5
++  echo "$as_me:25592: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_iostream_namespace=yes
+ else
+@@ -25539,7 +25598,7 @@
+ cf_iostream_namespace=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:25542: result: $cf_iostream_namespace" >&5
++	echo "$as_me:25601: result: $cf_iostream_namespace" >&5
+ echo "${ECHO_T}$cf_iostream_namespace" >&6
+ 	if test "$cf_iostream_namespace" = yes ; then
+ 
+@@ -25550,7 +25609,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:25553: checking if we should include stdbool.h" >&5
++echo "$as_me:25612: checking if we should include stdbool.h" >&5
+ echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
+ 
+ if test "${cf_cv_header_stdbool_h+set}" = set; then
+@@ -25558,7 +25617,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25561 "configure"
++#line 25620 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -25570,23 +25629,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25573: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25632: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25576: \$? = $ac_status" >&5
++  echo "$as_me:25635: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25579: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25638: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25582: \$? = $ac_status" >&5
++  echo "$as_me:25641: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=0
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25589 "configure"
++#line 25648 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -25602,16 +25661,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25605: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25664: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25608: \$? = $ac_status" >&5
++  echo "$as_me:25667: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25611: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25670: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25614: \$? = $ac_status" >&5
++  echo "$as_me:25673: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -25625,13 +25684,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:25628: result: yes" >&5
++then	echo "$as_me:25687: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:25630: result: no" >&5
++else	echo "$as_me:25689: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:25634: checking for builtin bool type" >&5
++echo "$as_me:25693: checking for builtin bool type" >&5
+ echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
+ 
+ if test "${cf_cv_builtin_bool+set}" = set; then
+@@ -25639,7 +25698,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25642 "configure"
++#line 25701 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -25654,16 +25713,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25657: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25716: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25660: \$? = $ac_status" >&5
++  echo "$as_me:25719: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25663: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25722: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25666: \$? = $ac_status" >&5
++  echo "$as_me:25725: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_builtin_bool=1
+ else
+@@ -25676,19 +25735,19 @@
+ fi
+ 
+ if test "$cf_cv_builtin_bool" = 1
+-then	echo "$as_me:25679: result: yes" >&5
++then	echo "$as_me:25738: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:25681: result: no" >&5
++else	echo "$as_me:25740: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:25685: checking for bool" >&5
++echo "$as_me:25744: checking for bool" >&5
+ echo $ECHO_N "checking for bool... $ECHO_C" >&6
+ if test "${ac_cv_type_bool+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25691 "configure"
++#line 25750 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -25724,16 +25783,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25727: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25786: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25730: \$? = $ac_status" >&5
++  echo "$as_me:25789: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25733: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25792: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25736: \$? = $ac_status" >&5
++  echo "$as_me:25795: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -25743,10 +25802,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:25746: result: $ac_cv_type_bool" >&5
++echo "$as_me:25805: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:25749: checking size of bool" >&5
++echo "$as_me:25808: checking size of bool" >&5
+ echo $ECHO_N "checking size of bool... $ECHO_C" >&6
+ if test "${ac_cv_sizeof_bool+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -25755,7 +25814,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25758 "configure"
++#line 25817 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -25788,21 +25847,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25791: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25850: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25794: \$? = $ac_status" >&5
++  echo "$as_me:25853: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25797: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25856: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25800: \$? = $ac_status" >&5
++  echo "$as_me:25859: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25805 "configure"
++#line 25864 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -25835,16 +25894,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25838: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25897: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25841: \$? = $ac_status" >&5
++  echo "$as_me:25900: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25844: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25903: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25847: \$? = $ac_status" >&5
++  echo "$as_me:25906: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -25860,7 +25919,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25863 "configure"
++#line 25922 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -25893,16 +25952,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25896: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25955: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25899: \$? = $ac_status" >&5
++  echo "$as_me:25958: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25902: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25961: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25905: \$? = $ac_status" >&5
++  echo "$as_me:25964: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -25918,7 +25977,7 @@
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25921 "configure"
++#line 25980 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -25951,16 +26010,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25954: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26013: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25957: \$? = $ac_status" >&5
++  echo "$as_me:26016: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25960: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26019: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25963: \$? = $ac_status" >&5
++  echo "$as_me:26022: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -25973,12 +26032,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:25976: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:26035: error: cannot run test program while cross compiling" >&5
+ echo "$as_me: error: cannot run test program while cross compiling" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25981 "configure"
++#line 26040 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26015,15 +26074,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26018: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26077: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26021: \$? = $ac_status" >&5
++  echo "$as_me:26080: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26023: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26082: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26026: \$? = $ac_status" >&5
++  echo "$as_me:26085: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -26039,13 +26098,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:26042: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:26101: result: $ac_cv_sizeof_bool" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:26107: checking for type of bool" >&5
+ echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
+ if test "${cf_cv_type_of_bool+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -26064,7 +26123,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26067 "configure"
++#line 26126 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26106,15 +26165,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26109: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26168: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26112: \$? = $ac_status" >&5
++  echo "$as_me:26171: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26114: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26173: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26117: \$? = $ac_status" >&5
++  echo "$as_me:26176: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_type_of_bool=`cat cf_test.out`
+ 		 if test -z "$cf_cv_type_of_bool"; then
+@@ -26131,19 +26190,19 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:26134: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:26193: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ 
+ if test "$cf_cv_type_of_bool" = unknown ; then
+ 	case .$NCURSES_BOOL in
+ 	(.auto|.) NCURSES_BOOL=unsigned;;
+ 	esac
+-	{ echo "$as_me:26141: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:26200: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+ echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
+ 	cf_cv_type_of_bool=$NCURSES_BOOL
+ fi
+ 
+-echo "$as_me:26146: checking for special defines needed for etip.h" >&5
++echo "$as_me:26205: checking for special defines needed for etip.h" >&5
+ echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6
+ cf_save_CXXFLAGS="$CXXFLAGS"
+ cf_result="none"
+@@ -26161,7 +26220,7 @@
+ 	test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}"
+ 	test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26164 "configure"
++#line 26223 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26175,16 +26234,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26178: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26237: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26181: \$? = $ac_status" >&5
++  echo "$as_me:26240: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26184: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26243: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26187: \$? = $ac_status" >&5
++  echo "$as_me:26246: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	test -n "$cf_math" && cat >>confdefs.h <&5
++echo "$as_me:26267: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ CXXFLAGS="$cf_save_CXXFLAGS"
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:26213: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:26272: checking if $CXX accepts parameter initialization" >&5
+ echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6
+ if test "${cf_cv_cpp_param_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -26227,7 +26286,7 @@
+   cf_cv_cpp_param_init=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26230 "configure"
++#line 26289 "configure"
+ #include "confdefs.h"
+ 
+ class TEST {
+@@ -26246,15 +26305,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26249: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26308: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26252: \$? = $ac_status" >&5
++  echo "$as_me:26311: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26254: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26313: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26257: \$? = $ac_status" >&5
++  echo "$as_me:26316: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_param_init=yes
+ else
+@@ -26273,7 +26332,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:26276: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:26335: result: $cf_cv_cpp_param_init" >&5
+ echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
+ fi
+ test "$cf_cv_cpp_param_init" = yes &&
+@@ -26283,7 +26342,7 @@
+ 
+ if test -n "$CXX"; then
+ 
+-echo "$as_me:26286: checking if $CXX accepts static_cast" >&5
++echo "$as_me:26345: checking if $CXX accepts static_cast" >&5
+ echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6
+ if test "${cf_cv_cpp_static_cast+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -26297,7 +26356,7 @@
+ ac_main_return="return"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26300 "configure"
++#line 26359 "configure"
+ #include "confdefs.h"
+ 
+ class NCursesPanel
+@@ -26341,16 +26400,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26344: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26403: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26347: \$? = $ac_status" >&5
++  echo "$as_me:26406: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26350: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26409: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26353: \$? = $ac_status" >&5
++  echo "$as_me:26412: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_static_cast=yes
+ else
+@@ -26368,7 +26427,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:26371: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:26430: result: $cf_cv_cpp_static_cast" >&5
+ echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
+ 
+ fi
+@@ -26417,13 +26476,13 @@
+ 	else
+ 		if test "$cf_cv_header_stdbool_h" = 1 ; then
+ 
+-echo "$as_me:26420: checking for bool" >&5
++echo "$as_me:26479: checking for bool" >&5
+ echo $ECHO_N "checking for bool... $ECHO_C" >&6
+ if test "${ac_cv_type_bool+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26426 "configure"
++#line 26485 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26459,16 +26518,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26462: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26521: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26465: \$? = $ac_status" >&5
++  echo "$as_me:26524: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26468: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26527: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26471: \$? = $ac_status" >&5
++  echo "$as_me:26530: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -26478,10 +26537,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:26481: result: $ac_cv_type_bool" >&5
++echo "$as_me:26540: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:26484: checking size of bool" >&5
++echo "$as_me:26543: checking size of bool" >&5
+ echo $ECHO_N "checking size of bool... $ECHO_C" >&6
+ if test "${ac_cv_sizeof_bool+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -26490,7 +26549,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26493 "configure"
++#line 26552 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26523,21 +26582,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26526: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26585: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26529: \$? = $ac_status" >&5
++  echo "$as_me:26588: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26532: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26591: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26535: \$? = $ac_status" >&5
++  echo "$as_me:26594: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26540 "configure"
++#line 26599 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26570,16 +26629,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26573: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26632: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26576: \$? = $ac_status" >&5
++  echo "$as_me:26635: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26579: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26638: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26582: \$? = $ac_status" >&5
++  echo "$as_me:26641: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -26595,7 +26654,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26598 "configure"
++#line 26657 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26628,16 +26687,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26631: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26690: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26634: \$? = $ac_status" >&5
++  echo "$as_me:26693: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26637: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26696: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26640: \$? = $ac_status" >&5
++  echo "$as_me:26699: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -26653,7 +26712,7 @@
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26656 "configure"
++#line 26715 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26686,16 +26745,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26689: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26748: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26692: \$? = $ac_status" >&5
++  echo "$as_me:26751: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26695: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26754: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26698: \$? = $ac_status" >&5
++  echo "$as_me:26757: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -26708,12 +26767,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:26711: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:26770: error: cannot run test program while cross compiling" >&5
+ echo "$as_me: error: cannot run test program while cross compiling" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26716 "configure"
++#line 26775 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26750,15 +26809,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26753: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26812: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26756: \$? = $ac_status" >&5
++  echo "$as_me:26815: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26758: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26817: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26761: \$? = $ac_status" >&5
++  echo "$as_me:26820: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -26774,13 +26833,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:26777: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:26836: result: $ac_cv_sizeof_bool" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:26842: checking for type of bool" >&5
+ echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
+ if test "${cf_cv_type_of_bool+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -26799,7 +26858,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26802 "configure"
++#line 26861 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26841,15 +26900,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26844: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26903: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26847: \$? = $ac_status" >&5
++  echo "$as_me:26906: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26849: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26908: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26852: \$? = $ac_status" >&5
++  echo "$as_me:26911: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_type_of_bool=`cat cf_test.out`
+ 		 if test -z "$cf_cv_type_of_bool"; then
+@@ -26866,26 +26925,26 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:26869: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:26928: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ 
+ if test "$cf_cv_type_of_bool" = unknown ; then
+ 	case .$NCURSES_BOOL in
+ 	(.auto|.) NCURSES_BOOL=unsigned;;
+ 	esac
+-	{ echo "$as_me:26876: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:26935: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+ echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
+ 	cf_cv_type_of_bool=$NCURSES_BOOL
+ fi
+ 
+ 		else
+-			echo "$as_me:26882: checking for fallback type of bool" >&5
++			echo "$as_me:26941: checking for fallback type of bool" >&5
+ echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
+ 			case "$host_cpu" in
+ 			(i?86)	cf_cv_type_of_bool=char	;;
+ 			(*)	cf_cv_type_of_bool=int	;;
+ 			esac
+-			echo "$as_me:26888: result: $cf_cv_type_of_bool" >&5
++			echo "$as_me:26947: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ 		fi
+ 	fi
+@@ -26914,7 +26973,7 @@
+ 
+ 	if test "$cf_with_ada" != "no" ; then
+ 		if test "$with_libtool" != "no"; then
+-			{ echo "$as_me:26917: WARNING: libtool does not support Ada - disabling feature" >&5
++			{ echo "$as_me:26976: WARNING: libtool does not support Ada - disabling feature" >&5
+ echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
+ 			cf_with_ada=no
+ 		fi
+@@ -26931,7 +26990,7 @@
+ 	unset cf_TEMP_gnat
+ 	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
+ set dummy $cf_prog_gnat; ac_word=$2
+-echo "$as_me:26934: checking for $ac_word" >&5
++echo "$as_me:26993: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -26948,7 +27007,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
+-   echo "$as_me:26951: found $ac_dir/$ac_word" >&5
++   echo "$as_me:27010: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -26960,10 +27019,10 @@
+ cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
+ 
+ if test -n "$cf_TEMP_gnat"; then
+-  echo "$as_me:26963: result: $cf_TEMP_gnat" >&5
++  echo "$as_me:27022: result: $cf_TEMP_gnat" >&5
+ echo "${ECHO_T}$cf_TEMP_gnat" >&6
+ else
+-  echo "$as_me:26966: result: no" >&5
++  echo "$as_me:27025: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -26973,7 +27032,7 @@
+ 		unset cf_cv_gnat_version
+ 		unset cf_TEMP_gnat
+ 
+-echo "$as_me:26976: checking for $cf_prog_gnat version" >&5
++echo "$as_me:27035: checking for $cf_prog_gnat version" >&5
+ echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
+ if test "${cf_cv_gnat_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -26984,7 +27043,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:26987: result: $cf_cv_gnat_version" >&5
++echo "$as_me:27046: result: $cf_cv_gnat_version" >&5
+ echo "${ECHO_T}$cf_cv_gnat_version" >&6
+ test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
+ eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
+@@ -27013,7 +27072,7 @@
+ 			cd conftest.src
+ 			for cf_gprconfig in Ada C
+ 			do
+-				echo "$as_me:27016: checking for gprconfig name for $cf_gprconfig" >&5
++				echo "$as_me:27075: checking for gprconfig name for $cf_gprconfig" >&5
+ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
+ 				if test "$cf_gprconfig" = C
+ 				then
+@@ -27032,10 +27091,10 @@
+ 				if test -n "$cf_gprconfig_value"
+ 				then
+ 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
+-					echo "$as_me:27035: result: $cf_gprconfig_value" >&5
++					echo "$as_me:27094: result: $cf_gprconfig_value" >&5
+ echo "${ECHO_T}$cf_gprconfig_value" >&6
+ 				else
+-					echo "$as_me:27038: result: missing" >&5
++					echo "$as_me:27097: result: missing" >&5
+ echo "${ECHO_T}missing" >&6
+ 					cf_ada_config="#"
+ 					break
+@@ -27048,7 +27107,7 @@
+ 	if test "x$cf_ada_config" != "x#"
+ 	then
+ 
+-echo "$as_me:27051: checking for gnat version" >&5
++echo "$as_me:27110: checking for gnat version" >&5
+ echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
+ if test "${cf_cv_gnat_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -27059,7 +27118,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:27062: result: $cf_cv_gnat_version" >&5
++echo "$as_me:27121: result: $cf_cv_gnat_version" >&5
+ echo "${ECHO_T}$cf_cv_gnat_version" >&6
+ test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
+ 
+@@ -27068,7 +27127,7 @@
+ 	cf_cv_prog_gnat_correct=yes
+ 	;;
+ (*)
+-	{ echo "$as_me:27071: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
++	{ echo "$as_me:27130: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+ echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
+ 	cf_cv_prog_gnat_correct=no
+ 	;;
+@@ -27076,7 +27135,7 @@
+ 
+ 		# Extract the first word of "m4", so it can be a program name with args.
+ set dummy m4; ac_word=$2
+-echo "$as_me:27079: checking for $ac_word" >&5
++echo "$as_me:27138: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_M4_exists+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -27091,7 +27150,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_M4_exists="yes"
+-echo "$as_me:27094: found $ac_dir/$ac_word" >&5
++echo "$as_me:27153: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -27100,20 +27159,20 @@
+ fi
+ M4_exists=$ac_cv_prog_M4_exists
+ if test -n "$M4_exists"; then
+-  echo "$as_me:27103: result: $M4_exists" >&5
++  echo "$as_me:27162: result: $M4_exists" >&5
+ echo "${ECHO_T}$M4_exists" >&6
+ else
+-  echo "$as_me:27106: result: no" >&5
++  echo "$as_me:27165: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ 		if test "$ac_cv_prog_M4_exists" = no; then
+ 			cf_cv_prog_gnat_correct=no
+-			{ echo "$as_me:27112: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
++			{ echo "$as_me:27171: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+ echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
+ 		fi
+ 		if test "$cf_cv_prog_gnat_correct" = yes; then
+-			echo "$as_me:27116: checking if GNAT works" >&5
++			echo "$as_me:27175: checking if GNAT works" >&5
+ echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
+ 
+ rm -rf ./conftest* ./*~conftest*
+@@ -27141,7 +27200,7 @@
+ fi
+ rm -rf ./conftest* ./*~conftest*
+ 
+-			echo "$as_me:27144: result: $cf_cv_prog_gnat_correct" >&5
++			echo "$as_me:27203: result: $cf_cv_prog_gnat_correct" >&5
+ echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
+ 		fi
+ 	else
+@@ -27153,7 +27212,7 @@
+ 
+  	ADAFLAGS="$ADAFLAGS -gnatpn"
+ 
+-	echo "$as_me:27156: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:27215: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -27170,10 +27229,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:27173: result: $ADAFLAGS" >&5
++	echo "$as_me:27232: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:27176: checking if GNATPREP supports -T option" >&5
++echo "$as_me:27235: checking if GNATPREP supports -T option" >&5
+ echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6
+ if test "${cf_cv_gnatprep_opt_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -27183,11 +27242,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:27186: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:27245: result: $cf_cv_gnatprep_opt_t" >&5
+ echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
+ test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
+ 
+-echo "$as_me:27190: checking if GNAT supports generics" >&5
++echo "$as_me:27249: checking if GNAT supports generics" >&5
+ echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
+ case "$cf_cv_gnat_version" in
+ (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
+@@ -27197,7 +27256,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:27200: result: $cf_gnat_generics" >&5
++echo "$as_me:27259: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -27209,7 +27268,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:27212: checking if GNAT supports SIGINT" >&5
++echo "$as_me:27271: checking if GNAT supports SIGINT" >&5
+ echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
+ if test "${cf_cv_gnat_sigint+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -27257,7 +27316,7 @@
+ rm -rf ./conftest* ./*~conftest*
+ 
+ fi
+-echo "$as_me:27260: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:27319: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -27270,7 +27329,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:27273: checking if GNAT supports project files" >&5
++echo "$as_me:27332: checking if GNAT supports project files" >&5
+ echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
+ case "$cf_cv_gnat_version" in
+ (3.[0-9]*)
+@@ -27333,15 +27392,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:27336: result: $cf_gnat_projects" >&5
++echo "$as_me:27395: result: $cf_gnat_projects" >&5
+ echo "${ECHO_T}$cf_gnat_projects" >&6
+ fi # enable_gnat_projects
+ 
+ if test "$cf_gnat_projects" = yes
+ then
+-	echo "$as_me:27342: checking if GNAT supports libraries" >&5
++	echo "$as_me:27401: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:27344: result: $cf_gnat_libraries" >&5
++	echo "$as_me:27403: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -27361,7 +27420,7 @@
+ 	then
+ 		USE_GNAT_MAKE_GPR=""
+ 	else
+-		{ echo "$as_me:27364: WARNING: use old makefile rules since tools are missing" >&5
++		{ echo "$as_me:27423: WARNING: use old makefile rules since tools are missing" >&5
+ echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
+ 	fi
+ fi
+@@ -27373,7 +27432,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:27376: checking for ada-compiler" >&5
++echo "$as_me:27435: checking for ada-compiler" >&5
+ echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -27384,12 +27443,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:27387: result: $cf_ada_compiler" >&5
++echo "$as_me:27446: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 			cf_ada_package=terminal_interface
+ 
+-echo "$as_me:27392: checking for ada-include" >&5
++echo "$as_me:27451: checking for ada-include" >&5
+ echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -27425,7 +27484,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:27428: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:27487: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -27434,10 +27493,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:27437: result: $ADA_INCLUDE" >&5
++echo "$as_me:27496: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:27440: checking for ada-objects" >&5
++echo "$as_me:27499: checking for ada-objects" >&5
+ echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -27473,7 +27532,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:27476: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:27535: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -27482,10 +27541,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:27485: result: $ADA_OBJECTS" >&5
++echo "$as_me:27544: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:27488: checking if an Ada95 shared-library should be built" >&5
++echo "$as_me:27547: checking if an Ada95 shared-library should be built" >&5
+ echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -27495,14 +27554,14 @@
+ else
+   with_ada_sharedlib=no
+ fi;
+-echo "$as_me:27498: result: $with_ada_sharedlib" >&5
++echo "$as_me:27557: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ 
+ if test "x$with_ada_sharedlib" != xno
+ then
+ 	if test "x$cf_gnat_projects" != xyes
+ 	then
+-		{ echo "$as_me:27505: WARNING: disabling shared-library since GNAT projects are not supported" >&5
++		{ echo "$as_me:27564: WARNING: disabling shared-library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;}
+ 		with_ada_sharedlib=no
+ 	fi
+@@ -27522,7 +27581,7 @@
+ 
+ 			# allow the Ada binding to be renamed
+ 
+-echo "$as_me:27525: checking for ada-libname" >&5
++echo "$as_me:27584: checking for ada-libname" >&5
+ echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-libname or --without-ada-libname was given.
+@@ -27538,7 +27597,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:27541: result: $ADA_LIBNAME" >&5
++echo "$as_me:27600: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 		fi
+@@ -27549,13 +27608,13 @@
+ 
+ # do this "late" to avoid conflict with header-checks
+ if test "x$with_widec" = xyes ; then
+-	echo "$as_me:27552: checking for wchar_t" >&5
++	echo "$as_me:27611: checking for wchar_t" >&5
+ echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6
+ if test "${ac_cv_type_wchar_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27558 "configure"
++#line 27617 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27570,16 +27629,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27573: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27632: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27576: \$? = $ac_status" >&5
++  echo "$as_me:27635: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27579: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27638: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27582: \$? = $ac_status" >&5
++  echo "$as_me:27641: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_wchar_t=yes
+ else
+@@ -27589,10 +27648,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:27592: result: $ac_cv_type_wchar_t" >&5
++echo "$as_me:27651: result: $ac_cv_type_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
+ 
+-echo "$as_me:27595: checking size of wchar_t" >&5
++echo "$as_me:27654: checking size of wchar_t" >&5
+ echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6
+ if test "${ac_cv_sizeof_wchar_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -27601,7 +27660,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27604 "configure"
++#line 27663 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27613,21 +27672,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27616: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27675: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27619: \$? = $ac_status" >&5
++  echo "$as_me:27678: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27622: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27681: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27625: \$? = $ac_status" >&5
++  echo "$as_me:27684: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27630 "configure"
++#line 27689 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27639,16 +27698,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27642: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27701: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27645: \$? = $ac_status" >&5
++  echo "$as_me:27704: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27648: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27707: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27651: \$? = $ac_status" >&5
++  echo "$as_me:27710: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -27664,7 +27723,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27667 "configure"
++#line 27726 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27676,16 +27735,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27679: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27738: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27682: \$? = $ac_status" >&5
++  echo "$as_me:27741: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27685: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27744: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27688: \$? = $ac_status" >&5
++  echo "$as_me:27747: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -27701,7 +27760,7 @@
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27704 "configure"
++#line 27763 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27713,16 +27772,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27716: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27775: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27719: \$? = $ac_status" >&5
++  echo "$as_me:27778: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27722: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27781: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27725: \$? = $ac_status" >&5
++  echo "$as_me:27784: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -27735,12 +27794,12 @@
+ ac_cv_sizeof_wchar_t=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:27738: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:27797: error: cannot run test program while cross compiling" >&5
+ echo "$as_me: error: cannot run test program while cross compiling" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27743 "configure"
++#line 27802 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27756,15 +27815,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27759: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27818: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27762: \$? = $ac_status" >&5
++  echo "$as_me:27821: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27764: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27823: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27767: \$? = $ac_status" >&5
++  echo "$as_me:27826: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_wchar_t=`cat conftest.val`
+ else
+@@ -27780,7 +27839,7 @@
+   ac_cv_sizeof_wchar_t=0
+ fi
+ fi
+-echo "$as_me:27783: result: $ac_cv_sizeof_wchar_t" >&5
++echo "$as_me:27842: result: $ac_cv_sizeof_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
+ cat >>confdefs.h <&6
+ 
+-echo "${as_me:-configure}:27796: testing test failed (assume 2) ..." 1>&5
++echo "${as_me:-configure}:27855: testing test failed (assume 2) ..." 1>&5
+ 
+ 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
+ 		mv confdefs.tmp confdefs.h
+@@ -27811,7 +27870,7 @@
+ ### chooses to split module lists into libraries.
+ ###
+ ### (see CF_LIB_RULES).
+-echo "$as_me:27814: checking for library subsets" >&5
++echo "$as_me:27873: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+ 
+@@ -27865,7 +27924,7 @@
+ test "x$with_widec"     = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
+ test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
+ 
+-echo "$as_me:27868: result: $LIB_SUBSETS" >&5
++echo "$as_me:27927: result: $LIB_SUBSETS" >&5
+ echo "${ECHO_T}$LIB_SUBSETS" >&6
+ 
+ ### Construct the list of include-directories to be generated
+@@ -27896,7 +27955,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:27899: checking default library suffix" >&5
++echo "$as_me:27958: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -27907,10 +27966,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:27910: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:27969: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:27913: checking default library-dependency suffix" >&5
++echo "$as_me:27972: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -27993,10 +28052,10 @@
+ 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
+ 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
+ 	fi
+-echo "$as_me:27996: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:28055: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:27999: checking default object directory" >&5
++echo "$as_me:28058: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -28012,11 +28071,11 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:28015: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:28074: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ if test "x$cf_with_cxx" = xyes ; then
+-echo "$as_me:28019: checking c++ library-dependency suffix" >&5
++echo "$as_me:28078: checking c++ library-dependency suffix" >&5
+ echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
+ if test "$with_libtool" != "no"; then
+ 	# libtool thinks it can make c++ shared libraries (perhaps only g++)
+@@ -28109,7 +28168,7 @@
+ 	fi
+ 
+ fi
+-echo "$as_me:28112: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:28171: result: $CXX_LIB_SUFFIX" >&5
+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
+ 
+ fi
+@@ -28285,19 +28344,19 @@
+ 
+ if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
+ then
+-	echo "$as_me:28288: checking if linker supports switching between static/dynamic" >&5
++	echo "$as_me:28347: checking if linker supports switching between static/dynamic" >&5
+ echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6
+ 
+ 	rm -f libconftest.a
+ 	cat >conftest.$ac_ext <
+ int cf_ldflags_static(FILE *fp) { return fflush(fp); }
+ EOF
+-	if { (eval echo "$as_me:28297: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:28356: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28300: \$? = $ac_status" >&5
++  echo "$as_me:28359: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+ 		( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null
+ 		( eval $RANLIB libconftest.a ) 2>&5 >/dev/null
+@@ -28308,10 +28367,10 @@
+ 
+ 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28311 "configure"
++#line 28370 "configure"
+ #include "confdefs.h"
+ 
+-#line 28314 "configure"
++#line 28373 "configure"
+ #include 
+ int cf_ldflags_static(FILE *fp);
+ 
+@@ -28326,16 +28385,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:28329: \"$ac_link\"") >&5
++if { (eval echo "$as_me:28388: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:28332: \$? = $ac_status" >&5
++  echo "$as_me:28391: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:28335: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28394: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28338: \$? = $ac_status" >&5
++  echo "$as_me:28397: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	# some linkers simply ignore the -dynamic
+@@ -28358,7 +28417,7 @@
+ 	rm -f libconftest.*
+ 	LIBS="$cf_save_LIBS"
+ 
+-	echo "$as_me:28361: result: $cf_ldflags_static" >&5
++	echo "$as_me:28420: result: $cf_ldflags_static" >&5
+ echo "${ECHO_T}$cf_ldflags_static" >&6
+ 
+ 	if test "$cf_ldflags_static" != yes
+@@ -28374,7 +28433,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28377: checking where we will install curses.h" >&5
++echo "$as_me:28436: checking where we will install curses.h" >&5
+ echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
+ 
+ includesubdir=
+@@ -28384,7 +28443,7 @@
+ then
+ 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
+ fi
+-echo "$as_me:28387: result: ${includedir}${includesubdir}" >&5
++echo "$as_me:28446: result: ${includedir}${includesubdir}" >&5
+ echo "${ECHO_T}${includedir}${includesubdir}" >&6
+ 
+ ### Resolve a conflict between normal and wide-curses by forcing applications
+@@ -28392,7 +28451,7 @@
+ if test "$with_overwrite" != no ; then
+ if test "$NCURSES_LIBUTF8" = 1 ; then
+ 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
+-	{ echo "$as_me:28395: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++	{ echo "$as_me:28454: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+ echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
+ fi
+ fi
+@@ -28420,7 +28479,7 @@
+ 
+ # pkgsrc uses these
+ 
+-echo "$as_me:28423: checking for desired basename for form library" >&5
++echo "$as_me:28482: checking for desired basename for form library" >&5
+ echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
+ 
+ # Check whether --with-form-libname or --without-form-libname was given.
+@@ -28440,10 +28499,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28443: result: $FORM_NAME" >&5
++echo "$as_me:28502: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+ 
+-echo "$as_me:28446: checking for desired basename for menu library" >&5
++echo "$as_me:28505: checking for desired basename for menu library" >&5
+ echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
+ 
+ # Check whether --with-menu-libname or --without-menu-libname was given.
+@@ -28463,10 +28522,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28466: result: $MENU_NAME" >&5
++echo "$as_me:28525: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+ 
+-echo "$as_me:28469: checking for desired basename for panel library" >&5
++echo "$as_me:28528: checking for desired basename for panel library" >&5
+ echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
+ 
+ # Check whether --with-panel-libname or --without-panel-libname was given.
+@@ -28486,10 +28545,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28489: result: $PANEL_NAME" >&5
++echo "$as_me:28548: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+ 
+-echo "$as_me:28492: checking for desired basename for cxx library" >&5
++echo "$as_me:28551: checking for desired basename for cxx library" >&5
+ echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
+ 
+ # Check whether --with-cxx-libname or --without-cxx-libname was given.
+@@ -28509,13 +28568,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28512: result: $CXX_NAME" >&5
++echo "$as_me:28571: result: $CXX_NAME" >&5
+ echo "${ECHO_T}$CXX_NAME" >&6
+ 
+ ### Construct the list of subdirectories for which we'll customize makefiles
+ ### with the appropriate compile-rules.
+ 
+-echo "$as_me:28518: checking for src modules" >&5
++echo "$as_me:28577: checking for src modules" >&5
+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
+ 
+ # dependencies and linker-arguments for test-programs
+@@ -28584,7 +28643,7 @@
+ 		fi
+ 	fi
+ done
+-echo "$as_me:28587: result: $cf_cv_src_modules" >&5
++echo "$as_me:28646: result: $cf_cv_src_modules" >&5
+ echo "${ECHO_T}$cf_cv_src_modules" >&6
+ 
+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+@@ -28745,7 +28804,7 @@
+ 	(*-D_XOPEN_SOURCE_EXTENDED*)
+ 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
+ 
+-echo "${as_me:-configure}:28748: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
++echo "${as_me:-configure}:28807: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+ 
+ 		CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
+ 		CPPFLAGS=`echo "x$CPPFLAGS" | sed -e  's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'`
+@@ -28756,7 +28815,7 @@
+ 
+ # Help to automatically enable the extended curses features when using either
+ # the *-config or the ".pc" files by adding defines.
+-echo "$as_me:28759: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
++echo "$as_me:28818: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
+ echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6
+ PKG_CFLAGS=
+ for cf_loop1 in $CPPFLAGS_after_XOPEN
+@@ -28772,7 +28831,7 @@
+ 	done
+ 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
+ done
+-echo "$as_me:28775: result: $PKG_CFLAGS" >&5
++echo "$as_me:28834: result: $PKG_CFLAGS" >&5
+ echo "${ECHO_T}$PKG_CFLAGS" >&6
+ 
+ # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
+@@ -28833,7 +28892,7 @@
+ 	cf_filter_syms=$cf_dft_filter_syms
+ 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_version" 1>&6
+ 
+-echo "${as_me:-configure}:28836: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
++echo "${as_me:-configure}:28895: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
+ 
+ fi
+ 
+@@ -28860,7 +28919,7 @@
+ 
+ # This is used for the *-config script and *.pc data files.
+ 
+-echo "$as_me:28863: checking for linker search path" >&5
++echo "$as_me:28922: checking for linker search path" >&5
+ echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
+ if test "${cf_cv_ld_searchpath+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -28908,7 +28967,7 @@
+ 			cf_pathlist="$cf_pathlist /lib /usr/lib"
+ 			;;
+ 		(*)
+-			{ echo "$as_me:28911: WARNING: problem with Solaris architecture" >&5
++			{ echo "$as_me:28970: WARNING: problem with Solaris architecture" >&5
+ echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
+ 			;;
+ 		esac
+@@ -28949,7 +29008,7 @@
+ test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
+ 
+ fi
+-echo "$as_me:28952: result: $cf_cv_ld_searchpath" >&5
++echo "$as_me:29011: result: $cf_cv_ld_searchpath" >&5
+ echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
+ 
+ LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
+@@ -29039,7 +29098,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:29042: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:29101: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -29218,7 +29277,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:29221: error: ambiguous option: $1
++    { { echo "$as_me:29280: error: ambiguous option: $1
+ Try \`$0 --help' for more information." >&5
+ echo "$as_me: error: ambiguous option: $1
+ Try \`$0 --help' for more information." >&2;}
+@@ -29237,7 +29296,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:29240: error: unrecognized option: $1
++  -*) { { echo "$as_me:29299: error: unrecognized option: $1
+ Try \`$0 --help' for more information." >&5
+ echo "$as_me: error: unrecognized option: $1
+ Try \`$0 --help' for more information." >&2;}
+@@ -29363,7 +29422,7 @@
+   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
+   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
+-  *) { { echo "$as_me:29366: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:29425: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -29875,7 +29934,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:29878: creating $ac_file" >&5
++    { echo "$as_me:29937: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -29893,7 +29952,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:29896: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:29955: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -29906,7 +29965,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:29909: error: cannot find input file: $f" >&5
++           { { echo "$as_me:29968: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -29922,7 +29981,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:29925: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:29984: WARNING: datarootdir was used implicitly but not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: datarootdir was used implicitly but not set:
+ $ac_seen" >&2;}
+@@ -29931,7 +29990,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:29934: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:29993: WARNING: datarootdir was used explicitly but not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: datarootdir was used explicitly but not set:
+ $ac_seen" >&2;}
+@@ -29968,7 +30027,7 @@
+             ac_init=`${EGREP-egrep} '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
+-              { echo "$as_me:29971: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:30030: WARNING: Variable $ac_name is used but was not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Variable $ac_name is used but was not set:
+ $ac_seen" >&2;}
+@@ -29979,7 +30038,7 @@
+     ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out
+     if test -s $tmp/out; then
+       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
+-      { echo "$as_me:29982: WARNING: Some variables may not be substituted:
++      { echo "$as_me:30041: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -30028,7 +30087,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:30031: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:30090: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -30039,7 +30098,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30042: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30101: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -30052,7 +30111,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30055: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30114: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -30110,7 +30169,7 @@
+   rm -f $tmp/in
+   if test x"$ac_file" != x-; then
+     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
+-      { echo "$as_me:30113: $ac_file is unchanged" >&5
++      { echo "$as_me:30172: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -30497,7 +30556,7 @@
+ 				(cygdll|msysdll|mingw|msvcdll)
+ 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
+ 
+-echo "${as_me:-configure}:30500: testing overriding CXX_MODEL to SHARED ..." 1>&5
++echo "${as_me:-configure}:30559: testing overriding CXX_MODEL to SHARED ..." 1>&5
+ 
+ 					with_shared_cxx=yes
+ 					;;
+Index: configure.in
+Prereq:  1.738 
+--- ncurses-6.3-20220115+/configure.in	2021-12-04 23:10:01.000000000 +0000
++++ ncurses-6.3-20220122/configure.in	2022-01-23 00:11:08.000000000 +0000
+@@ -1,5 +1,5 @@
+ dnl***************************************************************************
+-dnl Copyright 2018-2020,2021 Thomas E. Dickey                                *
++dnl Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ dnl Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
+ dnl                                                                          *
+ dnl Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: configure.in,v 1.738 2021/12/04 23:10:01 tom Exp $
++dnl $Id: configure.in,v 1.741 2022/01/23 00:11:08 tom Exp $
+ dnl Process this file with autoconf to produce a configure script.
+ dnl
+ dnl For additional information, see
+@@ -38,7 +38,7 @@
+ dnl
+ dnl ---------------------------------------------------------------------------
+ AC_PREREQ(2.52.20210101)
+-AC_REVISION($Revision: 1.738 $)
++AC_REVISION($Revision: 1.741 $)
+ AC_INIT(ncurses/base/lib_initscr.c)
+ AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
+ 
+@@ -1050,7 +1050,11 @@
+ 	[  --with-caps=alt         compile with alternate Caps file],
+ 	[TERMINFO_CAPS=Caps.$withval],
+ 	[TERMINFO_CAPS=Caps])
+-test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
++if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
++then
++	AC_MSG_WARN(file not found: "${srcdir}/include/${TERMINFO_CAPS}")
++	TERMINFO_CAPS=Caps
++fi
+ AC_MSG_RESULT($TERMINFO_CAPS)
+ AC_SUBST(TERMINFO_CAPS)
+ 
+@@ -1084,7 +1088,7 @@
+ AC_ARG_WITH(ccharw-max,
+ 	[  --with-ccharw-max=XXX   override size CCHARW_MAX],
+ 	[NCURSES_CCHARW_MAX="$withval"],
+-	[NCURSES_CCHARW_MAX=5])
++	[NCURSES_CCHARW_MAX=$cf_dft_ccharw_max])
+ AC_MSG_RESULT($NCURSES_CCHARW_MAX)
+ AC_SUBST(NCURSES_CCHARW_MAX)
+ 
+@@ -1098,7 +1102,7 @@
+ AC_ARG_ENABLE(signed-char,
+ 	[  --enable-signed-char    compile using signed Boolean's in term.h],
+ 	[with_signed_char=$enableval],
+-	[with_signed_char=no])
++	[with_signed_char=$cf_dft_signed_char])
+ AC_MSG_RESULT($with_signed_char)
+ test "x$with_signed_char" != xyes && NCURSES_SBOOL="char"
+ AC_SUBST(NCURSES_SBOOL)
+@@ -1234,11 +1238,22 @@
+ 	[with_ext_mouse=$enableval],
+ 	[with_ext_mouse=$cf_dft_ext_mouse])
+ AC_MSG_RESULT($with_ext_mouse)
+-NCURSES_MOUSE_VERSION=1
+ if test "x$with_ext_mouse" = xyes ; then
+-	NCURSES_MOUSE_VERSION=2
+ 	CF_NCURSES_ABI_6
+ fi
++
++case $cf_cv_abi_version in
++(5)
++	NCURSES_MOUSE_VERSION=1
++	;;
++(6)
++	NCURSES_MOUSE_VERSION=2
++	;;
++([789])
++	NCURSES_MOUSE_VERSION=3
++	;;
++esac
++
+ AC_SUBST(NCURSES_MOUSE_VERSION)
+ 
+ ###   use option --enable-ext-putwin to turn on extended screendumps
+@@ -1367,7 +1382,7 @@
+ else
+ 	cf_cv_enable_reentrant=0
+ 	cf_cv_enable_opaque="NCURSES_OPAQUE"
+-	NCURSES_SIZE_T=short
++	NCURSES_SIZE_T=$cf_dft_ordinate_type
+ fi
+ AC_SUBST(cf_cv_enable_reentrant)
+ AC_SUBST(cf_cv_enable_opaque)
+@@ -1379,7 +1394,7 @@
+ 	[  --enable-opaque-curses  make curses WINDOW, etc., "opaque"],
+ 	[enable_opaque_curses=yes],[
+ 	 test "$cf_cv_enable_reentrant" = 1 && enable_opaque_curses=yes
+-	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=no
++	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
+ 	])
+ AC_MSG_RESULT($enable_opaque_curses)
+ 
+Index: dist.mk
+Prereq:  1.1462 
+--- ncurses-6.3-20220115+/dist.mk	2022-01-15 14:00:23.000000000 +0000
++++ ncurses-6.3-20220122/dist.mk	2022-01-22 15:48:54.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1462 2022/01/15 14:00:23 tom Exp $
++# $Id: dist.mk,v 1.1463 2022/01/22 15:48:54 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -38,7 +38,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 3
+-NCURSES_PATCH = 20220115
++NCURSES_PATCH = 20220122
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: package/debian-mingw/changelog
+--- ncurses-6.3-20220115+/package/debian-mingw/changelog	2022-01-15 14:00:23.000000000 +0000
++++ ncurses-6.3-20220122/package/debian-mingw/changelog	2022-01-22 15:48:54.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.3+20220115) unstable; urgency=low
++ncurses6 (6.3+20220122) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 15 Jan 2022 09:00:23 -0500
++ -- Thomas E. Dickey   Sat, 22 Jan 2022 10:48:54 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.3-20220115+/package/debian-mingw64/changelog	2022-01-15 14:00:23.000000000 +0000
++++ ncurses-6.3-20220122/package/debian-mingw64/changelog	2022-01-22 15:48:54.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.3+20220115) unstable; urgency=low
++ncurses6 (6.3+20220122) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 15 Jan 2022 09:00:23 -0500
++ -- Thomas E. Dickey   Sat, 22 Jan 2022 10:48:54 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.3-20220115+/package/debian/changelog	2022-01-15 14:00:23.000000000 +0000
++++ ncurses-6.3-20220122/package/debian/changelog	2022-01-22 15:48:54.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.3+20220115) unstable; urgency=low
++ncurses6 (6.3+20220122) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 15 Jan 2022 09:00:23 -0500
++ -- Thomas E. Dickey   Sat, 22 Jan 2022 10:48:54 -0500
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.502 
+--- ncurses-6.3-20220115+/package/mingw-ncurses.nsi	2022-01-15 14:00:23.000000000 +0000
++++ ncurses-6.3-20220122/package/mingw-ncurses.nsi	2022-01-22 15:48:54.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.502 2022/01/15 14:00:23 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.503 2022/01/22 15:48:54 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "3"
+ !define VERSION_YYYY  "2022"
+-!define VERSION_MMDD  "0115"
++!define VERSION_MMDD  "0122"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.3-20220115+/package/mingw-ncurses.spec	2022-01-15 14:00:23.000000000 +0000
++++ ncurses-6.3-20220122/package/mingw-ncurses.spec	2022-01-22 15:48:54.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.3
+-Release: 20220115
++Release: 20220122
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.3-20220115+/package/ncurses.spec	2022-01-15 14:00:23.000000000 +0000
++++ ncurses-6.3-20220122/package/ncurses.spec	2022-01-22 15:48:54.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.3
+-Release: 20220115
++Release: 20220122
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncursest.spec
+--- ncurses-6.3-20220115+/package/ncursest.spec	2022-01-15 14:00:23.000000000 +0000
++++ ncurses-6.3-20220122/package/ncursest.spec	2022-01-22 15:48:54.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.3
+-Release: 20220115
++Release: 20220122
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: progs/dump_entry.c
+Prereq:  1.189 
+--- ncurses-6.3-20220115+/progs/dump_entry.c	2021-09-04 10:29:59.000000000 +0000
++++ ncurses-6.3-20220122/progs/dump_entry.c	2022-01-22 21:23:58.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
++ * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -40,7 +40,7 @@
+ #include 		/* this C file is generated */
+ #include 	/* so is this */
+ 
+-MODULE_ID("$Id: dump_entry.c,v 1.189 2021/09/04 10:29:59 tom Exp $")
++MODULE_ID("$Id: dump_entry.c,v 1.190 2022/01/22 21:23:58 tom Exp $")
+ 
+ #define DISCARD(string) string = ABSENT_STRING
+ #define PRINTF (void) printf
+@@ -859,7 +859,6 @@
+ 		indent_DYN(&tmpbuf, level + 1);
+ 		strncpy_DYN(&tmpbuf, "%", (size_t) 1);
+ 	    }
+-	    params = FALSE;
+ 	    percent = FALSE;
+ 	    break;
+ 	case ' ':
+Index: test/aclocal.m4
+Prereq:  1.202 
+--- ncurses-6.3-20220115+/test/aclocal.m4	2021-10-11 00:18:09.000000000 +0000
++++ ncurses-6.3-20220122/test/aclocal.m4	2022-01-23 00:22:31.000000000 +0000
+@@ -1,5 +1,5 @@
+ dnl***************************************************************************
+-dnl Copyright 2018-2020,2021 Thomas E. Dickey                                *
++dnl Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ dnl Copyright 2003-2017,2018 Free Software Foundation, Inc.                  *
+ dnl                                                                          *
+ dnl Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ dnl authorization.                                                           *
+ dnl***************************************************************************
+ dnl
+-dnl $Id: aclocal.m4,v 1.202 2021/10/11 00:18:09 tom Exp $
++dnl $Id: aclocal.m4,v 1.203 2022/01/23 00:22:31 tom Exp $
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+@@ -1618,7 +1618,7 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_FIX_WARNINGS version: 3 updated: 2020/12/31 18:40:20
++dnl CF_FIX_WARNINGS version: 4 updated: 2021/12/16 18:22:31
+ dnl ---------------
+ dnl Warning flags do not belong in CFLAGS, CPPFLAGS, etc.  Any of gcc's
+ dnl "-Werror" flags can interfere with configure-checks.  Those go into
+@@ -1630,11 +1630,13 @@
+ then
+ 	case [$]$1 in
+ 	(*-Werror=*)
+-		CF_VERBOSE(repairing $1: [$]$1)
+ 		cf_temp_flags=
+ 		for cf_temp_scan in [$]$1
+ 		do
+ 			case "x$cf_temp_scan" in
++			(x-Werror=format*)
++				CF_APPEND_TEXT(cf_temp_flags,$cf_temp_scan)
++				;;
+ 			(x-Werror=*)
+ 				CF_APPEND_TEXT(EXTRA_CFLAGS,$cf_temp_scan)
+ 				;;
+@@ -1643,9 +1645,13 @@
+ 				;;
+ 			esac
+ 		done
+-		$1="$cf_temp_flags"
+-		CF_VERBOSE(... fixed [$]$1)
+-		CF_VERBOSE(... extra $EXTRA_CFLAGS)
++		if test "x[$]$1" != "x$cf_temp_flags"
++		then
++			CF_VERBOSE(repairing $1: [$]$1)
++			$1="$cf_temp_flags"
++			CF_VERBOSE(... fixed [$]$1)
++			CF_VERBOSE(... extra $EXTRA_CFLAGS)
++		fi
+ 		;;
+ 	esac
+ fi
+Index: test/configure
+--- ncurses-6.3-20220115+/test/configure	2021-09-05 21:30:18.000000000 +0000
++++ ncurses-6.3-20220122/test/configure	2022-01-23 00:22:56.000000000 +0000
+@@ -21865,14 +21865,16 @@
+ then
+ 	case $CFLAGS in
+ 	(*-Werror=*)
+-		test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+-
+-echo "${as_me:-configure}:21870: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+-
+ 		cf_temp_flags=
+ 		for cf_temp_scan in $CFLAGS
+ 		do
+ 			case "x$cf_temp_scan" in
++			(x-Werror=format*)
++
++	test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "
++	cf_temp_flags="${cf_temp_flags}$cf_temp_scan"
++
++				;;
+ 			(x-Werror=*)
+ 
+ 	test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "
+@@ -21887,15 +21889,22 @@
+ 				;;
+ 			esac
+ 		done
+-		CFLAGS="$cf_temp_flags"
+-		test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
++		if test "x$CFLAGS" != "x$cf_temp_flags"
++		then
++			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
++
++echo "${as_me:-configure}:21896: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+-echo "${as_me:-configure}:21893: testing ... fixed $CFLAGS ..." 1>&5
++			CFLAGS="$cf_temp_flags"
++			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-		test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
++echo "${as_me:-configure}:21901: testing ... fixed $CFLAGS ..." 1>&5
+ 
+-echo "${as_me:-configure}:21897: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
++echo "${as_me:-configure}:21905: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++
++		fi
+ 		;;
+ 	esac
+ fi
+@@ -21904,14 +21913,16 @@
+ then
+ 	case $CPPFLAGS in
+ 	(*-Werror=*)
+-		test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+-
+-echo "${as_me:-configure}:21909: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+-
+ 		cf_temp_flags=
+ 		for cf_temp_scan in $CPPFLAGS
+ 		do
+ 			case "x$cf_temp_scan" in
++			(x-Werror=format*)
++
++	test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "
++	cf_temp_flags="${cf_temp_flags}$cf_temp_scan"
++
++				;;
+ 			(x-Werror=*)
+ 
+ 	test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "
+@@ -21926,15 +21937,22 @@
+ 				;;
+ 			esac
+ 		done
+-		CPPFLAGS="$cf_temp_flags"
+-		test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
++		if test "x$CPPFLAGS" != "x$cf_temp_flags"
++		then
++			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
++
++echo "${as_me:-configure}:21944: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++
++			CPPFLAGS="$cf_temp_flags"
++			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:21932: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:21949: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+-		test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
++			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:21936: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:21953: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
++		fi
+ 		;;
+ 	esac
+ fi
+@@ -21943,14 +21961,16 @@
+ then
+ 	case $LDFLAGS in
+ 	(*-Werror=*)
+-		test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+-
+-echo "${as_me:-configure}:21948: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+-
+ 		cf_temp_flags=
+ 		for cf_temp_scan in $LDFLAGS
+ 		do
+ 			case "x$cf_temp_scan" in
++			(x-Werror=format*)
++
++	test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "
++	cf_temp_flags="${cf_temp_flags}$cf_temp_scan"
++
++				;;
+ 			(x-Werror=*)
+ 
+ 	test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "
+@@ -21965,20 +21985,27 @@
+ 				;;
+ 			esac
+ 		done
+-		LDFLAGS="$cf_temp_flags"
+-		test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
++		if test "x$LDFLAGS" != "x$cf_temp_flags"
++		then
++			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
++
++echo "${as_me:-configure}:21992: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+-echo "${as_me:-configure}:21971: testing ... fixed $LDFLAGS ..." 1>&5
++			LDFLAGS="$cf_temp_flags"
++			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-		test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
++echo "${as_me:-configure}:21997: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+-echo "${as_me:-configure}:21975: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
++echo "${as_me:-configure}:22001: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++
++		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:21981: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:22008: checking if you want to turn on gcc warnings" >&5
+ echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6
+ 
+ # Check whether --enable-warnings or --disable-warnings was given.
+@@ -21995,7 +22022,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:21998: result: $enable_warnings" >&5
++echo "$as_me:22025: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -22018,10 +22045,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:22021: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:22048: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <&5
++		if { (eval echo "$as_me:22100: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22076: \$? = $ac_status" >&5
++  echo "$as_me:22103: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:22078: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:22105: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -22153,7 +22180,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22156 "configure"
++#line 22183 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22168,26 +22195,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22171: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22198: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22174: \$? = $ac_status" >&5
++  echo "$as_me:22201: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22177: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22204: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22180: \$? = $ac_status" >&5
++  echo "$as_me:22207: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:22183: checking for X11/Xt const-feature" >&5
++echo "$as_me:22210: checking for X11/Xt const-feature" >&5
+ echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
+ if test "${cf_cv_const_x_string+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22190 "configure"
++#line 22217 "configure"
+ #include "confdefs.h"
+ 
+ #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
+@@ -22204,16 +22231,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22207: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22234: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22210: \$? = $ac_status" >&5
++  echo "$as_me:22237: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22213: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22240: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22216: \$? = $ac_status" >&5
++  echo "$as_me:22243: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -22228,7 +22255,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:22231: result: $cf_cv_const_x_string" >&5
++echo "$as_me:22258: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -22257,7 +22284,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <&5
++	{ echo "$as_me:22303: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -22289,12 +22316,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:22292: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:22319: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22295: \$? = $ac_status" >&5
++  echo "$as_me:22322: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:22297: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:22324: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -22302,7 +22329,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:22305: checking for $CC warning options..." >&5
++	{ echo "$as_me:22332: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -22325,12 +22352,12 @@
+ 		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:22328: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:22355: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22331: \$? = $ac_status" >&5
++  echo "$as_me:22358: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:22333: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:22360: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -22338,7 +22365,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:22341: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:22368: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -22348,7 +22375,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:22351: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:22378: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -22365,7 +22392,7 @@
+ 
+ fi
+ 
+-echo "$as_me:22368: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:22395: checking if you want to use dmalloc for testing" >&5
+ echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
+ 
+ # Check whether --with-dmalloc or --without-dmalloc was given.
+@@ -22387,7 +22414,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:22390: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:22417: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -22501,23 +22528,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:22504: checking for dmalloc.h" >&5
++	echo "$as_me:22531: checking for dmalloc.h" >&5
+ echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
+ if test "${ac_cv_header_dmalloc_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22510 "configure"
++#line 22537 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:22514: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:22541: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:22520: \$? = $ac_status" >&5
++  echo "$as_me:22547: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -22536,11 +22563,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:22539: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:22566: result: $ac_cv_header_dmalloc_h" >&5
+ echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
+ if test "$ac_cv_header_dmalloc_h" = yes; then
+ 
+-echo "$as_me:22543: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:22570: checking for dmalloc_debug in -ldmalloc" >&5
+ echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
+ if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22548,7 +22575,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22551 "configure"
++#line 22578 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22567,16 +22594,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22570: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22597: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22573: \$? = $ac_status" >&5
++  echo "$as_me:22600: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22576: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22603: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22579: \$? = $ac_status" >&5
++  echo "$as_me:22606: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -22587,7 +22614,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22590: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:22617: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+ echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
+ if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:22632: checking if you want to use dbmalloc for testing" >&5
+ echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
+ 
+ # Check whether --with-dbmalloc or --without-dbmalloc was given.
+@@ -22624,7 +22651,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:22627: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:22654: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -22738,23 +22765,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:22741: checking for dbmalloc.h" >&5
++	echo "$as_me:22768: checking for dbmalloc.h" >&5
+ echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
+ if test "${ac_cv_header_dbmalloc_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22747 "configure"
++#line 22774 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:22751: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:22778: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:22757: \$? = $ac_status" >&5
++  echo "$as_me:22784: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -22773,11 +22800,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:22776: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:22803: result: $ac_cv_header_dbmalloc_h" >&5
+ echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
+ if test "$ac_cv_header_dbmalloc_h" = yes; then
+ 
+-echo "$as_me:22780: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:22807: checking for debug_malloc in -ldbmalloc" >&5
+ echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
+ if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22785,7 +22812,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22788 "configure"
++#line 22815 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -22804,16 +22831,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22807: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22834: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22810: \$? = $ac_status" >&5
++  echo "$as_me:22837: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22813: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22840: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22816: \$? = $ac_status" >&5
++  echo "$as_me:22843: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -22824,7 +22851,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:22827: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:22854: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+ echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
+ if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:22869: checking if you want to use valgrind for testing" >&5
+ echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
+ 
+ # Check whether --with-valgrind or --without-valgrind was given.
+@@ -22861,7 +22888,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:22864: result: ${with_valgrind:-no}" >&5
++echo "$as_me:22891: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -22974,7 +23001,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:22977: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:23004: checking if you want to perform memory-leak testing" >&5
+ echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
+ 
+ # Check whether --enable-leaks or --disable-leaks was given.
+@@ -22985,7 +23012,7 @@
+   enable_leaks=yes
+ fi;
+ if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
+-echo "$as_me:22988: result: $with_no_leaks" >&5
++echo "$as_me:23015: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$enable_leaks" = no ; then
+@@ -23003,7 +23030,7 @@
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+-	echo "$as_me:23006: checking for an rpath option" >&5
++	echo "$as_me:23033: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ 	case "$cf_cv_system_name" in
+ 	(irix*)
+@@ -23034,12 +23061,12 @@
+ 	(*)
+ 		;;
+ 	esac
+-	echo "$as_me:23037: result: $LD_RPATH_OPT" >&5
++	echo "$as_me:23064: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ 	case "x$LD_RPATH_OPT" in
+ 	(x-R*)
+-		echo "$as_me:23042: checking if we need a space after rpath option" >&5
++		echo "$as_me:23069: checking if we need a space after rpath option" >&5
+ echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
+ 		cf_save_LIBS="$LIBS"
+ 
+@@ -23060,7 +23087,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23063 "configure"
++#line 23090 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -23072,16 +23099,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23075: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23102: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23078: \$? = $ac_status" >&5
++  echo "$as_me:23105: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23081: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23108: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23084: \$? = $ac_status" >&5
++  echo "$as_me:23111: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_rpath_space=no
+ else
+@@ -23091,14 +23118,14 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:23094: result: $cf_rpath_space" >&5
++		echo "$as_me:23121: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:23101: checking if rpath-hack should be disabled" >&5
++echo "$as_me:23128: checking if rpath-hack should be disabled" >&5
+ echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
+ 
+ # Check whether --enable-rpath-hack or --disable-rpath-hack was given.
+@@ -23116,22 +23143,22 @@
+ 
+ fi;
+ if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
+-echo "$as_me:23119: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:23146: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+ 
+ if test "$enable_rpath_hack" = yes ; then
+ 
+-echo "$as_me:23124: checking for updated LDFLAGS" >&5
++echo "$as_me:23151: checking for updated LDFLAGS" >&5
+ echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
+ if test -n "$LD_RPATH_OPT" ; then
+-	echo "$as_me:23127: result: maybe" >&5
++	echo "$as_me:23154: result: maybe" >&5
+ echo "${ECHO_T}maybe" >&6
+ 
+ 	for ac_prog in ldd
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:23134: checking for $ac_word" >&5
++echo "$as_me:23161: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -23146,7 +23173,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_cf_ldd_prog="$ac_prog"
+-echo "$as_me:23149: found $ac_dir/$ac_word" >&5
++echo "$as_me:23176: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -23154,10 +23181,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+-  echo "$as_me:23157: result: $cf_ldd_prog" >&5
++  echo "$as_me:23184: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+-  echo "$as_me:23160: result: no" >&5
++  echo "$as_me:23187: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -23171,7 +23198,7 @@
+ 		cf_rpath_oops=
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23174 "configure"
++#line 23201 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -23183,16 +23210,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23186: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23213: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23189: \$? = $ac_status" >&5
++  echo "$as_me:23216: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23192: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23219: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23195: \$? = $ac_status" >&5
++  echo "$as_me:23222: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
+ 		 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
+@@ -23220,7 +23247,7 @@
+ 					then
+ 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+ 
+-echo "${as_me:-configure}:23223: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:23250: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+ 
+ 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ 						break
+@@ -23232,11 +23259,11 @@
+ 
+ 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:23235: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:23262: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:23239: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:23266: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -23273,7 +23300,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:23276: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:23303: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -23286,11 +23313,11 @@
+ 
+ test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:23289: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:23316: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:23293: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:23320: testing ...checking LIBS $LIBS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -23327,7 +23354,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:23330: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:23357: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -23340,14 +23367,14 @@
+ 
+ test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:23343: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:23370: testing ...checked LIBS $LIBS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:23347: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:23374: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ else
+-	echo "$as_me:23350: result: no" >&5
++	echo "$as_me:23377: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -23437,7 +23464,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:23440: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:23467: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -23616,7 +23643,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:23619: error: ambiguous option: $1
++    { { echo "$as_me:23646: error: ambiguous option: $1
+ Try \`$0 --help' for more information." >&5
+ echo "$as_me: error: ambiguous option: $1
+ Try \`$0 --help' for more information." >&2;}
+@@ -23635,7 +23662,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:23638: error: unrecognized option: $1
++  -*) { { echo "$as_me:23665: error: unrecognized option: $1
+ Try \`$0 --help' for more information." >&5
+ echo "$as_me: error: unrecognized option: $1
+ Try \`$0 --help' for more information." >&2;}
+@@ -23685,7 +23712,7 @@
+   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
+   "ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ncurses_cfg.h:ncurses_tst.hin" ;;
+-  *) { { echo "$as_me:23688: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:23715: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -23991,7 +24018,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:23994: creating $ac_file" >&5
++    { echo "$as_me:24021: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -24009,7 +24036,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:24012: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:24039: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -24022,7 +24049,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:24025: error: cannot find input file: $f" >&5
++           { { echo "$as_me:24052: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -24038,7 +24065,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:24041: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:24068: WARNING: datarootdir was used implicitly but not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: datarootdir was used implicitly but not set:
+ $ac_seen" >&2;}
+@@ -24047,7 +24074,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:24050: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:24077: WARNING: datarootdir was used explicitly but not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: datarootdir was used explicitly but not set:
+ $ac_seen" >&2;}
+@@ -24084,7 +24111,7 @@
+             ac_init=`${EGREP-egrep} '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
+-              { echo "$as_me:24087: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:24114: WARNING: Variable $ac_name is used but was not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Variable $ac_name is used but was not set:
+ $ac_seen" >&2;}
+@@ -24095,7 +24122,7 @@
+     ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out
+     if test -s $tmp/out; then
+       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
+-      { echo "$as_me:24098: WARNING: Some variables may not be substituted:
++      { echo "$as_me:24125: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -24144,7 +24171,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:24147: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:24174: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -24155,7 +24182,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:24158: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:24185: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -24168,7 +24195,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:24171: error: cannot find input file: $f" >&5
++           { { echo "$as_me:24198: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -24226,7 +24253,7 @@
+   rm -f $tmp/in
+   if test x"$ac_file" != x-; then
+     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
+-      { echo "$as_me:24229: $ac_file is unchanged" >&5
++      { echo "$as_me:24256: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
diff --git a/system/ncurses/ncurses-6.3-20220129.patch b/system/ncurses/ncurses-6.3-20220129.patch
new file mode 100644
index 000000000..c60e4b4f3
--- /dev/null
+++ b/system/ncurses/ncurses-6.3-20220129.patch
@@ -0,0 +1,23405 @@
+# ncurses 6.3 - patch 20220129 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.3 is at
+# 	ftp://ftp.invisible-island.net/ncurses/
+#	https://invisible-mirror.net/archives/ncurses/
+#	https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.3 can be found at
+# 	ftp://ftp.invisible-island.net/ncurses/6.3
+#	https://invisible-mirror.net/archives/ncurses/6.3
+#
+# ------------------------------------------------------------------------------
+# ftp://ftp.invisible-island.net/ncurses/6.3/ncurses-6.3-20220129.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Jan 30 01:46:17 UTC 2022
+# ------------------------------------------------------------------------------
+# Ada95/aclocal.m4                           |    9 
+# Ada95/configure                            | 2399 +++++++--------
+# NEWS                                       |   10 
+# VERSION                                    |    2 
+# aclocal.m4                                 |    9 
+# configure                                  | 4315 +++++++++++++--------------
+# dist.mk                                    |    4 
+# misc/terminfo.src                          |   69 
+# package/debian-mingw/changelog             |    4 
+# package/debian-mingw64/changelog           |    4 
+# package/debian/changelog                   |    4 
+# package/debian/ncurses6.lintian-overrides  |   10 
+# package/debian/ncursest6.lintian-overrides |   10 
+# package/debian/rules                       |    9 
+# package/mingw-ncurses.nsi                  |    4 
+# package/mingw-ncurses.spec                 |    2 
+# package/ncurses.spec                       |    2 
+# package/ncursest.spec                      |    2 
+# 18 files changed, 3461 insertions(+), 3407 deletions(-)
+# ------------------------------------------------------------------------------
+Index: Ada95/aclocal.m4
+Prereq:  1.192 
+--- ncurses-6.3-20220122+/Ada95/aclocal.m4	2022-01-23 00:21:27.000000000 +0000
++++ ncurses-6.3-20220129/Ada95/aclocal.m4	2022-01-29 22:06:07.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+-dnl $Id: aclocal.m4,v 1.192 2022/01/23 00:21:27 tom Exp $
++dnl $Id: aclocal.m4,v 1.193 2022/01/29 22:06:07 tom Exp $
+ dnl Macros used in NCURSES Ada95 auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -4808,7 +4808,7 @@
+ AC_SUBST($3)dnl
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_WITH_PKG_CONFIG_LIBDIR version: 19 updated: 2021/11/20 14:57:36
++dnl CF_WITH_PKG_CONFIG_LIBDIR version: 20 updated: 2022/01/29 17:03:42
+ dnl -------------------------
+ dnl Allow the choice of the pkg-config library directory to be overridden.
+ dnl
+@@ -4840,7 +4840,7 @@
+ 	[cf_search_path=$withval],
+ 	[test "x$PKG_CONFIG" != xnone && test -z "$cf_search_path" && cf_search_path=libdir])
+ 
+-case x$cf_search_path in
++case "x$cf_search_path" in
+ (xlibdir)
+ 	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
+ 	AC_MSG_RESULT($PKG_CONFIG_LIBDIR)
+@@ -4848,6 +4848,9 @@
+ 	;;
+ (x)
+ 	;;
++(x/*\ *)
++	PKG_CONFIG_LIBDIR=
++	;;
+ (x/*)
+ 	PKG_CONFIG_LIBDIR="$cf_search_path"
+ 	AC_MSG_RESULT($PKG_CONFIG_LIBDIR)
+Index: Ada95/configure
+--- ncurses-6.3-20220122+/Ada95/configure	2022-01-23 00:21:51.000000000 +0000
++++ ncurses-6.3-20220129/Ada95/configure	2022-01-29 22:07:15.000000000 +0000
+@@ -3292,7 +3292,7 @@
+   test "x$PKG_CONFIG" != xnone && test -z "$cf_search_path" && cf_search_path=libdir
+ fi;
+ 
+-case x$cf_search_path in
++case "x$cf_search_path" in
+ (xlibdir)
+ 	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
+ 	echo "$as_me:3298: result: $PKG_CONFIG_LIBDIR" >&5
+@@ -3301,18 +3301,21 @@
+ 	;;
+ (x)
+ 	;;
++(x/*\ *)
++	PKG_CONFIG_LIBDIR=
++	;;
+ (x/*)
+ 	PKG_CONFIG_LIBDIR="$cf_search_path"
+-	echo "$as_me:3306: result: $PKG_CONFIG_LIBDIR" >&5
++	echo "$as_me:3309: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	cf_search_path=
+ 	;;
+ (xyes|xauto)
+-	echo "$as_me:3311: result: auto" >&5
++	echo "$as_me:3314: result: auto" >&5
+ echo "${ECHO_T}auto" >&6
+ 	cf_search_path=
+ 	# Look for the library directory using the same prefix as the executable
+-	echo "$as_me:3315: checking for search-list" >&5
++	echo "$as_me:3318: checking for search-list" >&5
+ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
+ 	if test "x$PKG_CONFIG" != xnone
+ 	then
+@@ -3339,11 +3342,11 @@
+ "`
+ 	fi
+ 
+-	echo "$as_me:3342: result: $cf_search_path" >&5
++	echo "$as_me:3345: result: $cf_search_path" >&5
+ echo "${ECHO_T}$cf_search_path" >&6
+ 	;;
+ (*)
+-	{ { echo "$as_me:3346: error: Unexpected option value: $cf_search_path" >&5
++	{ { echo "$as_me:3349: error: Unexpected option value: $cf_search_path" >&5
+ echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -3351,7 +3354,7 @@
+ 
+ if test -n "$cf_search_path"
+ then
+-	echo "$as_me:3354: checking for first directory" >&5
++	echo "$as_me:3357: checking for first directory" >&5
+ echo $ECHO_N "checking for first directory... $ECHO_C" >&6
+ 	cf_pkg_config_path=none
+ 	for cf_config in $cf_search_path
+@@ -3362,7 +3365,7 @@
+ 			break
+ 		fi
+ 	done
+-	echo "$as_me:3365: result: $cf_pkg_config_path" >&5
++	echo "$as_me:3368: result: $cf_pkg_config_path" >&5
+ echo "${ECHO_T}$cf_pkg_config_path" >&6
+ 
+ 	if test "x$cf_pkg_config_path" != xnone ; then
+@@ -3372,7 +3375,7 @@
+ 
+ 	if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
+ 	then
+-		echo "$as_me:3375: checking for workaround" >&5
++		echo "$as_me:3378: checking for workaround" >&5
+ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
+ 		if test "$prefix" = "NONE" ; then
+ 			cf_prefix="$ac_default_prefix"
+@@ -3395,12 +3398,12 @@
+ 			esac
+ 		done
+ 		test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
+-		echo "$as_me:3398: result: $PKG_CONFIG_LIBDIR" >&5
++		echo "$as_me:3401: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	fi
+ fi
+ 
+-echo "$as_me:3403: checking if you want to build test-programs" >&5
++echo "$as_me:3406: checking if you want to build test-programs" >&5
+ echo $ECHO_N "checking if you want to build test-programs... $ECHO_C" >&6
+ 
+ # Check whether --with-tests or --without-tests was given.
+@@ -3410,10 +3413,10 @@
+ else
+   cf_with_tests=yes
+ fi;
+-echo "$as_me:3413: result: $cf_with_tests" >&5
++echo "$as_me:3416: result: $cf_with_tests" >&5
+ echo "${ECHO_T}$cf_with_tests" >&6
+ 
+-echo "$as_me:3416: checking if we should assume mixed-case filenames" >&5
++echo "$as_me:3419: checking if we should assume mixed-case filenames" >&5
+ echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6
+ 
+ # Check whether --enable-mixed-case or --disable-mixed-case was given.
+@@ -3423,11 +3426,11 @@
+ else
+   enable_mixedcase=auto
+ fi;
+-echo "$as_me:3426: result: $enable_mixedcase" >&5
++echo "$as_me:3429: result: $enable_mixedcase" >&5
+ echo "${ECHO_T}$enable_mixedcase" >&6
+ if test "$enable_mixedcase" = "auto" ; then
+ 
+-echo "$as_me:3430: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:3433: checking if filesystem supports mixed-case filenames" >&5
+ echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
+ if test "${cf_cv_mixedcase+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3454,7 +3457,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:3457: result: $cf_cv_mixedcase" >&5
++echo "$as_me:3460: result: $cf_cv_mixedcase" >&5
+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
+ test "$cf_cv_mixedcase" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -3472,7 +3475,7 @@
+ fi
+ 
+ # do this after mixed-case option (tags/TAGS is not as important as tic).
+-echo "$as_me:3475: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:3478: checking whether ${MAKE-make} sets \${MAKE}" >&5
+ echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
+ set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
+ if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+@@ -3492,16 +3495,16 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "$as_me:3495: result: yes" >&5
++  echo "$as_me:3498: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+   SET_MAKE=
+ else
+-  echo "$as_me:3499: result: no" >&5
++  echo "$as_me:3502: result: no" >&5
+ echo "${ECHO_T}no" >&6
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+ 
+-echo "$as_me:3504: checking for \".PHONY\" make-support" >&5
++echo "$as_me:3507: checking for \".PHONY\" make-support" >&5
+ echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6
+ if test "${cf_cv_make_PHONY+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3556,7 +3559,7 @@
+ 	rm -rf conftest*
+ 
+ fi
+-echo "$as_me:3559: result: $cf_cv_make_PHONY" >&5
++echo "$as_me:3562: result: $cf_cv_make_PHONY" >&5
+ echo "${ECHO_T}$cf_cv_make_PHONY" >&6
+ MAKE_NO_PHONY="#"
+ MAKE_PHONY="#"
+@@ -3567,7 +3570,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:3570: checking for $ac_word" >&5
++echo "$as_me:3573: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CTAGS+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3582,7 +3585,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CTAGS="$ac_prog"
+-echo "$as_me:3585: found $ac_dir/$ac_word" >&5
++echo "$as_me:3588: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3590,10 +3593,10 @@
+ fi
+ CTAGS=$ac_cv_prog_CTAGS
+ if test -n "$CTAGS"; then
+-  echo "$as_me:3593: result: $CTAGS" >&5
++  echo "$as_me:3596: result: $CTAGS" >&5
+ echo "${ECHO_T}$CTAGS" >&6
+ else
+-  echo "$as_me:3596: result: no" >&5
++  echo "$as_me:3599: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3604,7 +3607,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:3607: checking for $ac_word" >&5
++echo "$as_me:3610: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ETAGS+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3619,7 +3622,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ETAGS="$ac_prog"
+-echo "$as_me:3622: found $ac_dir/$ac_word" >&5
++echo "$as_me:3625: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3627,10 +3630,10 @@
+ fi
+ ETAGS=$ac_cv_prog_ETAGS
+ if test -n "$ETAGS"; then
+-  echo "$as_me:3630: result: $ETAGS" >&5
++  echo "$as_me:3633: result: $ETAGS" >&5
+ echo "${ECHO_T}$ETAGS" >&6
+ else
+-  echo "$as_me:3633: result: no" >&5
++  echo "$as_me:3636: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3639,7 +3642,7 @@
+ 
+ # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
+ set dummy ${CTAGS:-ctags}; ac_word=$2
+-echo "$as_me:3642: checking for $ac_word" >&5
++echo "$as_me:3645: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3654,7 +3657,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_MAKE_LOWER_TAGS="yes"
+-echo "$as_me:3657: found $ac_dir/$ac_word" >&5
++echo "$as_me:3660: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3663,17 +3666,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+-  echo "$as_me:3666: result: $MAKE_LOWER_TAGS" >&5
++  echo "$as_me:3669: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+-  echo "$as_me:3669: result: no" >&5
++  echo "$as_me:3672: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ if test "$cf_cv_mixedcase" = yes ; then
+ 	# Extract the first word of "${ETAGS:-etags}", so it can be a program name with args.
+ set dummy ${ETAGS:-etags}; ac_word=$2
+-echo "$as_me:3676: checking for $ac_word" >&5
++echo "$as_me:3679: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3688,7 +3691,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_MAKE_UPPER_TAGS="yes"
+-echo "$as_me:3691: found $ac_dir/$ac_word" >&5
++echo "$as_me:3694: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3697,10 +3700,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+-  echo "$as_me:3700: result: $MAKE_UPPER_TAGS" >&5
++  echo "$as_me:3703: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+-  echo "$as_me:3703: result: no" >&5
++  echo "$as_me:3706: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3720,7 +3723,7 @@
+ 	MAKE_LOWER_TAGS="#"
+ fi
+ 
+-echo "$as_me:3723: checking for makeflags variable" >&5
++echo "$as_me:3726: checking for makeflags variable" >&5
+ echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6
+ if test "${cf_cv_makeflags+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3750,7 +3753,7 @@
+ 			;;
+ 		(*)
+ 
+-echo "${as_me:-configure}:3753: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
++echo "${as_me:-configure}:3756: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+ 
+ 			;;
+ 		esac
+@@ -3758,13 +3761,13 @@
+ 	rm -f cf_makeflags.tmp
+ 
+ fi
+-echo "$as_me:3761: result: $cf_cv_makeflags" >&5
++echo "$as_me:3764: result: $cf_cv_makeflags" >&5
+ echo "${ECHO_T}$cf_cv_makeflags" >&6
+ 
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+-echo "$as_me:3767: checking for $ac_word" >&5
++echo "$as_me:3770: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_RANLIB+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3779,7 +3782,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+-echo "$as_me:3782: found $ac_dir/$ac_word" >&5
++echo "$as_me:3785: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3787,10 +3790,10 @@
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+-  echo "$as_me:3790: result: $RANLIB" >&5
++  echo "$as_me:3793: result: $RANLIB" >&5
+ echo "${ECHO_T}$RANLIB" >&6
+ else
+-  echo "$as_me:3793: result: no" >&5
++  echo "$as_me:3796: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3799,7 +3802,7 @@
+   ac_ct_RANLIB=$RANLIB
+   # Extract the first word of "ranlib", so it can be a program name with args.
+ set dummy ranlib; ac_word=$2
+-echo "$as_me:3802: checking for $ac_word" >&5
++echo "$as_me:3805: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3814,7 +3817,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_RANLIB="ranlib"
+-echo "$as_me:3817: found $ac_dir/$ac_word" >&5
++echo "$as_me:3820: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3823,10 +3826,10 @@
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+-  echo "$as_me:3826: result: $ac_ct_RANLIB" >&5
++  echo "$as_me:3829: result: $ac_ct_RANLIB" >&5
+ echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ else
+-  echo "$as_me:3829: result: no" >&5
++  echo "$as_me:3832: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3838,7 +3841,7 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ld; ac_word=$2
+-echo "$as_me:3841: checking for $ac_word" >&5
++echo "$as_me:3844: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_LD+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3853,7 +3856,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LD="${ac_tool_prefix}ld"
+-echo "$as_me:3856: found $ac_dir/$ac_word" >&5
++echo "$as_me:3859: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3861,10 +3864,10 @@
+ fi
+ LD=$ac_cv_prog_LD
+ if test -n "$LD"; then
+-  echo "$as_me:3864: result: $LD" >&5
++  echo "$as_me:3867: result: $LD" >&5
+ echo "${ECHO_T}$LD" >&6
+ else
+-  echo "$as_me:3867: result: no" >&5
++  echo "$as_me:3870: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3873,7 +3876,7 @@
+   ac_ct_LD=$LD
+   # Extract the first word of "ld", so it can be a program name with args.
+ set dummy ld; ac_word=$2
+-echo "$as_me:3876: checking for $ac_word" >&5
++echo "$as_me:3879: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3888,7 +3891,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_LD="ld"
+-echo "$as_me:3891: found $ac_dir/$ac_word" >&5
++echo "$as_me:3894: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3897,10 +3900,10 @@
+ fi
+ ac_ct_LD=$ac_cv_prog_ac_ct_LD
+ if test -n "$ac_ct_LD"; then
+-  echo "$as_me:3900: result: $ac_ct_LD" >&5
++  echo "$as_me:3903: result: $ac_ct_LD" >&5
+ echo "${ECHO_T}$ac_ct_LD" >&6
+ else
+-  echo "$as_me:3903: result: no" >&5
++  echo "$as_me:3906: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3912,7 +3915,7 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ar; ac_word=$2
+-echo "$as_me:3915: checking for $ac_word" >&5
++echo "$as_me:3918: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_AR+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3927,7 +3930,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_AR="${ac_tool_prefix}ar"
+-echo "$as_me:3930: found $ac_dir/$ac_word" >&5
++echo "$as_me:3933: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3935,10 +3938,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:3938: result: $AR" >&5
++  echo "$as_me:3941: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:3941: result: no" >&5
++  echo "$as_me:3944: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3947,7 +3950,7 @@
+   ac_ct_AR=$AR
+   # Extract the first word of "ar", so it can be a program name with args.
+ set dummy ar; ac_word=$2
+-echo "$as_me:3950: checking for $ac_word" >&5
++echo "$as_me:3953: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3962,7 +3965,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_AR="ar"
+-echo "$as_me:3965: found $ac_dir/$ac_word" >&5
++echo "$as_me:3968: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -3971,10 +3974,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:3974: result: $ac_ct_AR" >&5
++  echo "$as_me:3977: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:3977: result: no" >&5
++  echo "$as_me:3980: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -3986,7 +3989,7 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ar; ac_word=$2
+-echo "$as_me:3989: checking for $ac_word" >&5
++echo "$as_me:3992: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_AR+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4001,7 +4004,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_AR="${ac_tool_prefix}ar"
+-echo "$as_me:4004: found $ac_dir/$ac_word" >&5
++echo "$as_me:4007: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4009,10 +4012,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:4012: result: $AR" >&5
++  echo "$as_me:4015: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:4015: result: no" >&5
++  echo "$as_me:4018: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4021,7 +4024,7 @@
+   ac_ct_AR=$AR
+   # Extract the first word of "ar", so it can be a program name with args.
+ set dummy ar; ac_word=$2
+-echo "$as_me:4024: checking for $ac_word" >&5
++echo "$as_me:4027: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4036,7 +4039,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_AR="ar"
+-echo "$as_me:4039: found $ac_dir/$ac_word" >&5
++echo "$as_me:4042: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4045,10 +4048,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:4048: result: $ac_ct_AR" >&5
++  echo "$as_me:4051: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:4051: result: no" >&5
++  echo "$as_me:4054: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4057,7 +4060,7 @@
+   AR="$ac_cv_prog_AR"
+ fi
+ 
+-echo "$as_me:4060: checking for options to update archives" >&5
++echo "$as_me:4063: checking for options to update archives" >&5
+ echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6
+ if test "${cf_cv_ar_flags+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4094,13 +4097,13 @@
+ 			rm -f conftest.a
+ 
+ 			cat >"conftest.$ac_ext" <&5
++			if { (eval echo "$as_me:4103: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4103: \$? = $ac_status" >&5
++  echo "$as_me:4106: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+ 				echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5
+ 				$AR $ARFLAGS "$cf_ar_flags" conftest.a "conftest.$ac_cv_objext" 2>&5 1>/dev/null
+@@ -4111,7 +4114,7 @@
+ 			else
+ 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
+ 
+-echo "${as_me:-configure}:4114: testing cannot compile test-program ..." 1>&5
++echo "${as_me:-configure}:4117: testing cannot compile test-program ..." 1>&5
+ 
+ 				break
+ 			fi
+@@ -4121,7 +4124,7 @@
+ 	esac
+ 
+ fi
+-echo "$as_me:4124: result: $cf_cv_ar_flags" >&5
++echo "$as_me:4127: result: $cf_cv_ar_flags" >&5
+ echo "${ECHO_T}$cf_cv_ar_flags" >&6
+ 
+ if test -n "$ARFLAGS" ; then
+@@ -4132,17 +4135,17 @@
+ 	ARFLAGS=$cf_cv_ar_flags
+ fi
+ 
+-	echo "$as_me:4135: checking for PATH separator" >&5
++	echo "$as_me:4138: checking for PATH separator" >&5
+ echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6
+ 	case "$cf_cv_system_name" in
+ 	(os2*)	PATH_SEPARATOR=';'  ;;
+ 	(*)	${PATH_SEPARATOR:=':'}  ;;
+ 	esac
+ 
+-	echo "$as_me:4142: result: $PATH_SEPARATOR" >&5
++	echo "$as_me:4145: result: $PATH_SEPARATOR" >&5
+ echo "${ECHO_T}$PATH_SEPARATOR" >&6
+ 
+-echo "$as_me:4145: checking if you have specified an install-prefix" >&5
++echo "$as_me:4148: checking if you have specified an install-prefix" >&5
+ echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6
+ 
+ # Check whether --with-install-prefix or --without-install-prefix was given.
+@@ -4155,7 +4158,7 @@
+ 		;;
+ 	esac
+ fi;
+-echo "$as_me:4158: result: $DESTDIR" >&5
++echo "$as_me:4161: result: $DESTDIR" >&5
+ echo "${ECHO_T}$DESTDIR" >&6
+ 
+ ###############################################################################
+@@ -4183,7 +4186,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:4186: checking for $ac_word" >&5
++echo "$as_me:4189: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_BUILD_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4198,7 +4201,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_BUILD_CC="$ac_prog"
+-echo "$as_me:4201: found $ac_dir/$ac_word" >&5
++echo "$as_me:4204: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4206,10 +4209,10 @@
+ fi
+ BUILD_CC=$ac_cv_prog_BUILD_CC
+ if test -n "$BUILD_CC"; then
+-  echo "$as_me:4209: result: $BUILD_CC" >&5
++  echo "$as_me:4212: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ else
+-  echo "$as_me:4212: result: no" >&5
++  echo "$as_me:4215: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4218,12 +4221,12 @@
+ test -n "$BUILD_CC" || BUILD_CC="none"
+ 
+ fi;
+-	echo "$as_me:4221: checking for native build C compiler" >&5
++	echo "$as_me:4224: checking for native build C compiler" >&5
+ echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
+-	echo "$as_me:4223: result: $BUILD_CC" >&5
++	echo "$as_me:4226: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ 
+-	echo "$as_me:4226: checking for native build C preprocessor" >&5
++	echo "$as_me:4229: checking for native build C preprocessor" >&5
+ echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6
+ 
+ # Check whether --with-build-cpp or --without-build-cpp was given.
+@@ -4233,10 +4236,10 @@
+ else
+   BUILD_CPP='${BUILD_CC} -E'
+ fi;
+-	echo "$as_me:4236: result: $BUILD_CPP" >&5
++	echo "$as_me:4239: result: $BUILD_CPP" >&5
+ echo "${ECHO_T}$BUILD_CPP" >&6
+ 
+-	echo "$as_me:4239: checking for native build C flags" >&5
++	echo "$as_me:4242: checking for native build C flags" >&5
+ echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6
+ 
+ # Check whether --with-build-cflags or --without-build-cflags was given.
+@@ -4244,10 +4247,10 @@
+   withval="$with_build_cflags"
+   BUILD_CFLAGS="$withval"
+ fi;
+-	echo "$as_me:4247: result: $BUILD_CFLAGS" >&5
++	echo "$as_me:4250: result: $BUILD_CFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CFLAGS" >&6
+ 
+-	echo "$as_me:4250: checking for native build C preprocessor-flags" >&5
++	echo "$as_me:4253: checking for native build C preprocessor-flags" >&5
+ echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6
+ 
+ # Check whether --with-build-cppflags or --without-build-cppflags was given.
+@@ -4255,10 +4258,10 @@
+   withval="$with_build_cppflags"
+   BUILD_CPPFLAGS="$withval"
+ fi;
+-	echo "$as_me:4258: result: $BUILD_CPPFLAGS" >&5
++	echo "$as_me:4261: result: $BUILD_CPPFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
+ 
+-	echo "$as_me:4261: checking for native build linker-flags" >&5
++	echo "$as_me:4264: checking for native build linker-flags" >&5
+ echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6
+ 
+ # Check whether --with-build-ldflags or --without-build-ldflags was given.
+@@ -4266,10 +4269,10 @@
+   withval="$with_build_ldflags"
+   BUILD_LDFLAGS="$withval"
+ fi;
+-	echo "$as_me:4269: result: $BUILD_LDFLAGS" >&5
++	echo "$as_me:4272: result: $BUILD_LDFLAGS" >&5
+ echo "${ECHO_T}$BUILD_LDFLAGS" >&6
+ 
+-	echo "$as_me:4272: checking for native build linker-libraries" >&5
++	echo "$as_me:4275: checking for native build linker-libraries" >&5
+ echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6
+ 
+ # Check whether --with-build-libs or --without-build-libs was given.
+@@ -4277,7 +4280,7 @@
+   withval="$with_build_libs"
+   BUILD_LIBS="$withval"
+ fi;
+-	echo "$as_me:4280: result: $BUILD_LIBS" >&5
++	echo "$as_me:4283: result: $BUILD_LIBS" >&5
+ echo "${ECHO_T}$BUILD_LIBS" >&6
+ 
+ 	# this assumes we're on Unix.
+@@ -4287,7 +4290,7 @@
+ 	: ${BUILD_CC:='${CC}'}
+ 
+ 	if { test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}'; } ; then
+-		{ { echo "$as_me:4290: error: Cross-build requires two compilers.
++		{ { echo "$as_me:4293: error: Cross-build requires two compilers.
+ Use --with-build-cc to specify the native compiler." >&5
+ echo "$as_me: error: Cross-build requires two compilers.
+ Use --with-build-cc to specify the native compiler." >&2;}
+@@ -4312,7 +4315,7 @@
+ ### shared, for example.
+ cf_list_models=""
+ 
+-echo "$as_me:4315: checking if you want to build shared C-objects" >&5
++echo "$as_me:4318: checking if you want to build shared C-objects" >&5
+ echo $ECHO_N "checking if you want to build shared C-objects... $ECHO_C" >&6
+ 
+ # Check whether --with-shared or --without-shared was given.
+@@ -4322,27 +4325,27 @@
+ else
+   with_shared=no
+ fi;
+-echo "$as_me:4325: result: $with_shared" >&5
++echo "$as_me:4328: result: $with_shared" >&5
+ echo "${ECHO_T}$with_shared" >&6
+ test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
+ 
+-echo "$as_me:4329: checking for specified models" >&5
++echo "$as_me:4332: checking for specified models" >&5
+ echo $ECHO_N "checking for specified models... $ECHO_C" >&6
+ test -z "$cf_list_models" && cf_list_models=normal
+-echo "$as_me:4332: result: $cf_list_models" >&5
++echo "$as_me:4335: result: $cf_list_models" >&5
+ echo "${ECHO_T}$cf_list_models" >&6
+ 
+ ### Use the first model as the default, and save its suffix for use in building
+ ### up test-applications.
+-echo "$as_me:4337: checking for default model" >&5
++echo "$as_me:4340: checking for default model" >&5
+ echo $ECHO_N "checking for default model... $ECHO_C" >&6
+ DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'`
+-echo "$as_me:4340: result: $DFT_LWR_MODEL" >&5
++echo "$as_me:4343: result: $DFT_LWR_MODEL" >&5
+ echo "${ECHO_T}$DFT_LWR_MODEL" >&6
+ 
+ DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+ 
+-echo "$as_me:4345: checking for specific curses-directory" >&5
++echo "$as_me:4348: checking for specific curses-directory" >&5
+ echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6
+ 
+ # Check whether --with-curses-dir or --without-curses-dir was given.
+@@ -4352,7 +4355,7 @@
+ else
+   cf_cv_curses_dir=no
+ fi;
+-echo "$as_me:4355: result: $cf_cv_curses_dir" >&5
++echo "$as_me:4358: result: $cf_cv_curses_dir" >&5
+ echo "${ECHO_T}$cf_cv_curses_dir" >&6
+ 
+ if test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no"
+@@ -4383,7 +4386,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:4386: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:4389: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -4419,7 +4422,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4422 "configure"
++#line 4425 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -4431,16 +4434,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4434: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4437: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4437: \$? = $ac_status" >&5
++  echo "$as_me:4440: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4440: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4443: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4443: \$? = $ac_status" >&5
++  echo "$as_me:4446: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -4457,7 +4460,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:4460: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:4463: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -4493,7 +4496,7 @@
+ 			if test "$cf_have_libdir" = no ; then
+ 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+ 
+-echo "${as_me:-configure}:4496: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:4499: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -4508,13 +4511,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:4511: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:4514: checking pkg-config for $cf_ncuconfig_root" >&5
+ echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
+-		echo "$as_me:4514: result: yes" >&5
++		echo "$as_me:4517: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:4517: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:4520: checking if the $cf_ncuconfig_root package files work" >&5
+ echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
+ 		cf_have_ncuconfig=unknown
+ 
+@@ -4647,7 +4650,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4650 "configure"
++#line 4653 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -4659,37 +4662,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:4662: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4665: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4665: \$? = $ac_status" >&5
++  echo "$as_me:4668: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:4668: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4671: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4671: \$? = $ac_status" >&5
++  echo "$as_me:4674: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4677 "configure"
++#line 4680 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ 					int main(void)
+ 					{ const char *xx = curses_version(); return (xx == 0); }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:4684: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4687: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4687: \$? = $ac_status" >&5
++  echo "$as_me:4690: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:4689: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4692: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4692: \$? = $ac_status" >&5
++  echo "$as_me:4695: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -4863,7 +4866,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4866 "configure"
++#line 4869 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -4875,37 +4878,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:4878: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4881: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4881: \$? = $ac_status" >&5
++  echo "$as_me:4884: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:4884: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4887: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4887: \$? = $ac_status" >&5
++  echo "$as_me:4890: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4893 "configure"
++#line 4896 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ 				int main(void)
+ 				{ const char *xx = curses_version(); return (xx == 0); }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:4900: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4903: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4903: \$? = $ac_status" >&5
++  echo "$as_me:4906: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:4905: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4908: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4908: \$? = $ac_status" >&5
++  echo "$as_me:4911: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -4922,7 +4925,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:4925: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:4928: result: $cf_have_ncuconfig" >&5
+ echo "${ECHO_T}$cf_have_ncuconfig" >&6
+ 		test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
+ 		if test "$cf_have_ncuconfig" != "yes"
+@@ -4938,7 +4941,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:4941: checking for terminfo header" >&5
++echo "$as_me:4944: checking for terminfo header" >&5
+ echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4956,7 +4959,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 4959 "configure"
++#line 4962 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -4971,16 +4974,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:4974: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4977: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4977: \$? = $ac_status" >&5
++  echo "$as_me:4980: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:4980: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4983: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4983: \$? = $ac_status" >&5
++  echo "$as_me:4986: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -4996,7 +4999,7 @@
+ done
+ 
+ fi
+-echo "$as_me:4999: result: $cf_cv_term_header" >&5
++echo "$as_me:5002: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -5031,7 +5034,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:5034: result: no" >&5
++		echo "$as_me:5037: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -5047,7 +5050,7 @@
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:5050: checking for $ac_word" >&5
++echo "$as_me:5053: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5062,7 +5065,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
+-echo "$as_me:5065: found $ac_dir/$ac_word" >&5
++echo "$as_me:5068: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5070,10 +5073,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:5073: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:5076: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:5076: result: no" >&5
++  echo "$as_me:5079: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5086,7 +5089,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:5089: checking for $ac_word" >&5
++echo "$as_me:5092: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5101,7 +5104,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
+-echo "$as_me:5104: found $ac_dir/$ac_word" >&5
++echo "$as_me:5107: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5109,10 +5112,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:5112: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:5115: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:5115: result: no" >&5
++  echo "$as_me:5118: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5269,7 +5272,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:5272: checking if we have identified curses headers" >&5
++echo "$as_me:5275: checking if we have identified curses headers" >&5
+ echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5281,7 +5284,7 @@
+ 	curses.h ncurses/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5284 "configure"
++#line 5287 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -5293,16 +5296,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5296: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5299: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5299: \$? = $ac_status" >&5
++  echo "$as_me:5302: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5302: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5305: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5305: \$? = $ac_status" >&5
++  echo "$as_me:5308: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -5313,11 +5316,11 @@
+ done
+ 
+ fi
+-echo "$as_me:5316: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:5319: result: $cf_cv_ncurses_header" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_header" >&6
+ 
+ if test "$cf_cv_ncurses_header" = none ; then
+-	{ { echo "$as_me:5320: error: No curses header-files found" >&5
++	{ { echo "$as_me:5323: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -5327,23 +5330,23 @@
+ for ac_header in $cf_cv_ncurses_header
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:5330: checking for $ac_header" >&5
++echo "$as_me:5333: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5336 "configure"
++#line 5339 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:5340: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:5343: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:5346: \$? = $ac_status" >&5
++  echo "$as_me:5349: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -5362,7 +5365,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:5365: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:5368: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF
+-#line 5421 "configure"
++#line 5424 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5430,16 +5433,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5433: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5436: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5436: \$? = $ac_status" >&5
++  echo "$as_me:5439: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5439: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5442: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5442: \$? = $ac_status" >&5
++  echo "$as_me:5445: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -5456,7 +5459,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:5459: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:5462: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -5475,7 +5478,7 @@
+ 
+ }
+ 
+-echo "$as_me:5478: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:5481: checking for $cf_ncuhdr_root header in include-path" >&5
+ echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5487,7 +5490,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5490 "configure"
++#line 5493 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -5511,16 +5514,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5514: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5517: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5517: \$? = $ac_status" >&5
++  echo "$as_me:5520: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5520: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5523: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5523: \$? = $ac_status" >&5
++  echo "$as_me:5526: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -5535,14 +5538,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:5538: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:5541: result: $cf_cv_ncurses_h" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_h" >&6
+ 
+ if test "$cf_cv_ncurses_h" != no ; then
+ 	cf_cv_ncurses_header=$cf_cv_ncurses_h
+ else
+ 
+-echo "$as_me:5545: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:5548: checking for $cf_ncuhdr_root include-path" >&5
+ echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_h2+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5663,7 +5666,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5666 "configure"
++#line 5669 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5675,16 +5678,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5678: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5681: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5681: \$? = $ac_status" >&5
++  echo "$as_me:5684: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5684: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5687: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5687: \$? = $ac_status" >&5
++  echo "$as_me:5690: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -5701,7 +5704,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:5704: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:5707: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -5724,7 +5727,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5727 "configure"
++#line 5730 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -5748,16 +5751,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5751: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5754: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5754: \$? = $ac_status" >&5
++  echo "$as_me:5757: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5757: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5760: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5760: \$? = $ac_status" >&5
++  echo "$as_me:5763: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -5778,12 +5781,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5781: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5784: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:5786: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:5789: result: $cf_cv_ncurses_h2" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
+ 
+ 	cf_1st_incdir=`echo "$cf_cv_ncurses_h2" | sed -e 's%/[^/]*$%%'`
+@@ -5819,7 +5822,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5822 "configure"
++#line 5825 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -5831,16 +5834,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5834: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5837: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5837: \$? = $ac_status" >&5
++  echo "$as_me:5840: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5840: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5843: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5843: \$? = $ac_status" >&5
++  echo "$as_me:5846: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -5857,7 +5860,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:5860: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:5863: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -5905,7 +5908,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:5908: checking for terminfo header" >&5
++echo "$as_me:5911: checking for terminfo header" >&5
+ echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5923,7 +5926,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 5926 "configure"
++#line 5929 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -5938,16 +5941,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:5941: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5944: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5944: \$? = $ac_status" >&5
++  echo "$as_me:5947: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:5947: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5950: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5950: \$? = $ac_status" >&5
++  echo "$as_me:5953: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -5963,7 +5966,7 @@
+ done
+ 
+ fi
+-echo "$as_me:5966: result: $cf_cv_term_header" >&5
++echo "$as_me:5969: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -6001,7 +6004,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:6004: checking for ncurses version" >&5
++echo "$as_me:6007: checking for ncurses version" >&5
+ echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6027,10 +6030,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:6030: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:6033: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6033: \$? = $ac_status" >&5
++  echo "$as_me:6036: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -6040,7 +6043,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6043 "configure"
++#line 6046 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -6065,15 +6068,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:6068: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6071: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6071: \$? = $ac_status" >&5
++  echo "$as_me:6074: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:6073: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6076: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6076: \$? = $ac_status" >&5
++  echo "$as_me:6079: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -6087,7 +6090,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:6090: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:6093: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -6100,7 +6103,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:6103: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:6106: checking for Gpm_Open in -lgpm" >&5
+ echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
+ if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6108,7 +6111,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6111 "configure"
++#line 6114 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6127,16 +6130,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6130: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6133: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6133: \$? = $ac_status" >&5
++  echo "$as_me:6136: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6136: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6139: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6139: \$? = $ac_status" >&5
++  echo "$as_me:6142: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -6147,10 +6150,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6150: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:6153: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
+ if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then
+-  echo "$as_me:6153: checking for initscr in -lgpm" >&5
++  echo "$as_me:6156: checking for initscr in -lgpm" >&5
+ echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
+ if test "${ac_cv_lib_gpm_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6158,7 +6161,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6161 "configure"
++#line 6164 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6177,16 +6180,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6180: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6183: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6183: \$? = $ac_status" >&5
++  echo "$as_me:6186: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6186: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6189: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6189: \$? = $ac_status" >&5
++  echo "$as_me:6192: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -6197,7 +6200,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6200: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:6203: result: $ac_cv_lib_gpm_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
+ if test "$ac_cv_lib_gpm_initscr" = yes; then
+   LIBS="$cf_ncurses_SAVE"
+@@ -6212,7 +6215,7 @@
+ 	# This is only necessary if you are linking against an obsolete
+ 	# version of ncurses (but it should do no harm, since it is static).
+ 	if test "$cf_nculib_root" = ncurses ; then
+-		echo "$as_me:6215: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:6218: checking for tgoto in -lmytinfo" >&5
+ echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
+ if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6220,7 +6223,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6223 "configure"
++#line 6226 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6239,16 +6242,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6242: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6245: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6245: \$? = $ac_status" >&5
++  echo "$as_me:6248: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6248: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6251: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6251: \$? = $ac_status" >&5
++  echo "$as_me:6254: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -6259,7 +6262,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6262: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:6265: result: $ac_cv_lib_mytinfo_tgoto" >&5
+ echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
+ if test "$ac_cv_lib_mytinfo_tgoto" = yes; then
+   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
+@@ -6308,13 +6311,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:6311: checking for initscr" >&5
++	echo "$as_me:6314: checking for initscr" >&5
+ echo $ECHO_N "checking for initscr... $ECHO_C" >&6
+ if test "${ac_cv_func_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6317 "configure"
++#line 6320 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -6345,16 +6348,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6348: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6351: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6351: \$? = $ac_status" >&5
++  echo "$as_me:6354: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6354: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6357: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6357: \$? = $ac_status" >&5
++  echo "$as_me:6360: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -6364,18 +6367,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:6367: result: $ac_cv_func_initscr" >&5
++echo "$as_me:6370: result: $ac_cv_func_initscr" >&5
+ echo "${ECHO_T}$ac_cv_func_initscr" >&6
+ if test "$ac_cv_func_initscr" = yes; then
+   eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'
+ else
+ 
+ 		cf_save_LIBS="$LIBS"
+-		echo "$as_me:6374: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:6377: checking for initscr in -l$cf_nculib_root" >&5
+ echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
+ 		LIBS="-l$cf_nculib_root $LIBS"
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6378 "configure"
++#line 6381 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6387,25 +6390,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6390: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6393: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6393: \$? = $ac_status" >&5
++  echo "$as_me:6396: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6396: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6399: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6399: \$? = $ac_status" >&5
++  echo "$as_me:6402: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:6401: result: yes" >&5
++  echo "$as_me:6404: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 			 eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:6408: result: no" >&5
++echo "$as_me:6411: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -6473,11 +6476,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:6476: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:6479: checking for -l$cf_nculib_root in $cf_libdir" >&5
+ echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
+ 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6480 "configure"
++#line 6483 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6489,25 +6492,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6492: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6495: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6495: \$? = $ac_status" >&5
++  echo "$as_me:6498: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6498: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6501: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6501: \$? = $ac_status" >&5
++  echo "$as_me:6504: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:6503: result: yes" >&5
++  echo "$as_me:6506: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 			 		 eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'
+ 					 break
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:6510: result: no" >&5
++echo "$as_me:6513: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -6522,7 +6525,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:6525: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:6528: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -6530,7 +6533,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:6533: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:6536: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
+ 	cf_ncurses_SAVE="$LIBS"
+ 	for p in $cf_ncurses_LIBS ; do
+@@ -6540,7 +6543,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6543 "configure"
++#line 6546 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -6552,23 +6555,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6555: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6558: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6558: \$? = $ac_status" >&5
++  echo "$as_me:6561: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6561: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6564: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6564: \$? = $ac_status" >&5
++  echo "$as_me:6567: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:6566: result: yes" >&5
++  echo "$as_me:6569: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:6571: result: no" >&5
++echo "$as_me:6574: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -6586,7 +6589,7 @@
+ 	NCURSES_CONFIG=none
+ fi
+ 
+-echo "$as_me:6589: checking if you want wide-character code" >&5
++echo "$as_me:6592: checking if you want wide-character code" >&5
+ echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6
+ 
+ # Check whether --enable-widec or --disable-widec was given.
+@@ -6596,30 +6599,30 @@
+ else
+   with_widec=no
+ fi;
+-echo "$as_me:6599: result: $with_widec" >&5
++echo "$as_me:6602: result: $with_widec" >&5
+ echo "${ECHO_T}$with_widec" >&6
+ if test "$with_widec" = yes ; then
+ 
+ for ac_header in wchar.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:6606: checking for $ac_header" >&5
++echo "$as_me:6609: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6612 "configure"
++#line 6615 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:6616: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:6619: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:6622: \$? = $ac_status" >&5
++  echo "$as_me:6625: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -6638,7 +6641,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:6641: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:6644: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:6654: checking for multibyte character support" >&5
+ echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6
+ if test "${cf_cv_utf8_lib+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6656,7 +6659,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6659 "configure"
++#line 6662 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -6674,16 +6677,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6677: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6680: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6680: \$? = $ac_status" >&5
++  echo "$as_me:6683: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6683: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6686: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6686: \$? = $ac_status" >&5
++  echo "$as_me:6689: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -6695,12 +6698,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:6698: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:6701: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6703 "configure"
++#line 6706 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -6713,16 +6716,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6716: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6719: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6719: \$? = $ac_status" >&5
++  echo "$as_me:6722: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6722: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6725: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6725: \$? = $ac_status" >&5
++  echo "$as_me:6728: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -6736,7 +6739,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6739 "configure"
++#line 6742 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -6749,16 +6752,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6752: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6755: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6755: \$? = $ac_status" >&5
++  echo "$as_me:6758: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6758: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6761: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6761: \$? = $ac_status" >&5
++  echo "$as_me:6764: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -6775,9 +6778,9 @@
+ 
+ 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:6778: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:6781: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:6780: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:6783: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -6868,7 +6871,7 @@
+ 		if test -d "$cf_cv_header_path_utf8" ; then
+ 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
+ 
+-echo "${as_me:-configure}:6871: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:6874: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+@@ -6876,7 +6879,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6879 "configure"
++#line 6882 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -6889,21 +6892,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6892: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6895: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6895: \$? = $ac_status" >&5
++  echo "$as_me:6898: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6898: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6901: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6901: \$? = $ac_status" >&5
++  echo "$as_me:6904: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 				test -n "$verbose" && echo "	... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
+ 
+-echo "${as_me:-configure}:6906: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:6909: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 				cf_cv_find_linkage_utf8=maybe
+ 				cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -6921,7 +6924,7 @@
+ 
+ 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:6924: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:6927: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 		cf_save_LIBS="$LIBS"
+ 		cf_save_LDFLAGS="$LDFLAGS"
+@@ -6996,13 +6999,13 @@
+ 				if test -d "$cf_cv_library_path_utf8" ; then
+ 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
+ 
+-echo "${as_me:-configure}:6999: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7002: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					CPPFLAGS="$cf_test_CPPFLAGS"
+ 					LIBS="-lutf8  $cf_save_LIBS"
+ 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8"
+ 					cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7005 "configure"
++#line 7008 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -7015,21 +7018,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7018: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7021: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7021: \$? = $ac_status" >&5
++  echo "$as_me:7024: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7024: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7027: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7027: \$? = $ac_status" >&5
++  echo "$as_me:7030: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 					test -n "$verbose" && echo "	... found utf8 library in $cf_cv_library_path_utf8" 1>&6
+ 
+-echo "${as_me:-configure}:7032: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7035: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					cf_cv_find_linkage_utf8=yes
+ 					cf_cv_library_file_utf8="-lutf8"
+@@ -7071,7 +7074,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:7074: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:7077: result: $cf_cv_utf8_lib" >&5
+ echo "${ECHO_T}$cf_cv_utf8_lib" >&6
+ 
+ # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
+@@ -7109,7 +7112,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7112 "configure"
++#line 7115 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -7121,16 +7124,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7124: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7127: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7127: \$? = $ac_status" >&5
++  echo "$as_me:7130: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:7130: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7133: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7133: \$? = $ac_status" >&5
++  echo "$as_me:7136: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -7147,7 +7150,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:7150: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:7153: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -7183,7 +7186,7 @@
+ 			if test "$cf_have_libdir" = no ; then
+ 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+ 
+-echo "${as_me:-configure}:7186: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7189: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -7213,13 +7216,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:7216: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:7219: checking pkg-config for $cf_ncuconfig_root" >&5
+ echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
+-		echo "$as_me:7219: result: yes" >&5
++		echo "$as_me:7222: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:7222: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:7225: checking if the $cf_ncuconfig_root package files work" >&5
+ echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
+ 		cf_have_ncuconfig=unknown
+ 
+@@ -7352,7 +7355,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7355 "configure"
++#line 7358 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7364,37 +7367,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7367: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7370: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7370: \$? = $ac_status" >&5
++  echo "$as_me:7373: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7373: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7376: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7376: \$? = $ac_status" >&5
++  echo "$as_me:7379: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7382 "configure"
++#line 7385 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ 					int main(void)
+ 					{ const char *xx = curses_version(); return (xx == 0); }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:7389: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7392: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7392: \$? = $ac_status" >&5
++  echo "$as_me:7395: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:7394: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7397: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7397: \$? = $ac_status" >&5
++  echo "$as_me:7400: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -7568,7 +7571,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7571 "configure"
++#line 7574 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7580,37 +7583,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7583: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7586: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7586: \$? = $ac_status" >&5
++  echo "$as_me:7589: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7589: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7592: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7592: \$? = $ac_status" >&5
++  echo "$as_me:7595: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7598 "configure"
++#line 7601 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ 				int main(void)
+ 				{ const char *xx = curses_version(); return (xx == 0); }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:7605: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7608: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7608: \$? = $ac_status" >&5
++  echo "$as_me:7611: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:7610: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7613: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7613: \$? = $ac_status" >&5
++  echo "$as_me:7616: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -7627,7 +7630,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:7630: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:7633: result: $cf_have_ncuconfig" >&5
+ echo "${ECHO_T}$cf_have_ncuconfig" >&6
+ 		test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
+ 		if test "$cf_have_ncuconfig" != "yes"
+@@ -7643,7 +7646,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:7646: checking for terminfo header" >&5
++echo "$as_me:7649: checking for terminfo header" >&5
+ echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7661,7 +7664,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7664 "configure"
++#line 7667 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -7676,16 +7679,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:7679: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7682: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7682: \$? = $ac_status" >&5
++  echo "$as_me:7685: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:7685: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7688: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7688: \$? = $ac_status" >&5
++  echo "$as_me:7691: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -7701,7 +7704,7 @@
+ done
+ 
+ fi
+-echo "$as_me:7704: result: $cf_cv_term_header" >&5
++echo "$as_me:7707: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -7736,7 +7739,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:7739: result: no" >&5
++		echo "$as_me:7742: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -7752,7 +7755,7 @@
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:7755: checking for $ac_word" >&5
++echo "$as_me:7758: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7767,7 +7770,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
+-echo "$as_me:7770: found $ac_dir/$ac_word" >&5
++echo "$as_me:7773: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -7775,10 +7778,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:7778: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:7781: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:7781: result: no" >&5
++  echo "$as_me:7784: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -7791,7 +7794,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:7794: checking for $ac_word" >&5
++echo "$as_me:7797: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7806,7 +7809,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
+-echo "$as_me:7809: found $ac_dir/$ac_word" >&5
++echo "$as_me:7812: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -7814,10 +7817,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:7817: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:7820: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:7820: result: no" >&5
++  echo "$as_me:7823: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -7974,7 +7977,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:7977: checking if we have identified curses headers" >&5
++echo "$as_me:7980: checking if we have identified curses headers" >&5
+ echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7986,7 +7989,7 @@
+ 	curses.h ncursesw/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7989 "configure"
++#line 7992 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -7998,16 +8001,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8001: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8004: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8004: \$? = $ac_status" >&5
++  echo "$as_me:8007: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8007: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8010: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8010: \$? = $ac_status" >&5
++  echo "$as_me:8013: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -8018,11 +8021,11 @@
+ done
+ 
+ fi
+-echo "$as_me:8021: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:8024: result: $cf_cv_ncurses_header" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_header" >&6
+ 
+ if test "$cf_cv_ncurses_header" = none ; then
+-	{ { echo "$as_me:8025: error: No curses header-files found" >&5
++	{ { echo "$as_me:8028: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -8032,23 +8035,23 @@
+ for ac_header in $cf_cv_ncurses_header
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:8035: checking for $ac_header" >&5
++echo "$as_me:8038: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8041 "configure"
++#line 8044 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:8045: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:8048: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:8051: \$? = $ac_status" >&5
++  echo "$as_me:8054: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -8067,7 +8070,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:8070: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:8073: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF
+-#line 8126 "configure"
++#line 8129 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8135,16 +8138,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8138: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8141: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8141: \$? = $ac_status" >&5
++  echo "$as_me:8144: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8144: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8147: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8147: \$? = $ac_status" >&5
++  echo "$as_me:8150: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -8161,7 +8164,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:8164: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8167: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8180,7 +8183,7 @@
+ 
+ }
+ 
+-echo "$as_me:8183: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:8186: checking for $cf_ncuhdr_root header in include-path" >&5
+ echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8192,7 +8195,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8195 "configure"
++#line 8198 "configure"
+ #include "confdefs.h"
+ 
+ #define _XOPEN_SOURCE_EXTENDED
+@@ -8224,16 +8227,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8227: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8230: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8230: \$? = $ac_status" >&5
++  echo "$as_me:8233: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8233: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8236: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8236: \$? = $ac_status" >&5
++  echo "$as_me:8239: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -8248,14 +8251,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:8251: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:8254: result: $cf_cv_ncurses_h" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_h" >&6
+ 
+ if test "$cf_cv_ncurses_h" != no ; then
+ 	cf_cv_ncurses_header=$cf_cv_ncurses_h
+ else
+ 
+-echo "$as_me:8258: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:8261: checking for $cf_ncuhdr_root include-path" >&5
+ echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_h2+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8376,7 +8379,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8379 "configure"
++#line 8382 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8388,16 +8391,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8391: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8394: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8394: \$? = $ac_status" >&5
++  echo "$as_me:8397: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8397: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8400: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8400: \$? = $ac_status" >&5
++  echo "$as_me:8403: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -8414,7 +8417,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:8417: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8420: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8437,7 +8440,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8440 "configure"
++#line 8443 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -8461,16 +8464,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8464: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8467: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8467: \$? = $ac_status" >&5
++  echo "$as_me:8470: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8470: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8473: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8473: \$? = $ac_status" >&5
++  echo "$as_me:8476: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -8491,12 +8494,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8494: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8497: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:8499: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:8502: result: $cf_cv_ncurses_h2" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
+ 
+ 	cf_1st_incdir=`echo "$cf_cv_ncurses_h2" | sed -e 's%/[^/]*$%%'`
+@@ -8532,7 +8535,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8535 "configure"
++#line 8538 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8544,16 +8547,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8547: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8550: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8550: \$? = $ac_status" >&5
++  echo "$as_me:8553: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8553: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8556: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8556: \$? = $ac_status" >&5
++  echo "$as_me:8559: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -8570,7 +8573,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:8573: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8576: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8618,7 +8621,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:8621: checking for terminfo header" >&5
++echo "$as_me:8624: checking for terminfo header" >&5
+ echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8636,7 +8639,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8639 "configure"
++#line 8642 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -8651,16 +8654,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8654: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8657: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8657: \$? = $ac_status" >&5
++  echo "$as_me:8660: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8660: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8663: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8663: \$? = $ac_status" >&5
++  echo "$as_me:8666: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -8676,7 +8679,7 @@
+ done
+ 
+ fi
+-echo "$as_me:8679: result: $cf_cv_term_header" >&5
++echo "$as_me:8682: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -8714,7 +8717,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:8717: checking for ncurses version" >&5
++echo "$as_me:8720: checking for ncurses version" >&5
+ echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8740,10 +8743,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:8743: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:8746: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8746: \$? = $ac_status" >&5
++  echo "$as_me:8749: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -8753,7 +8756,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8756 "configure"
++#line 8759 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -8778,15 +8781,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:8781: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8784: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8784: \$? = $ac_status" >&5
++  echo "$as_me:8787: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:8786: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8789: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8789: \$? = $ac_status" >&5
++  echo "$as_me:8792: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -8800,7 +8803,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:8803: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:8806: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -8813,7 +8816,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:8816: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:8819: checking for Gpm_Open in -lgpm" >&5
+ echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
+ if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8821,7 +8824,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8824 "configure"
++#line 8827 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8840,16 +8843,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8843: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8846: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8846: \$? = $ac_status" >&5
++  echo "$as_me:8849: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8849: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8852: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8852: \$? = $ac_status" >&5
++  echo "$as_me:8855: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -8860,10 +8863,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8863: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:8866: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
+ if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then
+-  echo "$as_me:8866: checking for initscr in -lgpm" >&5
++  echo "$as_me:8869: checking for initscr in -lgpm" >&5
+ echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
+ if test "${ac_cv_lib_gpm_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8871,7 +8874,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8874 "configure"
++#line 8877 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8890,16 +8893,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8893: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8896: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8896: \$? = $ac_status" >&5
++  echo "$as_me:8899: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8899: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8902: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8902: \$? = $ac_status" >&5
++  echo "$as_me:8905: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -8910,7 +8913,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8913: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:8916: result: $ac_cv_lib_gpm_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
+ if test "$ac_cv_lib_gpm_initscr" = yes; then
+   LIBS="$cf_ncurses_SAVE"
+@@ -8925,7 +8928,7 @@
+ 	# This is only necessary if you are linking against an obsolete
+ 	# version of ncurses (but it should do no harm, since it is static).
+ 	if test "$cf_nculib_root" = ncurses ; then
+-		echo "$as_me:8928: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:8931: checking for tgoto in -lmytinfo" >&5
+ echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
+ if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8933,7 +8936,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8936 "configure"
++#line 8939 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8952,16 +8955,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8955: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8958: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8958: \$? = $ac_status" >&5
++  echo "$as_me:8961: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8961: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8964: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8964: \$? = $ac_status" >&5
++  echo "$as_me:8967: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -8972,7 +8975,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8975: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:8978: result: $ac_cv_lib_mytinfo_tgoto" >&5
+ echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
+ if test "$ac_cv_lib_mytinfo_tgoto" = yes; then
+   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
+@@ -9021,13 +9024,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:9024: checking for initscr" >&5
++	echo "$as_me:9027: checking for initscr" >&5
+ echo $ECHO_N "checking for initscr... $ECHO_C" >&6
+ if test "${ac_cv_func_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9030 "configure"
++#line 9033 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -9058,16 +9061,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9061: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9064: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9064: \$? = $ac_status" >&5
++  echo "$as_me:9067: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9067: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9070: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9070: \$? = $ac_status" >&5
++  echo "$as_me:9073: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -9077,18 +9080,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:9080: result: $ac_cv_func_initscr" >&5
++echo "$as_me:9083: result: $ac_cv_func_initscr" >&5
+ echo "${ECHO_T}$ac_cv_func_initscr" >&6
+ if test "$ac_cv_func_initscr" = yes; then
+   eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'
+ else
+ 
+ 		cf_save_LIBS="$LIBS"
+-		echo "$as_me:9087: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:9090: checking for initscr in -l$cf_nculib_root" >&5
+ echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
+ 		LIBS="-l$cf_nculib_root $LIBS"
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9091 "configure"
++#line 9094 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9100,25 +9103,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9103: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9106: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9106: \$? = $ac_status" >&5
++  echo "$as_me:9109: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9109: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9112: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9112: \$? = $ac_status" >&5
++  echo "$as_me:9115: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:9114: result: yes" >&5
++  echo "$as_me:9117: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 			 eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:9121: result: no" >&5
++echo "$as_me:9124: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -9186,11 +9189,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:9189: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:9192: checking for -l$cf_nculib_root in $cf_libdir" >&5
+ echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
+ 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9193 "configure"
++#line 9196 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9202,25 +9205,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9205: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9208: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9208: \$? = $ac_status" >&5
++  echo "$as_me:9211: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9211: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9214: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9214: \$? = $ac_status" >&5
++  echo "$as_me:9217: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:9216: result: yes" >&5
++  echo "$as_me:9219: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 			 		 eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'
+ 					 break
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:9223: result: no" >&5
++echo "$as_me:9226: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -9235,7 +9238,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:9238: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:9241: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -9243,7 +9246,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:9246: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:9249: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
+ 	cf_ncurses_SAVE="$LIBS"
+ 	for p in $cf_ncurses_LIBS ; do
+@@ -9253,7 +9256,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9256 "configure"
++#line 9259 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9265,23 +9268,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9268: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9271: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9271: \$? = $ac_status" >&5
++  echo "$as_me:9274: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9274: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9277: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9277: \$? = $ac_status" >&5
++  echo "$as_me:9280: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:9279: result: yes" >&5
++  echo "$as_me:9282: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:9284: result: no" >&5
++echo "$as_me:9287: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -9305,13 +9308,13 @@
+ cf_have_ncuconfig=no
+ 
+ if test "x${PKG_CONFIG:=none}" != xnone; then
+-	echo "$as_me:9308: checking pkg-config for $cf_ncuconfig_root" >&5
++	echo "$as_me:9311: checking pkg-config for $cf_ncuconfig_root" >&5
+ echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
+ 	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
+-		echo "$as_me:9311: result: yes" >&5
++		echo "$as_me:9314: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-		echo "$as_me:9314: checking if the $cf_ncuconfig_root package files work" >&5
++		echo "$as_me:9317: checking if the $cf_ncuconfig_root package files work" >&5
+ echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
+ 		cf_have_ncuconfig=unknown
+ 
+@@ -9444,7 +9447,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9447 "configure"
++#line 9450 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9456,37 +9459,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9459: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9462: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9462: \$? = $ac_status" >&5
++  echo "$as_me:9465: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9465: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9468: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9468: \$? = $ac_status" >&5
++  echo "$as_me:9471: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_test_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9474 "configure"
++#line 9477 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ 					int main(void)
+ 					{ const char *xx = curses_version(); return (xx == 0); }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:9481: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9484: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9484: \$? = $ac_status" >&5
++  echo "$as_me:9487: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:9486: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9489: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9489: \$? = $ac_status" >&5
++  echo "$as_me:9492: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_test_ncuconfig=yes
+ else
+@@ -9660,7 +9663,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9663 "configure"
++#line 9666 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9672,37 +9675,37 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9675: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9678: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9678: \$? = $ac_status" >&5
++  echo "$as_me:9681: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9681: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9684: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9684: \$? = $ac_status" >&5
++  echo "$as_me:9687: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   if test "$cross_compiling" = yes; then
+   cf_have_ncuconfig=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9690 "configure"
++#line 9693 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ 				int main(void)
+ 				{ const char *xx = curses_version(); return (xx == 0); }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:9697: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9700: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9700: \$? = $ac_status" >&5
++  echo "$as_me:9703: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:9702: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9705: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9705: \$? = $ac_status" >&5
++  echo "$as_me:9708: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_ncuconfig=yes
+ else
+@@ -9719,7 +9722,7 @@
+ cf_have_ncuconfig=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:9722: result: $cf_have_ncuconfig" >&5
++		echo "$as_me:9725: result: $cf_have_ncuconfig" >&5
+ echo "${ECHO_T}$cf_have_ncuconfig" >&6
+ 		test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
+ 		if test "$cf_have_ncuconfig" != "yes"
+@@ -9735,7 +9738,7 @@
+ 
+ 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
+ 
+-echo "$as_me:9738: checking for terminfo header" >&5
++echo "$as_me:9741: checking for terminfo header" >&5
+ echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9753,7 +9756,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9756 "configure"
++#line 9759 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -9768,16 +9771,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9771: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9774: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9774: \$? = $ac_status" >&5
++  echo "$as_me:9777: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9777: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9780: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9780: \$? = $ac_status" >&5
++  echo "$as_me:9783: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -9793,7 +9796,7 @@
+ done
+ 
+ fi
+-echo "$as_me:9796: result: $cf_cv_term_header" >&5
++echo "$as_me:9799: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -9828,7 +9831,7 @@
+ 		fi
+ 
+ 	else
+-		echo "$as_me:9831: result: no" >&5
++		echo "$as_me:9834: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		NCURSES_CONFIG_PKG=none
+ 	fi
+@@ -9844,7 +9847,7 @@
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:9847: checking for $ac_word" >&5
++echo "$as_me:9850: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9859,7 +9862,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
+-echo "$as_me:9862: found $ac_dir/$ac_word" >&5
++echo "$as_me:9865: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9867,10 +9870,10 @@
+ fi
+ NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:9870: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:9873: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:9873: result: no" >&5
++  echo "$as_me:9876: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9883,7 +9886,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:9886: checking for $ac_word" >&5
++echo "$as_me:9889: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9898,7 +9901,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
+-echo "$as_me:9901: found $ac_dir/$ac_word" >&5
++echo "$as_me:9904: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -9906,10 +9909,10 @@
+ fi
+ ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
+ if test -n "$ac_ct_NCURSES_CONFIG"; then
+-  echo "$as_me:9909: result: $ac_ct_NCURSES_CONFIG" >&5
++  echo "$as_me:9912: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:9912: result: no" >&5
++  echo "$as_me:9915: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -10066,7 +10069,7 @@
+ 
+ 		# even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:10069: checking if we have identified curses headers" >&5
++echo "$as_me:10072: checking if we have identified curses headers" >&5
+ echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10078,7 +10081,7 @@
+ 	curses.h ncurses/curses.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10081 "configure"
++#line 10084 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -10090,16 +10093,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10093: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10096: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10096: \$? = $ac_status" >&5
++  echo "$as_me:10099: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10099: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10102: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10102: \$? = $ac_status" >&5
++  echo "$as_me:10105: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -10110,11 +10113,11 @@
+ done
+ 
+ fi
+-echo "$as_me:10113: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:10116: result: $cf_cv_ncurses_header" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_header" >&6
+ 
+ if test "$cf_cv_ncurses_header" = none ; then
+-	{ { echo "$as_me:10117: error: No curses header-files found" >&5
++	{ { echo "$as_me:10120: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -10124,23 +10127,23 @@
+ for ac_header in $cf_cv_ncurses_header
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:10127: checking for $ac_header" >&5
++echo "$as_me:10130: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10133 "configure"
++#line 10136 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:10137: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:10140: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:10143: \$? = $ac_status" >&5
++  echo "$as_me:10146: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -10159,7 +10162,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:10162: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:10165: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF
+-#line 10218 "configure"
++#line 10221 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10227,16 +10230,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10230: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10233: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10233: \$? = $ac_status" >&5
++  echo "$as_me:10236: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10236: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10239: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10239: \$? = $ac_status" >&5
++  echo "$as_me:10242: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -10253,7 +10256,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:10256: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:10259: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -10272,7 +10275,7 @@
+ 
+ }
+ 
+-echo "$as_me:10275: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:10278: checking for $cf_ncuhdr_root header in include-path" >&5
+ echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10284,7 +10287,7 @@
+ 	do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10287 "configure"
++#line 10290 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -10308,16 +10311,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10311: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10314: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10314: \$? = $ac_status" >&5
++  echo "$as_me:10317: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10317: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10320: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10320: \$? = $ac_status" >&5
++  echo "$as_me:10323: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -10332,14 +10335,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:10335: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:10338: result: $cf_cv_ncurses_h" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_h" >&6
+ 
+ if test "$cf_cv_ncurses_h" != no ; then
+ 	cf_cv_ncurses_header=$cf_cv_ncurses_h
+ else
+ 
+-echo "$as_me:10342: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:10345: checking for $cf_ncuhdr_root include-path" >&5
+ echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_h2+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10460,7 +10463,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10463 "configure"
++#line 10466 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10472,16 +10475,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10475: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10478: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10478: \$? = $ac_status" >&5
++  echo "$as_me:10481: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10481: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10484: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10484: \$? = $ac_status" >&5
++  echo "$as_me:10487: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -10498,7 +10501,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:10501: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:10504: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -10521,7 +10524,7 @@
+ 		do
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10524 "configure"
++#line 10527 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -10545,16 +10548,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10548: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10551: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10551: \$? = $ac_status" >&5
++  echo "$as_me:10554: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10554: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10557: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10557: \$? = $ac_status" >&5
++  echo "$as_me:10560: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -10575,12 +10578,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10578: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10581: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:10583: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:10586: result: $cf_cv_ncurses_h2" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
+ 
+ 	cf_1st_incdir=`echo "$cf_cv_ncurses_h2" | sed -e 's%/[^/]*$%%'`
+@@ -10616,7 +10619,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10619 "configure"
++#line 10622 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10628,16 +10631,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10631: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10634: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10634: \$? = $ac_status" >&5
++  echo "$as_me:10637: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10637: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10640: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10640: \$? = $ac_status" >&5
++  echo "$as_me:10643: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -10654,7 +10657,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:10657: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:10660: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -10702,7 +10705,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:10705: checking for terminfo header" >&5
++echo "$as_me:10708: checking for terminfo header" >&5
+ echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+ if test "${cf_cv_term_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10720,7 +10723,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10723 "configure"
++#line 10726 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -10735,16 +10738,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10738: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10741: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10741: \$? = $ac_status" >&5
++  echo "$as_me:10744: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10744: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10747: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10747: \$? = $ac_status" >&5
++  echo "$as_me:10750: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -10760,7 +10763,7 @@
+ done
+ 
+ fi
+-echo "$as_me:10763: result: $cf_cv_term_header" >&5
++echo "$as_me:10766: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -10798,7 +10801,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:10801: checking for ncurses version" >&5
++echo "$as_me:10804: checking for ncurses version" >&5
+ echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10824,10 +10827,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:10827: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:10830: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10830: \$? = $ac_status" >&5
++  echo "$as_me:10833: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 	if test -f conftest.out ; then
+ 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
+@@ -10837,7 +10840,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10840 "configure"
++#line 10843 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -10862,15 +10865,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:10865: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10868: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10868: \$? = $ac_status" >&5
++  echo "$as_me:10871: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:10870: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10873: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10873: \$? = $ac_status" >&5
++  echo "$as_me:10876: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -10884,7 +10887,7 @@
+ 	rm -f "$cf_tempfile"
+ 
+ fi
+-echo "$as_me:10887: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:10890: result: $cf_cv_ncurses_version" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_version" >&6
+ test "$cf_cv_ncurses_version" = no ||
+ cat >>confdefs.h <<\EOF
+@@ -10897,7 +10900,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:10900: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:10903: checking for Gpm_Open in -lgpm" >&5
+ echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
+ if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10905,7 +10908,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10908 "configure"
++#line 10911 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10924,16 +10927,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10927: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10930: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10930: \$? = $ac_status" >&5
++  echo "$as_me:10933: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10933: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10936: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10936: \$? = $ac_status" >&5
++  echo "$as_me:10939: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -10944,10 +10947,10 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10947: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:10950: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
+ if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then
+-  echo "$as_me:10950: checking for initscr in -lgpm" >&5
++  echo "$as_me:10953: checking for initscr in -lgpm" >&5
+ echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
+ if test "${ac_cv_lib_gpm_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10955,7 +10958,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10958 "configure"
++#line 10961 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10974,16 +10977,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:10977: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10980: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10980: \$? = $ac_status" >&5
++  echo "$as_me:10983: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:10983: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10986: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10986: \$? = $ac_status" >&5
++  echo "$as_me:10989: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -10994,7 +10997,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10997: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:11000: result: $ac_cv_lib_gpm_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
+ if test "$ac_cv_lib_gpm_initscr" = yes; then
+   LIBS="$cf_ncurses_SAVE"
+@@ -11009,7 +11012,7 @@
+ 	# This is only necessary if you are linking against an obsolete
+ 	# version of ncurses (but it should do no harm, since it is static).
+ 	if test "$cf_nculib_root" = ncurses ; then
+-		echo "$as_me:11012: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:11015: checking for tgoto in -lmytinfo" >&5
+ echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
+ if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11017,7 +11020,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11020 "configure"
++#line 11023 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11036,16 +11039,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11039: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11042: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11042: \$? = $ac_status" >&5
++  echo "$as_me:11045: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11045: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11048: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11048: \$? = $ac_status" >&5
++  echo "$as_me:11051: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -11056,7 +11059,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11059: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:11062: result: $ac_cv_lib_mytinfo_tgoto" >&5
+ echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
+ if test "$ac_cv_lib_mytinfo_tgoto" = yes; then
+   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
+@@ -11105,13 +11108,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
+ 	cf_libdir=""
+-	echo "$as_me:11108: checking for initscr" >&5
++	echo "$as_me:11111: checking for initscr" >&5
+ echo $ECHO_N "checking for initscr... $ECHO_C" >&6
+ if test "${ac_cv_func_initscr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11114 "configure"
++#line 11117 "configure"
+ #include "confdefs.h"
+ #define initscr autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -11142,16 +11145,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11145: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11148: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11148: \$? = $ac_status" >&5
++  echo "$as_me:11151: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11151: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11154: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11154: \$? = $ac_status" >&5
++  echo "$as_me:11157: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -11161,18 +11164,18 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:11164: result: $ac_cv_func_initscr" >&5
++echo "$as_me:11167: result: $ac_cv_func_initscr" >&5
+ echo "${ECHO_T}$ac_cv_func_initscr" >&6
+ if test "$ac_cv_func_initscr" = yes; then
+   eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'
+ else
+ 
+ 		cf_save_LIBS="$LIBS"
+-		echo "$as_me:11171: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:11174: checking for initscr in -l$cf_nculib_root" >&5
+ echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
+ 		LIBS="-l$cf_nculib_root $LIBS"
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11175 "configure"
++#line 11178 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11184,25 +11187,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11187: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11190: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11190: \$? = $ac_status" >&5
++  echo "$as_me:11193: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11193: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11196: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11196: \$? = $ac_status" >&5
++  echo "$as_me:11199: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:11198: result: yes" >&5
++  echo "$as_me:11201: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 			 eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:11205: result: no" >&5
++echo "$as_me:11208: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -11270,11 +11273,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:11273: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:11276: checking for -l$cf_nculib_root in $cf_libdir" >&5
+ echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
+ 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11277 "configure"
++#line 11280 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11286,25 +11289,25 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11289: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11292: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11292: \$? = $ac_status" >&5
++  echo "$as_me:11295: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11295: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11298: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11298: \$? = $ac_status" >&5
++  echo "$as_me:11301: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:11300: result: yes" >&5
++  echo "$as_me:11303: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 			 		 eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'
+ 					 break
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:11307: result: no" >&5
++echo "$as_me:11310: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -11319,7 +11322,7 @@
+ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
+ 
+ if test "$cf_found_library" = no ; then
+-	{ { echo "$as_me:11322: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:11325: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -11327,7 +11330,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:11330: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:11333: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
+ 	cf_ncurses_SAVE="$LIBS"
+ 	for p in $cf_ncurses_LIBS ; do
+@@ -11337,7 +11340,7 @@
+ 		fi
+ 	done
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11340 "configure"
++#line 11343 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -11349,23 +11352,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11352: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11355: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11355: \$? = $ac_status" >&5
++  echo "$as_me:11358: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11358: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11361: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11361: \$? = $ac_status" >&5
++  echo "$as_me:11364: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+-  echo "$as_me:11363: result: yes" >&5
++  echo "$as_me:11366: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+-echo "$as_me:11368: result: no" >&5
++echo "$as_me:11371: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -11418,10 +11421,10 @@
+ 	AUTOCONF_$cf_name NCURSES_VERSION_$cf_name
+ CF_EOF
+ 		cf_try="$ac_cpp conftest.$ac_ext 2>&5 | fgrep AUTOCONF_$cf_name >conftest.out"
+-		{ (eval echo "$as_me:11421: \"$cf_try\"") >&5
++		{ (eval echo "$as_me:11424: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11424: \$? = $ac_status" >&5
++  echo "$as_me:11427: \$? = $ac_status" >&5
+   (exit "$ac_status"); }
+ 		if test -f conftest.out ; then
+ 			cf_result=`sed -e "s/^.*AUTOCONF_${cf_name}[ 	][ 	]*//" conftest.out`
+@@ -11439,10 +11442,10 @@
+ 
+ cf_cv_timestamp=`date`
+ 
+-echo "$as_me:11442: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
++echo "$as_me:11445: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
+ echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6
+ 
+-echo "$as_me:11445: checking if you want to have a library-prefix" >&5
++echo "$as_me:11448: checking if you want to have a library-prefix" >&5
+ echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6
+ 
+ # Check whether --with-lib-prefix or --without-lib-prefix was given.
+@@ -11452,7 +11455,7 @@
+ else
+   with_lib_prefix=auto
+ fi;
+-echo "$as_me:11455: result: $with_lib_prefix" >&5
++echo "$as_me:11458: result: $with_lib_prefix" >&5
+ echo "${ECHO_T}$with_lib_prefix" >&6
+ 
+ if test "$with_lib_prefix" = auto
+@@ -11490,7 +11493,7 @@
+ 	test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT=''
+ fi
+ 
+-echo "$as_me:11493: checking for default loader flags" >&5
++echo "$as_me:11496: checking for default loader flags" >&5
+ echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
+ case $DFT_LWR_MODEL in
+ (normal)  LD_MODEL=''   ;;
+@@ -11498,13 +11501,13 @@
+ (profile) LD_MODEL='-pg';;
+ (shared)  LD_MODEL=''   ;;
+ esac
+-echo "$as_me:11501: result: $LD_MODEL" >&5
++echo "$as_me:11504: result: $LD_MODEL" >&5
+ echo "${ECHO_T}$LD_MODEL" >&6
+ 
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+-	echo "$as_me:11507: checking for an rpath option" >&5
++	echo "$as_me:11510: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ 	case "$cf_cv_system_name" in
+ 	(irix*)
+@@ -11535,12 +11538,12 @@
+ 	(*)
+ 		;;
+ 	esac
+-	echo "$as_me:11538: result: $LD_RPATH_OPT" >&5
++	echo "$as_me:11541: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ 	case "x$LD_RPATH_OPT" in
+ 	(x-R*)
+-		echo "$as_me:11543: checking if we need a space after rpath option" >&5
++		echo "$as_me:11546: checking if we need a space after rpath option" >&5
+ echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
+ 		cf_save_LIBS="$LIBS"
+ 
+@@ -11561,7 +11564,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11564 "configure"
++#line 11567 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -11573,16 +11576,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11576: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11579: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11579: \$? = $ac_status" >&5
++  echo "$as_me:11582: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11582: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11585: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11585: \$? = $ac_status" >&5
++  echo "$as_me:11588: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_rpath_space=no
+ else
+@@ -11592,7 +11595,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:11595: result: $cf_rpath_space" >&5
++		echo "$as_me:11598: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ 		;;
+@@ -11614,7 +11617,7 @@
+ 	cf_ld_rpath_opt=
+ 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
+ 
+-	echo "$as_me:11617: checking if release/abi version should be used for shared libs" >&5
++	echo "$as_me:11620: checking if release/abi version should be used for shared libs" >&5
+ echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6
+ 
+ # Check whether --with-shlib-version or --without-shlib-version was given.
+@@ -11629,9 +11632,9 @@
+ 		cf_cv_shlib_version=$withval
+ 		;;
+ 	(*)
+-		echo "$as_me:11632: result: $withval" >&5
++		echo "$as_me:11635: result: $withval" >&5
+ echo "${ECHO_T}$withval" >&6
+-		{ { echo "$as_me:11634: error: option value must be one of: rel, abi, or auto" >&5
++		{ { echo "$as_me:11637: error: option value must be one of: rel, abi, or auto" >&5
+ echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
+    { (exit 1); exit 1; }; }
+ 		;;
+@@ -11640,7 +11643,7 @@
+ else
+   cf_cv_shlib_version=auto
+ fi;
+-	echo "$as_me:11643: result: $cf_cv_shlib_version" >&5
++	echo "$as_me:11646: result: $cf_cv_shlib_version" >&5
+ echo "${ECHO_T}$cf_cv_shlib_version" >&6
+ 
+ 	cf_cv_rm_so_locs=no
+@@ -11663,14 +11666,14 @@
+ 
+ 	if test "$cf_try_fPIC" = yes
+ 	then
+-		echo "$as_me:11666: checking which $CC option to use" >&5
++		echo "$as_me:11669: checking which $CC option to use" >&5
+ echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
+ 		cf_save_CFLAGS="$CFLAGS"
+ 		for CC_SHARED_OPTS in -fPIC -fpic ''
+ 		do
+ 			CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS"
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11673 "configure"
++#line 11676 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11682,16 +11685,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11685: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11688: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11688: \$? = $ac_status" >&5
++  echo "$as_me:11691: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11691: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11694: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11694: \$? = $ac_status" >&5
++  echo "$as_me:11697: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -11700,7 +11703,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		done
+-		echo "$as_me:11703: result: $CC_SHARED_OPTS" >&5
++		echo "$as_me:11706: result: $CC_SHARED_OPTS" >&5
+ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+ 		CFLAGS="$cf_save_CFLAGS"
+ 	fi
+@@ -11771,7 +11774,7 @@
+ 		MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
+ 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
+ 		cf_cv_shlib_version_infix=yes
+-		echo "$as_me:11774: checking if ld -search_paths_first works" >&5
++		echo "$as_me:11777: checking if ld -search_paths_first works" >&5
+ echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6
+ if test "${cf_cv_ldflags_search_paths_first+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11780,7 +11783,7 @@
+ 			cf_save_LDFLAGS=$LDFLAGS
+ 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11783 "configure"
++#line 11786 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -11792,16 +11795,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11795: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11798: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11798: \$? = $ac_status" >&5
++  echo "$as_me:11801: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11801: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11804: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11804: \$? = $ac_status" >&5
++  echo "$as_me:11807: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ldflags_search_paths_first=yes
+ else
+@@ -11812,7 +11815,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 				LDFLAGS=$cf_save_LDFLAGS
+ fi
+-echo "$as_me:11815: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:11818: result: $cf_cv_ldflags_search_paths_first" >&5
+ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
+ 		if test "$cf_cv_ldflags_search_paths_first" = yes; then
+ 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+@@ -12162,7 +12165,7 @@
+ 			do
+ 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12165 "configure"
++#line 12168 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12174,16 +12177,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12177: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12180: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12180: \$? = $ac_status" >&5
++  echo "$as_me:12183: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12183: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12186: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12186: \$? = $ac_status" >&5
++  echo "$as_me:12189: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -12220,7 +12223,7 @@
+ 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ 			;;
+ 		(*)
+-			{ echo "$as_me:12223: WARNING: ignored --with-shlib-version" >&5
++			{ echo "$as_me:12226: WARNING: ignored --with-shlib-version" >&5
+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ 			;;
+ 		esac
+@@ -12230,7 +12233,7 @@
+ 	if test -n "$cf_try_cflags"
+ 	then
+ cat > conftest.$ac_ext <
+ int main(int argc, char *argv[])
+ {
+@@ -12242,18 +12245,18 @@
+ 		for cf_opt in $cf_try_cflags
+ 		do
+ 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
+-			echo "$as_me:12245: checking if CFLAGS option -$cf_opt works" >&5
++			echo "$as_me:12248: checking if CFLAGS option -$cf_opt works" >&5
+ echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6
+-			if { (eval echo "$as_me:12247: \"$ac_compile\"") >&5
++			if { (eval echo "$as_me:12250: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12250: \$? = $ac_status" >&5
++  echo "$as_me:12253: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-				echo "$as_me:12252: result: yes" >&5
++				echo "$as_me:12255: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 				cf_save_CFLAGS="$CFLAGS"
+ 			else
+-				echo "$as_me:12256: result: no" >&5
++				echo "$as_me:12259: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 			fi
+ 		done
+@@ -12268,17 +12271,17 @@
+ 
+ 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
+ 
+-echo "${as_me:-configure}:12271: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++echo "${as_me:-configure}:12274: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
+ 
+-echo "${as_me:-configure}:12275: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:12278: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ # The test/sample programs in the original tree link using rpath option.
+ # Make it optional for packagers.
+ if test -n "$LOCAL_LDFLAGS"
+ then
+-	echo "$as_me:12281: checking if you want to link sample programs with rpath option" >&5
++	echo "$as_me:12284: checking if you want to link sample programs with rpath option" >&5
+ echo $ECHO_N "checking if you want to link sample programs with rpath option... $ECHO_C" >&6
+ 
+ # Check whether --enable-rpath-link or --disable-rpath-link was given.
+@@ -12288,7 +12291,7 @@
+ else
+   with_rpath_link=yes
+ fi;
+-	echo "$as_me:12291: result: $with_rpath_link" >&5
++	echo "$as_me:12294: result: $with_rpath_link" >&5
+ echo "${ECHO_T}$with_rpath_link" >&6
+ 	if test "$with_rpath_link" = no
+ 	then
+@@ -12301,7 +12304,7 @@
+ 
+ ###   use option --enable-broken-linker to force on use of broken-linker support
+ 
+-echo "$as_me:12304: checking if you want broken-linker support code" >&5
++echo "$as_me:12307: checking if you want broken-linker support code" >&5
+ echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6
+ 
+ # Check whether --enable-broken_linker or --disable-broken_linker was given.
+@@ -12311,7 +12314,7 @@
+ else
+   with_broken_linker=no
+ fi;
+-echo "$as_me:12314: result: $with_broken_linker" >&5
++echo "$as_me:12317: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+ 
+ : "${BROKEN_LINKER:=0}"
+@@ -12326,14 +12329,14 @@
+ 
+ # Check to define _XOPEN_SOURCE "automatically"
+ 
+-echo "$as_me:12329: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:12332: checking if the POSIX test-macros are already defined" >&5
+ echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6
+ if test "${cf_cv_posix_visible+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12336 "configure"
++#line 12339 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12352,16 +12355,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12355: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12358: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12358: \$? = $ac_status" >&5
++  echo "$as_me:12361: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12361: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12364: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12364: \$? = $ac_status" >&5
++  echo "$as_me:12367: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_visible=no
+ else
+@@ -12372,7 +12375,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12375: result: $cf_cv_posix_visible" >&5
++echo "$as_me:12378: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+ 
+ if test "$cf_cv_posix_visible" = no; then
+@@ -12417,14 +12420,14 @@
+ 
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+ 
+-echo "$as_me:12420: checking if this is the GNU C library" >&5
++echo "$as_me:12423: checking if this is the GNU C library" >&5
+ echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6
+ if test "${cf_cv_gnu_library+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12427 "configure"
++#line 12430 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12443,16 +12446,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12446: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12449: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12449: \$? = $ac_status" >&5
++  echo "$as_me:12452: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12452: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12455: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12455: \$? = $ac_status" >&5
++  echo "$as_me:12458: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library=yes
+ else
+@@ -12463,7 +12466,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12466: result: $cf_cv_gnu_library" >&5
++echo "$as_me:12469: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+ 
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -12471,7 +12474,7 @@
+ 	# With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE
+ 	# was changed to help a little.  newlib incorporated the change about 4
+ 	# years later.
+-	echo "$as_me:12474: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++	echo "$as_me:12477: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+ echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6
+ if test "${cf_cv_gnu_library_219+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12483,7 +12486,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12486 "configure"
++#line 12489 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12502,16 +12505,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12505: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12508: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12508: \$? = $ac_status" >&5
++  echo "$as_me:12511: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12511: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12514: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12514: \$? = $ac_status" >&5
++  echo "$as_me:12517: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library_219=yes
+ else
+@@ -12523,12 +12526,12 @@
+ 		CPPFLAGS="$cf_save"
+ 
+ fi
+-echo "$as_me:12526: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:12529: result: $cf_cv_gnu_library_219" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library_219" >&6
+ 
+ 	if test "x$cf_cv_gnu_library_219" = xyes; then
+ 		cf_save="$CPPFLAGS"
+-		echo "$as_me:12531: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++		echo "$as_me:12534: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+ echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_gnu_dftsrc_219+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12633,7 +12636,7 @@
+ fi
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12636 "configure"
++#line 12639 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -12653,16 +12656,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12656: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12659: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12659: \$? = $ac_status" >&5
++  echo "$as_me:12662: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12662: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12665: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12665: \$? = $ac_status" >&5
++  echo "$as_me:12668: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -12673,7 +12676,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12676: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:12679: result: $cf_cv_gnu_dftsrc_219" >&5
+ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
+ 		test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save"
+ 	else
+@@ -12682,14 +12685,14 @@
+ 
+ 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+ 
+-		echo "$as_me:12685: checking if we must define _GNU_SOURCE" >&5
++		echo "$as_me:12688: checking if we must define _GNU_SOURCE" >&5
+ echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_gnu_source+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12692 "configure"
++#line 12695 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12704,16 +12707,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12707: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12710: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12710: \$? = $ac_status" >&5
++  echo "$as_me:12713: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12713: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12716: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12716: \$? = $ac_status" >&5
++  echo "$as_me:12719: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -12820,7 +12823,7 @@
+ fi
+ 
+ 			 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12823 "configure"
++#line 12826 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12835,16 +12838,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12838: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12841: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12841: \$? = $ac_status" >&5
++  echo "$as_me:12844: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12844: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12847: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12847: \$? = $ac_status" >&5
++  echo "$as_me:12850: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -12859,12 +12862,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12862: result: $cf_cv_gnu_source" >&5
++echo "$as_me:12865: result: $cf_cv_gnu_source" >&5
+ echo "${ECHO_T}$cf_cv_gnu_source" >&6
+ 
+ 		if test "$cf_cv_gnu_source" = yes
+ 		then
+-		echo "$as_me:12867: checking if we should also define _DEFAULT_SOURCE" >&5
++		echo "$as_me:12870: checking if we should also define _DEFAULT_SOURCE" >&5
+ echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_default_source+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12874,7 +12877,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12877 "configure"
++#line 12880 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12889,16 +12892,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12892: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12895: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12895: \$? = $ac_status" >&5
++  echo "$as_me:12898: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12898: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12901: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12901: \$? = $ac_status" >&5
++  echo "$as_me:12904: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_default_source=no
+ else
+@@ -12909,7 +12912,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:12912: result: $cf_cv_default_source" >&5
++echo "$as_me:12915: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ 			if test "$cf_cv_default_source" = yes
+ 			then
+@@ -12946,16 +12949,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:12949: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:12952: checking if we should define _POSIX_C_SOURCE" >&5
+ echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_posix_c_source+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-echo "${as_me:-configure}:12955: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:12958: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12958 "configure"
++#line 12961 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12970,16 +12973,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12973: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12976: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12976: \$? = $ac_status" >&5
++  echo "$as_me:12979: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12979: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12982: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12982: \$? = $ac_status" >&5
++  echo "$as_me:12985: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -13000,7 +13003,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13003 "configure"
++#line 13006 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13015,16 +13018,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13018: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13021: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13021: \$? = $ac_status" >&5
++  echo "$as_me:13024: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13024: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13027: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13027: \$? = $ac_status" >&5
++  echo "$as_me:13030: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -13035,7 +13038,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:13038: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:13041: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -13043,10 +13046,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:13046: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:13049: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13049 "configure"
++#line 13052 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13061,16 +13064,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13064: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13067: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13067: \$? = $ac_status" >&5
++  echo "$as_me:13070: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13070: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13073: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13073: \$? = $ac_status" >&5
++  echo "$as_me:13076: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -13086,7 +13089,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13089: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:13092: result: $cf_cv_posix_c_source" >&5
+ echo "${ECHO_T}$cf_cv_posix_c_source" >&6
+ 
+ if test "$cf_cv_posix_c_source" != no ; then
+@@ -13203,7 +13206,7 @@
+ 	# OpenBSD 6.x has broken locale support, both compile-time and runtime.
+ 	# see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
+ 	# Abusing the conformance level is a workaround.
+-	{ echo "$as_me:13206: WARNING: this system does not provide usable locale support" >&5
++	{ echo "$as_me:13209: WARNING: this system does not provide usable locale support" >&5
+ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
+ 	cf_xopen_source="-D_BSD_SOURCE"
+ 	cf_XOPEN_SOURCE=700
+@@ -13235,14 +13238,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:13238: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:13241: checking if we should define _XOPEN_SOURCE" >&5
+ echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_xopen_source+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13245 "configure"
++#line 13248 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13261,16 +13264,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13264: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13267: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13267: \$? = $ac_status" >&5
++  echo "$as_me:13270: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13270: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13273: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13273: \$? = $ac_status" >&5
++  echo "$as_me:13276: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -13282,7 +13285,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13285 "configure"
++#line 13288 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13301,16 +13304,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13304: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13307: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13307: \$? = $ac_status" >&5
++  echo "$as_me:13310: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13310: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13313: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13313: \$? = $ac_status" >&5
++  echo "$as_me:13316: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -13325,7 +13328,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13328: result: $cf_cv_xopen_source" >&5
++echo "$as_me:13331: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -13483,16 +13486,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:13486: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:13489: checking if we should define _POSIX_C_SOURCE" >&5
+ echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_posix_c_source+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-echo "${as_me:-configure}:13492: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:13495: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13495 "configure"
++#line 13498 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13507,16 +13510,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13510: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13513: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13513: \$? = $ac_status" >&5
++  echo "$as_me:13516: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13516: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13519: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13519: \$? = $ac_status" >&5
++  echo "$as_me:13522: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -13537,7 +13540,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13540 "configure"
++#line 13543 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13552,16 +13555,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13555: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13558: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13558: \$? = $ac_status" >&5
++  echo "$as_me:13561: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13561: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13564: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13564: \$? = $ac_status" >&5
++  echo "$as_me:13567: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -13572,7 +13575,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:13575: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:13578: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -13580,10 +13583,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:13583: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:13586: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13586 "configure"
++#line 13589 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13598,16 +13601,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13601: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13604: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13604: \$? = $ac_status" >&5
++  echo "$as_me:13607: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13607: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13610: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13610: \$? = $ac_status" >&5
++  echo "$as_me:13613: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -13623,7 +13626,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13626: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:13629: result: $cf_cv_posix_c_source" >&5
+ echo "${ECHO_T}$cf_cv_posix_c_source" >&6
+ 
+ if test "$cf_cv_posix_c_source" != no ; then
+@@ -13749,7 +13752,7 @@
+ 	test "$CFLAGS" != "$cf_old_cflag" || break
+ 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:13752: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:13755: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+ 
+ 	CFLAGS="$cf_old_cflag"
+ done
+@@ -13761,7 +13764,7 @@
+ 	test "$CPPFLAGS" != "$cf_old_cflag" || break
+ 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:13764: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:13767: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+ 
+ 	CPPFLAGS="$cf_old_cflag"
+ done
+@@ -13849,7 +13852,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:13852: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:13855: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -13859,7 +13862,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:13862: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:13865: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -13869,7 +13872,7 @@
+ if test -n "$cf_new_extra_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:13872: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:13875: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+ 
+ 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+ 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+@@ -13881,10 +13884,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:13884: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:13887: checking if _XOPEN_SOURCE really is set" >&5
+ echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13887 "configure"
++#line 13890 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13899,16 +13902,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13902: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13905: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13905: \$? = $ac_status" >&5
++  echo "$as_me:13908: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13908: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13911: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13911: \$? = $ac_status" >&5
++  echo "$as_me:13914: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -13917,12 +13920,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:13920: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:13923: result: $cf_XOPEN_SOURCE_set" >&5
+ echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
+ 	if test "$cf_XOPEN_SOURCE_set" = yes
+ 	then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13925 "configure"
++#line 13928 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13937,16 +13940,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13940: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13943: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13943: \$? = $ac_status" >&5
++  echo "$as_me:13946: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13946: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13949: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13949: \$? = $ac_status" >&5
++  echo "$as_me:13952: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -13957,19 +13960,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		if test "$cf_XOPEN_SOURCE_set_ok" = no
+ 		then
+-			{ echo "$as_me:13960: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:13963: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:13965: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:13968: checking if we should define _XOPEN_SOURCE" >&5
+ echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_xopen_source+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13972 "configure"
++#line 13975 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13988,16 +13991,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13991: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13994: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13994: \$? = $ac_status" >&5
++  echo "$as_me:13997: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13997: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14000: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14000: \$? = $ac_status" >&5
++  echo "$as_me:14003: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -14009,7 +14012,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14012 "configure"
++#line 14015 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14028,16 +14031,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14031: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14034: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14034: \$? = $ac_status" >&5
++  echo "$as_me:14037: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14037: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14040: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14040: \$? = $ac_status" >&5
++  echo "$as_me:14043: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -14052,7 +14055,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14055: result: $cf_cv_xopen_source" >&5
++echo "$as_me:14058: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -14206,7 +14209,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+ 
+-  echo "$as_me:14209: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:14212: checking for special C compiler options needed for large files" >&5
+ echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
+ if test "${ac_cv_sys_largefile_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14218,7 +14221,7 @@
+      	 # IRIX 6.2 and later do not support large files by default,
+      	 # so use the C compiler's -n32 option if that helps.
+          cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14221 "configure"
++#line 14224 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14238,16 +14241,16 @@
+ }
+ _ACEOF
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14241: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14244: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14244: \$? = $ac_status" >&5
++  echo "$as_me:14247: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14247: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14250: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14250: \$? = $ac_status" >&5
++  echo "$as_me:14253: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14257,16 +14260,16 @@
+ rm -f "conftest.$ac_objext"
+      	 CC="$CC -n32"
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14260: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14263: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14263: \$? = $ac_status" >&5
++  echo "$as_me:14266: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14266: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14269: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14269: \$? = $ac_status" >&5
++  echo "$as_me:14272: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -14280,13 +14283,13 @@
+        rm -f "conftest.$ac_ext"
+     fi
+ fi
+-echo "$as_me:14283: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:14286: result: $ac_cv_sys_largefile_CC" >&5
+ echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
+   if test "$ac_cv_sys_largefile_CC" != no; then
+     CC=$CC$ac_cv_sys_largefile_CC
+   fi
+ 
+-  echo "$as_me:14289: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:14292: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+ echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
+ if test "${ac_cv_sys_file_offset_bits+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14294,7 +14297,7 @@
+   while :; do
+   ac_cv_sys_file_offset_bits=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14297 "configure"
++#line 14300 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14314,16 +14317,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14317: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14320: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14320: \$? = $ac_status" >&5
++  echo "$as_me:14323: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14323: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14326: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14326: \$? = $ac_status" >&5
++  echo "$as_me:14329: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14332,7 +14335,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14335 "configure"
++#line 14338 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include 
+@@ -14353,16 +14356,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14356: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14359: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14359: \$? = $ac_status" >&5
++  echo "$as_me:14362: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14362: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14365: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14365: \$? = $ac_status" >&5
++  echo "$as_me:14368: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -14373,7 +14376,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14376: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:14379: result: $ac_cv_sys_file_offset_bits" >&5
+ echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
+ if test "$ac_cv_sys_file_offset_bits" != no; then
+ 
+@@ -14383,7 +14386,7 @@
+ 
+ fi
+ rm -rf conftest*
+-  echo "$as_me:14386: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:14389: checking for _LARGE_FILES value needed for large files" >&5
+ echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
+ if test "${ac_cv_sys_large_files+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14391,7 +14394,7 @@
+   while :; do
+   ac_cv_sys_large_files=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14394 "configure"
++#line 14397 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -14411,16 +14414,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14414: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14417: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14417: \$? = $ac_status" >&5
++  echo "$as_me:14420: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14420: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14423: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14423: \$? = $ac_status" >&5
++  echo "$as_me:14426: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14429,7 +14432,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14432 "configure"
++#line 14435 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include 
+@@ -14450,16 +14453,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14453: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14456: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14456: \$? = $ac_status" >&5
++  echo "$as_me:14459: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14459: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14462: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14462: \$? = $ac_status" >&5
++  echo "$as_me:14465: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_large_files=1; break
+ else
+@@ -14470,7 +14473,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14473: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:14476: result: $ac_cv_sys_large_files" >&5
+ echo "${ECHO_T}$ac_cv_sys_large_files" >&6
+ if test "$ac_cv_sys_large_files" != no; then
+ 
+@@ -14483,7 +14486,7 @@
+ fi
+ 
+ 	if test "$enable_largefile" != no ; then
+-	echo "$as_me:14486: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++	echo "$as_me:14489: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+ echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
+ if test "${ac_cv_sys_largefile_source+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14491,7 +14494,7 @@
+   while :; do
+   ac_cv_sys_largefile_source=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14494 "configure"
++#line 14497 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14503,16 +14506,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14506: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14509: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14509: \$? = $ac_status" >&5
++  echo "$as_me:14512: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14512: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14515: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14515: \$? = $ac_status" >&5
++  echo "$as_me:14518: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -14521,7 +14524,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14524 "configure"
++#line 14527 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include 
+@@ -14534,16 +14537,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14537: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14540: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14540: \$? = $ac_status" >&5
++  echo "$as_me:14543: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14543: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14546: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14546: \$? = $ac_status" >&5
++  echo "$as_me:14549: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_source=1; break
+ else
+@@ -14554,7 +14557,7 @@
+   break
+ done
+ fi
+-echo "$as_me:14557: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:14560: result: $ac_cv_sys_largefile_source" >&5
+ echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
+ if test "$ac_cv_sys_largefile_source" != no; then
+ 
+@@ -14568,13 +14571,13 @@
+ # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
+ # in glibc 2.1.3, but that breaks too many other things.
+ # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
+-echo "$as_me:14571: checking for fseeko" >&5
++echo "$as_me:14574: checking for fseeko" >&5
+ echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
+ if test "${ac_cv_func_fseeko+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14577 "configure"
++#line 14580 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -14586,16 +14589,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14589: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14592: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14592: \$? = $ac_status" >&5
++  echo "$as_me:14595: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:14595: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14598: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14598: \$? = $ac_status" >&5
++  echo "$as_me:14601: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fseeko=yes
+ else
+@@ -14605,7 +14608,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14608: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:14611: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+ 
+@@ -14644,14 +14647,14 @@
+ 
+ 	fi
+ 
+-	echo "$as_me:14647: checking whether to use struct dirent64" >&5
++	echo "$as_me:14650: checking whether to use struct dirent64" >&5
+ echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6
+ if test "${cf_cv_struct_dirent64+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14654 "configure"
++#line 14657 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -14674,16 +14677,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14677: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14680: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14680: \$? = $ac_status" >&5
++  echo "$as_me:14683: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14683: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14686: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14686: \$? = $ac_status" >&5
++  echo "$as_me:14689: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_struct_dirent64=yes
+ else
+@@ -14694,7 +14697,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:14697: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:14700: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ 	test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -14704,7 +14707,7 @@
+ 	fi
+ 
+ ### Enable compiling-in rcs id's
+-echo "$as_me:14707: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:14710: checking if RCS identifiers should be compiled-in" >&5
+ echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6
+ 
+ # Check whether --with-rcs-ids or --without-rcs-ids was given.
+@@ -14714,7 +14717,7 @@
+ else
+   with_rcs_ids=no
+ fi;
+-echo "$as_me:14717: result: $with_rcs_ids" >&5
++echo "$as_me:14720: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "$with_rcs_ids" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -14724,7 +14727,7 @@
+ ###############################################################################
+ 
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:14727: checking if you want to build with function extensions" >&5
++echo "$as_me:14730: checking if you want to build with function extensions" >&5
+ echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6
+ 
+ # Check whether --enable-ext-funcs or --disable-ext-funcs was given.
+@@ -14734,7 +14737,7 @@
+ else
+   with_ext_funcs=yes
+ fi;
+-echo "$as_me:14737: result: $with_ext_funcs" >&5
++echo "$as_me:14740: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "$with_ext_funcs" = yes ; then
+ 	NCURSES_EXT_FUNCS=1
+@@ -14752,7 +14755,7 @@
+ fi
+ 
+ ###   use option --enable-const to turn on use of const beyond that in XSI.
+-echo "$as_me:14755: checking for extended use of const keyword" >&5
++echo "$as_me:14758: checking for extended use of const keyword" >&5
+ echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
+ 
+ # Check whether --enable-const or --disable-const was given.
+@@ -14762,7 +14765,7 @@
+ else
+   with_ext_const=no
+ fi;
+-echo "$as_me:14765: result: $with_ext_const" >&5
++echo "$as_me:14768: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "$with_ext_const" = yes ; then
+@@ -14772,7 +14775,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+ 
+-echo "$as_me:14775: checking if you want all development code" >&5
++echo "$as_me:14778: checking if you want all development code" >&5
+ echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
+ 
+ # Check whether --with-develop or --without-develop was given.
+@@ -14782,7 +14785,7 @@
+ else
+   with_develop=no
+ fi;
+-echo "$as_me:14785: result: $with_develop" >&5
++echo "$as_me:14788: result: $with_develop" >&5
+ echo "${ECHO_T}$with_develop" >&6
+ 
+ ###############################################################################
+@@ -14791,7 +14794,7 @@
+ # This is still experimental (20080329), but should ultimately be moved to
+ # the script-block --with-normal, etc.
+ 
+-echo "$as_me:14794: checking if you want to link with the pthread library" >&5
++echo "$as_me:14797: checking if you want to link with the pthread library" >&5
+ echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6
+ 
+ # Check whether --with-pthread or --without-pthread was given.
+@@ -14801,27 +14804,27 @@
+ else
+   with_pthread=no
+ fi;
+-echo "$as_me:14804: result: $with_pthread" >&5
++echo "$as_me:14807: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+ if test "$with_pthread" != no ; then
+-	echo "$as_me:14808: checking for pthread.h" >&5
++	echo "$as_me:14811: checking for pthread.h" >&5
+ echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
+ if test "${ac_cv_header_pthread_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14814 "configure"
++#line 14817 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:14818: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:14821: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:14824: \$? = $ac_status" >&5
++  echo "$as_me:14827: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -14840,7 +14843,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:14843: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:14846: result: $ac_cv_header_pthread_h" >&5
+ echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
+ if test "$ac_cv_header_pthread_h" = yes; then
+ 
+@@ -14850,7 +14853,7 @@
+ 
+ 	for cf_lib_pthread in pthread c_r
+ 	do
+-	    echo "$as_me:14853: checking if we can link with the $cf_lib_pthread library" >&5
++	    echo "$as_me:14856: checking if we can link with the $cf_lib_pthread library" >&5
+ echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6
+ 	    cf_save_LIBS="$LIBS"
+ 
+@@ -14871,7 +14874,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	    cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14874 "configure"
++#line 14877 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14888,16 +14891,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:14891: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14894: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14894: \$? = $ac_status" >&5
++  echo "$as_me:14897: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:14897: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14900: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14900: \$? = $ac_status" >&5
++  echo "$as_me:14903: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_pthread=yes
+ else
+@@ -14907,7 +14910,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	    LIBS="$cf_save_LIBS"
+-	    echo "$as_me:14910: result: $with_pthread" >&5
++	    echo "$as_me:14913: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 	    test "$with_pthread" = yes && break
+ 	done
+@@ -14935,7 +14938,7 @@
+ EOF
+ 
+ 	else
+-	    { { echo "$as_me:14938: error: Cannot link with pthread library" >&5
++	    { { echo "$as_me:14941: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -14944,7 +14947,7 @@
+ 
+ fi
+ 
+-echo "$as_me:14947: checking if you want to use weak-symbols for pthreads" >&5
++echo "$as_me:14950: checking if you want to use weak-symbols for pthreads" >&5
+ echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6
+ 
+ # Check whether --enable-weak-symbols or --disable-weak-symbols was given.
+@@ -14954,18 +14957,18 @@
+ else
+   use_weak_symbols=no
+ fi;
+-echo "$as_me:14957: result: $use_weak_symbols" >&5
++echo "$as_me:14960: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ if test "$use_weak_symbols" = yes ; then
+ 
+-echo "$as_me:14961: checking if $CC supports weak symbols" >&5
++echo "$as_me:14964: checking if $CC supports weak symbols" >&5
+ echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6
+ if test "${cf_cv_weak_symbols+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14968 "configure"
++#line 14971 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -14991,16 +14994,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14994: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14997: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14997: \$? = $ac_status" >&5
++  echo "$as_me:15000: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15000: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15003: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15003: \$? = $ac_status" >&5
++  echo "$as_me:15006: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_weak_symbols=yes
+ else
+@@ -15011,7 +15014,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:15014: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:15017: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+ 
+ else
+@@ -15040,13 +15043,13 @@
+ fi
+ 
+ # OpenSUSE is installing ncurses6, using reentrant option.
+-echo "$as_me:15043: checking for _nc_TABSIZE" >&5
++echo "$as_me:15046: checking for _nc_TABSIZE" >&5
+ echo $ECHO_N "checking for _nc_TABSIZE... $ECHO_C" >&6
+ if test "${ac_cv_func__nc_TABSIZE+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15049 "configure"
++#line 15052 "configure"
+ #include "confdefs.h"
+ #define _nc_TABSIZE autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -15077,16 +15080,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15080: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15083: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15083: \$? = $ac_status" >&5
++  echo "$as_me:15086: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15086: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15089: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15089: \$? = $ac_status" >&5
++  echo "$as_me:15092: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func__nc_TABSIZE=yes
+ else
+@@ -15096,7 +15099,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15099: result: $ac_cv_func__nc_TABSIZE" >&5
++echo "$as_me:15102: result: $ac_cv_func__nc_TABSIZE" >&5
+ echo "${ECHO_T}$ac_cv_func__nc_TABSIZE" >&6
+ if test "$ac_cv_func__nc_TABSIZE" = yes; then
+   assume_reentrant=yes
+@@ -15108,7 +15111,7 @@
+ # opaque outside of that, so there is no --enable-opaque option.  We can use
+ # this option without --with-pthreads, but this will be always set for
+ # pthreads.
+-echo "$as_me:15111: checking if you want experimental reentrant code" >&5
++echo "$as_me:15114: checking if you want experimental reentrant code" >&5
+ echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6
+ 
+ # Check whether --enable-reentrant or --disable-reentrant was given.
+@@ -15118,7 +15121,7 @@
+ else
+   with_reentrant=$assume_reentrant
+ fi;
+-echo "$as_me:15121: result: $with_reentrant" >&5
++echo "$as_me:15124: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "$with_reentrant" = yes ; then
+ 	cf_cv_enable_reentrant=1
+@@ -15141,7 +15144,7 @@
+ 
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+-	echo "$as_me:15144: checking for prefix used to wrap public variables" >&5
++	echo "$as_me:15147: checking for prefix used to wrap public variables" >&5
+ echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6
+ 
+ # Check whether --with-wrap-prefix or --without-wrap-prefix was given.
+@@ -15151,7 +15154,7 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-	echo "$as_me:15154: result: $NCURSES_WRAP_PREFIX" >&5
++	echo "$as_me:15157: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ 	NCURSES_WRAP_PREFIX=_nc_
+@@ -15165,7 +15168,7 @@
+ 
+ ###	use option --disable-echo to suppress full display compiling commands
+ 
+-echo "$as_me:15168: checking if you want to see long compiling messages" >&5
++echo "$as_me:15171: checking if you want to see long compiling messages" >&5
+ echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
+ 
+ # Check whether --enable-echo or --disable-echo was given.
+@@ -15199,10 +15202,10 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:15202: result: $enableval" >&5
++echo "$as_me:15205: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+-echo "$as_me:15205: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:15208: checking if you want to use C11 _Noreturn feature" >&5
+ echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
+ 
+ # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
+@@ -15219,17 +15222,17 @@
+ 	enable_stdnoreturn=no
+ 
+ fi;
+-echo "$as_me:15222: result: $enable_stdnoreturn" >&5
++echo "$as_me:15225: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+ 
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:15226: checking for C11 _Noreturn feature" >&5
++echo "$as_me:15229: checking for C11 _Noreturn feature" >&5
+ echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
+ if test "${cf_cv_c11_noreturn+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15232 "configure"
++#line 15235 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -15246,16 +15249,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15249: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15252: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15252: \$? = $ac_status" >&5
++  echo "$as_me:15255: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15255: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15258: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15258: \$? = $ac_status" >&5
++  echo "$as_me:15261: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_c11_noreturn=yes
+ else
+@@ -15266,7 +15269,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:15269: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:15272: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ 	cf_cv_c11_noreturn=no,
+@@ -15322,16 +15325,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15325: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15328: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+ 			CFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15330: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15333: testing ... fixed $CFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15334: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15337: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -15370,16 +15373,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15373: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:15376: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15378: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:15381: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15382: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15385: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -15418,23 +15421,23 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15421: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:15424: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+ 			LDFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15426: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:15429: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:15430: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:15433: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:15437: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:15440: checking if you want to turn on gcc warnings" >&5
+ echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6
+ 
+ # Check whether --enable-warnings or --disable-warnings was given.
+@@ -15451,7 +15454,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:15454: result: $enable_warnings" >&5
++echo "$as_me:15457: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -15475,7 +15478,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15478 "configure"
++#line 15481 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -15490,26 +15493,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15493: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15496: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15496: \$? = $ac_status" >&5
++  echo "$as_me:15499: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15499: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15502: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15502: \$? = $ac_status" >&5
++  echo "$as_me:15505: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:15505: checking for X11/Xt const-feature" >&5
++echo "$as_me:15508: checking for X11/Xt const-feature" >&5
+ echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
+ if test "${cf_cv_const_x_string+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15512 "configure"
++#line 15515 "configure"
+ #include "confdefs.h"
+ 
+ #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
+@@ -15526,16 +15529,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15529: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15532: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15532: \$? = $ac_status" >&5
++  echo "$as_me:15535: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15535: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15538: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15538: \$? = $ac_status" >&5
++  echo "$as_me:15541: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -15550,7 +15553,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:15553: result: $cf_cv_const_x_string" >&5
++echo "$as_me:15556: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -15579,7 +15582,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <&5
++	{ echo "$as_me:15601: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -15611,12 +15614,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:15614: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:15617: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15617: \$? = $ac_status" >&5
++  echo "$as_me:15620: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:15619: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:15622: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -15624,7 +15627,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:15627: checking for $CC warning options..." >&5
++	{ echo "$as_me:15630: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -15647,12 +15650,12 @@
+ 		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:15650: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:15653: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15653: \$? = $ac_status" >&5
++  echo "$as_me:15656: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:15655: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:15658: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -15660,7 +15663,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:15663: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:15666: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -15670,7 +15673,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:15673: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:15676: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -15703,10 +15706,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:15706: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:15709: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <&5
++		if { (eval echo "$as_me:15761: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15761: \$? = $ac_status" >&5
++  echo "$as_me:15764: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:15763: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:15766: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -15828,7 +15831,7 @@
+ fi
+ 
+ ###	use option --enable-assertions to turn on generation of assertion code
+-echo "$as_me:15831: checking if you want to enable runtime assertions" >&5
++echo "$as_me:15834: checking if you want to enable runtime assertions" >&5
+ echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
+ 
+ # Check whether --enable-assertions or --disable-assertions was given.
+@@ -15838,7 +15841,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:15841: result: $with_assertions" >&5
++echo "$as_me:15844: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -15891,7 +15894,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:15894: checking whether to add trace feature to all models" >&5
++echo "$as_me:15897: checking whether to add trace feature to all models" >&5
+ echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
+ 
+ # Check whether --with-trace or --without-trace was given.
+@@ -15901,7 +15904,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:15904: result: $cf_with_trace" >&5
++echo "$as_me:15907: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "$cf_with_trace" = yes ; then
+@@ -16009,7 +16012,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:16012: checking if we want to use GNAT projects" >&5
++echo "$as_me:16015: checking if we want to use GNAT projects" >&5
+ echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6
+ 
+ # Check whether --enable-gnat-projects or --disable-gnat-projects was given.
+@@ -16026,21 +16029,21 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:16029: result: $enable_gnat_projects" >&5
++echo "$as_me:16032: result: $enable_gnat_projects" >&5
+ echo "${ECHO_T}$enable_gnat_projects" >&6
+ 
+ ###	Checks for libraries.
+ case $cf_cv_system_name in
+ (*mingw32*)
+ 
+-echo "$as_me:16036: checking if ssp library is needed" >&5
++echo "$as_me:16039: checking if ssp library is needed" >&5
+ echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
+ if test "${cf_cv_need_libssp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16043 "configure"
++#line 16046 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16057,16 +16060,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16060: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16063: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16063: \$? = $ac_status" >&5
++  echo "$as_me:16066: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16066: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16069: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16069: \$? = $ac_status" >&5
++  echo "$as_me:16072: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=no
+ else
+@@ -16076,7 +16079,7 @@
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lssp"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16079 "configure"
++#line 16082 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16093,16 +16096,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16096: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16099: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16099: \$? = $ac_status" >&5
++  echo "$as_me:16102: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16102: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16105: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16105: \$? = $ac_status" >&5
++  echo "$as_me:16108: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=yes
+ else
+@@ -16116,7 +16119,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16119: result: $cf_cv_need_libssp" >&5
++echo "$as_me:16122: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+ 
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -16142,13 +16145,13 @@
+ 
+ 	;;
+ (*)
+-echo "$as_me:16145: checking for gettimeofday" >&5
++echo "$as_me:16148: checking for gettimeofday" >&5
+ echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
+ if test "${ac_cv_func_gettimeofday+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16151 "configure"
++#line 16154 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -16179,16 +16182,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16182: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16185: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16185: \$? = $ac_status" >&5
++  echo "$as_me:16188: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16188: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16191: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16191: \$? = $ac_status" >&5
++  echo "$as_me:16194: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -16198,7 +16201,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16201: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:16204: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+   cat >>confdefs.h <<\EOF
+@@ -16207,7 +16210,7 @@
+ 
+ else
+ 
+-echo "$as_me:16210: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:16213: checking for gettimeofday in -lbsd" >&5
+ echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16215,7 +16218,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16218 "configure"
++#line 16221 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16234,16 +16237,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16237: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16240: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16240: \$? = $ac_status" >&5
++  echo "$as_me:16243: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16243: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16246: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16246: \$? = $ac_status" >&5
++  echo "$as_me:16249: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -16254,7 +16257,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16257: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:16260: result: $ac_cv_lib_bsd_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
+ if test "$ac_cv_lib_bsd_gettimeofday" = yes; then
+ 
+@@ -16270,13 +16273,13 @@
+ esac
+ 
+ ###	Checks for header files.
+-echo "$as_me:16273: checking for ANSI C header files" >&5
++echo "$as_me:16276: checking for ANSI C header files" >&5
+ echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+ if test "${ac_cv_header_stdc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16279 "configure"
++#line 16282 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -16284,13 +16287,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:16287: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:16290: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:16293: \$? = $ac_status" >&5
++  echo "$as_me:16296: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16312,7 +16315,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16315 "configure"
++#line 16318 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -16330,7 +16333,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16333 "configure"
++#line 16336 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -16351,7 +16354,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16354 "configure"
++#line 16357 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -16377,15 +16380,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:16380: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16383: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16383: \$? = $ac_status" >&5
++  echo "$as_me:16386: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:16385: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16388: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16388: \$? = $ac_status" >&5
++  echo "$as_me:16391: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -16398,7 +16401,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:16401: result: $ac_cv_header_stdc" >&5
++echo "$as_me:16404: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -16414,28 +16417,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:16417: checking for $ac_header" >&5
++echo "$as_me:16420: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16423 "configure"
++#line 16426 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16429: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16432: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16432: \$? = $ac_status" >&5
++  echo "$as_me:16435: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16435: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16438: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16438: \$? = $ac_status" >&5
++  echo "$as_me:16441: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -16445,7 +16448,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16448: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:16451: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:16461: checking for signed char" >&5
+ echo $ECHO_N "checking for signed char... $ECHO_C" >&6
+ if test "${ac_cv_type_signed_char+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16464 "configure"
++#line 16467 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16476,16 +16479,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16479: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16482: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16482: \$? = $ac_status" >&5
++  echo "$as_me:16485: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16485: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16488: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16488: \$? = $ac_status" >&5
++  echo "$as_me:16491: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_signed_char=yes
+ else
+@@ -16495,10 +16498,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16498: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:16501: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+ 
+-echo "$as_me:16501: checking size of signed char" >&5
++echo "$as_me:16504: checking size of signed char" >&5
+ echo $ECHO_N "checking size of signed char... $ECHO_C" >&6
+ if test "${ac_cv_sizeof_signed_char+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16507,7 +16510,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16510 "configure"
++#line 16513 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16519,21 +16522,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16522: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16525: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16525: \$? = $ac_status" >&5
++  echo "$as_me:16528: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16528: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16531: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16531: \$? = $ac_status" >&5
++  echo "$as_me:16534: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16536 "configure"
++#line 16539 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16545,16 +16548,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16548: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16551: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16551: \$? = $ac_status" >&5
++  echo "$as_me:16554: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16554: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16557: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16557: \$? = $ac_status" >&5
++  echo "$as_me:16560: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -16570,7 +16573,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16573 "configure"
++#line 16576 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16582,16 +16585,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16585: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16588: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16588: \$? = $ac_status" >&5
++  echo "$as_me:16591: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16591: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16594: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16594: \$? = $ac_status" >&5
++  echo "$as_me:16597: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -16607,7 +16610,7 @@
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16610 "configure"
++#line 16613 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16619,16 +16622,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16622: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16625: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16625: \$? = $ac_status" >&5
++  echo "$as_me:16628: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16628: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16631: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16631: \$? = $ac_status" >&5
++  echo "$as_me:16634: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -16641,12 +16644,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:16644: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:16647: error: cannot run test program while cross compiling" >&5
+ echo "$as_me: error: cannot run test program while cross compiling" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16649 "configure"
++#line 16652 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16662,15 +16665,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:16665: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16668: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16668: \$? = $ac_status" >&5
++  echo "$as_me:16671: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:16670: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16673: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16673: \$? = $ac_status" >&5
++  echo "$as_me:16676: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -16686,19 +16689,19 @@
+   ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:16689: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:16692: result: $ac_cv_sizeof_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:16698: checking for ANSI C header files" >&5
+ echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+ if test "${ac_cv_header_stdc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16701 "configure"
++#line 16704 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -16706,13 +16709,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:16709: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:16712: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:16715: \$? = $ac_status" >&5
++  echo "$as_me:16718: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16734,7 +16737,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16737 "configure"
++#line 16740 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -16752,7 +16755,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16755 "configure"
++#line 16758 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -16773,7 +16776,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16776 "configure"
++#line 16779 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -16799,15 +16802,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:16802: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16805: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16805: \$? = $ac_status" >&5
++  echo "$as_me:16808: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:16807: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16810: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16810: \$? = $ac_status" >&5
++  echo "$as_me:16813: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -16820,7 +16823,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:16823: result: $ac_cv_header_stdc" >&5
++echo "$as_me:16826: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -16833,13 +16836,13 @@
+ ac_header_dirent=no
+ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
+   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+-echo "$as_me:16836: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:16839: checking for $ac_hdr that defines DIR" >&5
+ echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16842 "configure"
++#line 16845 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$ac_hdr>
+@@ -16854,16 +16857,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16857: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16860: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16860: \$? = $ac_status" >&5
++  echo "$as_me:16863: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16863: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16866: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16866: \$? = $ac_status" >&5
++  echo "$as_me:16869: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -16873,7 +16876,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:16876: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:16879: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++  echo "$as_me:16892: checking for opendir in -ldir" >&5
+ echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
+ if test "${ac_cv_lib_dir_opendir+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16894,7 +16897,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16897 "configure"
++#line 16900 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16913,16 +16916,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16916: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16919: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16919: \$? = $ac_status" >&5
++  echo "$as_me:16922: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16922: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16925: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16925: \$? = $ac_status" >&5
++  echo "$as_me:16928: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -16933,14 +16936,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16936: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:16939: result: $ac_cv_lib_dir_opendir" >&5
+ echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
+ if test "$ac_cv_lib_dir_opendir" = yes; then
+   LIBS="$LIBS -ldir"
+ fi
+ 
+ else
+-  echo "$as_me:16943: checking for opendir in -lx" >&5
++  echo "$as_me:16946: checking for opendir in -lx" >&5
+ echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
+ if test "${ac_cv_lib_x_opendir+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16948,7 +16951,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16951 "configure"
++#line 16954 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -16967,16 +16970,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16970: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16973: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16973: \$? = $ac_status" >&5
++  echo "$as_me:16976: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16976: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16979: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16979: \$? = $ac_status" >&5
++  echo "$as_me:16982: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -16987,7 +16990,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16990: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:16993: result: $ac_cv_lib_x_opendir" >&5
+ echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
+ if test "$ac_cv_lib_x_opendir" = yes; then
+   LIBS="$LIBS -lx"
+@@ -16995,13 +16998,13 @@
+ 
+ fi
+ 
+-echo "$as_me:16998: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:17001: checking whether time.h and sys/time.h may both be included" >&5
+ echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
+ if test "${ac_cv_header_time+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17004 "configure"
++#line 17007 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -17017,16 +17020,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17020: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17023: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17023: \$? = $ac_status" >&5
++  echo "$as_me:17026: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17026: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17029: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17029: \$? = $ac_status" >&5
++  echo "$as_me:17032: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -17036,7 +17039,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17039: result: $ac_cv_header_time" >&5
++echo "$as_me:17042: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -17054,13 +17057,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:17057: checking for an ANSI C-conforming const" >&5
++echo "$as_me:17060: checking for an ANSI C-conforming const" >&5
+ echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
+ if test "${ac_cv_c_const+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17063 "configure"
++#line 17066 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17118,16 +17121,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17121: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17124: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17124: \$? = $ac_status" >&5
++  echo "$as_me:17127: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17127: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17130: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17130: \$? = $ac_status" >&5
++  echo "$as_me:17133: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -17137,7 +17140,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17140: result: $ac_cv_c_const" >&5
++echo "$as_me:17143: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -17149,7 +17152,7 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:17152: checking if data-only library module links" >&5
++echo "$as_me:17155: checking if data-only library module links" >&5
+ echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
+ if test "${cf_cv_link_dataonly+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17157,20 +17160,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:17166: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17166: \$? = $ac_status" >&5
++  echo "$as_me:17169: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+ 		mv conftest.o data.o && \
+ 		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
+ 	fi
+ 	rm -f conftest.$ac_ext data.o
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:17189: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17189: \$? = $ac_status" >&5
++  echo "$as_me:17192: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+ 		mv conftest.o func.o && \
+ 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -17199,7 +17202,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17202 "configure"
++#line 17205 "configure"
+ #include "confdefs.h"
+ 
+ 	int main(void)
+@@ -17210,15 +17213,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17213: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17216: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17216: \$? = $ac_status" >&5
++  echo "$as_me:17219: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17218: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17221: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17221: \$? = $ac_status" >&5
++  echo "$as_me:17224: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -17233,7 +17236,7 @@
+ 
+ fi
+ 
+-echo "$as_me:17236: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:17239: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -17252,23 +17255,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:17255: checking for $ac_header" >&5
++echo "$as_me:17258: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17261 "configure"
++#line 17264 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:17265: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:17268: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:17271: \$? = $ac_status" >&5
++  echo "$as_me:17274: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17287,7 +17290,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:17290: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:17293: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:17303: checking for working mkstemp" >&5
+ echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
+ if test "${cf_cv_func_mkstemp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17308,7 +17311,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17311 "configure"
++#line 17314 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -17349,15 +17352,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:17352: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17355: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17355: \$? = $ac_status" >&5
++  echo "$as_me:17358: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:17357: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17360: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17360: \$? = $ac_status" >&5
++  echo "$as_me:17363: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -17372,16 +17375,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:17375: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:17378: result: $cf_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
+ if test "x$cf_cv_func_mkstemp" = xmaybe ; then
+-	echo "$as_me:17378: checking for mkstemp" >&5
++	echo "$as_me:17381: checking for mkstemp" >&5
+ echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
+ if test "${ac_cv_func_mkstemp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17384 "configure"
++#line 17387 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17412,16 +17415,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17415: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17418: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17418: \$? = $ac_status" >&5
++  echo "$as_me:17421: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17421: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17424: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17424: \$? = $ac_status" >&5
++  echo "$as_me:17427: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -17431,7 +17434,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17434: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:17437: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -17460,7 +17463,7 @@
+ 	unset cf_TEMP_gnat
+ 	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
+ set dummy $cf_prog_gnat; ac_word=$2
+-echo "$as_me:17463: checking for $ac_word" >&5
++echo "$as_me:17466: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17477,7 +17480,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
+-   echo "$as_me:17480: found $ac_dir/$ac_word" >&5
++   echo "$as_me:17483: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -17489,10 +17492,10 @@
+ cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
+ 
+ if test -n "$cf_TEMP_gnat"; then
+-  echo "$as_me:17492: result: $cf_TEMP_gnat" >&5
++  echo "$as_me:17495: result: $cf_TEMP_gnat" >&5
+ echo "${ECHO_T}$cf_TEMP_gnat" >&6
+ else
+-  echo "$as_me:17495: result: no" >&5
++  echo "$as_me:17498: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -17502,7 +17505,7 @@
+ 		unset cf_cv_gnat_version
+ 		unset cf_TEMP_gnat
+ 
+-echo "$as_me:17505: checking for $cf_prog_gnat version" >&5
++echo "$as_me:17508: checking for $cf_prog_gnat version" >&5
+ echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
+ if test "${cf_cv_gnat_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17513,7 +17516,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:17516: result: $cf_cv_gnat_version" >&5
++echo "$as_me:17519: result: $cf_cv_gnat_version" >&5
+ echo "${ECHO_T}$cf_cv_gnat_version" >&6
+ test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
+ eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
+@@ -17542,7 +17545,7 @@
+ 			cd conftest.src
+ 			for cf_gprconfig in Ada C
+ 			do
+-				echo "$as_me:17545: checking for gprconfig name for $cf_gprconfig" >&5
++				echo "$as_me:17548: checking for gprconfig name for $cf_gprconfig" >&5
+ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
+ 				if test "$cf_gprconfig" = C
+ 				then
+@@ -17561,10 +17564,10 @@
+ 				if test -n "$cf_gprconfig_value"
+ 				then
+ 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
+-					echo "$as_me:17564: result: $cf_gprconfig_value" >&5
++					echo "$as_me:17567: result: $cf_gprconfig_value" >&5
+ echo "${ECHO_T}$cf_gprconfig_value" >&6
+ 				else
+-					echo "$as_me:17567: result: missing" >&5
++					echo "$as_me:17570: result: missing" >&5
+ echo "${ECHO_T}missing" >&6
+ 					cf_ada_config="#"
+ 					break
+@@ -17577,7 +17580,7 @@
+ 	if test "x$cf_ada_config" != "x#"
+ 	then
+ 
+-echo "$as_me:17580: checking for gnat version" >&5
++echo "$as_me:17583: checking for gnat version" >&5
+ echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
+ if test "${cf_cv_gnat_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17588,7 +17591,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:17591: result: $cf_cv_gnat_version" >&5
++echo "$as_me:17594: result: $cf_cv_gnat_version" >&5
+ echo "${ECHO_T}$cf_cv_gnat_version" >&6
+ test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
+ 
+@@ -17597,7 +17600,7 @@
+ 	cf_cv_prog_gnat_correct=yes
+ 	;;
+ (*)
+-	{ echo "$as_me:17600: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
++	{ echo "$as_me:17603: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+ echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
+ 	cf_cv_prog_gnat_correct=no
+ 	;;
+@@ -17605,7 +17608,7 @@
+ 
+ 		# Extract the first word of "m4", so it can be a program name with args.
+ set dummy m4; ac_word=$2
+-echo "$as_me:17608: checking for $ac_word" >&5
++echo "$as_me:17611: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_M4_exists+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17620,7 +17623,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_M4_exists="yes"
+-echo "$as_me:17623: found $ac_dir/$ac_word" >&5
++echo "$as_me:17626: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -17629,20 +17632,20 @@
+ fi
+ M4_exists=$ac_cv_prog_M4_exists
+ if test -n "$M4_exists"; then
+-  echo "$as_me:17632: result: $M4_exists" >&5
++  echo "$as_me:17635: result: $M4_exists" >&5
+ echo "${ECHO_T}$M4_exists" >&6
+ else
+-  echo "$as_me:17635: result: no" >&5
++  echo "$as_me:17638: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ 		if test "$ac_cv_prog_M4_exists" = no; then
+ 			cf_cv_prog_gnat_correct=no
+-			{ echo "$as_me:17641: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
++			{ echo "$as_me:17644: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+ echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
+ 		fi
+ 		if test "$cf_cv_prog_gnat_correct" = yes; then
+-			echo "$as_me:17645: checking if GNAT works" >&5
++			echo "$as_me:17648: checking if GNAT works" >&5
+ echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
+ 
+ rm -rf ./conftest* ./*~conftest*
+@@ -17670,7 +17673,7 @@
+ fi
+ rm -rf ./conftest* ./*~conftest*
+ 
+-			echo "$as_me:17673: result: $cf_cv_prog_gnat_correct" >&5
++			echo "$as_me:17676: result: $cf_cv_prog_gnat_correct" >&5
+ echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
+ 		fi
+ 	else
+@@ -17680,7 +17683,7 @@
+ 
+ 	if test	"$cf_cv_prog_gnat_correct" = yes; then
+ 
+-	echo "$as_me:17683: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:17686: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -17697,10 +17700,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:17700: result: $ADAFLAGS" >&5
++	echo "$as_me:17703: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:17703: checking if GNATPREP supports -T option" >&5
++echo "$as_me:17706: checking if GNATPREP supports -T option" >&5
+ echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6
+ if test "${cf_cv_gnatprep_opt_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17710,11 +17713,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:17713: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:17716: result: $cf_cv_gnatprep_opt_t" >&5
+ echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
+ test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
+ 
+-echo "$as_me:17717: checking if GNAT supports generics" >&5
++echo "$as_me:17720: checking if GNAT supports generics" >&5
+ echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
+ case "$cf_cv_gnat_version" in
+ (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
+@@ -17724,7 +17727,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:17727: result: $cf_gnat_generics" >&5
++echo "$as_me:17730: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -17736,7 +17739,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:17739: checking if GNAT supports SIGINT" >&5
++echo "$as_me:17742: checking if GNAT supports SIGINT" >&5
+ echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
+ if test "${cf_cv_gnat_sigint+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17784,7 +17787,7 @@
+ rm -rf ./conftest* ./*~conftest*
+ 
+ fi
+-echo "$as_me:17787: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:17790: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -17797,7 +17800,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:17800: checking if GNAT supports project files" >&5
++echo "$as_me:17803: checking if GNAT supports project files" >&5
+ echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
+ case "$cf_cv_gnat_version" in
+ (3.[0-9]*)
+@@ -17860,15 +17863,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:17863: result: $cf_gnat_projects" >&5
++echo "$as_me:17866: result: $cf_gnat_projects" >&5
+ echo "${ECHO_T}$cf_gnat_projects" >&6
+ fi # enable_gnat_projects
+ 
+ if test "$cf_gnat_projects" = yes
+ then
+-	echo "$as_me:17869: checking if GNAT supports libraries" >&5
++	echo "$as_me:17872: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:17871: result: $cf_gnat_libraries" >&5
++	echo "$as_me:17874: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -17888,7 +17891,7 @@
+ 	then
+ 		USE_GNAT_MAKE_GPR=""
+ 	else
+-		{ echo "$as_me:17891: WARNING: use old makefile rules since tools are missing" >&5
++		{ echo "$as_me:17894: WARNING: use old makefile rules since tools are missing" >&5
+ echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
+ 	fi
+ fi
+@@ -17900,7 +17903,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:17903: checking for ada-compiler" >&5
++echo "$as_me:17906: checking for ada-compiler" >&5
+ echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -17911,12 +17914,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:17914: result: $cf_ada_compiler" >&5
++echo "$as_me:17917: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 		cf_ada_package=terminal_interface
+ 
+-echo "$as_me:17919: checking for ada-include" >&5
++echo "$as_me:17922: checking for ada-include" >&5
+ echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -17952,7 +17955,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:17955: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:17958: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -17961,10 +17964,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:17964: result: $ADA_INCLUDE" >&5
++echo "$as_me:17967: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:17967: checking for ada-objects" >&5
++echo "$as_me:17970: checking for ada-objects" >&5
+ echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -18000,7 +18003,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:18003: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:18006: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -18009,10 +18012,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:18012: result: $ADA_OBJECTS" >&5
++echo "$as_me:18015: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:18015: checking if an Ada95 shared-library should be built" >&5
++echo "$as_me:18018: checking if an Ada95 shared-library should be built" >&5
+ echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -18022,14 +18025,14 @@
+ else
+   with_ada_sharedlib=no
+ fi;
+-echo "$as_me:18025: result: $with_ada_sharedlib" >&5
++echo "$as_me:18028: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ 
+ if test "x$with_ada_sharedlib" != xno
+ then
+ 	if test "x$cf_gnat_projects" != xyes
+ 	then
+-		{ echo "$as_me:18032: WARNING: disabling shared-library since GNAT projects are not supported" >&5
++		{ echo "$as_me:18035: WARNING: disabling shared-library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;}
+ 		with_ada_sharedlib=no
+ 	fi
+@@ -18049,7 +18052,7 @@
+ 
+ 		# allow the Ada binding to be renamed
+ 
+-echo "$as_me:18052: checking for ada-libname" >&5
++echo "$as_me:18055: checking for ada-libname" >&5
+ echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-libname or --without-ada-libname was given.
+@@ -18065,16 +18068,16 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:18068: result: $ADA_LIBNAME" >&5
++echo "$as_me:18071: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 	else
+-		{ { echo "$as_me:18072: error: No usable Ada compiler found" >&5
++		{ { echo "$as_me:18075: error: No usable Ada compiler found" >&5
+ echo "$as_me: error: No usable Ada compiler found" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+ else
+-	{ { echo "$as_me:18077: error: The Ada compiler is needed for this package" >&5
++	{ { echo "$as_me:18080: error: The Ada compiler is needed for this package" >&5
+ echo "$as_me: error: The Ada compiler is needed for this package" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -18114,7 +18117,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:18117: checking default library suffix" >&5
++echo "$as_me:18120: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -18125,10 +18128,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:18128: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:18131: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:18131: checking default library-dependency suffix" >&5
++echo "$as_me:18134: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -18211,10 +18214,10 @@
+ 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
+ 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
+ 	fi
+-echo "$as_me:18214: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:18217: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:18217: checking default object directory" >&5
++echo "$as_me:18220: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -18230,7 +18233,7 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:18233: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:18236: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ ### Set up low-level terminfo dependencies for makefiles.
+@@ -18372,7 +18375,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:18375: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:18378: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -18551,7 +18554,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:18554: error: ambiguous option: $1
++    { { echo "$as_me:18557: error: ambiguous option: $1
+ Try \`$0 --help' for more information." >&5
+ echo "$as_me: error: ambiguous option: $1
+ Try \`$0 --help' for more information." >&2;}
+@@ -18570,7 +18573,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:18573: error: unrecognized option: $1
++  -*) { { echo "$as_me:18576: error: unrecognized option: $1
+ Try \`$0 --help' for more information." >&5
+ echo "$as_me: error: unrecognized option: $1
+ Try \`$0 --help' for more information." >&2;}
+@@ -18644,7 +18647,7 @@
+   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
+   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
+-  *) { { echo "$as_me:18647: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:18650: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -19004,7 +19007,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:19007: creating $ac_file" >&5
++    { echo "$as_me:19010: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -19022,7 +19025,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:19025: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:19028: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -19035,7 +19038,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:19038: error: cannot find input file: $f" >&5
++           { { echo "$as_me:19041: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -19051,7 +19054,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:19054: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:19057: WARNING: datarootdir was used implicitly but not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: datarootdir was used implicitly but not set:
+ $ac_seen" >&2;}
+@@ -19060,7 +19063,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:19063: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:19066: WARNING: datarootdir was used explicitly but not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: datarootdir was used explicitly but not set:
+ $ac_seen" >&2;}
+@@ -19097,7 +19100,7 @@
+             ac_init=`${EGREP-egrep} '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
+-              { echo "$as_me:19100: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:19103: WARNING: Variable $ac_name is used but was not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Variable $ac_name is used but was not set:
+ $ac_seen" >&2;}
+@@ -19108,7 +19111,7 @@
+     ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out
+     if test -s $tmp/out; then
+       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
+-      { echo "$as_me:19111: WARNING: Some variables may not be substituted:
++      { echo "$as_me:19114: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -19157,7 +19160,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:19160: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:19163: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -19168,7 +19171,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:19171: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:19174: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -19181,7 +19184,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:19184: error: cannot find input file: $f" >&5
++           { { echo "$as_me:19187: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -19239,7 +19242,7 @@
+   rm -f $tmp/in
+   if test x"$ac_file" != x-; then
+     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
+-      { echo "$as_me:19242: $ac_file is unchanged" >&5
++      { echo "$as_me:19245: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+Index: NEWS
+Prereq:  1.3771 
+--- ncurses-6.3-20220122+/NEWS	2022-01-23 00:20:39.000000000 +0000
++++ ncurses-6.3-20220129/NEWS	2022-01-30 01:11:51.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.3771 2022/01/23 00:20:39 tom Exp $
++-- $Id: NEWS,v 1.3774 2022/01/30 01:11:51 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -46,6 +46,14 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20220129
++	+ minor updates for test-packages
++	+ improve handling of --with-pkg-config-libdir option, allowing for the
++	  case where either $PKG_CONFIG_LIBDIR or the option value has a
++	  colon-separated list of directories (report by Rudi Heitbaum,
++	  cf: 20211113).
++	+ update kitty -TD
++
+ 20220122
+ 	+ add ABI 7 defaults to configure script.
+ 	+ add warning in configure script if file specified for "--with-caps"
+Index: VERSION
+--- ncurses-6.3-20220122+/VERSION	2022-01-22 15:48:54.000000000 +0000
++++ ncurses-6.3-20220129/VERSION	2022-01-29 12:21:50.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.3	20220122
++5:0:10	6.3	20220129
+Index: aclocal.m4
+Prereq:  1.1001 
+--- ncurses-6.3-20220122+/aclocal.m4	2022-01-23 00:15:35.000000000 +0000
++++ ncurses-6.3-20220129/aclocal.m4	2022-01-29 22:05:06.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: aclocal.m4,v 1.1001 2022/01/23 00:15:35 tom Exp $
++dnl $Id: aclocal.m4,v 1.1003 2022/01/29 22:05:06 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -9317,7 +9317,7 @@
+ fi
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_WITH_PKG_CONFIG_LIBDIR version: 19 updated: 2021/11/20 14:57:36
++dnl CF_WITH_PKG_CONFIG_LIBDIR version: 20 updated: 2022/01/29 17:03:42
+ dnl -------------------------
+ dnl Allow the choice of the pkg-config library directory to be overridden.
+ dnl
+@@ -9349,7 +9349,7 @@
+ 	[cf_search_path=$withval],
+ 	[test "x$PKG_CONFIG" != xnone && test -z "$cf_search_path" && cf_search_path=libdir])
+ 
+-case x$cf_search_path in
++case "x$cf_search_path" in
+ (xlibdir)
+ 	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
+ 	AC_MSG_RESULT($PKG_CONFIG_LIBDIR)
+@@ -9357,6 +9357,9 @@
+ 	;;
+ (x)
+ 	;;
++(x/*\ *)
++	PKG_CONFIG_LIBDIR=
++	;;
+ (x/*)
+ 	PKG_CONFIG_LIBDIR="$cf_search_path"
+ 	AC_MSG_RESULT($PKG_CONFIG_LIBDIR)
+Index: configure
+--- ncurses-6.3-20220122+/configure	2022-01-23 00:15:55.000000000 +0000
++++ ncurses-6.3-20220129/configure	2022-01-29 22:05:31.000000000 +0000
+@@ -4168,7 +4168,7 @@
+   test "x$PKG_CONFIG" != xnone && test -z "$cf_search_path" && cf_search_path=libdir
+ fi;
+ 
+-case x$cf_search_path in
++case "x$cf_search_path" in
+ (xlibdir)
+ 	PKG_CONFIG_LIBDIR='${libdir}/pkgconfig'
+ 	echo "$as_me:4174: result: $PKG_CONFIG_LIBDIR" >&5
+@@ -4177,18 +4177,21 @@
+ 	;;
+ (x)
+ 	;;
++(x/*\ *)
++	PKG_CONFIG_LIBDIR=
++	;;
+ (x/*)
+ 	PKG_CONFIG_LIBDIR="$cf_search_path"
+-	echo "$as_me:4182: result: $PKG_CONFIG_LIBDIR" >&5
++	echo "$as_me:4185: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	cf_search_path=
+ 	;;
+ (xyes|xauto)
+-	echo "$as_me:4187: result: auto" >&5
++	echo "$as_me:4190: result: auto" >&5
+ echo "${ECHO_T}auto" >&6
+ 	cf_search_path=
+ 	# Look for the library directory using the same prefix as the executable
+-	echo "$as_me:4191: checking for search-list" >&5
++	echo "$as_me:4194: checking for search-list" >&5
+ echo $ECHO_N "checking for search-list... $ECHO_C" >&6
+ 	if test "x$PKG_CONFIG" != xnone
+ 	then
+@@ -4215,11 +4218,11 @@
+ "`
+ 	fi
+ 
+-	echo "$as_me:4218: result: $cf_search_path" >&5
++	echo "$as_me:4221: result: $cf_search_path" >&5
+ echo "${ECHO_T}$cf_search_path" >&6
+ 	;;
+ (*)
+-	{ { echo "$as_me:4222: error: Unexpected option value: $cf_search_path" >&5
++	{ { echo "$as_me:4225: error: Unexpected option value: $cf_search_path" >&5
+ echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -4227,7 +4230,7 @@
+ 
+ if test -n "$cf_search_path"
+ then
+-	echo "$as_me:4230: checking for first directory" >&5
++	echo "$as_me:4233: checking for first directory" >&5
+ echo $ECHO_N "checking for first directory... $ECHO_C" >&6
+ 	cf_pkg_config_path=none
+ 	for cf_config in $cf_search_path
+@@ -4238,7 +4241,7 @@
+ 			break
+ 		fi
+ 	done
+-	echo "$as_me:4241: result: $cf_pkg_config_path" >&5
++	echo "$as_me:4244: result: $cf_pkg_config_path" >&5
+ echo "${ECHO_T}$cf_pkg_config_path" >&6
+ 
+ 	if test "x$cf_pkg_config_path" != xnone ; then
+@@ -4248,7 +4251,7 @@
+ 
+ 	if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path"
+ 	then
+-		echo "$as_me:4251: checking for workaround" >&5
++		echo "$as_me:4254: checking for workaround" >&5
+ echo $ECHO_N "checking for workaround... $ECHO_C" >&6
+ 		if test "$prefix" = "NONE" ; then
+ 			cf_prefix="$ac_default_prefix"
+@@ -4271,17 +4274,17 @@
+ 			esac
+ 		done
+ 		test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup
+-		echo "$as_me:4274: result: $PKG_CONFIG_LIBDIR" >&5
++		echo "$as_me:4277: result: $PKG_CONFIG_LIBDIR" >&5
+ echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
+ 	fi
+ fi
+ 
+ if test "x$PKG_CONFIG" != xnone
+ then
+-	echo "$as_me:4281: checking if we should install .pc files for $PKG_CONFIG" >&5
++	echo "$as_me:4284: checking if we should install .pc files for $PKG_CONFIG" >&5
+ echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6
+ else
+-	echo "$as_me:4284: checking if we should install .pc files" >&5
++	echo "$as_me:4287: checking if we should install .pc files" >&5
+ echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6
+ fi
+ 
+@@ -4292,7 +4295,7 @@
+ else
+   enable_pc_files=no
+ fi;
+-echo "$as_me:4295: result: $enable_pc_files" >&5
++echo "$as_me:4298: result: $enable_pc_files" >&5
+ echo "${ECHO_T}$enable_pc_files" >&6
+ 
+ if test "x$enable_pc_files" != xno
+@@ -4300,7 +4303,7 @@
+ 	MAKE_PC_FILES=
+ 	case "x$PKG_CONFIG_LIBDIR" in
+ 	(xno|xnone|xyes|x)
+-		{ echo "$as_me:4303: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
++		{ echo "$as_me:4306: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
+ echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
+ 		;;
+ 	(*)
+@@ -4331,7 +4334,7 @@
+ 	cf_pkg_config_libdir=`echo "$cf_pkg_config_libdir" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:4334: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
++	{ { echo "$as_me:4337: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_pkg_config_libdir\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -4345,7 +4348,7 @@
+ 
+ if test -z "$MAKE_PC_FILES"
+ then
+-	echo "$as_me:4348: checking for suffix to add to pc-files" >&5
++	echo "$as_me:4351: checking for suffix to add to pc-files" >&5
+ echo $ECHO_N "checking for suffix to add to pc-files... $ECHO_C" >&6
+ 
+ # Check whether --with-pc-suffix or --without-pc-suffix was given.
+@@ -4360,13 +4363,13 @@
+ 	esac
+ fi;
+ 	test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none
+-	echo "$as_me:4363: result: $PC_MODULE_SUFFIX" >&5
++	echo "$as_me:4366: result: $PC_MODULE_SUFFIX" >&5
+ echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
+ 	test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
+ 
+ fi
+ 
+-echo "$as_me:4369: checking if we should assume mixed-case filenames" >&5
++echo "$as_me:4372: checking if we should assume mixed-case filenames" >&5
+ echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6
+ 
+ # Check whether --enable-mixed-case or --disable-mixed-case was given.
+@@ -4376,11 +4379,11 @@
+ else
+   enable_mixedcase=auto
+ fi;
+-echo "$as_me:4379: result: $enable_mixedcase" >&5
++echo "$as_me:4382: result: $enable_mixedcase" >&5
+ echo "${ECHO_T}$enable_mixedcase" >&6
+ if test "$enable_mixedcase" = "auto" ; then
+ 
+-echo "$as_me:4383: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:4386: checking if filesystem supports mixed-case filenames" >&5
+ echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
+ if test "${cf_cv_mixedcase+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4407,7 +4410,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:4410: result: $cf_cv_mixedcase" >&5
++echo "$as_me:4413: result: $cf_cv_mixedcase" >&5
+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
+ test "$cf_cv_mixedcase" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -4426,7 +4429,7 @@
+ fi
+ 
+ # do this after mixed-case option (tags/TAGS is not as important as tic).
+-echo "$as_me:4429: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:4432: checking whether ${MAKE-make} sets \${MAKE}" >&5
+ echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
+ set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
+ if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+@@ -4446,16 +4449,16 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "$as_me:4449: result: yes" >&5
++  echo "$as_me:4452: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+   SET_MAKE=
+ else
+-  echo "$as_me:4453: result: no" >&5
++  echo "$as_me:4456: result: no" >&5
+ echo "${ECHO_T}no" >&6
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+ 
+-echo "$as_me:4458: checking for \".PHONY\" make-support" >&5
++echo "$as_me:4461: checking for \".PHONY\" make-support" >&5
+ echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6
+ if test "${cf_cv_make_PHONY+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4510,7 +4513,7 @@
+ 	rm -rf conftest*
+ 
+ fi
+-echo "$as_me:4513: result: $cf_cv_make_PHONY" >&5
++echo "$as_me:4516: result: $cf_cv_make_PHONY" >&5
+ echo "${ECHO_T}$cf_cv_make_PHONY" >&6
+ MAKE_NO_PHONY="#"
+ MAKE_PHONY="#"
+@@ -4521,7 +4524,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:4524: checking for $ac_word" >&5
++echo "$as_me:4527: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CTAGS+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4536,7 +4539,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CTAGS="$ac_prog"
+-echo "$as_me:4539: found $ac_dir/$ac_word" >&5
++echo "$as_me:4542: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4544,10 +4547,10 @@
+ fi
+ CTAGS=$ac_cv_prog_CTAGS
+ if test -n "$CTAGS"; then
+-  echo "$as_me:4547: result: $CTAGS" >&5
++  echo "$as_me:4550: result: $CTAGS" >&5
+ echo "${ECHO_T}$CTAGS" >&6
+ else
+-  echo "$as_me:4550: result: no" >&5
++  echo "$as_me:4553: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4558,7 +4561,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:4561: checking for $ac_word" >&5
++echo "$as_me:4564: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ETAGS+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4573,7 +4576,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ETAGS="$ac_prog"
+-echo "$as_me:4576: found $ac_dir/$ac_word" >&5
++echo "$as_me:4579: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4581,10 +4584,10 @@
+ fi
+ ETAGS=$ac_cv_prog_ETAGS
+ if test -n "$ETAGS"; then
+-  echo "$as_me:4584: result: $ETAGS" >&5
++  echo "$as_me:4587: result: $ETAGS" >&5
+ echo "${ECHO_T}$ETAGS" >&6
+ else
+-  echo "$as_me:4587: result: no" >&5
++  echo "$as_me:4590: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4593,7 +4596,7 @@
+ 
+ # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
+ set dummy ${CTAGS:-ctags}; ac_word=$2
+-echo "$as_me:4596: checking for $ac_word" >&5
++echo "$as_me:4599: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4608,7 +4611,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_MAKE_LOWER_TAGS="yes"
+-echo "$as_me:4611: found $ac_dir/$ac_word" >&5
++echo "$as_me:4614: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4617,17 +4620,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+-  echo "$as_me:4620: result: $MAKE_LOWER_TAGS" >&5
++  echo "$as_me:4623: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+-  echo "$as_me:4623: result: no" >&5
++  echo "$as_me:4626: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ if test "$cf_cv_mixedcase" = yes ; then
+ 	# Extract the first word of "${ETAGS:-etags}", so it can be a program name with args.
+ set dummy ${ETAGS:-etags}; ac_word=$2
+-echo "$as_me:4630: checking for $ac_word" >&5
++echo "$as_me:4633: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4642,7 +4645,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_MAKE_UPPER_TAGS="yes"
+-echo "$as_me:4645: found $ac_dir/$ac_word" >&5
++echo "$as_me:4648: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4651,10 +4654,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+-  echo "$as_me:4654: result: $MAKE_UPPER_TAGS" >&5
++  echo "$as_me:4657: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+-  echo "$as_me:4657: result: no" >&5
++  echo "$as_me:4660: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4674,7 +4677,7 @@
+ 	MAKE_LOWER_TAGS="#"
+ fi
+ 
+-echo "$as_me:4677: checking for makeflags variable" >&5
++echo "$as_me:4680: checking for makeflags variable" >&5
+ echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6
+ if test "${cf_cv_makeflags+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4704,7 +4707,7 @@
+ 			;;
+ 		(*)
+ 
+-echo "${as_me:-configure}:4707: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
++echo "${as_me:-configure}:4710: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+ 
+ 			;;
+ 		esac
+@@ -4712,13 +4715,13 @@
+ 	rm -f cf_makeflags.tmp
+ 
+ fi
+-echo "$as_me:4715: result: $cf_cv_makeflags" >&5
++echo "$as_me:4718: result: $cf_cv_makeflags" >&5
+ echo "${ECHO_T}$cf_cv_makeflags" >&6
+ 
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+-echo "$as_me:4721: checking for $ac_word" >&5
++echo "$as_me:4724: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_RANLIB+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4733,7 +4736,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+-echo "$as_me:4736: found $ac_dir/$ac_word" >&5
++echo "$as_me:4739: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4741,10 +4744,10 @@
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+-  echo "$as_me:4744: result: $RANLIB" >&5
++  echo "$as_me:4747: result: $RANLIB" >&5
+ echo "${ECHO_T}$RANLIB" >&6
+ else
+-  echo "$as_me:4747: result: no" >&5
++  echo "$as_me:4750: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4753,7 +4756,7 @@
+   ac_ct_RANLIB=$RANLIB
+   # Extract the first word of "ranlib", so it can be a program name with args.
+ set dummy ranlib; ac_word=$2
+-echo "$as_me:4756: checking for $ac_word" >&5
++echo "$as_me:4759: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4768,7 +4771,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_RANLIB="ranlib"
+-echo "$as_me:4771: found $ac_dir/$ac_word" >&5
++echo "$as_me:4774: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4777,10 +4780,10 @@
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+-  echo "$as_me:4780: result: $ac_ct_RANLIB" >&5
++  echo "$as_me:4783: result: $ac_ct_RANLIB" >&5
+ echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ else
+-  echo "$as_me:4783: result: no" >&5
++  echo "$as_me:4786: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4792,7 +4795,7 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ld; ac_word=$2
+-echo "$as_me:4795: checking for $ac_word" >&5
++echo "$as_me:4798: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_LD+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4807,7 +4810,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LD="${ac_tool_prefix}ld"
+-echo "$as_me:4810: found $ac_dir/$ac_word" >&5
++echo "$as_me:4813: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4815,10 +4818,10 @@
+ fi
+ LD=$ac_cv_prog_LD
+ if test -n "$LD"; then
+-  echo "$as_me:4818: result: $LD" >&5
++  echo "$as_me:4821: result: $LD" >&5
+ echo "${ECHO_T}$LD" >&6
+ else
+-  echo "$as_me:4821: result: no" >&5
++  echo "$as_me:4824: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4827,7 +4830,7 @@
+   ac_ct_LD=$LD
+   # Extract the first word of "ld", so it can be a program name with args.
+ set dummy ld; ac_word=$2
+-echo "$as_me:4830: checking for $ac_word" >&5
++echo "$as_me:4833: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4842,7 +4845,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_LD="ld"
+-echo "$as_me:4845: found $ac_dir/$ac_word" >&5
++echo "$as_me:4848: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4851,10 +4854,10 @@
+ fi
+ ac_ct_LD=$ac_cv_prog_ac_ct_LD
+ if test -n "$ac_ct_LD"; then
+-  echo "$as_me:4854: result: $ac_ct_LD" >&5
++  echo "$as_me:4857: result: $ac_ct_LD" >&5
+ echo "${ECHO_T}$ac_ct_LD" >&6
+ else
+-  echo "$as_me:4857: result: no" >&5
++  echo "$as_me:4860: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4866,7 +4869,7 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ar; ac_word=$2
+-echo "$as_me:4869: checking for $ac_word" >&5
++echo "$as_me:4872: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_AR+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4881,7 +4884,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_AR="${ac_tool_prefix}ar"
+-echo "$as_me:4884: found $ac_dir/$ac_word" >&5
++echo "$as_me:4887: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4889,10 +4892,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:4892: result: $AR" >&5
++  echo "$as_me:4895: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:4895: result: no" >&5
++  echo "$as_me:4898: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4901,7 +4904,7 @@
+   ac_ct_AR=$AR
+   # Extract the first word of "ar", so it can be a program name with args.
+ set dummy ar; ac_word=$2
+-echo "$as_me:4904: checking for $ac_word" >&5
++echo "$as_me:4907: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4916,7 +4919,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_AR="ar"
+-echo "$as_me:4919: found $ac_dir/$ac_word" >&5
++echo "$as_me:4922: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4925,10 +4928,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:4928: result: $ac_ct_AR" >&5
++  echo "$as_me:4931: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:4931: result: no" >&5
++  echo "$as_me:4934: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4940,7 +4943,7 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}nm; ac_word=$2
+-echo "$as_me:4943: checking for $ac_word" >&5
++echo "$as_me:4946: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_NM+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4955,7 +4958,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_NM="${ac_tool_prefix}nm"
+-echo "$as_me:4958: found $ac_dir/$ac_word" >&5
++echo "$as_me:4961: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4963,10 +4966,10 @@
+ fi
+ NM=$ac_cv_prog_NM
+ if test -n "$NM"; then
+-  echo "$as_me:4966: result: $NM" >&5
++  echo "$as_me:4969: result: $NM" >&5
+ echo "${ECHO_T}$NM" >&6
+ else
+-  echo "$as_me:4969: result: no" >&5
++  echo "$as_me:4972: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -4975,7 +4978,7 @@
+   ac_ct_NM=$NM
+   # Extract the first word of "nm", so it can be a program name with args.
+ set dummy nm; ac_word=$2
+-echo "$as_me:4978: checking for $ac_word" >&5
++echo "$as_me:4981: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_NM+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4990,7 +4993,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_NM="nm"
+-echo "$as_me:4993: found $ac_dir/$ac_word" >&5
++echo "$as_me:4996: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -4999,10 +5002,10 @@
+ fi
+ ac_ct_NM=$ac_cv_prog_ac_ct_NM
+ if test -n "$ac_ct_NM"; then
+-  echo "$as_me:5002: result: $ac_ct_NM" >&5
++  echo "$as_me:5005: result: $ac_ct_NM" >&5
+ echo "${ECHO_T}$ac_ct_NM" >&6
+ else
+-  echo "$as_me:5005: result: no" >&5
++  echo "$as_me:5008: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5014,7 +5017,7 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ar; ac_word=$2
+-echo "$as_me:5017: checking for $ac_word" >&5
++echo "$as_me:5020: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_AR+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5029,7 +5032,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_AR="${ac_tool_prefix}ar"
+-echo "$as_me:5032: found $ac_dir/$ac_word" >&5
++echo "$as_me:5035: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5037,10 +5040,10 @@
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:5040: result: $AR" >&5
++  echo "$as_me:5043: result: $AR" >&5
+ echo "${ECHO_T}$AR" >&6
+ else
+-  echo "$as_me:5043: result: no" >&5
++  echo "$as_me:5046: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5049,7 +5052,7 @@
+   ac_ct_AR=$AR
+   # Extract the first word of "ar", so it can be a program name with args.
+ set dummy ar; ac_word=$2
+-echo "$as_me:5052: checking for $ac_word" >&5
++echo "$as_me:5055: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5064,7 +5067,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_AR="ar"
+-echo "$as_me:5067: found $ac_dir/$ac_word" >&5
++echo "$as_me:5070: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5073,10 +5076,10 @@
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:5076: result: $ac_ct_AR" >&5
++  echo "$as_me:5079: result: $ac_ct_AR" >&5
+ echo "${ECHO_T}$ac_ct_AR" >&6
+ else
+-  echo "$as_me:5079: result: no" >&5
++  echo "$as_me:5082: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5085,7 +5088,7 @@
+   AR="$ac_cv_prog_AR"
+ fi
+ 
+-echo "$as_me:5088: checking for options to update archives" >&5
++echo "$as_me:5091: checking for options to update archives" >&5
+ echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6
+ if test "${cf_cv_ar_flags+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5122,13 +5125,13 @@
+ 			rm -f conftest.a
+ 
+ 			cat >"conftest.$ac_ext" <&5
++			if { (eval echo "$as_me:5131: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5131: \$? = $ac_status" >&5
++  echo "$as_me:5134: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+ 				echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5
+ 				$AR $ARFLAGS "$cf_ar_flags" conftest.a "conftest.$ac_cv_objext" 2>&5 1>/dev/null
+@@ -5139,7 +5142,7 @@
+ 			else
+ 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
+ 
+-echo "${as_me:-configure}:5142: testing cannot compile test-program ..." 1>&5
++echo "${as_me:-configure}:5145: testing cannot compile test-program ..." 1>&5
+ 
+ 				break
+ 			fi
+@@ -5149,7 +5152,7 @@
+ 	esac
+ 
+ fi
+-echo "$as_me:5152: result: $cf_cv_ar_flags" >&5
++echo "$as_me:5155: result: $cf_cv_ar_flags" >&5
+ echo "${ECHO_T}$cf_cv_ar_flags" >&6
+ 
+ if test -n "$ARFLAGS" ; then
+@@ -5160,7 +5163,7 @@
+ 	ARFLAGS=$cf_cv_ar_flags
+ fi
+ 
+-echo "$as_me:5163: checking if you have specified an install-prefix" >&5
++echo "$as_me:5166: checking if you have specified an install-prefix" >&5
+ echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6
+ 
+ # Check whether --with-install-prefix or --without-install-prefix was given.
+@@ -5173,7 +5176,7 @@
+ 		;;
+ 	esac
+ fi;
+-echo "$as_me:5176: result: $DESTDIR" >&5
++echo "$as_me:5179: result: $DESTDIR" >&5
+ echo "${ECHO_T}$DESTDIR" >&6
+ 
+ ###############################################################################
+@@ -5208,7 +5211,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:5211: checking for $ac_word" >&5
++echo "$as_me:5214: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_BUILD_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5223,7 +5226,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_BUILD_CC="$ac_prog"
+-echo "$as_me:5226: found $ac_dir/$ac_word" >&5
++echo "$as_me:5229: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5231,10 +5234,10 @@
+ fi
+ BUILD_CC=$ac_cv_prog_BUILD_CC
+ if test -n "$BUILD_CC"; then
+-  echo "$as_me:5234: result: $BUILD_CC" >&5
++  echo "$as_me:5237: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ else
+-  echo "$as_me:5237: result: no" >&5
++  echo "$as_me:5240: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5243,12 +5246,12 @@
+ test -n "$BUILD_CC" || BUILD_CC="none"
+ 
+ fi;
+-	echo "$as_me:5246: checking for native build C compiler" >&5
++	echo "$as_me:5249: checking for native build C compiler" >&5
+ echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
+-	echo "$as_me:5248: result: $BUILD_CC" >&5
++	echo "$as_me:5251: result: $BUILD_CC" >&5
+ echo "${ECHO_T}$BUILD_CC" >&6
+ 
+-	echo "$as_me:5251: checking for native build C preprocessor" >&5
++	echo "$as_me:5254: checking for native build C preprocessor" >&5
+ echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6
+ 
+ # Check whether --with-build-cpp or --without-build-cpp was given.
+@@ -5258,10 +5261,10 @@
+ else
+   BUILD_CPP='${BUILD_CC} -E'
+ fi;
+-	echo "$as_me:5261: result: $BUILD_CPP" >&5
++	echo "$as_me:5264: result: $BUILD_CPP" >&5
+ echo "${ECHO_T}$BUILD_CPP" >&6
+ 
+-	echo "$as_me:5264: checking for native build C flags" >&5
++	echo "$as_me:5267: checking for native build C flags" >&5
+ echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6
+ 
+ # Check whether --with-build-cflags or --without-build-cflags was given.
+@@ -5269,10 +5272,10 @@
+   withval="$with_build_cflags"
+   BUILD_CFLAGS="$withval"
+ fi;
+-	echo "$as_me:5272: result: $BUILD_CFLAGS" >&5
++	echo "$as_me:5275: result: $BUILD_CFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CFLAGS" >&6
+ 
+-	echo "$as_me:5275: checking for native build C preprocessor-flags" >&5
++	echo "$as_me:5278: checking for native build C preprocessor-flags" >&5
+ echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6
+ 
+ # Check whether --with-build-cppflags or --without-build-cppflags was given.
+@@ -5280,10 +5283,10 @@
+   withval="$with_build_cppflags"
+   BUILD_CPPFLAGS="$withval"
+ fi;
+-	echo "$as_me:5283: result: $BUILD_CPPFLAGS" >&5
++	echo "$as_me:5286: result: $BUILD_CPPFLAGS" >&5
+ echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
+ 
+-	echo "$as_me:5286: checking for native build linker-flags" >&5
++	echo "$as_me:5289: checking for native build linker-flags" >&5
+ echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6
+ 
+ # Check whether --with-build-ldflags or --without-build-ldflags was given.
+@@ -5291,10 +5294,10 @@
+   withval="$with_build_ldflags"
+   BUILD_LDFLAGS="$withval"
+ fi;
+-	echo "$as_me:5294: result: $BUILD_LDFLAGS" >&5
++	echo "$as_me:5297: result: $BUILD_LDFLAGS" >&5
+ echo "${ECHO_T}$BUILD_LDFLAGS" >&6
+ 
+-	echo "$as_me:5297: checking for native build linker-libraries" >&5
++	echo "$as_me:5300: checking for native build linker-libraries" >&5
+ echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6
+ 
+ # Check whether --with-build-libs or --without-build-libs was given.
+@@ -5302,7 +5305,7 @@
+   withval="$with_build_libs"
+   BUILD_LIBS="$withval"
+ fi;
+-	echo "$as_me:5305: result: $BUILD_LIBS" >&5
++	echo "$as_me:5308: result: $BUILD_LIBS" >&5
+ echo "${ECHO_T}$BUILD_LIBS" >&6
+ 
+ 	# this assumes we're on Unix.
+@@ -5312,7 +5315,7 @@
+ 	: ${BUILD_CC:='${CC}'}
+ 
+ 	if { test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}'; } ; then
+-		{ { echo "$as_me:5315: error: Cross-build requires two compilers.
++		{ { echo "$as_me:5318: error: Cross-build requires two compilers.
+ Use --with-build-cc to specify the native compiler." >&5
+ echo "$as_me: error: Cross-build requires two compilers.
+ Use --with-build-cc to specify the native compiler." >&2;}
+@@ -5337,7 +5340,7 @@
+ ### shared, for example.
+ cf_list_models=""
+ 
+-echo "$as_me:5340: checking if libtool -version-number should be used" >&5
++echo "$as_me:5343: checking if libtool -version-number should be used" >&5
+ echo $ECHO_N "checking if libtool -version-number should be used... $ECHO_C" >&6
+ 
+ # Check whether --enable-libtool-version or --disable-libtool-version was given.
+@@ -5354,7 +5357,7 @@
+ 	cf_libtool_version=yes
+ 
+ fi;
+-echo "$as_me:5357: result: $cf_libtool_version" >&5
++echo "$as_me:5360: result: $cf_libtool_version" >&5
+ echo "${ECHO_T}$cf_libtool_version" >&6
+ 
+ if test "$cf_libtool_version" = yes ; then
+@@ -5363,25 +5366,25 @@
+ 	LIBTOOL_VERSION="-version-info"
+ 	case "x$VERSION" in
+ 	(x)
+-		{ echo "$as_me:5366: WARNING: VERSION was not set" >&5
++		{ echo "$as_me:5369: WARNING: VERSION was not set" >&5
+ echo "$as_me: WARNING: VERSION was not set" >&2;}
+ 		;;
+ 	(x*.*.*)
+ 		ABI_VERSION="$VERSION"
+ 		test -n "$verbose" && echo "	ABI_VERSION: $ABI_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:5373: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:5376: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+ 
+ 		;;
+ 	(x*:*:*)
+ 		ABI_VERSION=`echo "$VERSION" | sed -e 's/:/./g'`
+ 		test -n "$verbose" && echo "	ABI_VERSION: $ABI_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:5380: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
++echo "${as_me:-configure}:5383: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+ 
+ 		;;
+ 	(*)
+-		{ echo "$as_me:5384: WARNING: unexpected VERSION value: $VERSION" >&5
++		{ echo "$as_me:5387: WARNING: unexpected VERSION value: $VERSION" >&5
+ echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
+ 		;;
+ 	esac
+@@ -5403,7 +5406,7 @@
+ LIB_INSTALL=
+ LIB_UNINSTALL=
+ 
+-echo "$as_me:5406: checking if you want to build libraries with libtool" >&5
++echo "$as_me:5409: checking if you want to build libraries with libtool" >&5
+ echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6
+ 
+ # Check whether --with-libtool or --without-libtool was given.
+@@ -5413,7 +5416,7 @@
+ else
+   with_libtool=no
+ fi;
+-echo "$as_me:5416: result: $with_libtool" >&5
++echo "$as_me:5419: result: $with_libtool" >&5
+ echo "${ECHO_T}$with_libtool" >&6
+ if test "$with_libtool" != "no"; then
+ 
+@@ -5444,7 +5447,7 @@
+ 	with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:5447: error: expected a pathname, not \"$with_libtool\"" >&5
++	{ { echo "$as_me:5450: error: expected a pathname, not \"$with_libtool\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -5457,7 +5460,7 @@
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:5460: checking for $ac_word" >&5
++echo "$as_me:5463: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_LIBTOOL+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5472,7 +5475,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
+-echo "$as_me:5475: found $ac_dir/$ac_word" >&5
++echo "$as_me:5478: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5480,10 +5483,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+-  echo "$as_me:5483: result: $LIBTOOL" >&5
++  echo "$as_me:5486: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+-  echo "$as_me:5486: result: no" >&5
++  echo "$as_me:5489: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5496,7 +5499,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:5499: checking for $ac_word" >&5
++echo "$as_me:5502: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5511,7 +5514,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
+-echo "$as_me:5514: found $ac_dir/$ac_word" >&5
++echo "$as_me:5517: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5519,10 +5522,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+-  echo "$as_me:5522: result: $ac_ct_LIBTOOL" >&5
++  echo "$as_me:5525: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+-  echo "$as_me:5525: result: no" >&5
++  echo "$as_me:5528: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5553,7 +5556,7 @@
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:5556: checking for $ac_word" >&5
++echo "$as_me:5559: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_LIBTOOL+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5568,7 +5571,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
+-echo "$as_me:5571: found $ac_dir/$ac_word" >&5
++echo "$as_me:5574: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5576,10 +5579,10 @@
+ fi
+ LIBTOOL=$ac_cv_prog_LIBTOOL
+ if test -n "$LIBTOOL"; then
+-  echo "$as_me:5579: result: $LIBTOOL" >&5
++  echo "$as_me:5582: result: $LIBTOOL" >&5
+ echo "${ECHO_T}$LIBTOOL" >&6
+ else
+-  echo "$as_me:5582: result: no" >&5
++  echo "$as_me:5585: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5592,7 +5595,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:5595: checking for $ac_word" >&5
++echo "$as_me:5598: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5607,7 +5610,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
+-echo "$as_me:5610: found $ac_dir/$ac_word" >&5
++echo "$as_me:5613: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -5615,10 +5618,10 @@
+ fi
+ ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
+ if test -n "$ac_ct_LIBTOOL"; then
+-  echo "$as_me:5618: result: $ac_ct_LIBTOOL" >&5
++  echo "$as_me:5621: result: $ac_ct_LIBTOOL" >&5
+ echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
+ else
+-  echo "$as_me:5621: result: no" >&5
++  echo "$as_me:5624: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5640,7 +5643,7 @@
+ 		fi
+ 	fi
+ 	if test -z "$LIBTOOL" ; then
+-		{ { echo "$as_me:5643: error: Cannot find libtool" >&5
++		{ { echo "$as_me:5646: error: Cannot find libtool" >&5
+ echo "$as_me: error: Cannot find libtool" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -5656,7 +5659,7 @@
+ 
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+ then
+-	echo "$as_me:5659: checking version of $LIBTOOL" >&5
++	echo "$as_me:5662: checking version of $LIBTOOL" >&5
+ echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
+ 
+ if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+@@ -5667,7 +5670,7 @@
+ fi
+ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
+ 
+-	echo "$as_me:5670: result: $cf_cv_libtool_version" >&5
++	echo "$as_me:5673: result: $cf_cv_libtool_version" >&5
+ echo "${ECHO_T}$cf_cv_libtool_version" >&6
+ 	if test -n "$cf_cv_libtool_version"
+ 	then
+@@ -5676,18 +5679,18 @@
+ 		(*...GNU-libtool...*)
+ 			;;
+ 		(*)
+-			{ { echo "$as_me:5679: error: This is not GNU libtool" >&5
++			{ { echo "$as_me:5682: error: This is not GNU libtool" >&5
+ echo "$as_me: error: This is not GNU libtool" >&2;}
+    { (exit 1); exit 1; }; }
+ 			;;
+ 		esac
+ 	else
+-		{ { echo "$as_me:5685: error: No version found for $LIBTOOL" >&5
++		{ { echo "$as_me:5688: error: No version found for $LIBTOOL" >&5
+ echo "$as_me: error: No version found for $LIBTOOL" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+ else
+-	{ { echo "$as_me:5690: error: GNU libtool has not been found" >&5
++	{ { echo "$as_me:5693: error: GNU libtool has not been found" >&5
+ echo "$as_me: error: GNU libtool has not been found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -5723,7 +5726,7 @@
+ 
+ else
+ 
+-echo "$as_me:5726: checking if you want to build shared libraries" >&5
++echo "$as_me:5729: checking if you want to build shared libraries" >&5
+ echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6
+ 
+ # Check whether --with-shared or --without-shared was given.
+@@ -5733,11 +5736,11 @@
+ else
+   with_shared=no
+ fi;
+-echo "$as_me:5736: result: $with_shared" >&5
++echo "$as_me:5739: result: $with_shared" >&5
+ echo "${ECHO_T}$with_shared" >&6
+ test "x$with_shared" = "xyes" && cf_list_models="$cf_list_models shared"
+ 
+-echo "$as_me:5740: checking if you want to build static libraries" >&5
++echo "$as_me:5743: checking if you want to build static libraries" >&5
+ echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6
+ 
+ # Check whether --with-normal or --without-normal was given.
+@@ -5747,11 +5750,11 @@
+ else
+   with_normal=yes
+ fi;
+-echo "$as_me:5750: result: $with_normal" >&5
++echo "$as_me:5753: result: $with_normal" >&5
+ echo "${ECHO_T}$with_normal" >&6
+ test "x$with_normal" = "xyes" && cf_list_models="$cf_list_models normal"
+ 
+-echo "$as_me:5754: checking if you want to build debug libraries" >&5
++echo "$as_me:5757: checking if you want to build debug libraries" >&5
+ echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6
+ 
+ # Check whether --with-debug or --without-debug was given.
+@@ -5761,11 +5764,11 @@
+ else
+   with_debug=yes
+ fi;
+-echo "$as_me:5764: result: $with_debug" >&5
++echo "$as_me:5767: result: $with_debug" >&5
+ echo "${ECHO_T}$with_debug" >&6
+ test "x$with_debug" = "xyes" && cf_list_models="$cf_list_models debug"
+ 
+-echo "$as_me:5768: checking if you want to build profiling libraries" >&5
++echo "$as_me:5771: checking if you want to build profiling libraries" >&5
+ echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6
+ 
+ # Check whether --with-profile or --without-profile was given.
+@@ -5775,7 +5778,7 @@
+ else
+   with_profile=no
+ fi;
+-echo "$as_me:5778: result: $with_profile" >&5
++echo "$as_me:5781: result: $with_profile" >&5
+ echo "${ECHO_T}$with_profile" >&6
+ test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
+ 
+@@ -5783,7 +5786,7 @@
+ 
+ if test "X$cf_with_cxx_binding" != Xno; then
+ if test "x$with_shared" = "xyes"; then
+-echo "$as_me:5786: checking if you want to build C++ shared libraries" >&5
++echo "$as_me:5789: checking if you want to build C++ shared libraries" >&5
+ echo $ECHO_N "checking if you want to build C++ shared libraries... $ECHO_C" >&6
+ 
+ # Check whether --with-cxx-shared or --without-cxx-shared was given.
+@@ -5793,26 +5796,26 @@
+ else
+   with_shared_cxx=no
+ fi;
+-echo "$as_me:5796: result: $with_shared_cxx" >&5
++echo "$as_me:5799: result: $with_shared_cxx" >&5
+ echo "${ECHO_T}$with_shared_cxx" >&6
+ fi
+ fi
+ 
+ ###############################################################################
+ 
+-echo "$as_me:5803: checking for specified models" >&5
++echo "$as_me:5806: checking for specified models" >&5
+ echo $ECHO_N "checking for specified models... $ECHO_C" >&6
+ test -z "$cf_list_models" && cf_list_models=normal
+ test "$with_libtool" != "no" && cf_list_models=libtool
+-echo "$as_me:5807: result: $cf_list_models" >&5
++echo "$as_me:5810: result: $cf_list_models" >&5
+ echo "${ECHO_T}$cf_list_models" >&6
+ 
+ ### Use the first model as the default, and save its suffix for use in building
+ ### up test-applications.
+-echo "$as_me:5812: checking for default model" >&5
++echo "$as_me:5815: checking for default model" >&5
+ echo $ECHO_N "checking for default model... $ECHO_C" >&6
+ DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'`
+-echo "$as_me:5815: result: $DFT_LWR_MODEL" >&5
++echo "$as_me:5818: result: $DFT_LWR_MODEL" >&5
+ echo "${ECHO_T}$DFT_LWR_MODEL" >&6
+ 
+ DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+@@ -5826,7 +5829,7 @@
+ LIB_DIR=../lib
+ LIB_2ND=../../lib
+ 
+-echo "$as_me:5829: checking if you want to have a library-prefix" >&5
++echo "$as_me:5832: checking if you want to have a library-prefix" >&5
+ echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6
+ 
+ # Check whether --with-lib-prefix or --without-lib-prefix was given.
+@@ -5836,7 +5839,7 @@
+ else
+   with_lib_prefix=auto
+ fi;
+-echo "$as_me:5839: result: $with_lib_prefix" >&5
++echo "$as_me:5842: result: $with_lib_prefix" >&5
+ echo "${ECHO_T}$with_lib_prefix" >&6
+ 
+ if test "$with_lib_prefix" = auto
+@@ -5867,19 +5870,19 @@
+ 
+ LIB_SUFFIX=
+ 
+-	echo "$as_me:5870: checking for PATH separator" >&5
++	echo "$as_me:5873: checking for PATH separator" >&5
+ echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6
+ 	case "$cf_cv_system_name" in
+ 	(os2*)	PATH_SEPARATOR=';'  ;;
+ 	(*)	${PATH_SEPARATOR:=':'}  ;;
+ 	esac
+ 
+-	echo "$as_me:5877: result: $PATH_SEPARATOR" >&5
++	echo "$as_me:5880: result: $PATH_SEPARATOR" >&5
+ echo "${ECHO_T}$PATH_SEPARATOR" >&6
+ 
+ ###############################################################################
+ 
+-echo "$as_me:5882: checking if you want to build a separate terminfo library" >&5
++echo "$as_me:5885: checking if you want to build a separate terminfo library" >&5
+ echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6
+ 
+ # Check whether --with-termlib or --without-termlib was given.
+@@ -5889,10 +5892,10 @@
+ else
+   with_termlib=no
+ fi;
+-echo "$as_me:5892: result: $with_termlib" >&5
++echo "$as_me:5895: result: $with_termlib" >&5
+ echo "${ECHO_T}$with_termlib" >&6
+ 
+-echo "$as_me:5895: checking if you want to build a separate tic library" >&5
++echo "$as_me:5898: checking if you want to build a separate tic library" >&5
+ echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6
+ 
+ # Check whether --with-ticlib or --without-ticlib was given.
+@@ -5902,7 +5905,7 @@
+ else
+   with_ticlib=no
+ fi;
+-echo "$as_me:5905: result: $with_ticlib" >&5
++echo "$as_me:5908: result: $with_ticlib" >&5
+ echo "${ECHO_T}$with_ticlib" >&6
+ 
+ if test X"$CC_G_OPT" = X"" ; then
+@@ -5915,7 +5918,7 @@
+ 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
+ fi
+ 
+-echo "$as_me:5918: checking for default loader flags" >&5
++echo "$as_me:5921: checking for default loader flags" >&5
+ echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
+ case "$DFT_LWR_MODEL" in
+ (libtool) LD_MODEL=''   ;;
+@@ -5924,13 +5927,13 @@
+ (profile) LD_MODEL='-pg';;
+ (shared)  LD_MODEL=''   ;;
+ esac
+-echo "$as_me:5927: result: $LD_MODEL" >&5
++echo "$as_me:5930: result: $LD_MODEL" >&5
+ echo "${ECHO_T}$LD_MODEL" >&6
+ 
+ case "$DFT_LWR_MODEL" in
+ (shared)
+ 
+-echo "$as_me:5933: checking if rpath option should be used" >&5
++echo "$as_me:5936: checking if rpath option should be used" >&5
+ echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6
+ 
+ # Check whether --enable-rpath or --disable-rpath was given.
+@@ -5940,10 +5943,10 @@
+ else
+   cf_cv_enable_rpath=no
+ fi;
+-echo "$as_me:5943: result: $cf_cv_enable_rpath" >&5
++echo "$as_me:5946: result: $cf_cv_enable_rpath" >&5
+ echo "${ECHO_T}$cf_cv_enable_rpath" >&6
+ 
+-echo "$as_me:5946: checking if shared libraries should be relinked during install" >&5
++echo "$as_me:5949: checking if shared libraries should be relinked during install" >&5
+ echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6
+ 
+ # Check whether --enable-relink or --disable-relink was given.
+@@ -5953,7 +5956,7 @@
+ else
+   cf_cv_do_relink=yes
+ fi;
+-echo "$as_me:5956: result: $cf_cv_do_relink" >&5
++echo "$as_me:5959: result: $cf_cv_do_relink" >&5
+ echo "${ECHO_T}$cf_cv_do_relink" >&6
+ 	;;
+ esac
+@@ -5964,7 +5967,7 @@
+ LD_RPATH_OPT=
+ if test "x$cf_cv_enable_rpath" != xno
+ then
+-	echo "$as_me:5967: checking for an rpath option" >&5
++	echo "$as_me:5970: checking for an rpath option" >&5
+ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+ 	case "$cf_cv_system_name" in
+ 	(irix*)
+@@ -5995,12 +5998,12 @@
+ 	(*)
+ 		;;
+ 	esac
+-	echo "$as_me:5998: result: $LD_RPATH_OPT" >&5
++	echo "$as_me:6001: result: $LD_RPATH_OPT" >&5
+ echo "${ECHO_T}$LD_RPATH_OPT" >&6
+ 
+ 	case "x$LD_RPATH_OPT" in
+ 	(x-R*)
+-		echo "$as_me:6003: checking if we need a space after rpath option" >&5
++		echo "$as_me:6006: checking if we need a space after rpath option" >&5
+ echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
+ 		cf_save_LIBS="$LIBS"
+ 
+@@ -6021,7 +6024,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6024 "configure"
++#line 6027 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -6033,16 +6036,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6036: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6039: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6039: \$? = $ac_status" >&5
++  echo "$as_me:6042: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6042: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6045: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6045: \$? = $ac_status" >&5
++  echo "$as_me:6048: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_rpath_space=no
+ else
+@@ -6052,7 +6055,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 		LIBS="$cf_save_LIBS"
+-		echo "$as_me:6055: result: $cf_rpath_space" >&5
++		echo "$as_me:6058: result: $cf_rpath_space" >&5
+ echo "${ECHO_T}$cf_rpath_space" >&6
+ 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+ 		;;
+@@ -6074,7 +6077,7 @@
+ 	cf_ld_rpath_opt=
+ 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
+ 
+-	echo "$as_me:6077: checking if release/abi version should be used for shared libs" >&5
++	echo "$as_me:6080: checking if release/abi version should be used for shared libs" >&5
+ echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6
+ 
+ # Check whether --with-shlib-version or --without-shlib-version was given.
+@@ -6089,9 +6092,9 @@
+ 		cf_cv_shlib_version=$withval
+ 		;;
+ 	(*)
+-		echo "$as_me:6092: result: $withval" >&5
++		echo "$as_me:6095: result: $withval" >&5
+ echo "${ECHO_T}$withval" >&6
+-		{ { echo "$as_me:6094: error: option value must be one of: rel, abi, or auto" >&5
++		{ { echo "$as_me:6097: error: option value must be one of: rel, abi, or auto" >&5
+ echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
+    { (exit 1); exit 1; }; }
+ 		;;
+@@ -6100,7 +6103,7 @@
+ else
+   cf_cv_shlib_version=auto
+ fi;
+-	echo "$as_me:6103: result: $cf_cv_shlib_version" >&5
++	echo "$as_me:6106: result: $cf_cv_shlib_version" >&5
+ echo "${ECHO_T}$cf_cv_shlib_version" >&6
+ 
+ 	cf_cv_rm_so_locs=no
+@@ -6123,14 +6126,14 @@
+ 
+ 	if test "$cf_try_fPIC" = yes
+ 	then
+-		echo "$as_me:6126: checking which $CC option to use" >&5
++		echo "$as_me:6129: checking which $CC option to use" >&5
+ echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
+ 		cf_save_CFLAGS="$CFLAGS"
+ 		for CC_SHARED_OPTS in -fPIC -fpic ''
+ 		do
+ 			CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS"
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6133 "configure"
++#line 6136 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6142,16 +6145,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6145: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6148: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6148: \$? = $ac_status" >&5
++  echo "$as_me:6151: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6151: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6154: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6154: \$? = $ac_status" >&5
++  echo "$as_me:6157: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -6160,7 +6163,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		done
+-		echo "$as_me:6163: result: $CC_SHARED_OPTS" >&5
++		echo "$as_me:6166: result: $CC_SHARED_OPTS" >&5
+ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
+ 		CFLAGS="$cf_save_CFLAGS"
+ 	fi
+@@ -6231,7 +6234,7 @@
+ 		MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
+ 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
+ 		cf_cv_shlib_version_infix=yes
+-		echo "$as_me:6234: checking if ld -search_paths_first works" >&5
++		echo "$as_me:6237: checking if ld -search_paths_first works" >&5
+ echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6
+ if test "${cf_cv_ldflags_search_paths_first+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6240,7 +6243,7 @@
+ 			cf_save_LDFLAGS=$LDFLAGS
+ 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6243 "configure"
++#line 6246 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -6252,16 +6255,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6255: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6258: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6258: \$? = $ac_status" >&5
++  echo "$as_me:6261: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6261: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6264: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6264: \$? = $ac_status" >&5
++  echo "$as_me:6267: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_ldflags_search_paths_first=yes
+ else
+@@ -6272,7 +6275,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 				LDFLAGS=$cf_save_LDFLAGS
+ fi
+-echo "$as_me:6275: result: $cf_cv_ldflags_search_paths_first" >&5
++echo "$as_me:6278: result: $cf_cv_ldflags_search_paths_first" >&5
+ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
+ 		if test "$cf_cv_ldflags_search_paths_first" = yes; then
+ 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+@@ -6622,7 +6625,7 @@
+ 			do
+ 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+ 				cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6625 "configure"
++#line 6628 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6634,16 +6637,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:6637: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6640: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6640: \$? = $ac_status" >&5
++  echo "$as_me:6643: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:6643: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6646: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6646: \$? = $ac_status" >&5
++  echo "$as_me:6649: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -6680,7 +6683,7 @@
+ 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
+ 			;;
+ 		(*)
+-			{ echo "$as_me:6683: WARNING: ignored --with-shlib-version" >&5
++			{ echo "$as_me:6686: WARNING: ignored --with-shlib-version" >&5
+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
+ 			;;
+ 		esac
+@@ -6690,7 +6693,7 @@
+ 	if test -n "$cf_try_cflags"
+ 	then
+ cat > conftest.$ac_ext <
+ int main(int argc, char *argv[])
+ {
+@@ -6702,18 +6705,18 @@
+ 		for cf_opt in $cf_try_cflags
+ 		do
+ 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
+-			echo "$as_me:6705: checking if CFLAGS option -$cf_opt works" >&5
++			echo "$as_me:6708: checking if CFLAGS option -$cf_opt works" >&5
+ echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6
+-			if { (eval echo "$as_me:6707: \"$ac_compile\"") >&5
++			if { (eval echo "$as_me:6710: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6710: \$? = $ac_status" >&5
++  echo "$as_me:6713: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-				echo "$as_me:6712: result: yes" >&5
++				echo "$as_me:6715: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 				cf_save_CFLAGS="$CFLAGS"
+ 			else
+-				echo "$as_me:6716: result: no" >&5
++				echo "$as_me:6719: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 			fi
+ 		done
+@@ -6728,17 +6731,17 @@
+ 
+ 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
+ 
+-echo "${as_me:-configure}:6731: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
++echo "${as_me:-configure}:6734: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
+ 
+-echo "${as_me:-configure}:6735: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:6738: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ for model in $cf_list_models ; do
+ 	case "$model" in
+ 	(libtool)
+ 
+-echo "$as_me:6741: checking for additional libtool options" >&5
++echo "$as_me:6744: checking for additional libtool options" >&5
+ echo $ECHO_N "checking for additional libtool options... $ECHO_C" >&6
+ 
+ # Check whether --with-libtool-opts or --without-libtool-opts was given.
+@@ -6748,7 +6751,7 @@
+ else
+   with_libtool_opts=no
+ fi;
+-echo "$as_me:6751: result: $with_libtool_opts" >&5
++echo "$as_me:6754: result: $with_libtool_opts" >&5
+ echo "${ECHO_T}$with_libtool_opts" >&6
+ 
+ case .$with_libtool_opts in
+@@ -6759,7 +6762,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:6762: checking if exported-symbols file should be used" >&5
++echo "$as_me:6765: checking if exported-symbols file should be used" >&5
+ echo $ECHO_N "checking if exported-symbols file should be used... $ECHO_C" >&6
+ 
+ # Check whether --with-export-syms or --without-export-syms was given.
+@@ -6774,7 +6777,7 @@
+ 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
+ 
+ fi
+-echo "$as_me:6777: result: $with_export_syms" >&5
++echo "$as_me:6780: result: $with_export_syms" >&5
+ echo "${ECHO_T}$with_export_syms" >&6
+ if test "x$with_export_syms" != xno
+ then
+@@ -6785,15 +6788,15 @@
+ 		;;
+ 	(shared)
+ 		if test "$CC_SHARED_OPTS" = "unknown"; then
+-			{ { echo "$as_me:6788: error: Shared libraries are not supported in this version" >&5
++			{ { echo "$as_me:6791: error: Shared libraries are not supported in this version" >&5
+ echo "$as_me: error: Shared libraries are not supported in this version" >&2;}
+    { (exit 1); exit 1; }; }
+ 		fi
+ 		# workaround for inept transition to PIE vs PIC...
+-		echo "$as_me:6793: checking if current CFLAGS link properly" >&5
++		echo "$as_me:6796: checking if current CFLAGS link properly" >&5
+ echo $ECHO_N "checking if current CFLAGS link properly... $ECHO_C" >&6
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 6796 "configure"
++#line 6799 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -6805,16 +6808,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:6808: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6811: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6811: \$? = $ac_status" >&5
++  echo "$as_me:6814: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:6814: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6817: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6817: \$? = $ac_status" >&5
++  echo "$as_me:6820: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cflags_work=yes
+ else
+@@ -6823,18 +6826,18 @@
+ cf_cflags_work=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:6826: result: $cf_cflags_work" >&5
++		echo "$as_me:6829: result: $cf_cflags_work" >&5
+ echo "${ECHO_T}$cf_cflags_work" >&6
+ 		if test "$cf_cflags_work" = no
+ 		then
+ 			test -n "$verbose" && echo "	try to work around by appending shared-options" 1>&6
+ 
+-echo "${as_me:-configure}:6832: testing try to work around by appending shared-options ..." 1>&5
++echo "${as_me:-configure}:6835: testing try to work around by appending shared-options ..." 1>&5
+ 
+ 			CFLAGS="$CFLAGS $CC_SHARED_OPTS"
+ 		fi
+ 
+-echo "$as_me:6837: checking if versioned-symbols file should be used" >&5
++echo "$as_me:6840: checking if versioned-symbols file should be used" >&5
+ echo $ECHO_N "checking if versioned-symbols file should be used... $ECHO_C" >&6
+ 
+ # Check whether --with-versioned-syms or --without-versioned-syms was given.
+@@ -6852,18 +6855,18 @@
+ (xno)
+ 	;;
+ (x/*)
+-	test -f "$with_versioned_syms" || { { echo "$as_me:6855: error: expected a filename: $with_versioned_syms" >&5
++	test -f "$with_versioned_syms" || { { echo "$as_me:6858: error: expected a filename: $with_versioned_syms" >&5
+ echo "$as_me: error: expected a filename: $with_versioned_syms" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+ (*)
+-	test -f "$with_versioned_syms" || { { echo "$as_me:6860: error: expected a filename: $with_versioned_syms" >&5
++	test -f "$with_versioned_syms" || { { echo "$as_me:6863: error: expected a filename: $with_versioned_syms" >&5
+ echo "$as_me: error: expected a filename: $with_versioned_syms" >&2;}
+    { (exit 1); exit 1; }; }
+ 	with_versioned_syms=`pwd`/"$with_versioned_syms"
+ 	;;
+ esac
+-echo "$as_me:6866: result: $with_versioned_syms" >&5
++echo "$as_me:6869: result: $with_versioned_syms" >&5
+ echo "${ECHO_T}$with_versioned_syms" >&6
+ 
+ RESULTING_SYMS=
+@@ -6879,7 +6882,7 @@
+ 		MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-Wl,%\\${VERSIONED_SYMS} -Wl,%"`
+ 		test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
+ 
+-echo "${as_me:-configure}:6882: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:6885: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ 		;;
+ 	(*-dy\ *)
+@@ -6887,11 +6890,11 @@
+ 		MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-dy%\\${VERSIONED_SYMS} -dy%"`
+ 		test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
+ 
+-echo "${as_me:-configure}:6890: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
++echo "${as_me:-configure}:6893: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+ 
+ 		;;
+ 	(*)
+-		{ echo "$as_me:6894: WARNING: this system does not support versioned-symbols" >&5
++		{ echo "$as_me:6897: WARNING: this system does not support versioned-symbols" >&5
+ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
+ 		;;
+ 	esac
+@@ -6903,7 +6906,7 @@
+ 	# symbols.
+ 	if test "x$VERSIONED_SYMS" != "x"
+ 	then
+-		echo "$as_me:6906: checking if wildcards can be used to selectively omit symbols" >&5
++		echo "$as_me:6909: checking if wildcards can be used to selectively omit symbols" >&5
+ echo $ECHO_N "checking if wildcards can be used to selectively omit symbols... $ECHO_C" >&6
+ 		WILDCARD_SYMS=no
+ 
+@@ -6940,7 +6943,7 @@
+ } submodule_1.0;
+ EOF
+ 		cat >conftest.$ac_ext <&5
++		echo "$as_me:6977: result: $WILDCARD_SYMS" >&5
+ echo "${ECHO_T}$WILDCARD_SYMS" >&6
+ 		rm -f conftest.*
+ 	fi
+@@ -6984,7 +6987,7 @@
+ ### Checks for special libraries, must be done up-front.
+ SHLIB_LIST=""
+ 
+-echo "$as_me:6987: checking if you want to link with the GPM mouse library" >&5
++echo "$as_me:6990: checking if you want to link with the GPM mouse library" >&5
+ echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6
+ 
+ # Check whether --with-gpm or --without-gpm was given.
+@@ -6994,27 +6997,27 @@
+ else
+   with_gpm=maybe
+ fi;
+-echo "$as_me:6997: result: $with_gpm" >&5
++echo "$as_me:7000: result: $with_gpm" >&5
+ echo "${ECHO_T}$with_gpm" >&6
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:7001: checking for gpm.h" >&5
++	echo "$as_me:7004: checking for gpm.h" >&5
+ echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6
+ if test "${ac_cv_header_gpm_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7007 "configure"
++#line 7010 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:7011: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7014: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:7017: \$? = $ac_status" >&5
++  echo "$as_me:7020: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7033,7 +7036,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7036: result: $ac_cv_header_gpm_h" >&5
++echo "$as_me:7039: result: $ac_cv_header_gpm_h" >&5
+ echo "${ECHO_T}$ac_cv_header_gpm_h" >&6
+ if test "$ac_cv_header_gpm_h" = yes; then
+ 
+@@ -7044,7 +7047,7 @@
+ 		if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then
+ 			test -n "$verbose" && echo "	assuming we really have GPM library" 1>&6
+ 
+-echo "${as_me:-configure}:7047: testing assuming we really have GPM library ..." 1>&5
++echo "${as_me:-configure}:7050: testing assuming we really have GPM library ..." 1>&5
+ 
+ cat >>confdefs.h <<\EOF
+ #define HAVE_LIBGPM 1
+@@ -7052,7 +7055,7 @@
+ 
+ 			with_gpm=yes
+ 		else
+-			echo "$as_me:7055: checking for Gpm_Open in -lgpm" >&5
++			echo "$as_me:7058: checking for Gpm_Open in -lgpm" >&5
+ echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
+ if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7060,7 +7063,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7063 "configure"
++#line 7066 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7079,16 +7082,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7082: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7085: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7085: \$? = $ac_status" >&5
++  echo "$as_me:7088: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7088: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7091: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7091: \$? = $ac_status" >&5
++  echo "$as_me:7094: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -7099,18 +7102,18 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7102: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:7105: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
+ if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then
+   with_gpm=yes
+ else
+ 
+ 				if test "$with_gpm" = maybe; then
+-					{ echo "$as_me:7109: WARNING: Cannot link with GPM library" >&5
++					{ echo "$as_me:7112: WARNING: Cannot link with GPM library" >&5
+ echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
+ 					with_gpm=no
+ 				else
+-					{ { echo "$as_me:7113: error: Cannot link with GPM library" >&5
++					{ { echo "$as_me:7116: error: Cannot link with GPM library" >&5
+ echo "$as_me: error: Cannot link with GPM library" >&2;}
+    { (exit 1); exit 1; }; }
+ 				fi
+@@ -7121,7 +7124,7 @@
+ 
+ else
+ 
+-		test "$with_gpm" != maybe && { echo "$as_me:7124: WARNING: Cannot find GPM header" >&5
++		test "$with_gpm" != maybe && { echo "$as_me:7127: WARNING: Cannot find GPM header" >&5
+ echo "$as_me: WARNING: Cannot find GPM header" >&2;}
+ 		with_gpm=no
+ 
+@@ -7130,7 +7133,7 @@
+ fi
+ 
+ if test "$with_gpm" != no ; then
+-	echo "$as_me:7133: checking if you want to load GPM dynamically" >&5
++	echo "$as_me:7136: checking if you want to load GPM dynamically" >&5
+ echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6
+ 
+ # Check whether --with-dlsym or --without-dlsym was given.
+@@ -7140,18 +7143,18 @@
+ else
+   with_dlsym=yes
+ fi;
+-	echo "$as_me:7143: result: $with_dlsym" >&5
++	echo "$as_me:7146: result: $with_dlsym" >&5
+ echo "${ECHO_T}$with_dlsym" >&6
+ 	if test "x$with_dlsym" = xyes ; then
+ 
+ cf_have_dlsym=no
+-echo "$as_me:7148: checking for dlsym" >&5
++echo "$as_me:7151: checking for dlsym" >&5
+ echo $ECHO_N "checking for dlsym... $ECHO_C" >&6
+ if test "${ac_cv_func_dlsym+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7154 "configure"
++#line 7157 "configure"
+ #include "confdefs.h"
+ #define dlsym autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -7182,16 +7185,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7185: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7188: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7188: \$? = $ac_status" >&5
++  echo "$as_me:7191: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7191: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7194: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7194: \$? = $ac_status" >&5
++  echo "$as_me:7197: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_dlsym=yes
+ else
+@@ -7201,14 +7204,14 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:7204: result: $ac_cv_func_dlsym" >&5
++echo "$as_me:7207: result: $ac_cv_func_dlsym" >&5
+ echo "${ECHO_T}$ac_cv_func_dlsym" >&6
+ if test "$ac_cv_func_dlsym" = yes; then
+   cf_have_dlsym=yes
+ else
+ 
+ cf_have_libdl=no
+-echo "$as_me:7211: checking for dlsym in -ldl" >&5
++echo "$as_me:7214: checking for dlsym in -ldl" >&5
+ echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6
+ if test "${ac_cv_lib_dl_dlsym+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7216,7 +7219,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7219 "configure"
++#line 7222 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7235,16 +7238,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7238: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7241: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7241: \$? = $ac_status" >&5
++  echo "$as_me:7244: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7244: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7247: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7247: \$? = $ac_status" >&5
++  echo "$as_me:7250: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dl_dlsym=yes
+ else
+@@ -7255,7 +7258,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7258: result: $ac_cv_lib_dl_dlsym" >&5
++echo "$as_me:7261: result: $ac_cv_lib_dl_dlsym" >&5
+ echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6
+ if test "$ac_cv_lib_dl_dlsym" = yes; then
+ 
+@@ -7284,10 +7287,10 @@
+ LIBS="$cf_add_libs"
+  }
+ 
+-	echo "$as_me:7287: checking whether able to link to dl*() functions" >&5
++	echo "$as_me:7290: checking whether able to link to dl*() functions" >&5
+ echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7290 "configure"
++#line 7293 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -7305,16 +7308,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7308: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7311: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7311: \$? = $ac_status" >&5
++  echo "$as_me:7314: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7314: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7317: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7317: \$? = $ac_status" >&5
++  echo "$as_me:7320: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ cat >>confdefs.h <<\EOF
+@@ -7325,15 +7328,15 @@
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ 
+-		{ { echo "$as_me:7328: error: Cannot link test program for libdl" >&5
++		{ { echo "$as_me:7331: error: Cannot link test program for libdl" >&5
+ echo "$as_me: error: Cannot link test program for libdl" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-	echo "$as_me:7333: result: ok" >&5
++	echo "$as_me:7336: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ else
+-	{ { echo "$as_me:7336: error: Cannot find dlsym function" >&5
++	{ { echo "$as_me:7339: error: Cannot find dlsym function" >&5
+ echo "$as_me: error: Cannot find dlsym function" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -7341,12 +7344,12 @@
+ 		if test "x$with_gpm" != xyes ; then
+ 			test -n "$verbose" && echo "	assuming soname for gpm is $with_gpm" 1>&6
+ 
+-echo "${as_me:-configure}:7344: testing assuming soname for gpm is $with_gpm ..." 1>&5
++echo "${as_me:-configure}:7347: testing assuming soname for gpm is $with_gpm ..." 1>&5
+ 
+ 			cf_cv_gpm_soname="$with_gpm"
+ 		else
+ 
+-echo "$as_me:7349: checking for soname of gpm library" >&5
++echo "$as_me:7352: checking for soname of gpm library" >&5
+ echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6
+ if test "${cf_cv_gpm_soname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7380,15 +7383,15 @@
+ done
+ LIBS="$cf_add_libs"
+ 
+-	if { (eval echo "$as_me:7383: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:7386: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7386: \$? = $ac_status" >&5
++  echo "$as_me:7389: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+-		if { (eval echo "$as_me:7388: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:7391: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7391: \$? = $ac_status" >&5
++  echo "$as_me:7394: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+ 			cf_cv_gpm_soname="`ldd \"conftest$ac_exeext\" 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | ${FGREP-fgrep} libgpm.`"
+ 			test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
+@@ -7399,7 +7402,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:7402: result: $cf_cv_gpm_soname" >&5
++echo "$as_me:7405: result: $cf_cv_gpm_soname" >&5
+ echo "${ECHO_T}$cf_cv_gpm_soname" >&6
+ 
+ 		fi
+@@ -7467,7 +7470,7 @@
+ #define HAVE_LIBGPM 1
+ EOF
+ 
+-echo "$as_me:7470: checking for Gpm_Wgetch in -lgpm" >&5
++echo "$as_me:7473: checking for Gpm_Wgetch in -lgpm" >&5
+ echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6
+ if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7475,7 +7478,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7478 "configure"
++#line 7481 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7494,16 +7497,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7497: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7500: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7500: \$? = $ac_status" >&5
++  echo "$as_me:7503: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7503: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7506: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7506: \$? = $ac_status" >&5
++  echo "$as_me:7509: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gpm_Gpm_Wgetch=yes
+ else
+@@ -7514,11 +7517,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7517: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
++echo "$as_me:7520: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
+ echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6
+ if test "$ac_cv_lib_gpm_Gpm_Wgetch" = yes; then
+ 
+-echo "$as_me:7521: checking if GPM is weakly bound to curses library" >&5
++echo "$as_me:7524: checking if GPM is weakly bound to curses library" >&5
+ echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6
+ if test "${cf_cv_check_gpm_wgetch+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7542,15 +7545,15 @@
+ 	# to rely on the static library, noting that some packagers may not
+ 	# include it.
+ 	LIBS="-static -lgpm -dynamic $LIBS"
+-	if { (eval echo "$as_me:7545: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:7548: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7548: \$? = $ac_status" >&5
++  echo "$as_me:7551: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+-		if { (eval echo "$as_me:7550: \"$ac_link\"") >&5
++		if { (eval echo "$as_me:7553: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7553: \$? = $ac_status" >&5
++  echo "$as_me:7556: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+ 			cf_cv_check_gpm_wgetch="`nm \"conftest$ac_exeext\" | ${EGREP-egrep} '\' | ${EGREP-egrep} '\<[vVwW]\>'`"
+ 			test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
+@@ -7562,11 +7565,11 @@
+ fi
+ 
+ fi
+-echo "$as_me:7565: result: $cf_cv_check_gpm_wgetch" >&5
++echo "$as_me:7568: result: $cf_cv_check_gpm_wgetch" >&5
+ echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6
+ 
+ if test "$cf_cv_check_gpm_wgetch" != yes ; then
+-	{ echo "$as_me:7569: WARNING: GPM library is already linked with curses - read the FAQ" >&5
++	{ echo "$as_me:7572: WARNING: GPM library is already linked with curses - read the FAQ" >&5
+ echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;}
+ fi
+ 
+@@ -7574,7 +7577,7 @@
+ 
+ fi
+ 
+-echo "$as_me:7577: checking if you want to use PCRE2 for regular-expressions" >&5
++echo "$as_me:7580: checking if you want to use PCRE2 for regular-expressions" >&5
+ echo $ECHO_N "checking if you want to use PCRE2 for regular-expressions... $ECHO_C" >&6
+ 
+ # Check whether --with-pcre2 or --without-pcre2 was given.
+@@ -7583,7 +7586,7 @@
+ 
+ fi;
+ test -z "$with_pcre2" && with_pcre2=no
+-echo "$as_me:7586: result: $with_pcre2" >&5
++echo "$as_me:7589: result: $with_pcre2" >&5
+ echo "${ECHO_T}$with_pcre2" >&6
+ 
+ if test "x$with_pcre2" != xno ; then
+@@ -7594,17 +7597,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then
+ 	test -n "$verbose" && echo "	found package $cf_with_pcre2" 1>&6
+ 
+-echo "${as_me:-configure}:7597: testing found package $cf_with_pcre2 ..." 1>&5
++echo "${as_me:-configure}:7600: testing found package $cf_with_pcre2 ..." 1>&5
+ 
+ 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_with_pcre2" 2>/dev/null`"
+ 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "$cf_with_pcre2" 2>/dev/null`"
+ 	test -n "$verbose" && echo "	package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs" 1>&6
+ 
+-echo "${as_me:-configure}:7603: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:7606: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs" 1>&6
+ 
+-echo "${as_me:-configure}:7607: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:7610: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -7728,7 +7731,7 @@
+ fi
+ 
+ 	done
+-	cf_with_pcre2_ok=yes || { { echo "$as_me:7731: error: Cannot find PCRE2 library" >&5
++	cf_with_pcre2_ok=yes || { { echo "$as_me:7734: error: Cannot find PCRE2 library" >&5
+ echo "$as_me: error: Cannot find PCRE2 library" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -7741,7 +7744,7 @@
+ 	(*pcre2-posix*|*pcreposix*)
+ 		;;
+ 	(*)
+-		echo "$as_me:7744: checking for regcomp in -lpcre2-posix" >&5
++		echo "$as_me:7747: checking for regcomp in -lpcre2-posix" >&5
+ echo $ECHO_N "checking for regcomp in -lpcre2-posix... $ECHO_C" >&6
+ if test "${ac_cv_lib_pcre2_posix_regcomp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7749,7 +7752,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcre2-posix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7752 "configure"
++#line 7755 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7768,16 +7771,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7771: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7774: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7774: \$? = $ac_status" >&5
++  echo "$as_me:7777: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7777: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7780: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7780: \$? = $ac_status" >&5
++  echo "$as_me:7783: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_pcre2_posix_regcomp=yes
+ else
+@@ -7788,7 +7791,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7791: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
++echo "$as_me:7794: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
+ echo "${ECHO_T}$ac_cv_lib_pcre2_posix_regcomp" >&6
+ if test "$ac_cv_lib_pcre2_posix_regcomp" = yes; then
+ 
+@@ -7809,7 +7812,7 @@
+ LIBS="$cf_add_libs"
+ 
+ else
+-  echo "$as_me:7812: checking for regcomp in -lpcreposix" >&5
++  echo "$as_me:7815: checking for regcomp in -lpcreposix" >&5
+ echo $ECHO_N "checking for regcomp in -lpcreposix... $ECHO_C" >&6
+ if test "${ac_cv_lib_pcreposix_regcomp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7817,7 +7820,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcreposix  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7820 "configure"
++#line 7823 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -7836,16 +7839,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7839: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7842: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7842: \$? = $ac_status" >&5
++  echo "$as_me:7845: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7845: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7848: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7848: \$? = $ac_status" >&5
++  echo "$as_me:7851: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_pcreposix_regcomp=yes
+ else
+@@ -7856,7 +7859,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:7859: result: $ac_cv_lib_pcreposix_regcomp" >&5
++echo "$as_me:7862: result: $ac_cv_lib_pcreposix_regcomp" >&5
+ echo "${ECHO_T}$ac_cv_lib_pcreposix_regcomp" >&6
+ if test "$ac_cv_lib_pcreposix_regcomp" = yes; then
+ 
+@@ -7877,7 +7880,7 @@
+ LIBS="$cf_add_libs"
+ 
+ else
+-  { { echo "$as_me:7880: error: Cannot find PCRE2 POSIX library" >&5
++  { { echo "$as_me:7883: error: Cannot find PCRE2 POSIX library" >&5
+ echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -7892,23 +7895,23 @@
+ for ac_header in pcre2posix.h pcreposix.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:7895: checking for $ac_header" >&5
++echo "$as_me:7898: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7901 "configure"
++#line 7904 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:7905: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:7908: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:7911: \$? = $ac_status" >&5
++  echo "$as_me:7914: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7927,7 +7930,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:7930: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:7933: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:7946: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 7949 "configure"
++#line 7952 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -7977,16 +7980,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:7980: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7983: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7983: \$? = $ac_status" >&5
++  echo "$as_me:7986: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:7986: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7989: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7989: \$? = $ac_status" >&5
++  echo "$as_me:7992: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -7996,7 +7999,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:7999: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:8002: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
+   cat >>confdefs.h </dev/null ; then
+-echo "$as_me:8013: checking if you want to use sysmouse" >&5
++echo "$as_me:8016: checking if you want to use sysmouse" >&5
+ echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6
+ 
+ # Check whether --with-sysmouse or --without-sysmouse was given.
+@@ -8022,7 +8025,7 @@
+ fi;
+ 	if test "$cf_with_sysmouse" != no ; then
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8025 "configure"
++#line 8028 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -8045,16 +8048,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:8048: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8051: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8051: \$? = $ac_status" >&5
++  echo "$as_me:8054: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:8054: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8057: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8057: \$? = $ac_status" >&5
++  echo "$as_me:8060: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_with_sysmouse=yes
+ else
+@@ -8064,7 +8067,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	fi
+-echo "$as_me:8067: result: $cf_with_sysmouse" >&5
++echo "$as_me:8070: result: $cf_with_sysmouse" >&5
+ echo "${ECHO_T}$cf_with_sysmouse" >&6
+ test "$cf_with_sysmouse" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -8074,7 +8077,7 @@
+ fi
+ 
+ # pretend that ncurses==ncursesw==ncursest
+-echo "$as_me:8077: checking if you want to disable library suffixes" >&5
++echo "$as_me:8080: checking if you want to disable library suffixes" >&5
+ echo $ECHO_N "checking if you want to disable library suffixes... $ECHO_C" >&6
+ 
+ # Check whether --enable-lib-suffixes or --disable-lib-suffixes was given.
+@@ -8091,13 +8094,13 @@
+ 	disable_lib_suffixes=no
+ 
+ fi;
+-echo "$as_me:8094: result: $disable_lib_suffixes" >&5
++echo "$as_me:8097: result: $disable_lib_suffixes" >&5
+ echo "${ECHO_T}$disable_lib_suffixes" >&6
+ 
+ ### If we're building with rpath, try to link non-standard libs that way too.
+ if test "$DFT_LWR_MODEL" = "shared" && test "x$cf_cv_enable_rpath" != xno; then
+ 
+-echo "$as_me:8100: checking if rpath-hack should be disabled" >&5
++echo "$as_me:8103: checking if rpath-hack should be disabled" >&5
+ echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
+ 
+ # Check whether --enable-rpath-hack or --disable-rpath-hack was given.
+@@ -8115,22 +8118,22 @@
+ 
+ fi;
+ if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
+-echo "$as_me:8118: result: $cf_disable_rpath_hack" >&5
++echo "$as_me:8121: result: $cf_disable_rpath_hack" >&5
+ echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+ 
+ if test "$enable_rpath_hack" = yes ; then
+ 
+-echo "$as_me:8123: checking for updated LDFLAGS" >&5
++echo "$as_me:8126: checking for updated LDFLAGS" >&5
+ echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
+ if test -n "$LD_RPATH_OPT" ; then
+-	echo "$as_me:8126: result: maybe" >&5
++	echo "$as_me:8129: result: maybe" >&5
+ echo "${ECHO_T}maybe" >&6
+ 
+ 	for ac_prog in ldd
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:8133: checking for $ac_word" >&5
++echo "$as_me:8136: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8145,7 +8148,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_cf_ldd_prog="$ac_prog"
+-echo "$as_me:8148: found $ac_dir/$ac_word" >&5
++echo "$as_me:8151: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8153,10 +8156,10 @@
+ fi
+ cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+ if test -n "$cf_ldd_prog"; then
+-  echo "$as_me:8156: result: $cf_ldd_prog" >&5
++  echo "$as_me:8159: result: $cf_ldd_prog" >&5
+ echo "${ECHO_T}$cf_ldd_prog" >&6
+ else
+-  echo "$as_me:8159: result: no" >&5
++  echo "$as_me:8162: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8170,7 +8173,7 @@
+ 		cf_rpath_oops=
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 8173 "configure"
++#line 8176 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -8182,16 +8185,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:8185: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8188: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8188: \$? = $ac_status" >&5
++  echo "$as_me:8191: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:8191: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8194: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8194: \$? = $ac_status" >&5
++  echo "$as_me:8197: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
+ 		 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
+@@ -8219,7 +8222,7 @@
+ 					then
+ 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
+ 
+-echo "${as_me:-configure}:8222: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
++echo "${as_me:-configure}:8225: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+ 
+ 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ 						break
+@@ -8231,11 +8234,11 @@
+ 
+ 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:8234: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:8237: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:8238: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:8241: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+@@ -8272,7 +8275,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:8275: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:8278: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -8285,11 +8288,11 @@
+ 
+ test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:8288: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:8291: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+ 
+ test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:8292: testing ...checking LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:8295: testing ...checking LIBS $LIBS ..." 1>&5
+ 
+ cf_rpath_dst=
+ for cf_rpath_src in $LIBS
+@@ -8326,7 +8329,7 @@
+ 			then
+ 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+ 
+-echo "${as_me:-configure}:8329: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
++echo "${as_me:-configure}:8332: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+ 
+ 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ 			fi
+@@ -8339,14 +8342,14 @@
+ 
+ test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:8342: testing ...checked LIBS $LIBS ..." 1>&5
++echo "${as_me:-configure}:8345: testing ...checked LIBS $LIBS ..." 1>&5
+ 
+ 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:8346: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:8349: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+ 
+ else
+-	echo "$as_me:8349: result: no" >&5
++	echo "$as_me:8352: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8360,7 +8363,7 @@
+ EXTRA_PKG_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
+ if test -n "$EXTRA_PKG_LDFLAGS"
+ then
+-	echo "$as_me:8363: checking if you want to disable extra LDFLAGS for package-scripts" >&5
++	echo "$as_me:8366: checking if you want to disable extra LDFLAGS for package-scripts" >&5
+ echo $ECHO_N "checking if you want to disable extra LDFLAGS for package-scripts... $ECHO_C" >&6
+ 
+ # Check whether --enable-pkg-ldflags or --disable-pkg-ldflags was given.
+@@ -8377,7 +8380,7 @@
+ 	disable_pkg_ldflags=no
+ 
+ fi;
+-	echo "$as_me:8380: result: $disable_pkg_ldflags" >&5
++	echo "$as_me:8383: result: $disable_pkg_ldflags" >&5
+ echo "${ECHO_T}$disable_pkg_ldflags" >&6
+ 	test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
+ fi
+@@ -8385,7 +8388,7 @@
+ ###############################################################################
+ 
+ ###	use option --with-extra-suffix to append suffix to headers and libraries
+-echo "$as_me:8388: checking if you wish to append extra suffix to header/library paths" >&5
++echo "$as_me:8391: checking if you wish to append extra suffix to header/library paths" >&5
+ echo $ECHO_N "checking if you wish to append extra suffix to header/library paths... $ECHO_C" >&6
+ EXTRA_SUFFIX=
+ 
+@@ -8404,11 +8407,11 @@
+ 	esac
+ 
+ fi;
+-echo "$as_me:8407: result: $EXTRA_SUFFIX" >&5
++echo "$as_me:8410: result: $EXTRA_SUFFIX" >&5
+ echo "${ECHO_T}$EXTRA_SUFFIX" >&6
+ 
+ ###	use option --disable-overwrite to leave out the link to -lcurses
+-echo "$as_me:8411: checking if you wish to install ncurses overwriting curses" >&5
++echo "$as_me:8414: checking if you wish to install ncurses overwriting curses" >&5
+ echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6
+ 
+ # Check whether --enable-overwrite or --disable-overwrite was given.
+@@ -8418,10 +8421,10 @@
+ else
+   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
+ fi;
+-echo "$as_me:8421: result: $with_overwrite" >&5
++echo "$as_me:8424: result: $with_overwrite" >&5
+ echo "${ECHO_T}$with_overwrite" >&6
+ 
+-echo "$as_me:8424: checking if external terminfo-database is used" >&5
++echo "$as_me:8427: checking if external terminfo-database is used" >&5
+ echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6
+ 
+ # Check whether --enable-database or --disable-database was given.
+@@ -8431,7 +8434,7 @@
+ else
+   use_database=yes
+ fi;
+-echo "$as_me:8434: result: $use_database" >&5
++echo "$as_me:8437: result: $use_database" >&5
+ echo "${ECHO_T}$use_database" >&6
+ 
+ case "$host_os" in
+@@ -8447,7 +8450,7 @@
+ if test "$use_database" != no ; then
+ 	NCURSES_USE_DATABASE=1
+ 
+-	echo "$as_me:8450: checking which terminfo source-file will be installed" >&5
++	echo "$as_me:8453: checking which terminfo source-file will be installed" >&5
+ echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6
+ 
+ # Check whether --with-database or --without-database was given.
+@@ -8455,10 +8458,10 @@
+   withval="$with_database"
+   TERMINFO_SRC=$withval
+ fi;
+-	echo "$as_me:8458: result: $TERMINFO_SRC" >&5
++	echo "$as_me:8461: result: $TERMINFO_SRC" >&5
+ echo "${ECHO_T}$TERMINFO_SRC" >&6
+ 
+-	echo "$as_me:8461: checking whether to use hashed database instead of directory/tree" >&5
++	echo "$as_me:8464: checking whether to use hashed database instead of directory/tree" >&5
+ echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6
+ 
+ # Check whether --with-hashed-db or --without-hashed-db was given.
+@@ -8468,13 +8471,13 @@
+ else
+   with_hashed_db=no
+ fi;
+-	echo "$as_me:8471: result: $with_hashed_db" >&5
++	echo "$as_me:8474: result: $with_hashed_db" >&5
+ echo "${ECHO_T}$with_hashed_db" >&6
+ else
+ 	with_hashed_db=no
+ fi
+ 
+-echo "$as_me:8477: checking for list of fallback descriptions" >&5
++echo "$as_me:8480: checking for list of fallback descriptions" >&5
+ echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6
+ 
+ # Check whether --with-fallbacks or --without-fallbacks was given.
+@@ -8484,7 +8487,7 @@
+ else
+   with_fallback=
+ fi;
+-echo "$as_me:8487: result: $with_fallback" >&5
++echo "$as_me:8490: result: $with_fallback" >&5
+ echo "${ECHO_T}$with_fallback" >&6
+ 
+ case ".$with_fallback" in
+@@ -8492,7 +8495,7 @@
+ 	FALLBACK_LIST=
+ 	;;
+ (.yes)
+-	{ echo "$as_me:8495: WARNING: expected a list of terminal descriptions" >&5
++	{ echo "$as_me:8498: WARNING: expected a list of terminal descriptions" >&5
+ echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
+ 	;;
+ (*)
+@@ -8508,7 +8511,7 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}tic", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}tic; ac_word=$2
+-echo "$as_me:8511: checking for $ac_word" >&5
++echo "$as_me:8514: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_TIC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8523,7 +8526,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_TIC="${ac_tool_prefix}tic"
+-echo "$as_me:8526: found $ac_dir/$ac_word" >&5
++echo "$as_me:8529: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8531,10 +8534,10 @@
+ fi
+ TIC=$ac_cv_prog_TIC
+ if test -n "$TIC"; then
+-  echo "$as_me:8534: result: $TIC" >&5
++  echo "$as_me:8537: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+-  echo "$as_me:8537: result: no" >&5
++  echo "$as_me:8540: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8543,7 +8546,7 @@
+   ac_ct_TIC=$TIC
+   # Extract the first word of "tic", so it can be a program name with args.
+ set dummy tic; ac_word=$2
+-echo "$as_me:8546: checking for $ac_word" >&5
++echo "$as_me:8549: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_TIC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8558,7 +8561,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_TIC="tic"
+-echo "$as_me:8561: found $ac_dir/$ac_word" >&5
++echo "$as_me:8564: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8566,10 +8569,10 @@
+ fi
+ ac_ct_TIC=$ac_cv_prog_ac_ct_TIC
+ if test -n "$ac_ct_TIC"; then
+-  echo "$as_me:8569: result: $ac_ct_TIC" >&5
++  echo "$as_me:8572: result: $ac_ct_TIC" >&5
+ echo "${ECHO_T}$ac_ct_TIC" >&6
+ else
+-  echo "$as_me:8572: result: no" >&5
++  echo "$as_me:8575: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8581,7 +8584,7 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}infocmp", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}infocmp; ac_word=$2
+-echo "$as_me:8584: checking for $ac_word" >&5
++echo "$as_me:8587: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_INFOCMP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8596,7 +8599,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_INFOCMP="${ac_tool_prefix}infocmp"
+-echo "$as_me:8599: found $ac_dir/$ac_word" >&5
++echo "$as_me:8602: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8604,10 +8607,10 @@
+ fi
+ INFOCMP=$ac_cv_prog_INFOCMP
+ if test -n "$INFOCMP"; then
+-  echo "$as_me:8607: result: $INFOCMP" >&5
++  echo "$as_me:8610: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+-  echo "$as_me:8610: result: no" >&5
++  echo "$as_me:8613: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8616,7 +8619,7 @@
+   ac_ct_INFOCMP=$INFOCMP
+   # Extract the first word of "infocmp", so it can be a program name with args.
+ set dummy infocmp; ac_word=$2
+-echo "$as_me:8619: checking for $ac_word" >&5
++echo "$as_me:8622: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_INFOCMP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8631,7 +8634,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_INFOCMP="infocmp"
+-echo "$as_me:8634: found $ac_dir/$ac_word" >&5
++echo "$as_me:8637: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -8639,10 +8642,10 @@
+ fi
+ ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP
+ if test -n "$ac_ct_INFOCMP"; then
+-  echo "$as_me:8642: result: $ac_ct_INFOCMP" >&5
++  echo "$as_me:8645: result: $ac_ct_INFOCMP" >&5
+ echo "${ECHO_T}$ac_ct_INFOCMP" >&6
+ else
+-  echo "$as_me:8645: result: no" >&5
++  echo "$as_me:8648: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8657,10 +8660,10 @@
+ # Check whether --with-tic-path or --without-tic-path was given.
+ if test "${with_tic_path+set}" = set; then
+   withval="$with_tic_path"
+-  echo "$as_me:8660: checking for tic program for fallbacks" >&5
++  echo "$as_me:8663: checking for tic program for fallbacks" >&5
+ echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
+ 		TIC=$withval
+-		echo "$as_me:8663: result: $TIC" >&5
++		echo "$as_me:8666: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ 
+ if test "x$prefix" != xNONE; then
+@@ -8688,7 +8691,7 @@
+ 	TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:8691: error: expected a pathname, not \"$TIC\"" >&5
++	{ { echo "$as_me:8694: error: expected a pathname, not \"$TIC\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -8701,7 +8704,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:8704: checking for $ac_word" >&5
++echo "$as_me:8707: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_TIC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8718,7 +8721,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_TIC="$ac_dir/$ac_word"
+-   echo "$as_me:8721: found $ac_dir/$ac_word" >&5
++   echo "$as_me:8724: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -8729,10 +8732,10 @@
+ TIC=$ac_cv_path_TIC
+ 
+ if test -n "$TIC"; then
+-  echo "$as_me:8732: result: $TIC" >&5
++  echo "$as_me:8735: result: $TIC" >&5
+ echo "${ECHO_T}$TIC" >&6
+ else
+-  echo "$as_me:8735: result: no" >&5
++  echo "$as_me:8738: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8791,7 +8794,7 @@
+ 
+ if test -n "$cf_path_prog" ; then
+ 
+-echo "${as_me:-configure}:8794: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:8797: testing defining path for ${cf_path_prog} ..." 1>&5
+ 
+ cat >>confdefs.h <&5
++			{ echo "$as_me:8812: WARNING: no tic program found for fallbacks" >&5
+ echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
+ 		fi
+ 
+@@ -8815,10 +8818,10 @@
+ # Check whether --with-infocmp-path or --without-infocmp-path was given.
+ if test "${with_infocmp_path+set}" = set; then
+   withval="$with_infocmp_path"
+-  echo "$as_me:8818: checking for infocmp program for fallbacks" >&5
++  echo "$as_me:8821: checking for infocmp program for fallbacks" >&5
+ echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
+ 		INFOCMP=$withval
+-		echo "$as_me:8821: result: $INFOCMP" >&5
++		echo "$as_me:8824: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ 
+ if test "x$prefix" != xNONE; then
+@@ -8846,7 +8849,7 @@
+ 	INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:8849: error: expected a pathname, not \"$INFOCMP\"" >&5
++	{ { echo "$as_me:8852: error: expected a pathname, not \"$INFOCMP\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -8859,7 +8862,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:8862: checking for $ac_word" >&5
++echo "$as_me:8865: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_INFOCMP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8876,7 +8879,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_INFOCMP="$ac_dir/$ac_word"
+-   echo "$as_me:8879: found $ac_dir/$ac_word" >&5
++   echo "$as_me:8882: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -8887,10 +8890,10 @@
+ INFOCMP=$ac_cv_path_INFOCMP
+ 
+ if test -n "$INFOCMP"; then
+-  echo "$as_me:8890: result: $INFOCMP" >&5
++  echo "$as_me:8893: result: $INFOCMP" >&5
+ echo "${ECHO_T}$INFOCMP" >&6
+ else
+-  echo "$as_me:8893: result: no" >&5
++  echo "$as_me:8896: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -8949,7 +8952,7 @@
+ 
+ if test -n "$cf_path_prog" ; then
+ 
+-echo "${as_me:-configure}:8952: testing defining path for ${cf_path_prog} ..." 1>&5
++echo "${as_me:-configure}:8955: testing defining path for ${cf_path_prog} ..." 1>&5
+ 
+ cat >>confdefs.h <&5
++			{ echo "$as_me:8970: WARNING: no infocmp program found for fallbacks" >&5
+ echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
+ 		fi
+ 
+@@ -8974,7 +8977,7 @@
+ 	test -z "$INFOCMP" && FALLBACK_LIST=
+ 	if test -z "$FALLBACK_LIST"
+ 	then
+-		{ echo "$as_me:8977: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
++		{ echo "$as_me:8980: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
+ echo "$as_me: WARNING: ignoring fallback option because tic/infocmp are not available" >&2;}
+ 	fi
+ fi
+@@ -8982,7 +8985,7 @@
+ USE_FALLBACKS=
+ test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
+ 
+-echo "$as_me:8985: checking if you want modern xterm or antique" >&5
++echo "$as_me:8988: checking if you want modern xterm or antique" >&5
+ echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6
+ 
+ # Check whether --with-xterm-new or --without-xterm-new was given.
+@@ -8996,11 +8999,11 @@
+ (no) with_xterm_new=xterm-old;;
+ (*)	 with_xterm_new=xterm-new;;
+ esac
+-echo "$as_me:8999: result: $with_xterm_new" >&5
++echo "$as_me:9002: result: $with_xterm_new" >&5
+ echo "${ECHO_T}$with_xterm_new" >&6
+ WHICH_XTERM=$with_xterm_new
+ 
+-echo "$as_me:9003: checking if xterm backspace sends BS or DEL" >&5
++echo "$as_me:9006: checking if xterm backspace sends BS or DEL" >&5
+ echo $ECHO_N "checking if xterm backspace sends BS or DEL... $ECHO_C" >&6
+ 
+ # Check whether --with-xterm-kbs or --without-xterm-kbs was given.
+@@ -9021,7 +9024,7 @@
+ 	with_xterm_kbs=$withval
+ 	;;
+ esac
+-echo "$as_me:9024: result: $with_xterm_kbs" >&5
++echo "$as_me:9027: result: $with_xterm_kbs" >&5
+ echo "${ECHO_T}$with_xterm_kbs" >&6
+ XTERM_KBS=$with_xterm_kbs
+ 
+@@ -9031,7 +9034,7 @@
+ 	MAKE_TERMINFO="#"
+ else
+ 
+-echo "$as_me:9034: checking for list of terminfo directories" >&5
++echo "$as_me:9037: checking for list of terminfo directories" >&5
+ echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6
+ 
+ # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given.
+@@ -9071,7 +9074,7 @@
+ 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9074: error: expected a pathname, not \"$cf_src_path\"" >&5
++	{ { echo "$as_me:9077: error: expected a pathname, not \"$cf_src_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -9094,7 +9097,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:9097: result: $TERMINFO_DIRS" >&5
++echo "$as_me:9100: result: $TERMINFO_DIRS" >&5
+ echo "${ECHO_T}$TERMINFO_DIRS" >&6
+ test -n "$TERMINFO_DIRS" &&
+ cat >>confdefs.h <&5
++	{ echo "$as_me:9109: WARNING: ignoring non-directory/file TERMINFO value" >&5
+ echo "$as_me: WARNING: ignoring non-directory/file TERMINFO value" >&2;}
+ 	unset TERMINFO
+ 	;;
+ esac
+ 
+-echo "$as_me:9112: checking for default terminfo directory" >&5
++echo "$as_me:9115: checking for default terminfo directory" >&5
+ echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6
+ 
+ # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given.
+@@ -9145,7 +9148,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9148: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:9151: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -9154,7 +9157,7 @@
+ fi
+ eval TERMINFO="$withval"
+ 
+-echo "$as_me:9157: result: $TERMINFO" >&5
++echo "$as_me:9160: result: $TERMINFO" >&5
+ echo "${ECHO_T}$TERMINFO" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:9171: checking if big-core option selected" >&5
+ echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6
+ 
+ # Check whether --enable-big-core or --disable-big-core was given.
+@@ -9177,7 +9180,7 @@
+   with_big_core=no
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9180 "configure"
++#line 9183 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -9191,15 +9194,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:9194: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9197: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9197: \$? = $ac_status" >&5
++  echo "$as_me:9200: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:9199: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9202: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9202: \$? = $ac_status" >&5
++  echo "$as_me:9205: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_big_core=yes
+ else
+@@ -9211,7 +9214,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi;
+-echo "$as_me:9214: result: $with_big_core" >&5
++echo "$as_me:9217: result: $with_big_core" >&5
+ echo "${ECHO_T}$with_big_core" >&6
+ test "x$with_big_core" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -9221,7 +9224,7 @@
+ ### ISO C only guarantees 512-char strings, we have tables which load faster
+ ### when constructed using "big" strings.  More than the C compiler, the awk
+ ### program is a limit on most vendor UNIX systems.  Check that we can build.
+-echo "$as_me:9224: checking if big-strings option selected" >&5
++echo "$as_me:9227: checking if big-strings option selected" >&5
+ echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6
+ 
+ # Check whether --enable-big-strings or --disable-big-strings was given.
+@@ -9245,14 +9248,14 @@
+ 	esac
+ 
+ fi;
+-echo "$as_me:9248: result: $with_big_strings" >&5
++echo "$as_me:9251: result: $with_big_strings" >&5
+ echo "${ECHO_T}$with_big_strings" >&6
+ 
+ USE_BIG_STRINGS=0
+ test "x$with_big_strings" = "xyes" && USE_BIG_STRINGS=1
+ 
+ ###	use option --enable-termcap to compile in the termcap fallback support
+-echo "$as_me:9255: checking if you want termcap-fallback support" >&5
++echo "$as_me:9258: checking if you want termcap-fallback support" >&5
+ echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6
+ 
+ # Check whether --enable-termcap or --disable-termcap was given.
+@@ -9262,14 +9265,14 @@
+ else
+   with_termcap=no
+ fi;
+-echo "$as_me:9265: result: $with_termcap" >&5
++echo "$as_me:9268: result: $with_termcap" >&5
+ echo "${ECHO_T}$with_termcap" >&6
+ 
+ NCURSES_USE_TERMCAP=0
+ if test "x$with_termcap" != "xyes" ; then
+ 	if test "$use_database" = no ; then
+ 		if test -z "$with_fallback" ; then
+-			{ { echo "$as_me:9272: error: You have disabled the database w/o specifying fallbacks" >&5
++			{ { echo "$as_me:9275: error: You have disabled the database w/o specifying fallbacks" >&5
+ echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;}
+    { (exit 1); exit 1; }; }
+ 		fi
+@@ -9282,13 +9285,13 @@
+ else
+ 
+ 	if test "$with_ticlib" != no ; then
+-		{ { echo "$as_me:9285: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
++		{ { echo "$as_me:9288: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
+ echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+ 
+ 	NCURSES_USE_TERMCAP=1
+-	echo "$as_me:9291: checking for list of termcap files" >&5
++	echo "$as_me:9294: checking for list of termcap files" >&5
+ echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6
+ 
+ # Check whether --with-termpath or --without-termpath was given.
+@@ -9328,7 +9331,7 @@
+ 	cf_src_path=`echo "$cf_src_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:9331: error: expected a pathname, not \"$cf_src_path\"" >&5
++	{ { echo "$as_me:9334: error: expected a pathname, not \"$cf_src_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -9351,7 +9354,7 @@
+ 	;;
+ esac
+ 
+-	echo "$as_me:9354: result: $TERMPATH" >&5
++	echo "$as_me:9357: result: $TERMPATH" >&5
+ echo "${ECHO_T}$TERMPATH" >&6
+ 	test -n "$TERMPATH" &&
+ cat >>confdefs.h <&5
++	echo "$as_me:9365: checking if fast termcap-loader is needed" >&5
+ echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6
+ 
+ # Check whether --enable-getcap or --disable-getcap was given.
+@@ -9369,14 +9372,14 @@
+ else
+   with_getcap=no
+ fi;
+-	echo "$as_me:9372: result: $with_getcap" >&5
++	echo "$as_me:9375: result: $with_getcap" >&5
+ echo "${ECHO_T}$with_getcap" >&6
+ 	test "x$with_getcap" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+ #define USE_GETCAP 1
+ EOF
+ 
+-	echo "$as_me:9379: checking if translated termcaps will be cached in ~/.terminfo" >&5
++	echo "$as_me:9382: checking if translated termcaps will be cached in ~/.terminfo" >&5
+ echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6
+ 
+ # Check whether --enable-getcap-cache or --disable-getcap-cache was given.
+@@ -9386,7 +9389,7 @@
+ else
+   with_getcap_cache=no
+ fi;
+-	echo "$as_me:9389: result: $with_getcap_cache" >&5
++	echo "$as_me:9392: result: $with_getcap_cache" >&5
+ echo "${ECHO_T}$with_getcap_cache" >&6
+ 	test "x$with_getcap_cache" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+@@ -9396,7 +9399,7 @@
+ fi
+ 
+ ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
+-echo "$as_me:9399: checking if ~/.terminfo is wanted" >&5
++echo "$as_me:9402: checking if ~/.terminfo is wanted" >&5
+ echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6
+ 
+ # Check whether --enable-home-terminfo or --disable-home-terminfo was given.
+@@ -9406,14 +9409,14 @@
+ else
+   with_home_terminfo=yes
+ fi;
+-echo "$as_me:9409: result: $with_home_terminfo" >&5
++echo "$as_me:9412: result: $with_home_terminfo" >&5
+ echo "${ECHO_T}$with_home_terminfo" >&6
+ test "x$with_home_terminfo" = "xyes" &&
+ cat >>confdefs.h <<\EOF
+ #define USE_HOME_TERMINFO 1
+ EOF
+ 
+-echo "$as_me:9416: checking if you want to permit root to use ncurses environment variables" >&5
++echo "$as_me:9419: checking if you want to permit root to use ncurses environment variables" >&5
+ echo $ECHO_N "checking if you want to permit root to use ncurses environment variables... $ECHO_C" >&6
+ 
+ # Check whether --enable-root-environ or --disable-root-environ was given.
+@@ -9423,14 +9426,14 @@
+ else
+   with_root_environ=yes
+ fi;
+-echo "$as_me:9426: result: $with_root_environ" >&5
++echo "$as_me:9429: result: $with_root_environ" >&5
+ echo "${ECHO_T}$with_root_environ" >&6
+ test "x$with_root_environ" = xyes &&
+ cat >>confdefs.h <<\EOF
+ #define USE_ROOT_ENVIRON 1
+ EOF
+ 
+-echo "$as_me:9433: checking if you want to permit setuid programs to access all files" >&5
++echo "$as_me:9436: checking if you want to permit setuid programs to access all files" >&5
+ echo $ECHO_N "checking if you want to permit setuid programs to access all files... $ECHO_C" >&6
+ 
+ # Check whether --enable-root-environ or --disable-root-environ was given.
+@@ -9440,7 +9443,7 @@
+ else
+   with_root_access=yes
+ fi;
+-echo "$as_me:9443: result: $with_root_access" >&5
++echo "$as_me:9446: result: $with_root_access" >&5
+ echo "${ECHO_T}$with_root_access" >&6
+ test "x$with_root_access" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -9455,23 +9458,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:9458: checking for $ac_header" >&5
++echo "$as_me:9461: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9464 "configure"
++#line 9467 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:9468: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:9471: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:9474: \$? = $ac_status" >&5
++  echo "$as_me:9477: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -9490,7 +9493,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:9493: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:9496: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:9511: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9514 "configure"
++#line 9517 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -9542,16 +9545,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9545: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9548: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9548: \$? = $ac_status" >&5
++  echo "$as_me:9551: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9551: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9554: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9554: \$? = $ac_status" >&5
++  echo "$as_me:9557: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -9561,7 +9564,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:9564: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:9567: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:9584: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9587 "configure"
++#line 9590 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -9615,16 +9618,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:9618: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9621: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9621: \$? = $ac_status" >&5
++  echo "$as_me:9624: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:9624: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9627: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9627: \$? = $ac_status" >&5
++  echo "$as_me:9630: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -9634,7 +9637,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:9637: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:9640: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
+   cat >>confdefs.h <&5
++	echo "$as_me:9651: checking if link/symlink functions work" >&5
+ echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6
+ if test "${cf_cv_link_funcs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9658,7 +9661,7 @@
+ 			eval 'ac_cv_func_'$cf_func'=error'
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9661 "configure"
++#line 9664 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -9696,15 +9699,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:9699: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9702: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9702: \$? = $ac_status" >&5
++  echo "$as_me:9705: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:9704: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9707: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9707: \$? = $ac_status" >&5
++  echo "$as_me:9710: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
+@@ -9722,7 +9725,7 @@
+ 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
+ 
+ fi
+-echo "$as_me:9725: result: $cf_cv_link_funcs" >&5
++echo "$as_me:9728: result: $cf_cv_link_funcs" >&5
+ echo "${ECHO_T}$cf_cv_link_funcs" >&6
+ 	test "$ac_cv_func_link"    = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -9742,7 +9745,7 @@
+ # soft links (symbolic links) are useful for some systems where hard links do
+ # not work, or to make it simpler to copy terminfo trees around.
+ if test "x$ac_cv_func_symlink" = xyes ; then
+-	echo "$as_me:9745: checking if tic should use symbolic links" >&5
++	echo "$as_me:9748: checking if tic should use symbolic links" >&5
+ echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6
+ 
+ # Check whether --enable-symlinks or --disable-symlinks was given.
+@@ -9752,21 +9755,21 @@
+ else
+   with_symlinks=no
+ fi;
+-	echo "$as_me:9755: result: $with_symlinks" >&5
++	echo "$as_me:9758: result: $with_symlinks" >&5
+ echo "${ECHO_T}$with_symlinks" >&6
+ fi
+ 
+ # If we have hard links and did not choose to use soft links instead, there is
+ # no reason to make this choice optional - use the hard links.
+ if test "$with_symlinks" = no ; then
+-	echo "$as_me:9762: checking if tic should use hard links" >&5
++	echo "$as_me:9765: checking if tic should use hard links" >&5
+ echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6
+ 	if test "x$ac_cv_func_link" = xyes ; then
+ 		with_links=yes
+ 	else
+ 		with_links=no
+ 	fi
+-	echo "$as_me:9769: result: $with_links" >&5
++	echo "$as_me:9772: result: $with_links" >&5
+ echo "${ECHO_T}$with_links" >&6
+ fi
+ 
+@@ -9782,7 +9785,7 @@
+ 
+ ###   use option --enable-broken-linker to force on use of broken-linker support
+ 
+-echo "$as_me:9785: checking if you want broken-linker support code" >&5
++echo "$as_me:9788: checking if you want broken-linker support code" >&5
+ echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6
+ 
+ # Check whether --enable-broken_linker or --disable-broken_linker was given.
+@@ -9792,7 +9795,7 @@
+ else
+   with_broken_linker=no
+ fi;
+-echo "$as_me:9795: result: $with_broken_linker" >&5
++echo "$as_me:9798: result: $with_broken_linker" >&5
+ echo "${ECHO_T}$with_broken_linker" >&6
+ 
+ : "${BROKEN_LINKER:=0}"
+@@ -9806,7 +9809,7 @@
+ fi
+ 
+ ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
+-echo "$as_me:9809: checking if tputs should process BSD-style prefix padding" >&5
++echo "$as_me:9812: checking if tputs should process BSD-style prefix padding" >&5
+ echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6
+ 
+ # Check whether --enable-bsdpad or --disable-bsdpad was given.
+@@ -9816,7 +9819,7 @@
+ else
+   with_bsdpad=no
+ fi;
+-echo "$as_me:9819: result: $with_bsdpad" >&5
++echo "$as_me:9822: result: $with_bsdpad" >&5
+ echo "${ECHO_T}$with_bsdpad" >&6
+ test "x$with_bsdpad" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -9835,14 +9838,14 @@
+ # Check to define _XOPEN_SOURCE "automatically"
+ CPPFLAGS_before_XOPEN="$CPPFLAGS"
+ 
+-echo "$as_me:9838: checking if the POSIX test-macros are already defined" >&5
++echo "$as_me:9841: checking if the POSIX test-macros are already defined" >&5
+ echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6
+ if test "${cf_cv_posix_visible+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9845 "configure"
++#line 9848 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9861,16 +9864,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9864: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9867: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9867: \$? = $ac_status" >&5
++  echo "$as_me:9870: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9870: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9873: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9873: \$? = $ac_status" >&5
++  echo "$as_me:9876: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_visible=no
+ else
+@@ -9881,7 +9884,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:9884: result: $cf_cv_posix_visible" >&5
++echo "$as_me:9887: result: $cf_cv_posix_visible" >&5
+ echo "${ECHO_T}$cf_cv_posix_visible" >&6
+ 
+ if test "$cf_cv_posix_visible" = no; then
+@@ -9926,14 +9929,14 @@
+ 
+ cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+ 
+-echo "$as_me:9929: checking if this is the GNU C library" >&5
++echo "$as_me:9932: checking if this is the GNU C library" >&5
+ echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6
+ if test "${cf_cv_gnu_library+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9936 "configure"
++#line 9939 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -9952,16 +9955,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:9955: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:9958: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:9958: \$? = $ac_status" >&5
++  echo "$as_me:9961: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:9961: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9964: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9964: \$? = $ac_status" >&5
++  echo "$as_me:9967: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library=yes
+ else
+@@ -9972,7 +9975,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:9975: result: $cf_cv_gnu_library" >&5
++echo "$as_me:9978: result: $cf_cv_gnu_library" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library" >&6
+ 
+ if test x$cf_cv_gnu_library = xyes; then
+@@ -9980,7 +9983,7 @@
+ 	# With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE
+ 	# was changed to help a little.  newlib incorporated the change about 4
+ 	# years later.
+-	echo "$as_me:9983: checking if _DEFAULT_SOURCE can be used as a basis" >&5
++	echo "$as_me:9986: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+ echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6
+ if test "${cf_cv_gnu_library_219+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9992,7 +9995,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 9995 "configure"
++#line 9998 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10011,16 +10014,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10014: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10017: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10017: \$? = $ac_status" >&5
++  echo "$as_me:10020: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10020: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10023: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10023: \$? = $ac_status" >&5
++  echo "$as_me:10026: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_library_219=yes
+ else
+@@ -10032,12 +10035,12 @@
+ 		CPPFLAGS="$cf_save"
+ 
+ fi
+-echo "$as_me:10035: result: $cf_cv_gnu_library_219" >&5
++echo "$as_me:10038: result: $cf_cv_gnu_library_219" >&5
+ echo "${ECHO_T}$cf_cv_gnu_library_219" >&6
+ 
+ 	if test "x$cf_cv_gnu_library_219" = xyes; then
+ 		cf_save="$CPPFLAGS"
+-		echo "$as_me:10040: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
++		echo "$as_me:10043: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+ echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_gnu_dftsrc_219+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10142,7 +10145,7 @@
+ fi
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10145 "configure"
++#line 10148 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -10162,16 +10165,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10165: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10168: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10168: \$? = $ac_status" >&5
++  echo "$as_me:10171: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10171: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10174: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10174: \$? = $ac_status" >&5
++  echo "$as_me:10177: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_dftsrc_219=yes
+ else
+@@ -10182,7 +10185,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10185: result: $cf_cv_gnu_dftsrc_219" >&5
++echo "$as_me:10188: result: $cf_cv_gnu_dftsrc_219" >&5
+ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
+ 		test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save"
+ 	else
+@@ -10191,14 +10194,14 @@
+ 
+ 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+ 
+-		echo "$as_me:10194: checking if we must define _GNU_SOURCE" >&5
++		echo "$as_me:10197: checking if we must define _GNU_SOURCE" >&5
+ echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_gnu_source+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10201 "configure"
++#line 10204 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10213,16 +10216,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10216: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10219: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10219: \$? = $ac_status" >&5
++  echo "$as_me:10222: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10222: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10225: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10225: \$? = $ac_status" >&5
++  echo "$as_me:10228: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -10329,7 +10332,7 @@
+ fi
+ 
+ 			 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10332 "configure"
++#line 10335 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10344,16 +10347,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10347: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10350: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10350: \$? = $ac_status" >&5
++  echo "$as_me:10353: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10353: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10356: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10356: \$? = $ac_status" >&5
++  echo "$as_me:10359: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -10368,12 +10371,12 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10371: result: $cf_cv_gnu_source" >&5
++echo "$as_me:10374: result: $cf_cv_gnu_source" >&5
+ echo "${ECHO_T}$cf_cv_gnu_source" >&6
+ 
+ 		if test "$cf_cv_gnu_source" = yes
+ 		then
+-		echo "$as_me:10376: checking if we should also define _DEFAULT_SOURCE" >&5
++		echo "$as_me:10379: checking if we should also define _DEFAULT_SOURCE" >&5
+ echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_default_source+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10383,7 +10386,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10386 "configure"
++#line 10389 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10398,16 +10401,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10401: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10404: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10404: \$? = $ac_status" >&5
++  echo "$as_me:10407: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10407: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10410: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10410: \$? = $ac_status" >&5
++  echo "$as_me:10413: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_default_source=no
+ else
+@@ -10418,7 +10421,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10421: result: $cf_cv_default_source" >&5
++echo "$as_me:10424: result: $cf_cv_default_source" >&5
+ echo "${ECHO_T}$cf_cv_default_source" >&6
+ 			if test "$cf_cv_default_source" = yes
+ 			then
+@@ -10455,16 +10458,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:10458: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:10461: checking if we should define _POSIX_C_SOURCE" >&5
+ echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_posix_c_source+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-echo "${as_me:-configure}:10464: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:10467: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10467 "configure"
++#line 10470 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10479,16 +10482,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10482: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10485: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10485: \$? = $ac_status" >&5
++  echo "$as_me:10488: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10488: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10491: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10491: \$? = $ac_status" >&5
++  echo "$as_me:10494: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -10509,7 +10512,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10512 "configure"
++#line 10515 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10524,16 +10527,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10527: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10530: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10530: \$? = $ac_status" >&5
++  echo "$as_me:10533: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10533: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10536: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10536: \$? = $ac_status" >&5
++  echo "$as_me:10539: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -10544,7 +10547,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:10547: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:10550: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -10552,10 +10555,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:10555: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:10558: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10558 "configure"
++#line 10561 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -10570,16 +10573,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10573: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10576: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10576: \$? = $ac_status" >&5
++  echo "$as_me:10579: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10579: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10582: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10582: \$? = $ac_status" >&5
++  echo "$as_me:10585: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -10595,7 +10598,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10598: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:10601: result: $cf_cv_posix_c_source" >&5
+ echo "${ECHO_T}$cf_cv_posix_c_source" >&6
+ 
+ if test "$cf_cv_posix_c_source" != no ; then
+@@ -10712,7 +10715,7 @@
+ 	# OpenBSD 6.x has broken locale support, both compile-time and runtime.
+ 	# see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
+ 	# Abusing the conformance level is a workaround.
+-	{ echo "$as_me:10715: WARNING: this system does not provide usable locale support" >&5
++	{ echo "$as_me:10718: WARNING: this system does not provide usable locale support" >&5
+ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
+ 	cf_xopen_source="-D_BSD_SOURCE"
+ 	cf_XOPEN_SOURCE=700
+@@ -10744,14 +10747,14 @@
+ 	;;
+ (*)
+ 
+-echo "$as_me:10747: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:10750: checking if we should define _XOPEN_SOURCE" >&5
+ echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_xopen_source+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10754 "configure"
++#line 10757 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -10770,16 +10773,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10773: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10776: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10776: \$? = $ac_status" >&5
++  echo "$as_me:10779: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10779: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10782: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10782: \$? = $ac_status" >&5
++  echo "$as_me:10785: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -10791,7 +10794,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 10794 "configure"
++#line 10797 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -10810,16 +10813,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:10813: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:10816: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:10816: \$? = $ac_status" >&5
++  echo "$as_me:10819: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:10819: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10822: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10822: \$? = $ac_status" >&5
++  echo "$as_me:10825: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -10834,7 +10837,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:10837: result: $cf_cv_xopen_source" >&5
++echo "$as_me:10840: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -10992,16 +10995,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:10995: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:10998: checking if we should define _POSIX_C_SOURCE" >&5
+ echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_posix_c_source+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-echo "${as_me:-configure}:11001: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:11004: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11004 "configure"
++#line 11007 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11016,16 +11019,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11019: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11022: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11022: \$? = $ac_status" >&5
++  echo "$as_me:11025: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11025: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11028: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11028: \$? = $ac_status" >&5
++  echo "$as_me:11031: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -11046,7 +11049,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11049 "configure"
++#line 11052 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11061,16 +11064,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11064: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11067: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11067: \$? = $ac_status" >&5
++  echo "$as_me:11070: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11070: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11073: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11073: \$? = $ac_status" >&5
++  echo "$as_me:11076: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11081,7 +11084,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	 fi
+ 
+-echo "${as_me:-configure}:11084: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:11087: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS"
+@@ -11089,10 +11092,10 @@
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:11092: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:11095: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11095 "configure"
++#line 11098 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11107,16 +11110,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11110: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11113: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11113: \$? = $ac_status" >&5
++  echo "$as_me:11116: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11116: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11119: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11119: \$? = $ac_status" >&5
++  echo "$as_me:11122: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -11132,7 +11135,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11135: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:11138: result: $cf_cv_posix_c_source" >&5
+ echo "${ECHO_T}$cf_cv_posix_c_source" >&6
+ 
+ if test "$cf_cv_posix_c_source" != no ; then
+@@ -11258,7 +11261,7 @@
+ 	test "$CFLAGS" != "$cf_old_cflag" || break
+ 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:11261: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
++echo "${as_me:-configure}:11264: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+ 
+ 	CFLAGS="$cf_old_cflag"
+ done
+@@ -11270,7 +11273,7 @@
+ 	test "$CPPFLAGS" != "$cf_old_cflag" || break
+ 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:11273: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:11276: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+ 
+ 	CPPFLAGS="$cf_old_cflag"
+ done
+@@ -11358,7 +11361,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:11361: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:11364: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_new_cflags"
+@@ -11368,7 +11371,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:11371: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:11374: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+ 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+@@ -11378,7 +11381,7 @@
+ if test -n "$cf_new_extra_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:11381: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:11384: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+ 
+ 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+ 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+@@ -11390,10 +11393,10 @@
+ fi
+ 
+ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
+-	echo "$as_me:11393: checking if _XOPEN_SOURCE really is set" >&5
++	echo "$as_me:11396: checking if _XOPEN_SOURCE really is set" >&5
+ echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11396 "configure"
++#line 11399 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11408,16 +11411,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11411: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11414: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11414: \$? = $ac_status" >&5
++  echo "$as_me:11417: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11417: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11420: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11420: \$? = $ac_status" >&5
++  echo "$as_me:11423: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set=yes
+ else
+@@ -11426,12 +11429,12 @@
+ cf_XOPEN_SOURCE_set=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:11429: result: $cf_XOPEN_SOURCE_set" >&5
++	echo "$as_me:11432: result: $cf_XOPEN_SOURCE_set" >&5
+ echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
+ 	if test "$cf_XOPEN_SOURCE_set" = yes
+ 	then
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11434 "configure"
++#line 11437 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11446,16 +11449,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11449: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11452: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11452: \$? = $ac_status" >&5
++  echo "$as_me:11455: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11455: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11458: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11458: \$? = $ac_status" >&5
++  echo "$as_me:11461: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_XOPEN_SOURCE_set_ok=yes
+ else
+@@ -11466,19 +11469,19 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		if test "$cf_XOPEN_SOURCE_set_ok" = no
+ 		then
+-			{ echo "$as_me:11469: WARNING: _XOPEN_SOURCE is lower than requested" >&5
++			{ echo "$as_me:11472: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
+ 		fi
+ 	else
+ 
+-echo "$as_me:11474: checking if we should define _XOPEN_SOURCE" >&5
++echo "$as_me:11477: checking if we should define _XOPEN_SOURCE" >&5
+ echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
+ if test "${cf_cv_xopen_source+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11481 "configure"
++#line 11484 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -11497,16 +11500,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11500: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11503: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11503: \$? = $ac_status" >&5
++  echo "$as_me:11506: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11506: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11509: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11509: \$? = $ac_status" >&5
++  echo "$as_me:11512: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -11518,7 +11521,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 
+ 	 cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11521 "configure"
++#line 11524 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -11537,16 +11540,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11540: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11543: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11543: \$? = $ac_status" >&5
++  echo "$as_me:11546: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11546: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11549: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11549: \$? = $ac_status" >&5
++  echo "$as_me:11552: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -11561,7 +11564,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11564: result: $cf_cv_xopen_source" >&5
++echo "$as_me:11567: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 
+ if test "$cf_cv_xopen_source" != no ; then
+@@ -11712,14 +11715,14 @@
+ 
+ # Work around breakage on OS X
+ 
+-echo "$as_me:11715: checking if SIGWINCH is defined" >&5
++echo "$as_me:11718: checking if SIGWINCH is defined" >&5
+ echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6
+ if test "${cf_cv_define_sigwinch+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11722 "configure"
++#line 11725 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -11734,23 +11737,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11737: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11740: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11740: \$? = $ac_status" >&5
++  echo "$as_me:11743: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11743: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11746: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11746: \$? = $ac_status" >&5
++  echo "$as_me:11749: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_define_sigwinch=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11753 "configure"
++#line 11756 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -11768,16 +11771,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11771: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11774: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11774: \$? = $ac_status" >&5
++  echo "$as_me:11777: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11777: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11780: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11780: \$? = $ac_status" >&5
++  echo "$as_me:11783: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_define_sigwinch=maybe
+ else
+@@ -11791,11 +11794,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11794: result: $cf_cv_define_sigwinch" >&5
++echo "$as_me:11797: result: $cf_cv_define_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_define_sigwinch" >&6
+ 
+ if test "$cf_cv_define_sigwinch" = maybe ; then
+-echo "$as_me:11798: checking for actual SIGWINCH definition" >&5
++echo "$as_me:11801: checking for actual SIGWINCH definition" >&5
+ echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6
+ if test "${cf_cv_fixup_sigwinch+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11806,7 +11809,7 @@
+ while test "$cf_sigwinch" != 1
+ do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11809 "configure"
++#line 11812 "configure"
+ #include "confdefs.h"
+ 
+ #undef _XOPEN_SOURCE
+@@ -11828,16 +11831,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:11831: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11834: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11834: \$? = $ac_status" >&5
++  echo "$as_me:11837: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:11837: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11840: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11840: \$? = $ac_status" >&5
++  echo "$as_me:11843: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fixup_sigwinch=$cf_sigwinch
+ 	 break
+@@ -11851,7 +11854,7 @@
+ done
+ 
+ fi
+-echo "$as_me:11854: result: $cf_cv_fixup_sigwinch" >&5
++echo "$as_me:11857: result: $cf_cv_fixup_sigwinch" >&5
+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
+ 
+ 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
+@@ -11861,13 +11864,13 @@
+ 
+ # Checks for CODESET support.
+ 
+-echo "$as_me:11864: checking for nl_langinfo and CODESET" >&5
++echo "$as_me:11867: checking for nl_langinfo and CODESET" >&5
+ echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
+ if test "${am_cv_langinfo_codeset+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11870 "configure"
++#line 11873 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -11879,16 +11882,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:11882: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11885: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11885: \$? = $ac_status" >&5
++  echo "$as_me:11888: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:11888: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11891: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11891: \$? = $ac_status" >&5
++  echo "$as_me:11894: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   am_cv_langinfo_codeset=yes
+ else
+@@ -11899,7 +11902,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:11902: result: $am_cv_langinfo_codeset" >&5
++echo "$as_me:11905: result: $am_cv_langinfo_codeset" >&5
+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+ 	if test "$am_cv_langinfo_codeset" = yes; then
+ 
+@@ -11913,7 +11916,7 @@
+ NCURSES_OK_WCHAR_T=
+ NCURSES_OK_WINT_T=
+ 
+-echo "$as_me:11916: checking if you want wide-character code" >&5
++echo "$as_me:11919: checking if you want wide-character code" >&5
+ echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6
+ 
+ # Check whether --enable-widec or --disable-widec was given.
+@@ -11923,7 +11926,7 @@
+ else
+   with_widec=no
+ fi;
+-echo "$as_me:11926: result: $with_widec" >&5
++echo "$as_me:11929: result: $with_widec" >&5
+ echo "${ECHO_T}$with_widec" >&6
+ 
+ NCURSES_WCWIDTH_GRAPHICS=1
+@@ -11947,23 +11950,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:11950: checking for $ac_header" >&5
++echo "$as_me:11953: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 11956 "configure"
++#line 11959 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:11960: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:11963: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:11966: \$? = $ac_status" >&5
++  echo "$as_me:11969: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -11982,7 +11985,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:11985: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:11988: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:11998: checking if wchar.h can be used as is" >&5
+ echo $ECHO_N "checking if wchar.h can be used as is... $ECHO_C" >&6
+ if test "${cf_cv_wchar_h_okay+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12002 "configure"
++#line 12005 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12021,16 +12024,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12024: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12027: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12027: \$? = $ac_status" >&5
++  echo "$as_me:12030: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12030: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12033: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12033: \$? = $ac_status" >&5
++  echo "$as_me:12036: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_h_okay=yes
+ else
+@@ -12040,16 +12043,16 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12043: result: $cf_cv_wchar_h_okay" >&5
++echo "$as_me:12046: result: $cf_cv_wchar_h_okay" >&5
+ echo "${ECHO_T}$cf_cv_wchar_h_okay" >&6
+ 
+ if test "$cf_cv_wchar_h_okay" = no
+ then
+ 
+-echo "$as_me:12049: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
++echo "$as_me:12052: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+ echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12052 "configure"
++#line 12055 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -12065,16 +12068,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12068: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12071: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12071: \$? = $ac_status" >&5
++  echo "$as_me:12074: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12074: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12077: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12077: \$? = $ac_status" >&5
++  echo "$as_me:12080: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=no
+ else
+@@ -12083,16 +12086,16 @@
+ cf_result=yes
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:12086: result: $cf_result" >&5
++echo "$as_me:12089: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ if test "$cf_result" = yes ; then
+ 	CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
+ elif test "x" != "x" ; then
+-	echo "$as_me:12092: checking checking for compatible value versus " >&5
++	echo "$as_me:12095: checking checking for compatible value versus " >&5
+ echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12095 "configure"
++#line 12098 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -12108,16 +12111,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12111: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12114: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12114: \$? = $ac_status" >&5
++  echo "$as_me:12117: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12117: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12120: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12120: \$? = $ac_status" >&5
++  echo "$as_me:12123: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_result=yes
+ else
+@@ -12126,7 +12129,7 @@
+ cf_result=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:12129: result: $cf_result" >&5
++	echo "$as_me:12132: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test "$cf_result" = no ; then
+ 		# perhaps we can override it - try...
+@@ -12136,7 +12139,7 @@
+ 
+ fi
+ 
+-echo "$as_me:12139: checking if wcwidth agrees graphics are single-width" >&5
++echo "$as_me:12142: checking if wcwidth agrees graphics are single-width" >&5
+ echo $ECHO_N "checking if wcwidth agrees graphics are single-width... $ECHO_C" >&6
+ if test "${cf_cv_wcwidth_graphics+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12207,7 +12210,7 @@
+   cf_cv_wcwidth_graphics=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12210 "configure"
++#line 12213 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12251,15 +12254,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:12254: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12257: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12257: \$? = $ac_status" >&5
++  echo "$as_me:12260: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:12259: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12262: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12262: \$? = $ac_status" >&5
++  echo "$as_me:12265: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wcwidth_graphics=yes
+ else
+@@ -12272,7 +12275,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:12275: result: $cf_cv_wcwidth_graphics" >&5
++echo "$as_me:12278: result: $cf_cv_wcwidth_graphics" >&5
+ echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
+ 
+ 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
+@@ -12283,13 +12286,13 @@
+ for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:12286: checking for $ac_func" >&5
++echo "$as_me:12289: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12292 "configure"
++#line 12295 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -12320,16 +12323,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12323: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12326: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12326: \$? = $ac_status" >&5
++  echo "$as_me:12329: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12329: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12332: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12332: \$? = $ac_status" >&5
++  echo "$as_me:12335: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -12339,7 +12342,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12342: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:12345: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:12360: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12363 "configure"
++#line 12366 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:12367: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:12370: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:12373: \$? = $ac_status" >&5
++  echo "$as_me:12376: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12389,7 +12392,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:12392: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:12395: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:12405: checking for multibyte character support" >&5
+ echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6
+ if test "${cf_cv_utf8_lib+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12407,7 +12410,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12410 "configure"
++#line 12413 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12425,16 +12428,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12428: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12431: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12431: \$? = $ac_status" >&5
++  echo "$as_me:12434: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12434: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12437: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12437: \$? = $ac_status" >&5
++  echo "$as_me:12440: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -12446,12 +12449,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:12449: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:12452: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12454 "configure"
++#line 12457 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12464,16 +12467,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12467: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12470: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12470: \$? = $ac_status" >&5
++  echo "$as_me:12473: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12473: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12476: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12476: \$? = $ac_status" >&5
++  echo "$as_me:12479: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -12487,7 +12490,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12490 "configure"
++#line 12493 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12500,16 +12503,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12503: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12506: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12506: \$? = $ac_status" >&5
++  echo "$as_me:12509: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12509: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12512: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12512: \$? = $ac_status" >&5
++  echo "$as_me:12515: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -12526,9 +12529,9 @@
+ 
+ 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:12529: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:12532: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:12531: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:12534: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 	cf_save_CPPFLAGS="$CPPFLAGS"
+ 	cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -12619,7 +12622,7 @@
+ 		if test -d "$cf_cv_header_path_utf8" ; then
+ 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
+ 
+-echo "${as_me:-configure}:12622: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:12625: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+@@ -12627,7 +12630,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
+ 
+ 			cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12630 "configure"
++#line 12633 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12640,21 +12643,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12643: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12646: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12646: \$? = $ac_status" >&5
++  echo "$as_me:12649: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12649: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12652: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12652: \$? = $ac_status" >&5
++  echo "$as_me:12655: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 				test -n "$verbose" && echo "	... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
+ 
+-echo "${as_me:-configure}:12657: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:12660: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+ 				cf_cv_find_linkage_utf8=maybe
+ 				cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -12672,7 +12675,7 @@
+ 
+ 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:12675: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:12678: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ 		cf_save_LIBS="$LIBS"
+ 		cf_save_LDFLAGS="$LDFLAGS"
+@@ -12747,13 +12750,13 @@
+ 				if test -d "$cf_cv_library_path_utf8" ; then
+ 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
+ 
+-echo "${as_me:-configure}:12750: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:12753: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					CPPFLAGS="$cf_test_CPPFLAGS"
+ 					LIBS="-lutf8  $cf_save_LIBS"
+ 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8"
+ 					cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12756 "configure"
++#line 12759 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12766,21 +12769,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:12769: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12772: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12772: \$? = $ac_status" >&5
++  echo "$as_me:12775: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:12775: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12778: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12778: \$? = $ac_status" >&5
++  echo "$as_me:12781: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 					test -n "$verbose" && echo "	... found utf8 library in $cf_cv_library_path_utf8" 1>&6
+ 
+-echo "${as_me:-configure}:12783: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:12786: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+ 					cf_cv_find_linkage_utf8=yes
+ 					cf_cv_library_file_utf8="-lutf8"
+@@ -12822,7 +12825,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:12825: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:12828: result: $cf_cv_utf8_lib" >&5
+ echo "${ECHO_T}$cf_cv_utf8_lib" >&6
+ 
+ # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
+@@ -12860,7 +12863,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12863 "configure"
++#line 12866 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -12872,16 +12875,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12875: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12878: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12878: \$? = $ac_status" >&5
++  echo "$as_me:12881: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:12881: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12884: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12884: \$? = $ac_status" >&5
++  echo "$as_me:12887: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -12898,7 +12901,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:12901: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:12904: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -12934,7 +12937,7 @@
+ 			if test "$cf_have_libdir" = no ; then
+ 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+ 
+-echo "${as_me:-configure}:12937: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:12940: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -12966,14 +12969,14 @@
+ 	fi
+ 
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:12969: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:12972: checking if we must include wchar.h to declare mbstate_t" >&5
+ echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
+ if test "${cf_cv_mbstate_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 12976 "configure"
++#line 12979 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -12991,23 +12994,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:12994: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12997: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12997: \$? = $ac_status" >&5
++  echo "$as_me:13000: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13000: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13003: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13003: \$? = $ac_status" >&5
++  echo "$as_me:13006: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_mbstate_t=no
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13010 "configure"
++#line 13013 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13026,16 +13029,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13029: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13032: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13032: \$? = $ac_status" >&5
++  echo "$as_me:13035: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13035: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13038: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13038: \$? = $ac_status" >&5
++  echo "$as_me:13041: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_mbstate_t=yes
+ else
+@@ -13047,7 +13050,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13050: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:13053: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+ 
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -13065,14 +13068,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:13068: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:13071: checking if we must include wchar.h to declare wchar_t" >&5
+ echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
+ if test "${cf_cv_wchar_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13075 "configure"
++#line 13078 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13090,23 +13093,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13093: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13096: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13096: \$? = $ac_status" >&5
++  echo "$as_me:13099: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13099: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13102: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13102: \$? = $ac_status" >&5
++  echo "$as_me:13105: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_t=no
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13109 "configure"
++#line 13112 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13125,16 +13128,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13128: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13131: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13131: \$? = $ac_status" >&5
++  echo "$as_me:13134: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13134: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13137: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13137: \$? = $ac_status" >&5
++  echo "$as_me:13140: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wchar_t=yes
+ else
+@@ -13146,7 +13149,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13149: result: $cf_cv_wchar_t" >&5
++echo "$as_me:13152: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+ 
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -13169,14 +13172,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:13172: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:13175: checking if we must include wchar.h to declare wint_t" >&5
+ echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
+ if test "${cf_cv_wint_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13179 "configure"
++#line 13182 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13194,23 +13197,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13197: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13200: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13200: \$? = $ac_status" >&5
++  echo "$as_me:13203: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13203: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13206: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13206: \$? = $ac_status" >&5
++  echo "$as_me:13209: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wint_t=no
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13213 "configure"
++#line 13216 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -13229,16 +13232,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13232: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13235: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13235: \$? = $ac_status" >&5
++  echo "$as_me:13238: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13238: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13241: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13241: \$? = $ac_status" >&5
++  echo "$as_me:13244: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_wint_t=yes
+ else
+@@ -13250,7 +13253,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13253: result: $cf_cv_wint_t" >&5
++echo "$as_me:13256: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+ 
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -13282,7 +13285,7 @@
+ fi
+ 
+ ###   use option --disable-lp64 to allow long chtype
+-echo "$as_me:13285: checking whether to enable _LP64 definition in curses.h" >&5
++echo "$as_me:13288: checking whether to enable _LP64 definition in curses.h" >&5
+ echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6
+ 
+ # Check whether --enable-lp64 or --disable-lp64 was given.
+@@ -13292,7 +13295,7 @@
+ else
+   with_lp64=$cf_dft_with_lp64
+ fi;
+-echo "$as_me:13295: result: $with_lp64" >&5
++echo "$as_me:13298: result: $with_lp64" >&5
+ echo "${ECHO_T}$with_lp64" >&6
+ 
+ if test "x$with_lp64" = xyes ; then
+@@ -13308,7 +13311,7 @@
+ fi;
+ if test "$enable_largefile" != no; then
+ 
+-  echo "$as_me:13311: checking for special C compiler options needed for large files" >&5
++  echo "$as_me:13314: checking for special C compiler options needed for large files" >&5
+ echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
+ if test "${ac_cv_sys_largefile_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13320,7 +13323,7 @@
+      	 # IRIX 6.2 and later do not support large files by default,
+      	 # so use the C compiler's -n32 option if that helps.
+          cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13323 "configure"
++#line 13326 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -13340,16 +13343,16 @@
+ }
+ _ACEOF
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13343: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13346: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13346: \$? = $ac_status" >&5
++  echo "$as_me:13349: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13349: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13352: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13352: \$? = $ac_status" >&5
++  echo "$as_me:13355: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -13359,16 +13362,16 @@
+ rm -f "conftest.$ac_objext"
+      	 CC="$CC -n32"
+      	 rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13362: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13365: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13365: \$? = $ac_status" >&5
++  echo "$as_me:13368: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13368: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13371: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13371: \$? = $ac_status" >&5
++  echo "$as_me:13374: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_CC=' -n32'; break
+ else
+@@ -13382,13 +13385,13 @@
+        rm -f "conftest.$ac_ext"
+     fi
+ fi
+-echo "$as_me:13385: result: $ac_cv_sys_largefile_CC" >&5
++echo "$as_me:13388: result: $ac_cv_sys_largefile_CC" >&5
+ echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
+   if test "$ac_cv_sys_largefile_CC" != no; then
+     CC=$CC$ac_cv_sys_largefile_CC
+   fi
+ 
+-  echo "$as_me:13391: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++  echo "$as_me:13394: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+ echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
+ if test "${ac_cv_sys_file_offset_bits+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13396,7 +13399,7 @@
+   while :; do
+   ac_cv_sys_file_offset_bits=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13399 "configure"
++#line 13402 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -13416,16 +13419,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13419: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13422: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13422: \$? = $ac_status" >&5
++  echo "$as_me:13425: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13425: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13428: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13428: \$? = $ac_status" >&5
++  echo "$as_me:13431: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -13434,7 +13437,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13437 "configure"
++#line 13440 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include 
+@@ -13455,16 +13458,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13458: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13461: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13461: \$? = $ac_status" >&5
++  echo "$as_me:13464: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13464: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13467: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13467: \$? = $ac_status" >&5
++  echo "$as_me:13470: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_file_offset_bits=64; break
+ else
+@@ -13475,7 +13478,7 @@
+   break
+ done
+ fi
+-echo "$as_me:13478: result: $ac_cv_sys_file_offset_bits" >&5
++echo "$as_me:13481: result: $ac_cv_sys_file_offset_bits" >&5
+ echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
+ if test "$ac_cv_sys_file_offset_bits" != no; then
+ 
+@@ -13485,7 +13488,7 @@
+ 
+ fi
+ rm -rf conftest*
+-  echo "$as_me:13488: checking for _LARGE_FILES value needed for large files" >&5
++  echo "$as_me:13491: checking for _LARGE_FILES value needed for large files" >&5
+ echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
+ if test "${ac_cv_sys_large_files+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13493,7 +13496,7 @@
+   while :; do
+   ac_cv_sys_large_files=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13496 "configure"
++#line 13499 "configure"
+ #include "confdefs.h"
+ #include 
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -13513,16 +13516,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13516: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13519: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13519: \$? = $ac_status" >&5
++  echo "$as_me:13522: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13522: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13525: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13525: \$? = $ac_status" >&5
++  echo "$as_me:13528: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -13531,7 +13534,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13534 "configure"
++#line 13537 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include 
+@@ -13552,16 +13555,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13555: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13558: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13558: \$? = $ac_status" >&5
++  echo "$as_me:13561: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13561: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13564: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13564: \$? = $ac_status" >&5
++  echo "$as_me:13567: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_large_files=1; break
+ else
+@@ -13572,7 +13575,7 @@
+   break
+ done
+ fi
+-echo "$as_me:13575: result: $ac_cv_sys_large_files" >&5
++echo "$as_me:13578: result: $ac_cv_sys_large_files" >&5
+ echo "${ECHO_T}$ac_cv_sys_large_files" >&6
+ if test "$ac_cv_sys_large_files" != no; then
+ 
+@@ -13585,7 +13588,7 @@
+ fi
+ 
+ 	if test "$enable_largefile" != no ; then
+-	echo "$as_me:13588: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++	echo "$as_me:13591: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+ echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
+ if test "${ac_cv_sys_largefile_source+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13593,7 +13596,7 @@
+   while :; do
+   ac_cv_sys_largefile_source=no
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13596 "configure"
++#line 13599 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13605,16 +13608,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13608: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13611: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13611: \$? = $ac_status" >&5
++  echo "$as_me:13614: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13614: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13617: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13617: \$? = $ac_status" >&5
++  echo "$as_me:13620: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   break
+ else
+@@ -13623,7 +13626,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13626 "configure"
++#line 13629 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include 
+@@ -13636,16 +13639,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13639: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13642: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13642: \$? = $ac_status" >&5
++  echo "$as_me:13645: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13645: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13648: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13648: \$? = $ac_status" >&5
++  echo "$as_me:13651: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sys_largefile_source=1; break
+ else
+@@ -13656,7 +13659,7 @@
+   break
+ done
+ fi
+-echo "$as_me:13659: result: $ac_cv_sys_largefile_source" >&5
++echo "$as_me:13662: result: $ac_cv_sys_largefile_source" >&5
+ echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
+ if test "$ac_cv_sys_largefile_source" != no; then
+ 
+@@ -13670,13 +13673,13 @@
+ # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
+ # in glibc 2.1.3, but that breaks too many other things.
+ # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
+-echo "$as_me:13673: checking for fseeko" >&5
++echo "$as_me:13676: checking for fseeko" >&5
+ echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
+ if test "${ac_cv_func_fseeko+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13679 "configure"
++#line 13682 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -13688,16 +13691,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:13691: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13694: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13694: \$? = $ac_status" >&5
++  echo "$as_me:13697: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:13697: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13700: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13700: \$? = $ac_status" >&5
++  echo "$as_me:13703: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fseeko=yes
+ else
+@@ -13707,7 +13710,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:13710: result: $ac_cv_func_fseeko" >&5
++echo "$as_me:13713: result: $ac_cv_func_fseeko" >&5
+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+ if test $ac_cv_func_fseeko = yes; then
+ 
+@@ -13746,14 +13749,14 @@
+ 
+ 	fi
+ 
+-	echo "$as_me:13749: checking whether to use struct dirent64" >&5
++	echo "$as_me:13752: checking whether to use struct dirent64" >&5
+ echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6
+ if test "${cf_cv_struct_dirent64+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 13756 "configure"
++#line 13759 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types"
+@@ -13776,16 +13779,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:13779: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13782: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13782: \$? = $ac_status" >&5
++  echo "$as_me:13785: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:13785: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13788: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13788: \$? = $ac_status" >&5
++  echo "$as_me:13791: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_struct_dirent64=yes
+ else
+@@ -13796,7 +13799,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:13799: result: $cf_cv_struct_dirent64" >&5
++echo "$as_me:13802: result: $cf_cv_struct_dirent64" >&5
+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
+ 	test "$cf_cv_struct_dirent64" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -13806,7 +13809,7 @@
+ 	fi
+ 
+ ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
+-echo "$as_me:13809: checking if you want tparm not to use X/Open fixed-parameter list" >&5
++echo "$as_me:13812: checking if you want tparm not to use X/Open fixed-parameter list" >&5
+ echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6
+ 
+ # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given.
+@@ -13816,14 +13819,14 @@
+ else
+   with_tparm_varargs=yes
+ fi;
+-echo "$as_me:13819: result: $with_tparm_varargs" >&5
++echo "$as_me:13822: result: $with_tparm_varargs" >&5
+ echo "${ECHO_T}$with_tparm_varargs" >&6
+ NCURSES_TPARM_VARARGS=0
+ test "x$with_tparm_varargs" = xyes && NCURSES_TPARM_VARARGS=1
+ 
+ ###   use option --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw
+ if test "$with_ticlib" != no ; then
+-echo "$as_me:13826: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
++echo "$as_me:13829: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
+ echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6
+ 
+ # Check whether --enable-tic-depends or --disable-tic-depends was given.
+@@ -13833,14 +13836,14 @@
+ else
+   with_tic_depends=yes
+ fi;
+-echo "$as_me:13836: result: $with_tic_depends" >&5
++echo "$as_me:13839: result: $with_tic_depends" >&5
+ echo "${ECHO_T}$with_tic_depends" >&6
+ else
+ 	with_tic_depends=no
+ fi
+ 
+ ###   use option --enable-wattr-macros to enable wattr* macros in curses.h
+-echo "$as_me:13843: checking if you want to enable wattr* macros" >&5
++echo "$as_me:13846: checking if you want to enable wattr* macros" >&5
+ echo $ECHO_N "checking if you want to enable wattr* macros... $ECHO_C" >&6
+ 
+ # Check whether --enable-wattr-macros or --disable-wattr-macros was given.
+@@ -13852,15 +13855,15 @@
+ fi;
+ if [ "x$with_wattr_macros" != xyes ]; then
+ 	NCURSES_WATTR_MACROS=0
+-	echo "$as_me:13855: result: no" >&5
++	echo "$as_me:13858: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ else
+ 	NCURSES_WATTR_MACROS=1
+-	echo "$as_me:13859: result: yes" >&5
++	echo "$as_me:13862: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ fi
+ 
+-echo "$as_me:13863: checking for X11 rgb file" >&5
++echo "$as_me:13866: checking for X11 rgb file" >&5
+ echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6
+ 
+ # Check whether --with-x11-rgb or --without-x11-rgb was given.
+@@ -13924,7 +13927,7 @@
+ 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:13927: error: expected a pathname, not \"$cf_path\"" >&5
++	{ { echo "$as_me:13930: error: expected a pathname, not \"$cf_path\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -13932,7 +13935,7 @@
+ 
+ fi
+ 
+-echo "$as_me:13935: result: $RGB_PATH" >&5
++echo "$as_me:13938: result: $RGB_PATH" >&5
+ echo "${ECHO_T}$RGB_PATH" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:13952: checking for type of bool" >&5
+ echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
+ 
+ # Check whether --with-bool or --without-bool was given.
+@@ -13956,10 +13959,10 @@
+ else
+   NCURSES_BOOL=auto
+ fi;
+-echo "$as_me:13959: result: $NCURSES_BOOL" >&5
++echo "$as_me:13962: result: $NCURSES_BOOL" >&5
+ echo "${ECHO_T}$NCURSES_BOOL" >&6
+ 
+-echo "$as_me:13962: checking for alternate terminal capabilities file" >&5
++echo "$as_me:13965: checking for alternate terminal capabilities file" >&5
+ echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6
+ 
+ # Check whether --with-caps or --without-caps was given.
+@@ -13971,15 +13974,15 @@
+ fi;
+ if test ! -f "${srcdir}/include/${TERMINFO_CAPS}"
+ then
+-	{ echo "$as_me:13974: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
++	{ echo "$as_me:13977: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&5
+ echo "$as_me: WARNING: file not found: \"${srcdir}/include/${TERMINFO_CAPS}\"" >&2;}
+ 	TERMINFO_CAPS=Caps
+ fi
+-echo "$as_me:13978: result: $TERMINFO_CAPS" >&5
++echo "$as_me:13981: result: $TERMINFO_CAPS" >&5
+ echo "${ECHO_T}$TERMINFO_CAPS" >&6
+ 
+ ###   use option --with-chtype to override chtype's type
+-echo "$as_me:13982: checking for type of chtype" >&5
++echo "$as_me:13985: checking for type of chtype" >&5
+ echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
+ 
+ # Check whether --with-chtype or --without-chtype was given.
+@@ -13989,11 +13992,11 @@
+ else
+   NCURSES_CHTYPE=$cf_dft_chtype
+ fi;
+-echo "$as_me:13992: result: $NCURSES_CHTYPE" >&5
++echo "$as_me:13995: result: $NCURSES_CHTYPE" >&5
+ echo "${ECHO_T}$NCURSES_CHTYPE" >&6
+ 
+ ###   use option --with-ospeed to override ospeed's type
+-echo "$as_me:13996: checking for type of ospeed" >&5
++echo "$as_me:13999: checking for type of ospeed" >&5
+ echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6
+ 
+ # Check whether --with-ospeed or --without-ospeed was given.
+@@ -14003,11 +14006,11 @@
+ else
+   NCURSES_OSPEED=short
+ fi;
+-echo "$as_me:14006: result: $NCURSES_OSPEED" >&5
++echo "$as_me:14009: result: $NCURSES_OSPEED" >&5
+ echo "${ECHO_T}$NCURSES_OSPEED" >&6
+ 
+ ###   use option --with-mmask-t to override mmask_t's type
+-echo "$as_me:14010: checking for type of mmask_t" >&5
++echo "$as_me:14013: checking for type of mmask_t" >&5
+ echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6
+ 
+ # Check whether --with-mmask-t or --without-mmask-t was given.
+@@ -14017,11 +14020,11 @@
+ else
+   NCURSES_MMASK_T=$cf_dft_mmask_t
+ fi;
+-echo "$as_me:14020: result: $NCURSES_MMASK_T" >&5
++echo "$as_me:14023: result: $NCURSES_MMASK_T" >&5
+ echo "${ECHO_T}$NCURSES_MMASK_T" >&6
+ 
+ ###   use option --with-ccharw-max to override CCHARW_MAX size
+-echo "$as_me:14024: checking for size CCHARW_MAX" >&5
++echo "$as_me:14027: checking for size CCHARW_MAX" >&5
+ echo $ECHO_N "checking for size CCHARW_MAX... $ECHO_C" >&6
+ 
+ # Check whether --with-ccharw-max or --without-ccharw-max was given.
+@@ -14031,16 +14034,16 @@
+ else
+   NCURSES_CCHARW_MAX=$cf_dft_ccharw_max
+ fi;
+-echo "$as_me:14034: result: $NCURSES_CCHARW_MAX" >&5
++echo "$as_me:14037: result: $NCURSES_CCHARW_MAX" >&5
+ echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
+ 
+-echo "$as_me:14037: checking for ANSI C header files" >&5
++echo "$as_me:14040: checking for ANSI C header files" >&5
+ echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+ if test "${ac_cv_header_stdc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14043 "configure"
++#line 14046 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -14048,13 +14051,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:14051: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:14054: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:14057: \$? = $ac_status" >&5
++  echo "$as_me:14060: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -14076,7 +14079,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14079 "configure"
++#line 14082 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -14094,7 +14097,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14097 "configure"
++#line 14100 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -14115,7 +14118,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14118 "configure"
++#line 14121 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -14141,15 +14144,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:14144: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14147: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14147: \$? = $ac_status" >&5
++  echo "$as_me:14150: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:14149: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14152: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14152: \$? = $ac_status" >&5
++  echo "$as_me:14155: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -14162,7 +14165,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:14165: result: $ac_cv_header_stdc" >&5
++echo "$as_me:14168: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -14178,28 +14181,28 @@
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:14181: checking for $ac_header" >&5
++echo "$as_me:14184: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14187 "configure"
++#line 14190 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14193: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14196: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14196: \$? = $ac_status" >&5
++  echo "$as_me:14199: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14199: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14202: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14202: \$? = $ac_status" >&5
++  echo "$as_me:14205: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -14209,7 +14212,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14212: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:14215: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:14225: checking for signed char" >&5
+ echo $ECHO_N "checking for signed char... $ECHO_C" >&6
+ if test "${ac_cv_type_signed_char+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14228 "configure"
++#line 14231 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14240,16 +14243,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14243: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14246: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14246: \$? = $ac_status" >&5
++  echo "$as_me:14249: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14249: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14252: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14252: \$? = $ac_status" >&5
++  echo "$as_me:14255: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_signed_char=yes
+ else
+@@ -14259,10 +14262,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:14262: result: $ac_cv_type_signed_char" >&5
++echo "$as_me:14265: result: $ac_cv_type_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
+ 
+-echo "$as_me:14265: checking size of signed char" >&5
++echo "$as_me:14268: checking size of signed char" >&5
+ echo $ECHO_N "checking size of signed char... $ECHO_C" >&6
+ if test "${ac_cv_sizeof_signed_char+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14271,7 +14274,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14274 "configure"
++#line 14277 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14283,21 +14286,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14286: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14289: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14289: \$? = $ac_status" >&5
++  echo "$as_me:14292: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14292: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14295: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14295: \$? = $ac_status" >&5
++  echo "$as_me:14298: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14300 "configure"
++#line 14303 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14309,16 +14312,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14312: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14315: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14315: \$? = $ac_status" >&5
++  echo "$as_me:14318: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14318: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14321: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14321: \$? = $ac_status" >&5
++  echo "$as_me:14324: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -14334,7 +14337,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14337 "configure"
++#line 14340 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14346,16 +14349,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14349: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14352: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14352: \$? = $ac_status" >&5
++  echo "$as_me:14355: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14355: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14358: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14358: \$? = $ac_status" >&5
++  echo "$as_me:14361: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -14371,7 +14374,7 @@
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14374 "configure"
++#line 14377 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14383,16 +14386,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:14386: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14389: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14389: \$? = $ac_status" >&5
++  echo "$as_me:14392: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:14392: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14395: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14395: \$? = $ac_status" >&5
++  echo "$as_me:14398: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -14405,12 +14408,12 @@
+ ac_cv_sizeof_signed_char=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:14408: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:14411: error: cannot run test program while cross compiling" >&5
+ echo "$as_me: error: cannot run test program while cross compiling" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 14413 "configure"
++#line 14416 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -14426,15 +14429,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:14429: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14432: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14432: \$? = $ac_status" >&5
++  echo "$as_me:14435: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:14434: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14437: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14437: \$? = $ac_status" >&5
++  echo "$as_me:14440: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_signed_char=`cat conftest.val`
+ else
+@@ -14450,7 +14453,7 @@
+   ac_cv_sizeof_signed_char=0
+ fi
+ fi
+-echo "$as_me:14453: result: $ac_cv_sizeof_signed_char" >&5
++echo "$as_me:14456: result: $ac_cv_sizeof_signed_char" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:14467: checking if you want to use signed Boolean array in term.h" >&5
+ echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6
+ 
+ # Check whether --enable-signed-char or --disable-signed-char was given.
+@@ -14471,12 +14474,12 @@
+ else
+   with_signed_char=$cf_dft_signed_char
+ fi;
+-echo "$as_me:14474: result: $with_signed_char" >&5
++echo "$as_me:14477: result: $with_signed_char" >&5
+ echo "${ECHO_T}$with_signed_char" >&6
+ test "x$with_signed_char" != xyes && NCURSES_SBOOL="char"
+ 
+ ###   use option --with-tparm-arg to override tparm's argument type
+-echo "$as_me:14479: checking for type of tparm args" >&5
++echo "$as_me:14482: checking for type of tparm args" >&5
+ echo $ECHO_N "checking for type of tparm args... $ECHO_C" >&6
+ 
+ # Check whether --with-tparm-arg or --without-tparm-arg was given.
+@@ -14486,11 +14489,11 @@
+ else
+   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
+ fi;
+-echo "$as_me:14489: result: $NCURSES_TPARM_ARG" >&5
++echo "$as_me:14492: result: $NCURSES_TPARM_ARG" >&5
+ echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
+ 
+ ### Enable compiling-in rcs id's
+-echo "$as_me:14493: checking if RCS identifiers should be compiled-in" >&5
++echo "$as_me:14496: checking if RCS identifiers should be compiled-in" >&5
+ echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6
+ 
+ # Check whether --with-rcs-ids or --without-rcs-ids was given.
+@@ -14500,7 +14503,7 @@
+ else
+   with_rcs_ids=no
+ fi;
+-echo "$as_me:14503: result: $with_rcs_ids" >&5
++echo "$as_me:14506: result: $with_rcs_ids" >&5
+ echo "${ECHO_T}$with_rcs_ids" >&6
+ test "x$with_rcs_ids" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -14509,7 +14512,7 @@
+ 
+ ###############################################################################
+ 
+-echo "$as_me:14512: checking format of man-pages" >&5
++echo "$as_me:14515: checking format of man-pages" >&5
+ echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6
+ 
+ # Check whether --with-manpage-format or --without-manpage-format was given.
+@@ -14598,14 +14601,14 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:14601: result: $MANPAGE_FORMAT" >&5
++echo "$as_me:14604: result: $MANPAGE_FORMAT" >&5
+ echo "${ECHO_T}$MANPAGE_FORMAT" >&6
+ if test -n "$cf_unknown" ; then
+-	{ echo "$as_me:14604: WARNING: Unexpected manpage-format $cf_unknown" >&5
++	{ echo "$as_me:14607: WARNING: Unexpected manpage-format $cf_unknown" >&5
+ echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
+ fi
+ 
+-echo "$as_me:14608: checking for manpage renaming" >&5
++echo "$as_me:14611: checking for manpage renaming" >&5
+ echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6
+ 
+ # Check whether --with-manpage-renames or --without-manpage-renames was given.
+@@ -14633,7 +14636,7 @@
+ 	if test -f "$srcdir/man/$MANPAGE_RENAMES" ; then
+ 		MANPAGE_RENAMES=`cd "$srcdir/man" && pwd`/$MANPAGE_RENAMES
+ 	elif test ! -f "$MANPAGE_RENAMES" ; then
+-		{ { echo "$as_me:14636: error: not a filename: $MANPAGE_RENAMES" >&5
++		{ { echo "$as_me:14639: error: not a filename: $MANPAGE_RENAMES" >&5
+ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -14647,10 +14650,10 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:14650: result: $MANPAGE_RENAMES" >&5
++echo "$as_me:14653: result: $MANPAGE_RENAMES" >&5
+ echo "${ECHO_T}$MANPAGE_RENAMES" >&6
+ 
+-echo "$as_me:14653: checking if manpage aliases will be installed" >&5
++echo "$as_me:14656: checking if manpage aliases will be installed" >&5
+ echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6
+ 
+ # Check whether --with-manpage-aliases or --without-manpage-aliases was given.
+@@ -14661,7 +14664,7 @@
+   MANPAGE_ALIASES=yes
+ fi;
+ 
+-echo "$as_me:14664: result: $MANPAGE_ALIASES" >&5
++echo "$as_me:14667: result: $MANPAGE_ALIASES" >&5
+ echo "${ECHO_T}$MANPAGE_ALIASES" >&6
+ 
+ case "x$LN_S" in
+@@ -14675,7 +14678,7 @@
+ 
+ MANPAGE_SYMLINKS=no
+ if test "$MANPAGE_ALIASES" = yes ; then
+-echo "$as_me:14678: checking if manpage symlinks should be used" >&5
++echo "$as_me:14681: checking if manpage symlinks should be used" >&5
+ echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6
+ 
+ # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given.
+@@ -14688,17 +14691,17 @@
+ 
+ if test "$$cf_use_symlinks" = no; then
+ if test "$MANPAGE_SYMLINKS" = yes ; then
+-	{ echo "$as_me:14691: WARNING: cannot make symlinks" >&5
++	{ echo "$as_me:14694: WARNING: cannot make symlinks" >&5
+ echo "$as_me: WARNING: cannot make symlinks" >&2;}
+ 	MANPAGE_SYMLINKS=no
+ fi
+ fi
+ 
+-echo "$as_me:14697: result: $MANPAGE_SYMLINKS" >&5
++echo "$as_me:14700: result: $MANPAGE_SYMLINKS" >&5
+ echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
+ fi
+ 
+-echo "$as_me:14701: checking for manpage tbl" >&5
++echo "$as_me:14704: checking for manpage tbl" >&5
+ echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6
+ 
+ # Check whether --with-manpage-tbl or --without-manpage-tbl was given.
+@@ -14709,7 +14712,7 @@
+   MANPAGE_TBL=no
+ fi;
+ 
+-echo "$as_me:14712: result: $MANPAGE_TBL" >&5
++echo "$as_me:14715: result: $MANPAGE_TBL" >&5
+ echo "${ECHO_T}$MANPAGE_TBL" >&6
+ 
+ if test "$prefix" = "NONE" ; then
+@@ -15042,7 +15045,7 @@
+ ###############################################################################
+ 
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:15045: checking if you want to build with function extensions" >&5
++echo "$as_me:15048: checking if you want to build with function extensions" >&5
+ echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6
+ 
+ # Check whether --enable-ext-funcs or --disable-ext-funcs was given.
+@@ -15052,7 +15055,7 @@
+ else
+   with_ext_funcs=yes
+ fi;
+-echo "$as_me:15055: result: $with_ext_funcs" >&5
++echo "$as_me:15058: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "x$with_ext_funcs" = xyes ; then
+ 	NCURSES_EXT_FUNCS=1
+@@ -15112,7 +15115,7 @@
+ 	GENERATED_EXT_FUNCS=
+ fi
+ 
+-echo "$as_me:15115: checking if you want to build with SCREEN extensions" >&5
++echo "$as_me:15118: checking if you want to build with SCREEN extensions" >&5
+ echo $ECHO_N "checking if you want to build with SCREEN extensions... $ECHO_C" >&6
+ 
+ # Check whether --enable-sp-funcs or --disable-sp-funcs was given.
+@@ -15122,7 +15125,7 @@
+ else
+   with_sp_funcs=$cf_dft_ext_spfuncs
+ fi;
+-echo "$as_me:15125: result: $with_sp_funcs" >&5
++echo "$as_me:15128: result: $with_sp_funcs" >&5
+ echo "${ECHO_T}$with_sp_funcs" >&6
+ if test "x$with_sp_funcs" = xyes ; then
+ 	NCURSES_SP_FUNCS=1
+@@ -15141,7 +15144,7 @@
+ 	GENERATED_SP_FUNCS=
+ fi
+ 
+-echo "$as_me:15144: checking if you want to build with terminal-driver" >&5
++echo "$as_me:15147: checking if you want to build with terminal-driver" >&5
+ echo $ECHO_N "checking if you want to build with terminal-driver... $ECHO_C" >&6
+ 
+ # Check whether --enable-term-driver or --disable-term-driver was given.
+@@ -15151,7 +15154,7 @@
+ else
+   with_term_driver=no
+ fi;
+-echo "$as_me:15154: result: $with_term_driver" >&5
++echo "$as_me:15157: result: $with_term_driver" >&5
+ echo "${ECHO_T}$with_term_driver" >&6
+ if test "x$with_term_driver" = xyes ; then
+ 
+@@ -15160,19 +15163,19 @@
+ EOF
+ 
+ 	if test "x$with_termlib" != xno ; then
+-		{ { echo "$as_me:15163: error: The term-driver option conflicts with the termlib option" >&5
++		{ { echo "$as_me:15166: error: The term-driver option conflicts with the termlib option" >&5
+ echo "$as_me: error: The term-driver option conflicts with the termlib option" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+ 	if test "x$with_sp_funcs" != xyes ; then
+-		{ { echo "$as_me:15168: error: The term-driver option relies upon sp-funcs" >&5
++		{ { echo "$as_me:15171: error: The term-driver option relies upon sp-funcs" >&5
+ echo "$as_me: error: The term-driver option relies upon sp-funcs" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+ fi
+ 
+ ###   use option --enable-const to turn on use of const beyond that in XSI.
+-echo "$as_me:15175: checking for extended use of const keyword" >&5
++echo "$as_me:15178: checking for extended use of const keyword" >&5
+ echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
+ 
+ # Check whether --enable-const or --disable-const was given.
+@@ -15182,7 +15185,7 @@
+ else
+   with_ext_const=$cf_dft_ext_const
+ fi;
+-echo "$as_me:15185: result: $with_ext_const" >&5
++echo "$as_me:15188: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "x$with_ext_const" = xyes ; then
+@@ -15190,7 +15193,7 @@
+ fi
+ 
+ ###   use option --enable-ext-colors to turn on use of colors beyond 16.
+-echo "$as_me:15193: checking if you want to use extended colors" >&5
++echo "$as_me:15196: checking if you want to use extended colors" >&5
+ echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6
+ 
+ # Check whether --enable-ext-colors or --disable-ext-colors was given.
+@@ -15200,12 +15203,12 @@
+ else
+   with_ext_colors=$cf_dft_ext_colors
+ fi;
+-echo "$as_me:15203: result: $with_ext_colors" >&5
++echo "$as_me:15206: result: $with_ext_colors" >&5
+ echo "${ECHO_T}$with_ext_colors" >&6
+ NCURSES_EXT_COLORS=0
+ if test "x$with_ext_colors" = xyes ; then
+ 	if test "x$with_widec" != xyes ; then
+-		{ echo "$as_me:15208: WARNING: This option applies only to wide-character library" >&5
++		{ echo "$as_me:15211: WARNING: This option applies only to wide-character library" >&5
+ echo "$as_me: WARNING: This option applies only to wide-character library" >&2;}
+ 	else
+ 		# cannot be ABI 5 since it changes sizeof(cchar_t)
+@@ -15215,7 +15218,7 @@
+ 	(5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:15218: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:15221: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -15243,7 +15246,7 @@
+ fi
+ 
+ ###   use option --enable-ext-mouse to modify coding to support 5-button mice
+-echo "$as_me:15246: checking if you want to use extended mouse encoding" >&5
++echo "$as_me:15249: checking if you want to use extended mouse encoding" >&5
+ echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6
+ 
+ # Check whether --enable-ext-mouse or --disable-ext-mouse was given.
+@@ -15253,7 +15256,7 @@
+ else
+   with_ext_mouse=$cf_dft_ext_mouse
+ fi;
+-echo "$as_me:15256: result: $with_ext_mouse" >&5
++echo "$as_me:15259: result: $with_ext_mouse" >&5
+ echo "${ECHO_T}$with_ext_mouse" >&6
+ if test "x$with_ext_mouse" = xyes ; then
+ 
+@@ -15262,7 +15265,7 @@
+ 	(5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:15265: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:15268: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -15283,7 +15286,7 @@
+ esac
+ 
+ ###   use option --enable-ext-putwin to turn on extended screendumps
+-echo "$as_me:15286: checking if you want to use extended putwin/screendump" >&5
++echo "$as_me:15289: checking if you want to use extended putwin/screendump" >&5
+ echo $ECHO_N "checking if you want to use extended putwin/screendump... $ECHO_C" >&6
+ 
+ # Check whether --enable-ext-putwin or --disable-ext-putwin was given.
+@@ -15293,7 +15296,7 @@
+ else
+   with_ext_putwin=$cf_dft_ext_putwin
+ fi;
+-echo "$as_me:15296: result: $with_ext_putwin" >&5
++echo "$as_me:15299: result: $with_ext_putwin" >&5
+ echo "${ECHO_T}$with_ext_putwin" >&6
+ if test "x$with_ext_putwin" = xyes ; then
+ 
+@@ -15303,7 +15306,7 @@
+ 
+ fi
+ 
+-echo "$as_me:15306: checking if you want \$NCURSES_NO_PADDING code" >&5
++echo "$as_me:15309: checking if you want \$NCURSES_NO_PADDING code" >&5
+ echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6
+ 
+ # Check whether --enable-no-padding or --disable-no-padding was given.
+@@ -15313,7 +15316,7 @@
+ else
+   with_no_padding=$with_ext_funcs
+ fi;
+-echo "$as_me:15316: result: $with_no_padding" >&5
++echo "$as_me:15319: result: $with_no_padding" >&5
+ echo "${ECHO_T}$with_no_padding" >&6
+ test "x$with_no_padding" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15321,7 +15324,7 @@
+ EOF
+ 
+ ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
+-echo "$as_me:15324: checking if you want SIGWINCH handler" >&5
++echo "$as_me:15327: checking if you want SIGWINCH handler" >&5
+ echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6
+ 
+ # Check whether --enable-sigwinch or --disable-sigwinch was given.
+@@ -15331,7 +15334,7 @@
+ else
+   with_sigwinch=$with_ext_funcs
+ fi;
+-echo "$as_me:15334: result: $with_sigwinch" >&5
++echo "$as_me:15337: result: $with_sigwinch" >&5
+ echo "${ECHO_T}$with_sigwinch" >&6
+ test "x$with_sigwinch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15339,7 +15342,7 @@
+ EOF
+ 
+ ###   use option --enable-tcap-names to allow user to define new capabilities
+-echo "$as_me:15342: checking if you want user-definable terminal capabilities like termcap" >&5
++echo "$as_me:15345: checking if you want user-definable terminal capabilities like termcap" >&5
+ echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6
+ 
+ # Check whether --enable-tcap-names or --disable-tcap-names was given.
+@@ -15349,14 +15352,14 @@
+ else
+   with_tcap_names=$with_ext_funcs
+ fi;
+-echo "$as_me:15352: result: $with_tcap_names" >&5
++echo "$as_me:15355: result: $with_tcap_names" >&5
+ echo "${ECHO_T}$with_tcap_names" >&6
+ NCURSES_XNAMES=0
+ test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1
+ 
+ ##############################################################################
+ 
+-echo "$as_me:15359: checking if you want to link with the pthread library" >&5
++echo "$as_me:15362: checking if you want to link with the pthread library" >&5
+ echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6
+ 
+ # Check whether --with-pthread or --without-pthread was given.
+@@ -15366,27 +15369,27 @@
+ else
+   with_pthread=no
+ fi;
+-echo "$as_me:15369: result: $with_pthread" >&5
++echo "$as_me:15372: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+ if test "$with_pthread" != no ; then
+-	echo "$as_me:15373: checking for pthread.h" >&5
++	echo "$as_me:15376: checking for pthread.h" >&5
+ echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
+ if test "${ac_cv_header_pthread_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15379 "configure"
++#line 15382 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:15383: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:15386: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:15389: \$? = $ac_status" >&5
++  echo "$as_me:15392: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -15405,7 +15408,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:15408: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:15411: result: $ac_cv_header_pthread_h" >&5
+ echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
+ if test "$ac_cv_header_pthread_h" = yes; then
+ 
+@@ -15415,7 +15418,7 @@
+ 
+ 	for cf_lib_pthread in pthread c_r
+ 	do
+-	    echo "$as_me:15418: checking if we can link with the $cf_lib_pthread library" >&5
++	    echo "$as_me:15421: checking if we can link with the $cf_lib_pthread library" >&5
+ echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6
+ 	    cf_save_LIBS="$LIBS"
+ 
+@@ -15436,7 +15439,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	    cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15439 "configure"
++#line 15442 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -15453,16 +15456,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15456: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15459: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15459: \$? = $ac_status" >&5
++  echo "$as_me:15462: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15462: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15465: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15465: \$? = $ac_status" >&5
++  echo "$as_me:15468: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_pthread=yes
+ else
+@@ -15472,7 +15475,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	    LIBS="$cf_save_LIBS"
+-	    echo "$as_me:15475: result: $with_pthread" >&5
++	    echo "$as_me:15478: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 	    test "$with_pthread" = yes && break
+ 	done
+@@ -15500,7 +15503,7 @@
+ EOF
+ 
+ 	else
+-	    { { echo "$as_me:15503: error: Cannot link with pthread library" >&5
++	    { { echo "$as_me:15506: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -15510,13 +15513,13 @@
+ fi
+ 
+ if test "x$with_pthread" != xno; then
+-	echo "$as_me:15513: checking for pthread_kill" >&5
++	echo "$as_me:15516: checking for pthread_kill" >&5
+ echo $ECHO_N "checking for pthread_kill... $ECHO_C" >&6
+ if test "${ac_cv_func_pthread_kill+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15519 "configure"
++#line 15522 "configure"
+ #include "confdefs.h"
+ #define pthread_kill autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -15547,16 +15550,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15550: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15553: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15553: \$? = $ac_status" >&5
++  echo "$as_me:15556: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15556: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15559: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15559: \$? = $ac_status" >&5
++  echo "$as_me:15562: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_pthread_kill=yes
+ else
+@@ -15566,11 +15569,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15569: result: $ac_cv_func_pthread_kill" >&5
++echo "$as_me:15572: result: $ac_cv_func_pthread_kill" >&5
+ echo "${ECHO_T}$ac_cv_func_pthread_kill" >&6
+ if test "$ac_cv_func_pthread_kill" = yes; then
+ 
+-		echo "$as_me:15573: checking if you want to allow EINTR in wgetch with pthreads" >&5
++		echo "$as_me:15576: checking if you want to allow EINTR in wgetch with pthreads" >&5
+ echo $ECHO_N "checking if you want to allow EINTR in wgetch with pthreads... $ECHO_C" >&6
+ 
+ # Check whether --enable-pthreads-eintr or --disable-pthreads-eintr was given.
+@@ -15580,7 +15583,7 @@
+ else
+   use_pthreads_eintr=no
+ fi;
+-		echo "$as_me:15583: result: $use_pthreads_eintr" >&5
++		echo "$as_me:15586: result: $use_pthreads_eintr" >&5
+ echo "${ECHO_T}$use_pthreads_eintr" >&6
+ 		if test "x$use_pthreads_eintr" = xyes ; then
+ 
+@@ -15591,7 +15594,7 @@
+ 		fi
+ fi
+ 
+-	echo "$as_me:15594: checking if you want to use weak-symbols for pthreads" >&5
++	echo "$as_me:15597: checking if you want to use weak-symbols for pthreads" >&5
+ echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6
+ 
+ # Check whether --enable-weak-symbols or --disable-weak-symbols was given.
+@@ -15601,18 +15604,18 @@
+ else
+   use_weak_symbols=no
+ fi;
+-	echo "$as_me:15604: result: $use_weak_symbols" >&5
++	echo "$as_me:15607: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ 	if test "x$use_weak_symbols" = xyes ; then
+ 
+-echo "$as_me:15608: checking if $CC supports weak symbols" >&5
++echo "$as_me:15611: checking if $CC supports weak symbols" >&5
+ echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6
+ if test "${cf_cv_weak_symbols+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15615 "configure"
++#line 15618 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -15638,16 +15641,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15641: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15644: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15644: \$? = $ac_status" >&5
++  echo "$as_me:15647: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15647: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15650: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15650: \$? = $ac_status" >&5
++  echo "$as_me:15653: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_weak_symbols=yes
+ else
+@@ -15658,7 +15661,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:15661: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:15664: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+ 
+ 	else
+@@ -15708,7 +15711,7 @@
+ # opaque outside of that, so there is no --enable-opaque option.  We can use
+ # this option without --with-pthreads, but this will be always set for
+ # pthreads.
+-echo "$as_me:15711: checking if you want reentrant code" >&5
++echo "$as_me:15714: checking if you want reentrant code" >&5
+ echo $ECHO_N "checking if you want reentrant code... $ECHO_C" >&6
+ 
+ # Check whether --enable-reentrant or --disable-reentrant was given.
+@@ -15718,7 +15721,7 @@
+ else
+   with_reentrant=no
+ fi;
+-echo "$as_me:15721: result: $with_reentrant" >&5
++echo "$as_me:15724: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "x$with_reentrant" = xyes ; then
+ 	cf_cv_enable_reentrant=1
+@@ -15806,7 +15809,7 @@
+ 	(5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:15809: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:15812: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -15818,7 +15821,7 @@
+ 	NCURSES_SIZE_T=$cf_dft_ordinate_type
+ fi
+ 
+-echo "$as_me:15821: checking if you want opaque curses-library structures" >&5
++echo "$as_me:15824: checking if you want opaque curses-library structures" >&5
+ echo $ECHO_N "checking if you want opaque curses-library structures... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
+@@ -15840,16 +15843,16 @@
+ 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:15843: result: $enable_opaque_curses" >&5
++echo "$as_me:15846: result: $enable_opaque_curses" >&5
+ echo "${ECHO_T}$enable_opaque_curses" >&6
+ 
+ test "$cf_cv_enable_reentrant" = 1 && \
+ test "$enable_opaque_curses" = no && \
+-{ { echo "$as_me:15848: error: reentrant configuration requires opaque library" >&5
++{ { echo "$as_me:15851: error: reentrant configuration requires opaque library" >&5
+ echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:15852: checking if you want opaque form-library structures" >&5
++echo "$as_me:15855: checking if you want opaque form-library structures" >&5
+ echo $ECHO_N "checking if you want opaque form-library structures... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-form or --disable-opaque-form was given.
+@@ -15859,10 +15862,10 @@
+ else
+   enable_opaque_form=no
+ fi;
+-echo "$as_me:15862: result: $enable_opaque_form" >&5
++echo "$as_me:15865: result: $enable_opaque_form" >&5
+ echo "${ECHO_T}$enable_opaque_form" >&6
+ 
+-echo "$as_me:15865: checking if you want opaque menu-library structures" >&5
++echo "$as_me:15868: checking if you want opaque menu-library structures" >&5
+ echo $ECHO_N "checking if you want opaque menu-library structures... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
+@@ -15872,10 +15875,10 @@
+ else
+   enable_opaque_menu=no
+ fi;
+-echo "$as_me:15875: result: $enable_opaque_menu" >&5
++echo "$as_me:15878: result: $enable_opaque_menu" >&5
+ echo "${ECHO_T}$enable_opaque_menu" >&6
+ 
+-echo "$as_me:15878: checking if you want opaque panel-library structures" >&5
++echo "$as_me:15881: checking if you want opaque panel-library structures" >&5
+ echo $ECHO_N "checking if you want opaque panel-library structures... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
+@@ -15885,7 +15888,7 @@
+ else
+   enable_opaque_panel=no
+ fi;
+-echo "$as_me:15888: result: $enable_opaque_panel" >&5
++echo "$as_me:15891: result: $enable_opaque_panel" >&5
+ echo "${ECHO_T}$enable_opaque_panel" >&6
+ 
+ NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
+@@ -15895,7 +15898,7 @@
+ 
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+-	echo "$as_me:15898: checking for prefix used to wrap public variables" >&5
++	echo "$as_me:15901: checking for prefix used to wrap public variables" >&5
+ echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6
+ 
+ # Check whether --with-wrap-prefix or --without-wrap-prefix was given.
+@@ -15905,7 +15908,7 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-	echo "$as_me:15908: result: $NCURSES_WRAP_PREFIX" >&5
++	echo "$as_me:15911: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ 	NCURSES_WRAP_PREFIX=_nc_
+@@ -15918,7 +15921,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+ 
+-echo "$as_me:15921: checking if you want all development code" >&5
++echo "$as_me:15924: checking if you want all development code" >&5
+ echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
+ 
+ # Check whether --with-develop or --without-develop was given.
+@@ -15928,11 +15931,11 @@
+ else
+   with_develop=no
+ fi;
+-echo "$as_me:15931: result: $with_develop" >&5
++echo "$as_me:15934: result: $with_develop" >&5
+ echo "${ECHO_T}$with_develop" >&6
+ 
+ ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
+-echo "$as_me:15935: checking if you want hard-tabs code" >&5
++echo "$as_me:15938: checking if you want hard-tabs code" >&5
+ echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6
+ 
+ # Check whether --enable-hard-tabs or --disable-hard-tabs was given.
+@@ -15942,7 +15945,7 @@
+ else
+   enable_hard_tabs=$with_develop
+ fi;
+-echo "$as_me:15945: result: $enable_hard_tabs" >&5
++echo "$as_me:15948: result: $enable_hard_tabs" >&5
+ echo "${ECHO_T}$enable_hard_tabs" >&6
+ test "x$enable_hard_tabs" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15950,7 +15953,7 @@
+ EOF
+ 
+ ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
+-echo "$as_me:15953: checking if you want limited support for xmc" >&5
++echo "$as_me:15956: checking if you want limited support for xmc" >&5
+ echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6
+ 
+ # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given.
+@@ -15960,7 +15963,7 @@
+ else
+   enable_xmc_glitch=$with_develop
+ fi;
+-echo "$as_me:15963: result: $enable_xmc_glitch" >&5
++echo "$as_me:15966: result: $enable_xmc_glitch" >&5
+ echo "${ECHO_T}$enable_xmc_glitch" >&6
+ test "x$enable_xmc_glitch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15970,7 +15973,7 @@
+ ###############################################################################
+ # These are just experimental, probably should not be in a package:
+ 
+-echo "$as_me:15973: checking if you do not want to assume colors are white-on-black" >&5
++echo "$as_me:15976: checking if you do not want to assume colors are white-on-black" >&5
+ echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6
+ 
+ # Check whether --enable-assumed-color or --disable-assumed-color was given.
+@@ -15980,7 +15983,7 @@
+ else
+   with_assumed_color=yes
+ fi;
+-echo "$as_me:15983: result: $with_assumed_color" >&5
++echo "$as_me:15986: result: $with_assumed_color" >&5
+ echo "${ECHO_T}$with_assumed_color" >&6
+ test "x$with_assumed_color" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15988,7 +15991,7 @@
+ EOF
+ 
+ ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
+-echo "$as_me:15991: checking if you want hashmap scrolling-optimization code" >&5
++echo "$as_me:15994: checking if you want hashmap scrolling-optimization code" >&5
+ echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6
+ 
+ # Check whether --enable-hashmap or --disable-hashmap was given.
+@@ -15998,7 +16001,7 @@
+ else
+   with_hashmap=yes
+ fi;
+-echo "$as_me:16001: result: $with_hashmap" >&5
++echo "$as_me:16004: result: $with_hashmap" >&5
+ echo "${ECHO_T}$with_hashmap" >&6
+ test "x$with_hashmap" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16006,7 +16009,7 @@
+ EOF
+ 
+ ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
+-echo "$as_me:16009: checking if you want colorfgbg code" >&5
++echo "$as_me:16012: checking if you want colorfgbg code" >&5
+ echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6
+ 
+ # Check whether --enable-colorfgbg or --disable-colorfgbg was given.
+@@ -16016,7 +16019,7 @@
+ else
+   with_colorfgbg=no
+ fi;
+-echo "$as_me:16019: result: $with_colorfgbg" >&5
++echo "$as_me:16022: result: $with_colorfgbg" >&5
+ echo "${ECHO_T}$with_colorfgbg" >&6
+ test "x$with_colorfgbg" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16024,7 +16027,7 @@
+ EOF
+ 
+ ###   use option --enable-fvisibility to turn on use of gcc-specific feature
+-echo "$as_me:16027: checking if you want to use gcc -fvisibility option" >&5
++echo "$as_me:16030: checking if you want to use gcc -fvisibility option" >&5
+ echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6
+ 
+ # Check whether --enable-fvisibility or --disable-fvisibility was given.
+@@ -16034,14 +16037,14 @@
+ else
+   cf_with_fvisibility=no
+ fi;
+-echo "$as_me:16037: result: $cf_with_fvisibility" >&5
++echo "$as_me:16040: result: $cf_with_fvisibility" >&5
+ echo "${ECHO_T}$cf_with_fvisibility" >&6
+ 
+ NCURSES_IMPEXP=
+ NCURSES_CXX_IMPEXP=
+ if test "x$cf_with_fvisibility" = xyes; then
+ 
+-echo "$as_me:16044: checking if $CC -fvisibility=hidden option works" >&5
++echo "$as_me:16047: checking if $CC -fvisibility=hidden option works" >&5
+ echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6
+ if test "${cf_cv_fvisibility_hidden+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16050,7 +16053,7 @@
+     cf_save_cflags="$CFLAGS"
+     CFLAGS="$CFLAGS -fvisibility=hidden"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16053 "configure"
++#line 16056 "configure"
+ #include "confdefs.h"
+ 
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -16066,16 +16069,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16069: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16072: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16072: \$? = $ac_status" >&5
++  echo "$as_me:16075: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16075: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16078: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16078: \$? = $ac_status" >&5
++  echo "$as_me:16081: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fvisibility_hidden=yes
+ else
+@@ -16087,7 +16090,7 @@
+     CFLAGS=$cf_save_cflags
+ 
+ fi
+-echo "$as_me:16090: result: $cf_cv_fvisibility_hidden" >&5
++echo "$as_me:16093: result: $cf_cv_fvisibility_hidden" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
+ 
+ 	if test "x$cf_cv_fvisibility_hidden" = xyes
+@@ -16202,7 +16205,7 @@
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:16205: checking if $CXX -fvisibility=hidden option works" >&5
++echo "$as_me:16208: checking if $CXX -fvisibility=hidden option works" >&5
+ echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6
+ if test "${cf_cv_fvisibility_hidden2+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16211,7 +16214,7 @@
+     cf_save_cflags="$CXXFLAGS"
+     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16214 "configure"
++#line 16217 "configure"
+ #include "confdefs.h"
+ 
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -16227,16 +16230,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16230: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16233: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16233: \$? = $ac_status" >&5
++  echo "$as_me:16236: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16236: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16239: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16239: \$? = $ac_status" >&5
++  echo "$as_me:16242: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fvisibility_hidden2=yes
+ else
+@@ -16248,7 +16251,7 @@
+     CXXFLAGS=$cf_save_cflags
+ 
+ fi
+-echo "$as_me:16251: result: $cf_cv_fvisibility_hidden2" >&5
++echo "$as_me:16254: result: $cf_cv_fvisibility_hidden2" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
+ 
+ 		if test "x$cf_cv_fvisibility_hidden2" = xyes
+@@ -16371,7 +16374,7 @@
+ fi
+ 
+ ###   use option --enable-interop to turn on use of bindings used for interop
+-echo "$as_me:16374: checking if you want interop bindings" >&5
++echo "$as_me:16377: checking if you want interop bindings" >&5
+ echo $ECHO_N "checking if you want interop bindings... $ECHO_C" >&6
+ 
+ # Check whether --enable-interop or --disable-interop was given.
+@@ -16381,13 +16384,13 @@
+ else
+   with_exp_interop=$cf_dft_interop
+ fi;
+-echo "$as_me:16384: result: $with_exp_interop" >&5
++echo "$as_me:16387: result: $with_exp_interop" >&5
+ echo "${ECHO_T}$with_exp_interop" >&6
+ 
+ NCURSES_INTEROP_FUNCS=0
+ test "x$with_exp_interop" = xyes && NCURSES_INTEROP_FUNCS=1
+ 
+-echo "$as_me:16390: checking if you want experimental safe-sprintf code" >&5
++echo "$as_me:16393: checking if you want experimental safe-sprintf code" >&5
+ echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6
+ 
+ # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given.
+@@ -16397,13 +16400,13 @@
+ else
+   with_safe_sprintf=no
+ fi;
+-echo "$as_me:16400: result: $with_safe_sprintf" >&5
++echo "$as_me:16403: result: $with_safe_sprintf" >&5
+ echo "${ECHO_T}$with_safe_sprintf" >&6
+ 
+ ###   use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
+ # when hashmap is used scroll hints are useless
+ if test "$with_hashmap" = no ; then
+-echo "$as_me:16406: checking if you want to experiment without scrolling-hints code" >&5
++echo "$as_me:16409: checking if you want to experiment without scrolling-hints code" >&5
+ echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6
+ 
+ # Check whether --enable-scroll-hints or --disable-scroll-hints was given.
+@@ -16413,7 +16416,7 @@
+ else
+   with_scroll_hints=yes
+ fi;
+-echo "$as_me:16416: result: $with_scroll_hints" >&5
++echo "$as_me:16419: result: $with_scroll_hints" >&5
+ echo "${ECHO_T}$with_scroll_hints" >&6
+ test "x$with_scroll_hints" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16422,7 +16425,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16425: checking if you want wgetch-events code" >&5
++echo "$as_me:16428: checking if you want wgetch-events code" >&5
+ echo $ECHO_N "checking if you want wgetch-events code... $ECHO_C" >&6
+ 
+ # Check whether --enable-wgetch-events or --disable-wgetch-events was given.
+@@ -16432,7 +16435,7 @@
+ else
+   with_wgetch_events=no
+ fi;
+-echo "$as_me:16435: result: $with_wgetch_events" >&5
++echo "$as_me:16438: result: $with_wgetch_events" >&5
+ echo "${ECHO_T}$with_wgetch_events" >&6
+ if test "x$with_wgetch_events" = xyes ; then
+ 
+@@ -16447,7 +16450,7 @@
+ 
+ case "$cf_cv_system_name" in
+ (*mingw32*|*mingw64*|*-msvc*)
+-	echo "$as_me:16450: checking if you want experimental-Windows driver" >&5
++	echo "$as_me:16453: checking if you want experimental-Windows driver" >&5
+ echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6
+ 
+ # Check whether --enable-exp-win32 or --disable-exp-win32 was given.
+@@ -16457,7 +16460,7 @@
+ else
+   with_exp_win32=no
+ fi;
+-	echo "$as_me:16460: result: $with_exp_win32" >&5
++	echo "$as_me:16463: result: $with_exp_win32" >&5
+ echo "${ECHO_T}$with_exp_win32" >&6
+ 	if test "x$with_exp_win32" = xyes
+ 	then
+@@ -16483,7 +16486,7 @@
+ 
+ ###	use option --disable-echo to suppress full display compiling commands
+ 
+-echo "$as_me:16486: checking if you want to see long compiling messages" >&5
++echo "$as_me:16489: checking if you want to see long compiling messages" >&5
+ echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
+ 
+ # Check whether --enable-echo or --disable-echo was given.
+@@ -16517,7 +16520,7 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:16520: result: $enableval" >&5
++echo "$as_me:16523: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+ if test "x$enable_echo" = xyes; then
+@@ -16530,7 +16533,7 @@
+ 
+ # --disable-stripping is used for debugging
+ 
+-echo "$as_me:16533: checking if you want to install stripped executables" >&5
++echo "$as_me:16536: checking if you want to install stripped executables" >&5
+ echo $ECHO_N "checking if you want to install stripped executables... $ECHO_C" >&6
+ 
+ # Check whether --enable-stripping or --disable-stripping was given.
+@@ -16547,7 +16550,7 @@
+ 	enable_stripping=yes
+ 
+ fi;
+-echo "$as_me:16550: result: $enable_stripping" >&5
++echo "$as_me:16553: result: $enable_stripping" >&5
+ echo "${ECHO_T}$enable_stripping" >&6
+ 
+ if test "$enable_stripping" = yes
+@@ -16558,7 +16561,7 @@
+ fi
+ 
+ : "${INSTALL:=install}"
+-echo "$as_me:16561: checking if install accepts -p option" >&5
++echo "$as_me:16564: checking if install accepts -p option" >&5
+ echo $ECHO_N "checking if install accepts -p option... $ECHO_C" >&6
+ if test "${cf_cv_install_p+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16589,10 +16592,10 @@
+ 	rm -rf ./conftest*
+ 
+ fi
+-echo "$as_me:16592: result: $cf_cv_install_p" >&5
++echo "$as_me:16595: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+ 
+-echo "$as_me:16595: checking if install needs to be told about ownership" >&5
++echo "$as_me:16598: checking if install needs to be told about ownership" >&5
+ echo $ECHO_N "checking if install needs to be told about ownership... $ECHO_C" >&6
+ case `$ac_config_guess` in
+ (*minix)
+@@ -16603,7 +16606,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:16606: result: $with_install_o" >&5
++echo "$as_me:16609: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -16628,7 +16631,7 @@
+ 
+ ###	use option --enable-warnings to turn on all gcc warnings
+ 
+-echo "$as_me:16631: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:16634: checking if you want to use C11 _Noreturn feature" >&5
+ echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
+ 
+ # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
+@@ -16645,17 +16648,17 @@
+ 	enable_stdnoreturn=no
+ 
+ fi;
+-echo "$as_me:16648: result: $enable_stdnoreturn" >&5
++echo "$as_me:16651: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+ 
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:16652: checking for C11 _Noreturn feature" >&5
++echo "$as_me:16655: checking for C11 _Noreturn feature" >&5
+ echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
+ if test "${cf_cv_c11_noreturn+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16658 "configure"
++#line 16661 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16672,16 +16675,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16675: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16678: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16678: \$? = $ac_status" >&5
++  echo "$as_me:16681: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16681: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16684: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16684: \$? = $ac_status" >&5
++  echo "$as_me:16687: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_c11_noreturn=yes
+ else
+@@ -16692,7 +16695,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16695: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:16698: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ 	cf_cv_c11_noreturn=no,
+@@ -16748,16 +16751,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16751: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16754: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+ 			CFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16756: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16759: testing ... fixed $CFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16760: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16763: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -16796,16 +16799,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16799: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:16802: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16804: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:16807: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16808: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16811: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -16844,23 +16847,23 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16847: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:16850: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+ 			LDFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16852: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:16855: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16856: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16859: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:16863: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:16866: checking if you want to turn on gcc warnings" >&5
+ echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6
+ 
+ # Check whether --enable-warnings or --disable-warnings was given.
+@@ -16877,7 +16880,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:16880: result: $enable_warnings" >&5
++echo "$as_me:16883: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -16901,7 +16904,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16904 "configure"
++#line 16907 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16916,26 +16919,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16919: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16922: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16922: \$? = $ac_status" >&5
++  echo "$as_me:16925: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16925: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16928: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16928: \$? = $ac_status" >&5
++  echo "$as_me:16931: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:16931: checking for X11/Xt const-feature" >&5
++echo "$as_me:16934: checking for X11/Xt const-feature" >&5
+ echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
+ if test "${cf_cv_const_x_string+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16938 "configure"
++#line 16941 "configure"
+ #include "confdefs.h"
+ 
+ #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
+@@ -16952,16 +16955,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16955: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16958: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16958: \$? = $ac_status" >&5
++  echo "$as_me:16961: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16961: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16964: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16964: \$? = $ac_status" >&5
++  echo "$as_me:16967: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -16976,7 +16979,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16979: result: $cf_cv_const_x_string" >&5
++echo "$as_me:16982: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -17005,7 +17008,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <&5
++	{ echo "$as_me:17027: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -17037,12 +17040,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:17040: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17043: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17043: \$? = $ac_status" >&5
++  echo "$as_me:17046: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17045: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17048: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -17050,7 +17053,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:17053: checking for $CC warning options..." >&5
++	{ echo "$as_me:17056: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -17073,12 +17076,12 @@
+ 		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:17076: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17079: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17079: \$? = $ac_status" >&5
++  echo "$as_me:17082: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17081: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17084: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -17086,7 +17089,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:17089: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17092: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -17096,7 +17099,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:17099: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17102: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -17129,10 +17132,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:17132: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:17135: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <&5
++		if { (eval echo "$as_me:17187: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17187: \$? = $ac_status" >&5
++  echo "$as_me:17190: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17189: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:17192: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -17258,12 +17261,12 @@
+ if test "$GCC" = yes ; then
+ 	case "$host_os" in
+ 	(linux*|gnu*)
+-		echo "$as_me:17261: checking if this is really Intel C++ compiler" >&5
++		echo "$as_me:17264: checking if this is really Intel C++ compiler" >&5
+ echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6
+ 		cf_save_CFLAGS="$CXXFLAGS"
+ 		CXXFLAGS="$CXXFLAGS -no-gcc"
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17266 "configure"
++#line 17269 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17280,16 +17283,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17283: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17286: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17286: \$? = $ac_status" >&5
++  echo "$as_me:17289: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17289: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17292: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17292: \$? = $ac_status" >&5
++  echo "$as_me:17295: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   INTEL_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -17300,7 +17303,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		CXXFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:17303: result: $INTEL_CPLUSPLUS" >&5
++		echo "$as_me:17306: result: $INTEL_CPLUSPLUS" >&5
+ echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
+ 		;;
+ 	esac
+@@ -17309,11 +17312,11 @@
+ CLANG_CPLUSPLUS=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:17312: checking if this is really Clang C++ compiler" >&5
++	echo "$as_me:17315: checking if this is really Clang C++ compiler" >&5
+ echo $ECHO_N "checking if this is really Clang C++ compiler... $ECHO_C" >&6
+ 	cf_save_CFLAGS="$CXXFLAGS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17316 "configure"
++#line 17319 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17330,16 +17333,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17333: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17336: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17336: \$? = $ac_status" >&5
++  echo "$as_me:17339: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17339: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17342: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17342: \$? = $ac_status" >&5
++  echo "$as_me:17345: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   CLANG_CPLUSPLUS=yes
+ 
+@@ -17349,7 +17352,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	CXXFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:17352: result: $CLANG_CPLUSPLUS" >&5
++	echo "$as_me:17355: result: $CLANG_CPLUSPLUS" >&5
+ echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
+ fi
+ 
+@@ -17358,30 +17361,30 @@
+ if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
+ 	case "$CC" in
+ 	(c[1-9][0-9]|*/c[1-9][0-9])
+-		{ echo "$as_me:17361: WARNING: replacing broken compiler alias $CC" >&5
++		{ echo "$as_me:17364: WARNING: replacing broken compiler alias $CC" >&5
+ echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
+ 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
+ 		CC=clang
+ 		;;
+ 	esac
+ 
+-	echo "$as_me:17368: checking version of $CC" >&5
++	echo "$as_me:17371: checking version of $CC" >&5
+ echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
+ 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+ 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
+-	echo "$as_me:17372: result: $CLANG_VERSION" >&5
++	echo "$as_me:17375: result: $CLANG_VERSION" >&5
+ echo "${ECHO_T}$CLANG_VERSION" >&6
+ 
+ 	for cf_clang_opt in \
+ 		-Qunused-arguments \
+ 		-Wno-error=implicit-function-declaration
+ 	do
+-		echo "$as_me:17379: checking if option $cf_clang_opt works" >&5
++		echo "$as_me:17382: checking if option $cf_clang_opt works" >&5
+ echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
+ 		cf_save_CFLAGS="$CFLAGS"
+ 		CFLAGS="$CFLAGS $cf_clang_opt"
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17384 "configure"
++#line 17387 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -17395,16 +17398,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17398: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17401: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17401: \$? = $ac_status" >&5
++  echo "$as_me:17404: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17404: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17407: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17407: \$? = $ac_status" >&5
++  echo "$as_me:17410: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_clang_optok=yes
+@@ -17415,13 +17418,13 @@
+ 			cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:17418: result: $cf_clang_optok" >&5
++		echo "$as_me:17421: result: $cf_clang_optok" >&5
+ echo "${ECHO_T}$cf_clang_optok" >&6
+ 		CFLAGS="$cf_save_CFLAGS"
+ 		if test "$cf_clang_optok" = yes; then
+ 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
+ 
+-echo "${as_me:-configure}:17424: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:17427: testing adding option $cf_clang_opt ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -17438,7 +17441,7 @@
+ ac_main_return="return"
+ 
+ cat > conftest.$ac_ext <&5
++	{ echo "$as_me:17462: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-Wall"
+@@ -17473,12 +17476,12 @@
+ 		wd981
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:17476: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17479: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17479: \$? = $ac_status" >&5
++  echo "$as_me:17482: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17481: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17484: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		fi
+@@ -17487,7 +17490,7 @@
+ 
+ elif test "$GXX" = yes
+ then
+-	{ echo "$as_me:17490: checking for $CXX warning options..." >&5
++	{ echo "$as_me:17493: checking for $CXX warning options..." >&5
+ echo "$as_me: checking for $CXX warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-W -Wall"
+@@ -17517,16 +17520,16 @@
+ 		Wundef $cf_gxx_extra_warnings Wno-unused
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
+-		if { (eval echo "$as_me:17520: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17523: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17523: \$? = $ac_status" >&5
++  echo "$as_me:17526: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17525: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17528: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		else
+-			test -n "$verbose" && echo "$as_me:17529: result: ... no -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17532: result: ... no -$cf_opt" >&5
+ echo "${ECHO_T}... no -$cf_opt" >&6
+ 		fi
+ 	done
+@@ -17544,7 +17547,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:17547: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:17550: checking if you want to work around bogus compiler/loader warnings" >&5
+ echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6
+ 
+ # Check whether --enable-string-hacks or --disable-string-hacks was given.
+@@ -17554,7 +17557,7 @@
+ else
+   enable_string_hacks=no
+ fi;
+-echo "$as_me:17557: result: $enable_string_hacks" >&5
++echo "$as_me:17560: result: $enable_string_hacks" >&5
+ echo "${ECHO_T}$enable_string_hacks" >&6
+ 
+ if test "x$enable_string_hacks" = "xyes"; then
+@@ -17563,15 +17566,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+ 
+-	{ echo "$as_me:17566: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++	{ echo "$as_me:17569: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+ echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;}
+-	echo "$as_me:17568: checking for strlcat" >&5
++	echo "$as_me:17571: checking for strlcat" >&5
+ echo $ECHO_N "checking for strlcat... $ECHO_C" >&6
+ if test "${ac_cv_func_strlcat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17574 "configure"
++#line 17577 "configure"
+ #include "confdefs.h"
+ #define strlcat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17602,16 +17605,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17605: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17608: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17608: \$? = $ac_status" >&5
++  echo "$as_me:17611: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17611: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17614: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17614: \$? = $ac_status" >&5
++  echo "$as_me:17617: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_strlcat=yes
+ else
+@@ -17621,7 +17624,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17624: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:17627: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test "$ac_cv_func_strlcat" = yes; then
+ 
+@@ -17631,7 +17634,7 @@
+ 
+ else
+ 
+-		echo "$as_me:17634: checking for strlcat in -lbsd" >&5
++		echo "$as_me:17637: checking for strlcat in -lbsd" >&5
+ echo $ECHO_N "checking for strlcat in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_strlcat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17639,7 +17642,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17642 "configure"
++#line 17645 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17658,16 +17661,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17661: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17664: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17664: \$? = $ac_status" >&5
++  echo "$as_me:17667: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17667: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17670: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17670: \$? = $ac_status" >&5
++  echo "$as_me:17673: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -17678,7 +17681,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17681: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:17684: result: $ac_cv_lib_bsd_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6
+ if test "$ac_cv_lib_bsd_strlcat" = yes; then
+ 
+@@ -17701,23 +17704,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:17704: checking for $ac_header" >&5
++echo "$as_me:17707: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17710 "configure"
++#line 17713 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:17714: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:17717: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:17720: \$? = $ac_status" >&5
++  echo "$as_me:17723: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17736,7 +17739,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:17739: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:17742: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:17763: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17766 "configure"
++#line 17769 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17794,16 +17797,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17797: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17800: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17800: \$? = $ac_status" >&5
++  echo "$as_me:17803: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17803: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17806: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17806: \$? = $ac_status" >&5
++  echo "$as_me:17809: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -17813,7 +17816,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17816: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:17819: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:17832: checking if you want to enable runtime assertions" >&5
+ echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
+ 
+ # Check whether --enable-assertions or --disable-assertions was given.
+@@ -17836,7 +17839,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:17839: result: $with_assertions" >&5
++echo "$as_me:17842: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -17852,7 +17855,7 @@
+ 
+ ###	use option --disable-leaks to suppress "permanent" leaks, for testing
+ 
+-echo "$as_me:17855: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:17858: checking if you want to use dmalloc for testing" >&5
+ echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
+ 
+ # Check whether --with-dmalloc or --without-dmalloc was given.
+@@ -17874,7 +17877,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:17877: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:17880: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -17988,23 +17991,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:17991: checking for dmalloc.h" >&5
++	echo "$as_me:17994: checking for dmalloc.h" >&5
+ echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
+ if test "${ac_cv_header_dmalloc_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17997 "configure"
++#line 18000 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:18001: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18004: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:18007: \$? = $ac_status" >&5
++  echo "$as_me:18010: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18023,11 +18026,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18026: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:18029: result: $ac_cv_header_dmalloc_h" >&5
+ echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
+ if test "$ac_cv_header_dmalloc_h" = yes; then
+ 
+-echo "$as_me:18030: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:18033: checking for dmalloc_debug in -ldmalloc" >&5
+ echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
+ if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18035,7 +18038,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18038 "configure"
++#line 18041 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18054,16 +18057,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18057: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18060: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18060: \$? = $ac_status" >&5
++  echo "$as_me:18063: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18063: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18066: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18066: \$? = $ac_status" >&5
++  echo "$as_me:18069: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -18074,7 +18077,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18077: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:18080: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+ echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
+ if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:18095: checking if you want to use dbmalloc for testing" >&5
+ echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
+ 
+ # Check whether --with-dbmalloc or --without-dbmalloc was given.
+@@ -18111,7 +18114,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:18114: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:18117: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -18225,23 +18228,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:18228: checking for dbmalloc.h" >&5
++	echo "$as_me:18231: checking for dbmalloc.h" >&5
+ echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
+ if test "${ac_cv_header_dbmalloc_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18234 "configure"
++#line 18237 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:18238: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18241: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:18244: \$? = $ac_status" >&5
++  echo "$as_me:18247: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18260,11 +18263,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18263: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:18266: result: $ac_cv_header_dbmalloc_h" >&5
+ echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
+ if test "$ac_cv_header_dbmalloc_h" = yes; then
+ 
+-echo "$as_me:18267: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:18270: checking for debug_malloc in -ldbmalloc" >&5
+ echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
+ if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18272,7 +18275,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18275 "configure"
++#line 18278 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18291,16 +18294,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18294: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18297: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18297: \$? = $ac_status" >&5
++  echo "$as_me:18300: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18300: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18303: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18303: \$? = $ac_status" >&5
++  echo "$as_me:18306: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -18311,7 +18314,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18314: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:18317: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+ echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
+ if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:18332: checking if you want to use valgrind for testing" >&5
+ echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
+ 
+ # Check whether --with-valgrind or --without-valgrind was given.
+@@ -18348,7 +18351,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:18351: result: ${with_valgrind:-no}" >&5
++echo "$as_me:18354: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -18461,7 +18464,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:18464: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:18467: checking if you want to perform memory-leak testing" >&5
+ echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
+ 
+ # Check whether --enable-leaks or --disable-leaks was given.
+@@ -18472,7 +18475,7 @@
+   enable_leaks=yes
+ fi;
+ if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
+-echo "$as_me:18475: result: $with_no_leaks" >&5
++echo "$as_me:18478: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$enable_leaks" = no ; then
+@@ -18524,7 +18527,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:18527: checking whether to add trace feature to all models" >&5
++echo "$as_me:18530: checking whether to add trace feature to all models" >&5
+ echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
+ 
+ # Check whether --with-trace or --without-trace was given.
+@@ -18534,7 +18537,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:18537: result: $cf_with_trace" >&5
++echo "$as_me:18540: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "x$cf_with_trace" = xyes ; then
+@@ -18648,7 +18651,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:18651: checking if we want to use GNAT projects" >&5
++echo "$as_me:18654: checking if we want to use GNAT projects" >&5
+ echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6
+ 
+ # Check whether --enable-gnat-projects or --disable-gnat-projects was given.
+@@ -18665,7 +18668,7 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:18668: result: $enable_gnat_projects" >&5
++echo "$as_me:18671: result: $enable_gnat_projects" >&5
+ echo "${ECHO_T}$enable_gnat_projects" >&6
+ 
+ ###	Checks for libraries.
+@@ -18678,14 +18681,14 @@
+ 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
+ 	fi
+ 
+-echo "$as_me:18681: checking if ssp library is needed" >&5
++echo "$as_me:18684: checking if ssp library is needed" >&5
+ echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
+ if test "${cf_cv_need_libssp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18688 "configure"
++#line 18691 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -18702,16 +18705,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18705: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18708: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18708: \$? = $ac_status" >&5
++  echo "$as_me:18711: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18711: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18714: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18714: \$? = $ac_status" >&5
++  echo "$as_me:18717: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=no
+ else
+@@ -18721,7 +18724,7 @@
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lssp"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18724 "configure"
++#line 18727 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -18738,16 +18741,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18741: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18744: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18744: \$? = $ac_status" >&5
++  echo "$as_me:18747: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18747: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18750: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18750: \$? = $ac_status" >&5
++  echo "$as_me:18753: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=yes
+ else
+@@ -18761,7 +18764,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18764: result: $cf_cv_need_libssp" >&5
++echo "$as_me:18767: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+ 
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -18787,13 +18790,13 @@
+ 
+ 	;;
+ (*)
+-echo "$as_me:18790: checking for gettimeofday" >&5
++echo "$as_me:18793: checking for gettimeofday" >&5
+ echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
+ if test "${ac_cv_func_gettimeofday+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18796 "configure"
++#line 18799 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18824,16 +18827,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18827: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18830: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18830: \$? = $ac_status" >&5
++  echo "$as_me:18833: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18833: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18836: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18836: \$? = $ac_status" >&5
++  echo "$as_me:18839: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -18843,7 +18846,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18846: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:18849: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+ 
+@@ -18853,7 +18856,7 @@
+ 
+ else
+ 
+-echo "$as_me:18856: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:18859: checking for gettimeofday in -lbsd" >&5
+ echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18861,7 +18864,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18864 "configure"
++#line 18867 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18880,16 +18883,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18883: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18886: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18886: \$? = $ac_status" >&5
++  echo "$as_me:18889: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18889: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18892: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18892: \$? = $ac_status" >&5
++  echo "$as_me:18895: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -18900,7 +18903,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18903: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:18906: result: $ac_cv_lib_bsd_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
+ if test "$ac_cv_lib_bsd_gettimeofday" = yes; then
+ 
+@@ -18930,14 +18933,14 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:18933: checking if -lm needed for math functions" >&5
++echo "$as_me:18936: checking if -lm needed for math functions" >&5
+ echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6
+ if test "${cf_cv_need_libm+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18940 "configure"
++#line 18943 "configure"
+ #include "confdefs.h"
+ 
+ 	#include 
+@@ -18953,16 +18956,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18956: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18959: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18959: \$? = $ac_status" >&5
++  echo "$as_me:18962: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18962: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18965: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18965: \$? = $ac_status" >&5
++  echo "$as_me:18968: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libm=no
+ else
+@@ -18972,7 +18975,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18975: result: $cf_cv_need_libm" >&5
++echo "$as_me:18978: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+ if test "$cf_cv_need_libm" = yes
+ then
+@@ -18980,13 +18983,13 @@
+ fi
+ 
+ ###	Checks for header files.
+-echo "$as_me:18983: checking for ANSI C header files" >&5
++echo "$as_me:18986: checking for ANSI C header files" >&5
+ echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+ if test "${ac_cv_header_stdc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18989 "configure"
++#line 18992 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -18994,13 +18997,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:18997: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:19000: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:19003: \$? = $ac_status" >&5
++  echo "$as_me:19006: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -19022,7 +19025,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19025 "configure"
++#line 19028 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -19040,7 +19043,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19043 "configure"
++#line 19046 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -19061,7 +19064,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19064 "configure"
++#line 19067 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -19087,15 +19090,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:19090: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19093: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19093: \$? = $ac_status" >&5
++  echo "$as_me:19096: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:19095: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19098: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19098: \$? = $ac_status" >&5
++  echo "$as_me:19101: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -19108,7 +19111,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:19111: result: $ac_cv_header_stdc" >&5
++echo "$as_me:19114: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -19121,13 +19124,13 @@
+ ac_header_dirent=no
+ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
+   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+-echo "$as_me:19124: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:19127: checking for $ac_hdr that defines DIR" >&5
+ echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19130 "configure"
++#line 19133 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$ac_hdr>
+@@ -19142,16 +19145,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19145: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19148: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19148: \$? = $ac_status" >&5
++  echo "$as_me:19151: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19151: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19154: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19154: \$? = $ac_status" >&5
++  echo "$as_me:19157: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -19161,7 +19164,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19164: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:19167: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++  echo "$as_me:19180: checking for opendir in -ldir" >&5
+ echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
+ if test "${ac_cv_lib_dir_opendir+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19182,7 +19185,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19185 "configure"
++#line 19188 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19201,16 +19204,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19204: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19207: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19207: \$? = $ac_status" >&5
++  echo "$as_me:19210: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19210: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19213: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19213: \$? = $ac_status" >&5
++  echo "$as_me:19216: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -19221,14 +19224,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19224: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:19227: result: $ac_cv_lib_dir_opendir" >&5
+ echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
+ if test "$ac_cv_lib_dir_opendir" = yes; then
+   LIBS="$LIBS -ldir"
+ fi
+ 
+ else
+-  echo "$as_me:19231: checking for opendir in -lx" >&5
++  echo "$as_me:19234: checking for opendir in -lx" >&5
+ echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
+ if test "${ac_cv_lib_x_opendir+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19236,7 +19239,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19239 "configure"
++#line 19242 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19255,16 +19258,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19258: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19261: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19261: \$? = $ac_status" >&5
++  echo "$as_me:19264: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19264: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19267: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19267: \$? = $ac_status" >&5
++  echo "$as_me:19270: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -19275,7 +19278,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19278: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:19281: result: $ac_cv_lib_x_opendir" >&5
+ echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
+ if test "$ac_cv_lib_x_opendir" = yes; then
+   LIBS="$LIBS -lx"
+@@ -19283,13 +19286,13 @@
+ 
+ fi
+ 
+-echo "$as_me:19286: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:19289: checking whether time.h and sys/time.h may both be included" >&5
+ echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
+ if test "${ac_cv_header_time+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19292 "configure"
++#line 19295 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -19305,16 +19308,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19308: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19311: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19311: \$? = $ac_status" >&5
++  echo "$as_me:19314: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19314: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19317: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19317: \$? = $ac_status" >&5
++  echo "$as_me:19320: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -19324,7 +19327,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19327: result: $ac_cv_header_time" >&5
++echo "$as_me:19330: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -19339,7 +19342,7 @@
+ case "$host_os" in
+ (mingw*)
+ 	# -lsystre -ltre -lintl -liconv
+-	echo "$as_me:19342: checking for regcomp in -lsystre" >&5
++	echo "$as_me:19345: checking for regcomp in -lsystre" >&5
+ echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6
+ if test "${ac_cv_lib_systre_regcomp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19347,7 +19350,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsystre  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19350 "configure"
++#line 19353 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19366,16 +19369,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19369: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19372: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19372: \$? = $ac_status" >&5
++  echo "$as_me:19375: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19375: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19378: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19378: \$? = $ac_status" >&5
++  echo "$as_me:19381: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_systre_regcomp=yes
+ else
+@@ -19386,11 +19389,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19389: result: $ac_cv_lib_systre_regcomp" >&5
++echo "$as_me:19392: result: $ac_cv_lib_systre_regcomp" >&5
+ echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6
+ if test "$ac_cv_lib_systre_regcomp" = yes; then
+ 
+-		echo "$as_me:19393: checking for libiconv_open in -liconv" >&5
++		echo "$as_me:19396: checking for libiconv_open in -liconv" >&5
+ echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
+ if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19398,7 +19401,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-liconv  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19401 "configure"
++#line 19404 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19417,16 +19420,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19420: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19423: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19423: \$? = $ac_status" >&5
++  echo "$as_me:19426: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19426: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19429: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19429: \$? = $ac_status" >&5
++  echo "$as_me:19432: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_iconv_libiconv_open=yes
+ else
+@@ -19437,7 +19440,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19440: result: $ac_cv_lib_iconv_libiconv_open" >&5
++echo "$as_me:19443: result: $ac_cv_lib_iconv_libiconv_open" >&5
+ echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6
+ if test "$ac_cv_lib_iconv_libiconv_open" = yes; then
+ 
+@@ -19459,7 +19462,7 @@
+ 
+ fi
+ 
+-		echo "$as_me:19462: checking for libintl_gettext in -lintl" >&5
++		echo "$as_me:19465: checking for libintl_gettext in -lintl" >&5
+ echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6
+ if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19467,7 +19470,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19470 "configure"
++#line 19473 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19486,16 +19489,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19489: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19492: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19492: \$? = $ac_status" >&5
++  echo "$as_me:19495: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19495: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19498: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19498: \$? = $ac_status" >&5
++  echo "$as_me:19501: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_intl_libintl_gettext=yes
+ else
+@@ -19506,7 +19509,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19509: result: $ac_cv_lib_intl_libintl_gettext" >&5
++echo "$as_me:19512: result: $ac_cv_lib_intl_libintl_gettext" >&5
+ echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6
+ if test "$ac_cv_lib_intl_libintl_gettext" = yes; then
+ 
+@@ -19528,7 +19531,7 @@
+ 
+ fi
+ 
+-		echo "$as_me:19531: checking for tre_regcomp in -ltre" >&5
++		echo "$as_me:19534: checking for tre_regcomp in -ltre" >&5
+ echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6
+ if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19536,7 +19539,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ltre  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19539 "configure"
++#line 19542 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19555,16 +19558,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19558: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19561: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19561: \$? = $ac_status" >&5
++  echo "$as_me:19564: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19564: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19567: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19567: \$? = $ac_status" >&5
++  echo "$as_me:19570: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_tre_tre_regcomp=yes
+ else
+@@ -19575,7 +19578,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19578: result: $ac_cv_lib_tre_tre_regcomp" >&5
++echo "$as_me:19581: result: $ac_cv_lib_tre_tre_regcomp" >&5
+ echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6
+ if test "$ac_cv_lib_tre_tre_regcomp" = yes; then
+ 
+@@ -19617,7 +19620,7 @@
+ 
+ else
+ 
+-		echo "$as_me:19620: checking for regcomp in -lgnurx" >&5
++		echo "$as_me:19623: checking for regcomp in -lgnurx" >&5
+ echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6
+ if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19625,7 +19628,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgnurx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19628 "configure"
++#line 19631 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19644,16 +19647,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19647: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19650: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19650: \$? = $ac_status" >&5
++  echo "$as_me:19653: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19653: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19656: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19656: \$? = $ac_status" >&5
++  echo "$as_me:19659: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gnurx_regcomp=yes
+ else
+@@ -19664,7 +19667,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19667: result: $ac_cv_lib_gnurx_regcomp" >&5
++echo "$as_me:19670: result: $ac_cv_lib_gnurx_regcomp" >&5
+ echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6
+ if test "$ac_cv_lib_gnurx_regcomp" = yes; then
+ 
+@@ -19692,13 +19695,13 @@
+ 	;;
+ (*)
+ 	cf_regex_libs="regex re"
+-	echo "$as_me:19695: checking for regcomp" >&5
++	echo "$as_me:19698: checking for regcomp" >&5
+ echo $ECHO_N "checking for regcomp... $ECHO_C" >&6
+ if test "${ac_cv_func_regcomp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19701 "configure"
++#line 19704 "configure"
+ #include "confdefs.h"
+ #define regcomp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19729,16 +19732,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19732: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19735: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19735: \$? = $ac_status" >&5
++  echo "$as_me:19738: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19738: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19741: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19741: \$? = $ac_status" >&5
++  echo "$as_me:19744: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_regcomp=yes
+ else
+@@ -19748,7 +19751,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19751: result: $ac_cv_func_regcomp" >&5
++echo "$as_me:19754: result: $ac_cv_func_regcomp" >&5
+ echo "${ECHO_T}$ac_cv_func_regcomp" >&6
+ if test "$ac_cv_func_regcomp" = yes; then
+   cf_regex_func=regcomp
+@@ -19757,7 +19760,7 @@
+ 		for cf_regex_lib in $cf_regex_libs
+ 		do
+ 			as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh`
+-echo "$as_me:19760: checking for regcomp in -l$cf_regex_lib" >&5
++echo "$as_me:19763: checking for regcomp in -l$cf_regex_lib" >&5
+ echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19765,7 +19768,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_regex_lib  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19768 "configure"
++#line 19771 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19784,16 +19787,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19787: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19790: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19790: \$? = $ac_status" >&5
++  echo "$as_me:19793: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19793: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19796: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19796: \$? = $ac_status" >&5
++  echo "$as_me:19799: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -19804,7 +19807,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19807: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:19810: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then
+ 
+@@ -19836,13 +19839,13 @@
+ esac
+ 
+ if test "$cf_regex_func" = no ; then
+-	echo "$as_me:19839: checking for compile" >&5
++	echo "$as_me:19842: checking for compile" >&5
+ echo $ECHO_N "checking for compile... $ECHO_C" >&6
+ if test "${ac_cv_func_compile+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19845 "configure"
++#line 19848 "configure"
+ #include "confdefs.h"
+ #define compile autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19873,16 +19876,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19876: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19879: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19879: \$? = $ac_status" >&5
++  echo "$as_me:19882: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19882: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19885: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19885: \$? = $ac_status" >&5
++  echo "$as_me:19888: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_compile=yes
+ else
+@@ -19892,13 +19895,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19895: result: $ac_cv_func_compile" >&5
++echo "$as_me:19898: result: $ac_cv_func_compile" >&5
+ echo "${ECHO_T}$ac_cv_func_compile" >&6
+ if test "$ac_cv_func_compile" = yes; then
+   cf_regex_func=compile
+ else
+ 
+-		echo "$as_me:19901: checking for compile in -lgen" >&5
++		echo "$as_me:19904: checking for compile in -lgen" >&5
+ echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6
+ if test "${ac_cv_lib_gen_compile+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19906,7 +19909,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgen  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19909 "configure"
++#line 19912 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19925,16 +19928,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19928: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19931: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19931: \$? = $ac_status" >&5
++  echo "$as_me:19934: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19934: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19937: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19937: \$? = $ac_status" >&5
++  echo "$as_me:19940: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gen_compile=yes
+ else
+@@ -19945,7 +19948,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19948: result: $ac_cv_lib_gen_compile" >&5
++echo "$as_me:19951: result: $ac_cv_lib_gen_compile" >&5
+ echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6
+ if test "$ac_cv_lib_gen_compile" = yes; then
+ 
+@@ -19973,11 +19976,11 @@
+ fi
+ 
+ if test "$cf_regex_func" = no ; then
+-	{ echo "$as_me:19976: WARNING: cannot find regular expression library" >&5
++	{ echo "$as_me:19979: WARNING: cannot find regular expression library" >&5
+ echo "$as_me: WARNING: cannot find regular expression library" >&2;}
+ fi
+ 
+-echo "$as_me:19980: checking for regular-expression headers" >&5
++echo "$as_me:19983: checking for regular-expression headers" >&5
+ echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
+ if test "${cf_cv_regex_hdrs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19989,7 +19992,7 @@
+ 	for cf_regex_hdr in regexp.h regexpr.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19992 "configure"
++#line 19995 "configure"
+ #include "confdefs.h"
+ #include <$cf_regex_hdr>
+ int
+@@ -20006,16 +20009,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20009: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20012: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20012: \$? = $ac_status" >&5
++  echo "$as_me:20015: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20015: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20018: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20018: \$? = $ac_status" >&5
++  echo "$as_me:20021: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20032,7 +20035,7 @@
+ 	for cf_regex_hdr in regex.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20035 "configure"
++#line 20038 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$cf_regex_hdr>
+@@ -20052,16 +20055,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20055: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20058: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20058: \$? = $ac_status" >&5
++  echo "$as_me:20061: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20061: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20064: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20064: \$? = $ac_status" >&5
++  echo "$as_me:20067: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20077,11 +20080,11 @@
+ esac
+ 
+ fi
+-echo "$as_me:20080: result: $cf_cv_regex_hdrs" >&5
++echo "$as_me:20083: result: $cf_cv_regex_hdrs" >&5
+ echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
+ 
+ case "$cf_cv_regex_hdrs" in
+-	(no)		{ echo "$as_me:20084: WARNING: no regular expression header found" >&5
++	(no)		{ echo "$as_me:20087: WARNING: no regular expression header found" >&5
+ echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
+ 	(regex.h)
+ cat >>confdefs.h <<\EOF
+@@ -20118,23 +20121,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:20121: checking for $ac_header" >&5
++echo "$as_me:20124: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20127 "configure"
++#line 20130 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20131: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20134: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:20137: \$? = $ac_status" >&5
++  echo "$as_me:20140: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20153,7 +20156,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20156: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20159: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:20172: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20175 "configure"
++#line 20178 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20179: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20182: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:20185: \$? = $ac_status" >&5
++  echo "$as_me:20188: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20201,7 +20204,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20204: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20207: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:20217: checking for header declaring getopt variables" >&5
+ echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6
+ if test "${cf_cv_getopt_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20221,7 +20224,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20224 "configure"
++#line 20227 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -20234,16 +20237,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20237: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20240: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20240: \$? = $ac_status" >&5
++  echo "$as_me:20243: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20243: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20246: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20246: \$? = $ac_status" >&5
++  echo "$as_me:20249: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_getopt_header=$cf_header
+  break
+@@ -20255,7 +20258,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20258: result: $cf_cv_getopt_header" >&5
++echo "$as_me:20261: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test "$cf_cv_getopt_header" != none ; then
+ 
+@@ -20272,14 +20275,14 @@
+ 
+ fi
+ 
+-echo "$as_me:20275: checking if external environ is declared" >&5
++echo "$as_me:20278: checking if external environ is declared" >&5
+ echo $ECHO_N "checking if external environ is declared... $ECHO_C" >&6
+ if test "${cf_cv_dcl_environ+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20282 "configure"
++#line 20285 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_STDLIB_H
+@@ -20295,16 +20298,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20298: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20301: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20301: \$? = $ac_status" >&5
++  echo "$as_me:20304: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20304: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20307: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20307: \$? = $ac_status" >&5
++  echo "$as_me:20310: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_environ=yes
+ else
+@@ -20315,7 +20318,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20318: result: $cf_cv_dcl_environ" >&5
++echo "$as_me:20321: result: $cf_cv_dcl_environ" >&5
+ echo "${ECHO_T}$cf_cv_dcl_environ" >&6
+ 
+ if test "$cf_cv_dcl_environ" = no ; then
+@@ -20330,14 +20333,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:20333: checking if external environ exists" >&5
++echo "$as_me:20336: checking if external environ exists" >&5
+ echo $ECHO_N "checking if external environ exists... $ECHO_C" >&6
+ if test "${cf_cv_have_environ+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20340 "configure"
++#line 20343 "configure"
+ #include "confdefs.h"
+ 
+ #undef environ
+@@ -20352,16 +20355,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20355: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20358: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20358: \$? = $ac_status" >&5
++  echo "$as_me:20361: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20361: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20364: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20364: \$? = $ac_status" >&5
++  echo "$as_me:20367: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_environ=yes
+ else
+@@ -20372,7 +20375,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20375: result: $cf_cv_have_environ" >&5
++echo "$as_me:20378: result: $cf_cv_have_environ" >&5
+ echo "${ECHO_T}$cf_cv_have_environ" >&6
+ 
+ if test "$cf_cv_have_environ" = yes ; then
+@@ -20385,13 +20388,13 @@
+ 
+ fi
+ 
+-echo "$as_me:20388: checking for getenv" >&5
++echo "$as_me:20391: checking for getenv" >&5
+ echo $ECHO_N "checking for getenv... $ECHO_C" >&6
+ if test "${ac_cv_func_getenv+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20394 "configure"
++#line 20397 "configure"
+ #include "confdefs.h"
+ #define getenv autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20422,16 +20425,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20425: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20428: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20428: \$? = $ac_status" >&5
++  echo "$as_me:20431: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20431: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20434: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20434: \$? = $ac_status" >&5
++  echo "$as_me:20437: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_getenv=yes
+ else
+@@ -20441,19 +20444,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20444: result: $ac_cv_func_getenv" >&5
++echo "$as_me:20447: result: $ac_cv_func_getenv" >&5
+ echo "${ECHO_T}$ac_cv_func_getenv" >&6
+ 
+ for ac_func in putenv setenv strdup
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:20450: checking for $ac_func" >&5
++echo "$as_me:20453: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20456 "configure"
++#line 20459 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20484,16 +20487,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20487: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20490: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20490: \$? = $ac_status" >&5
++  echo "$as_me:20493: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20493: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20496: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20496: \$? = $ac_status" >&5
++  echo "$as_me:20499: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -20503,7 +20506,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20506: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:20509: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:20519: checking if getenv returns consistent values" >&5
+ echo $ECHO_N "checking if getenv returns consistent values... $ECHO_C" >&6
+ if test "${cf_cv_consistent_getenv+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20523,7 +20526,7 @@
+   cf_cv_consistent_getenv=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20526 "configure"
++#line 20529 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20632,15 +20635,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:20635: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20638: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20638: \$? = $ac_status" >&5
++  echo "$as_me:20641: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:20640: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20643: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20643: \$? = $ac_status" >&5
++  echo "$as_me:20646: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_consistent_getenv=yes
+ else
+@@ -20653,7 +20656,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:20656: result: $cf_cv_consistent_getenv" >&5
++echo "$as_me:20659: result: $cf_cv_consistent_getenv" >&5
+ echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
+ 
+ if test "x$cf_cv_consistent_getenv" = xno
+@@ -20668,18 +20671,18 @@
+ if test "x$cf_cv_consistent_getenv" = xno && \
+ 	test "x$cf_with_trace" = xyes
+ then
+-	{ echo "$as_me:20671: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
++	{ echo "$as_me:20674: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
+ echo "$as_me: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&2;}
+ fi
+ 
+-echo "$as_me:20675: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:20678: checking if sys/time.h works with sys/select.h" >&5
+ echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
+ if test "${cf_cv_sys_time_select+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20682 "configure"
++#line 20685 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20699,16 +20702,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20702: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20705: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20705: \$? = $ac_status" >&5
++  echo "$as_me:20708: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20708: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20711: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20711: \$? = $ac_status" >&5
++  echo "$as_me:20714: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -20720,7 +20723,7 @@
+ 
+ fi
+ 
+-echo "$as_me:20723: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:20726: result: $cf_cv_sys_time_select" >&5
+ echo "${ECHO_T}$cf_cv_sys_time_select" >&6
+ test "$cf_cv_sys_time_select" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -20735,13 +20738,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:20738: checking for an ANSI C-conforming const" >&5
++echo "$as_me:20741: checking for an ANSI C-conforming const" >&5
+ echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
+ if test "${ac_cv_c_const+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20744 "configure"
++#line 20747 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -20799,16 +20802,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20802: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20805: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20805: \$? = $ac_status" >&5
++  echo "$as_me:20808: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20808: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20811: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20811: \$? = $ac_status" >&5
++  echo "$as_me:20814: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -20818,7 +20821,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20821: result: $ac_cv_c_const" >&5
++echo "$as_me:20824: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -20828,7 +20831,7 @@
+ 
+ fi
+ 
+-echo "$as_me:20831: checking for inline" >&5
++echo "$as_me:20834: checking for inline" >&5
+ echo $ECHO_N "checking for inline... $ECHO_C" >&6
+ if test "${ac_cv_c_inline+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20836,7 +20839,7 @@
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20839 "configure"
++#line 20842 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo () {return 0; }
+@@ -20845,16 +20848,16 @@
+ 
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20848: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20851: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20851: \$? = $ac_status" >&5
++  echo "$as_me:20854: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20854: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20857: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20857: \$? = $ac_status" >&5
++  echo "$as_me:20860: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -20865,7 +20868,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20868: result: $ac_cv_c_inline" >&5
++echo "$as_me:20871: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -20891,7 +20894,7 @@
+ 		:
+ 	elif test "$GCC" = yes
+ 	then
+-		echo "$as_me:20894: checking if $CC supports options to tune inlining" >&5
++		echo "$as_me:20897: checking if $CC supports options to tune inlining" >&5
+ echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6
+ if test "${cf_cv_gcc_inline+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20900,7 +20903,7 @@
+ 		cf_save_CFLAGS=$CFLAGS
+ 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20903 "configure"
++#line 20906 "configure"
+ #include "confdefs.h"
+ inline int foo(void) { return 1; }
+ int
+@@ -20912,16 +20915,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20915: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20918: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20918: \$? = $ac_status" >&5
++  echo "$as_me:20921: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20921: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20924: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20924: \$? = $ac_status" >&5
++  echo "$as_me:20927: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gcc_inline=yes
+ else
+@@ -20933,7 +20936,7 @@
+ 		CFLAGS=$cf_save_CFLAGS
+ 
+ fi
+-echo "$as_me:20936: result: $cf_cv_gcc_inline" >&5
++echo "$as_me:20939: result: $cf_cv_gcc_inline" >&5
+ echo "${ECHO_T}$cf_cv_gcc_inline" >&6
+ 		if test "$cf_cv_gcc_inline" = yes ; then
+ 
+@@ -21039,7 +21042,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:21042: checking for signal global datatype" >&5
++echo "$as_me:21045: checking for signal global datatype" >&5
+ echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6
+ if test "${cf_cv_sig_atomic_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21051,7 +21054,7 @@
+ 		"int"
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21054 "configure"
++#line 21057 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21075,16 +21078,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21078: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21081: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21081: \$? = $ac_status" >&5
++  echo "$as_me:21084: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21084: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21087: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21087: \$? = $ac_status" >&5
++  echo "$as_me:21090: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -21098,7 +21101,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21101: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:21104: result: $cf_cv_sig_atomic_t" >&5
+ echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
+ test "$cf_cv_sig_atomic_t" != no &&
+ cat >>confdefs.h <&5
++echo "$as_me:21113: checking for type of chtype" >&5
+ echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
+ if test "${cf_cv_typeof_chtype+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21117,7 +21120,7 @@
+   cf_cv_typeof_chtype=long
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21120 "configure"
++#line 21123 "configure"
+ #include "confdefs.h"
+ 
+ #define WANT_BITS 31
+@@ -21152,15 +21155,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21155: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21158: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21158: \$? = $ac_status" >&5
++  echo "$as_me:21161: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21160: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21163: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21163: \$? = $ac_status" >&5
++  echo "$as_me:21166: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_typeof_chtype=`cat cf_test.out`
+ else
+@@ -21175,7 +21178,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21178: result: $cf_cv_typeof_chtype" >&5
++echo "$as_me:21181: result: $cf_cv_typeof_chtype" >&5
+ echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:21193: checking if unsigned literals are legal" >&5
+ echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6
+ if test "${cf_cv_unsigned_literals+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21197 "configure"
++#line 21200 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21206,16 +21209,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21209: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21212: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21212: \$? = $ac_status" >&5
++  echo "$as_me:21215: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21215: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21218: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21218: \$? = $ac_status" >&5
++  echo "$as_me:21221: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_unsigned_literals=yes
+ else
+@@ -21227,7 +21230,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21230: result: $cf_cv_unsigned_literals" >&5
++echo "$as_me:21233: result: $cf_cv_unsigned_literals" >&5
+ echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
+ 
+ cf_cv_1UL="1"
+@@ -21243,14 +21246,14 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:21246: checking if external errno is declared" >&5
++echo "$as_me:21249: checking if external errno is declared" >&5
+ echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6
+ if test "${cf_cv_dcl_errno+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21253 "configure"
++#line 21256 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_STDLIB_H
+@@ -21268,16 +21271,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21271: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21274: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21274: \$? = $ac_status" >&5
++  echo "$as_me:21277: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21277: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21280: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21280: \$? = $ac_status" >&5
++  echo "$as_me:21283: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_errno=yes
+ else
+@@ -21288,7 +21291,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21291: result: $cf_cv_dcl_errno" >&5
++echo "$as_me:21294: result: $cf_cv_dcl_errno" >&5
+ echo "${ECHO_T}$cf_cv_dcl_errno" >&6
+ 
+ if test "$cf_cv_dcl_errno" = no ; then
+@@ -21303,14 +21306,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:21306: checking if external errno exists" >&5
++echo "$as_me:21309: checking if external errno exists" >&5
+ echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6
+ if test "${cf_cv_have_errno+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21313 "configure"
++#line 21316 "configure"
+ #include "confdefs.h"
+ 
+ #undef errno
+@@ -21325,16 +21328,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21328: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21331: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21331: \$? = $ac_status" >&5
++  echo "$as_me:21334: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21334: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21337: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21337: \$? = $ac_status" >&5
++  echo "$as_me:21340: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_errno=yes
+ else
+@@ -21345,7 +21348,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21348: result: $cf_cv_have_errno" >&5
++echo "$as_me:21351: result: $cf_cv_have_errno" >&5
+ echo "${ECHO_T}$cf_cv_have_errno" >&6
+ 
+ if test "$cf_cv_have_errno" = yes ; then
+@@ -21358,7 +21361,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21361: checking if data-only library module links" >&5
++echo "$as_me:21364: checking if data-only library module links" >&5
+ echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
+ if test "${cf_cv_link_dataonly+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21366,20 +21369,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:21375: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21375: \$? = $ac_status" >&5
++  echo "$as_me:21378: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+ 		mv conftest.o data.o && \
+ 		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
+ 	fi
+ 	rm -f conftest.$ac_ext data.o
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:21398: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21398: \$? = $ac_status" >&5
++  echo "$as_me:21401: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+ 		mv conftest.o func.o && \
+ 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -21408,7 +21411,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21411 "configure"
++#line 21414 "configure"
+ #include "confdefs.h"
+ 
+ 	int main(void)
+@@ -21419,15 +21422,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21422: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21425: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21425: \$? = $ac_status" >&5
++  echo "$as_me:21428: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21427: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21430: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21430: \$? = $ac_status" >&5
++  echo "$as_me:21433: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -21442,7 +21445,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21445: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:21448: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -21485,13 +21488,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:21488: checking for $ac_func" >&5
++echo "$as_me:21491: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21494 "configure"
++#line 21497 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21522,16 +21525,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21525: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21528: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21528: \$? = $ac_status" >&5
++  echo "$as_me:21531: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21531: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21534: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21534: \$? = $ac_status" >&5
++  echo "$as_me:21537: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -21541,7 +21544,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21544: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:21547: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:21557: checking if _PATH_TTYS is defined in ttyent.h" >&5
+ echo $ECHO_N "checking if _PATH_TTYS is defined in ttyent.h... $ECHO_C" >&6
+ if test "${cf_cv_PATH_TTYS+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21561 "configure"
++#line 21564 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21573,16 +21576,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21576: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21579: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21579: \$? = $ac_status" >&5
++  echo "$as_me:21582: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21582: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21585: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21585: \$? = $ac_status" >&5
++  echo "$as_me:21588: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_PATH_TTYS=yes
+ else
+@@ -21592,7 +21595,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21595: result: $cf_cv_PATH_TTYS" >&5
++echo "$as_me:21598: result: $cf_cv_PATH_TTYS" >&5
+ echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
+ 
+ if test $cf_cv_PATH_TTYS = no
+@@ -21614,7 +21617,7 @@
+ 
+ if test $cf_cv_PATH_TTYS != no
+ then
+-	echo "$as_me:21617: checking if _PATH_TTYS file exists" >&5
++	echo "$as_me:21620: checking if _PATH_TTYS file exists" >&5
+ echo $ECHO_N "checking if _PATH_TTYS file exists... $ECHO_C" >&6
+ if test "${cf_cv_have_PATH_TTYS+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21624,7 +21627,7 @@
+   cf_cv_have_PATH_TTYS=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21627 "configure"
++#line 21630 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21635,15 +21638,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21638: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21641: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21641: \$? = $ac_status" >&5
++  echo "$as_me:21644: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21643: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21646: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21646: \$? = $ac_status" >&5
++  echo "$as_me:21649: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_PATH_TTYS=yes
+ else
+@@ -21655,7 +21658,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:21658: result: $cf_cv_have_PATH_TTYS" >&5
++echo "$as_me:21661: result: $cf_cv_have_PATH_TTYS" >&5
+ echo "${ECHO_T}$cf_cv_have_PATH_TTYS" >&6
+ 	test "$cf_cv_have_PATH_TTYS" = no && cf_cv_PATH_TTYS=no
+ fi
+@@ -21667,14 +21670,14 @@
+ #define HAVE_PATH_TTYS 1
+ EOF
+ 
+-	echo "$as_me:21670: checking for getttynam" >&5
++	echo "$as_me:21673: checking for getttynam" >&5
+ echo $ECHO_N "checking for getttynam... $ECHO_C" >&6
+ if test "${cf_cv_func_getttynam+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21677 "configure"
++#line 21680 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -21686,16 +21689,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21689: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21692: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21692: \$? = $ac_status" >&5
++  echo "$as_me:21695: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21695: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21698: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21698: \$? = $ac_status" >&5
++  echo "$as_me:21701: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_getttynam=yes
+ else
+@@ -21705,7 +21708,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21708: result: $cf_cv_func_getttynam" >&5
++echo "$as_me:21711: result: $cf_cv_func_getttynam" >&5
+ echo "${ECHO_T}$cf_cv_func_getttynam" >&6
+ 	test "$cf_cv_func_getttynam" = yes && cat >>confdefs.h <<\EOF
+ #define HAVE_GETTTYNAM 1
+@@ -21715,7 +21718,7 @@
+ 
+ if test "x$ac_cv_func_getopt" = xno && \
+    test "x$cf_with_progs$cf_with_tests" != xnono; then
+-	{ { echo "$as_me:21718: error: getopt is required for building programs" >&5
++	{ { echo "$as_me:21721: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -21724,7 +21727,7 @@
+ then
+ 	if test "x$ac_cv_func_vsnprintf" = xyes
+ 	then
+-		{ echo "$as_me:21727: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
++		{ echo "$as_me:21730: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+ echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
+ 	else
+ 
+@@ -21737,14 +21740,14 @@
+ 
+ if test "x$with_getcap" = "xyes" ; then
+ 
+-echo "$as_me:21740: checking for terminal-capability database functions" >&5
++echo "$as_me:21743: checking for terminal-capability database functions" >&5
+ echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6
+ if test "${cf_cv_cgetent+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21747 "configure"
++#line 21750 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21764,16 +21767,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21767: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21770: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21770: \$? = $ac_status" >&5
++  echo "$as_me:21773: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21773: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21776: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21776: \$? = $ac_status" >&5
++  echo "$as_me:21779: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent=yes
+ else
+@@ -21784,7 +21787,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21787: result: $cf_cv_cgetent" >&5
++echo "$as_me:21790: result: $cf_cv_cgetent" >&5
+ echo "${ECHO_T}$cf_cv_cgetent" >&6
+ 
+ if test "$cf_cv_cgetent" = yes
+@@ -21794,14 +21797,14 @@
+ #define HAVE_BSD_CGETENT 1
+ EOF
+ 
+-echo "$as_me:21797: checking if cgetent uses const parameter" >&5
++echo "$as_me:21800: checking if cgetent uses const parameter" >&5
+ echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6
+ if test "${cf_cv_cgetent_const+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21804 "configure"
++#line 21807 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
+@@ -21824,16 +21827,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21827: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21830: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21830: \$? = $ac_status" >&5
++  echo "$as_me:21833: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21833: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21836: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21836: \$? = $ac_status" >&5
++  echo "$as_me:21839: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent_const=yes
+ else
+@@ -21844,7 +21847,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21847: result: $cf_cv_cgetent_const" >&5
++echo "$as_me:21850: result: $cf_cv_cgetent_const" >&5
+ echo "${ECHO_T}$cf_cv_cgetent_const" >&6
+ 	if test "$cf_cv_cgetent_const" = yes
+ 	then
+@@ -21858,14 +21861,14 @@
+ 
+ fi
+ 
+-echo "$as_me:21861: checking for isascii" >&5
++echo "$as_me:21864: checking for isascii" >&5
+ echo $ECHO_N "checking for isascii... $ECHO_C" >&6
+ if test "${cf_cv_have_isascii+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21868 "configure"
++#line 21871 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -21877,16 +21880,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21880: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21883: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21883: \$? = $ac_status" >&5
++  echo "$as_me:21886: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21886: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21889: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21889: \$? = $ac_status" >&5
++  echo "$as_me:21892: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_isascii=yes
+ else
+@@ -21897,7 +21900,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21900: result: $cf_cv_have_isascii" >&5
++echo "$as_me:21903: result: $cf_cv_have_isascii" >&5
+ echo "${ECHO_T}$cf_cv_have_isascii" >&6
+ test "$cf_cv_have_isascii" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -21905,10 +21908,10 @@
+ EOF
+ 
+ if test "$ac_cv_func_sigaction" = yes; then
+-echo "$as_me:21908: checking whether sigaction needs _POSIX_SOURCE" >&5
++echo "$as_me:21911: checking whether sigaction needs _POSIX_SOURCE" >&5
+ echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21911 "configure"
++#line 21914 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21922,16 +21925,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21925: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21928: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21928: \$? = $ac_status" >&5
++  echo "$as_me:21931: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21931: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21934: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21934: \$? = $ac_status" >&5
++  echo "$as_me:21937: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=no
+ else
+@@ -21939,7 +21942,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21942 "configure"
++#line 21945 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -21954,16 +21957,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21957: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21960: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21960: \$? = $ac_status" >&5
++  echo "$as_me:21963: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21963: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21966: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21966: \$? = $ac_status" >&5
++  echo "$as_me:21969: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=yes
+ 
+@@ -21979,11 +21982,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21982: result: $sigact_bad" >&5
++echo "$as_me:21985: result: $sigact_bad" >&5
+ echo "${ECHO_T}$sigact_bad" >&6
+ fi
+ 
+-echo "$as_me:21986: checking if nanosleep really works" >&5
++echo "$as_me:21989: checking if nanosleep really works" >&5
+ echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6
+ if test "${cf_cv_func_nanosleep+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21993,7 +21996,7 @@
+   cf_cv_func_nanosleep=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21996 "configure"
++#line 21999 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22018,15 +22021,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22021: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22024: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22024: \$? = $ac_status" >&5
++  echo "$as_me:22027: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22026: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22029: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22029: \$? = $ac_status" >&5
++  echo "$as_me:22032: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_nanosleep=yes
+ else
+@@ -22038,7 +22041,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:22041: result: $cf_cv_func_nanosleep" >&5
++echo "$as_me:22044: result: $cf_cv_func_nanosleep" >&5
+ echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
+ 
+ test "$cf_cv_func_nanosleep" = "yes" &&
+@@ -22055,23 +22058,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:22058: checking for $ac_header" >&5
++echo "$as_me:22061: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22064 "configure"
++#line 22067 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:22068: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:22071: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:22074: \$? = $ac_status" >&5
++  echo "$as_me:22077: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -22090,7 +22093,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:22093: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:22096: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++	echo "$as_me:22113: checking whether termios.h needs _POSIX_SOURCE" >&5
+ echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22113 "configure"
++#line 22116 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22122,16 +22125,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22125: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22128: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22128: \$? = $ac_status" >&5
++  echo "$as_me:22131: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22131: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22134: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22134: \$? = $ac_status" >&5
++  echo "$as_me:22137: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=no
+ else
+@@ -22139,7 +22142,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22142 "configure"
++#line 22145 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -22153,16 +22156,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22156: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22159: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22159: \$? = $ac_status" >&5
++  echo "$as_me:22162: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22162: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22165: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22165: \$? = $ac_status" >&5
++  echo "$as_me:22168: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=unknown
+ else
+@@ -22178,19 +22181,19 @@
+ 
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:22181: result: $termios_bad" >&5
++	echo "$as_me:22184: result: $termios_bad" >&5
+ echo "${ECHO_T}$termios_bad" >&6
+ 	fi
+ fi
+ 
+-echo "$as_me:22186: checking for tcgetattr" >&5
++echo "$as_me:22189: checking for tcgetattr" >&5
+ echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6
+ if test "${cf_cv_have_tcgetattr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22193 "configure"
++#line 22196 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22218,16 +22221,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22221: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22224: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22224: \$? = $ac_status" >&5
++  echo "$as_me:22227: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22227: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22230: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22230: \$? = $ac_status" >&5
++  echo "$as_me:22233: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_tcgetattr=yes
+ else
+@@ -22237,21 +22240,21 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22240: result: $cf_cv_have_tcgetattr" >&5
++echo "$as_me:22243: result: $cf_cv_have_tcgetattr" >&5
+ echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6
+ test "$cf_cv_have_tcgetattr" = yes &&
+ cat >>confdefs.h <<\EOF
+ #define HAVE_TCGETATTR 1
+ EOF
+ 
+-echo "$as_me:22247: checking for vsscanf function or workaround" >&5
++echo "$as_me:22250: checking for vsscanf function or workaround" >&5
+ echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6
+ if test "${cf_cv_func_vsscanf+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22254 "configure"
++#line 22257 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22267,16 +22270,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22270: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22273: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22273: \$? = $ac_status" >&5
++  echo "$as_me:22276: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22276: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22279: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22279: \$? = $ac_status" >&5
++  echo "$as_me:22282: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vsscanf
+ else
+@@ -22284,7 +22287,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22287 "configure"
++#line 22290 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22306,16 +22309,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22309: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22312: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22312: \$? = $ac_status" >&5
++  echo "$as_me:22315: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22315: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22318: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22318: \$? = $ac_status" >&5
++  echo "$as_me:22321: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vfscanf
+ else
+@@ -22323,7 +22326,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22326 "configure"
++#line 22329 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22345,16 +22348,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22348: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22351: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22351: \$? = $ac_status" >&5
++  echo "$as_me:22354: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22354: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22357: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22357: \$? = $ac_status" >&5
++  echo "$as_me:22360: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=_doscan
+ else
+@@ -22369,7 +22372,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22372: result: $cf_cv_func_vsscanf" >&5
++echo "$as_me:22375: result: $cf_cv_func_vsscanf" >&5
+ echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
+ 
+ case "$cf_cv_func_vsscanf" in
+@@ -22395,23 +22398,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:22398: checking for $ac_header" >&5
++echo "$as_me:22401: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22404 "configure"
++#line 22407 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:22408: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:22411: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:22414: \$? = $ac_status" >&5
++  echo "$as_me:22417: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -22430,7 +22433,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:22433: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:22436: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:22446: checking for working mkstemp" >&5
+ echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
+ if test "${cf_cv_func_mkstemp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22451,7 +22454,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22454 "configure"
++#line 22457 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22492,15 +22495,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22495: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22498: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22498: \$? = $ac_status" >&5
++  echo "$as_me:22501: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22500: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22503: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22503: \$? = $ac_status" >&5
++  echo "$as_me:22506: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -22515,16 +22518,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:22518: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:22521: result: $cf_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
+ if test "x$cf_cv_func_mkstemp" = xmaybe ; then
+-	echo "$as_me:22521: checking for mkstemp" >&5
++	echo "$as_me:22524: checking for mkstemp" >&5
+ echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
+ if test "${ac_cv_func_mkstemp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22527 "configure"
++#line 22530 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22555,16 +22558,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22558: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22561: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22561: \$? = $ac_status" >&5
++  echo "$as_me:22564: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22564: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22567: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22567: \$? = $ac_status" >&5
++  echo "$as_me:22570: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -22574,7 +22577,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22577: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:22580: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -22595,21 +22598,21 @@
+ fi
+ 
+ if test "x$cross_compiling" = xyes ; then
+-	{ echo "$as_me:22598: WARNING: cross compiling: assume setvbuf params not reversed" >&5
++	{ echo "$as_me:22601: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+ echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;}
+ else
+-	echo "$as_me:22601: checking whether setvbuf arguments are reversed" >&5
++	echo "$as_me:22604: checking whether setvbuf arguments are reversed" >&5
+ echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6
+ if test "${ac_cv_func_setvbuf_reversed+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:22607: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:22610: error: cannot run test program while cross compiling" >&5
+ echo "$as_me: error: cannot run test program while cross compiling" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22612 "configure"
++#line 22615 "configure"
+ #include "confdefs.h"
+ #include 
+ /* If setvbuf has the reversed format, exit 0. */
+@@ -22626,15 +22629,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22629: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22632: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22632: \$? = $ac_status" >&5
++  echo "$as_me:22635: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22634: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22637: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22637: \$? = $ac_status" >&5
++  echo "$as_me:22640: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_setvbuf_reversed=yes
+ else
+@@ -22647,7 +22650,7 @@
+ fi
+ rm -f core ./core.* ./*.core
+ fi
+-echo "$as_me:22650: result: $ac_cv_func_setvbuf_reversed" >&5
++echo "$as_me:22653: result: $ac_cv_func_setvbuf_reversed" >&5
+ echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6
+ if test $ac_cv_func_setvbuf_reversed = yes; then
+ 
+@@ -22658,13 +22661,13 @@
+ fi
+ 
+ fi
+-echo "$as_me:22661: checking for intptr_t" >&5
++echo "$as_me:22664: checking for intptr_t" >&5
+ echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6
+ if test "${ac_cv_type_intptr_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22667 "configure"
++#line 22670 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -22679,16 +22682,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22682: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22685: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22685: \$? = $ac_status" >&5
++  echo "$as_me:22688: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22688: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22691: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22691: \$? = $ac_status" >&5
++  echo "$as_me:22694: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_intptr_t=yes
+ else
+@@ -22698,7 +22701,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22701: result: $ac_cv_type_intptr_t" >&5
++echo "$as_me:22704: result: $ac_cv_type_intptr_t" >&5
+ echo "${ECHO_T}$ac_cv_type_intptr_t" >&6
+ if test "$ac_cv_type_intptr_t" = yes; then
+   :
+@@ -22710,13 +22713,13 @@
+ 
+ fi
+ 
+-echo "$as_me:22713: checking for ssize_t" >&5
++echo "$as_me:22716: checking for ssize_t" >&5
+ echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
+ if test "${ac_cv_type_ssize_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22719 "configure"
++#line 22722 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -22731,16 +22734,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22734: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22737: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22737: \$? = $ac_status" >&5
++  echo "$as_me:22740: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22740: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22743: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22743: \$? = $ac_status" >&5
++  echo "$as_me:22746: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_ssize_t=yes
+ else
+@@ -22750,7 +22753,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22753: result: $ac_cv_type_ssize_t" >&5
++echo "$as_me:22756: result: $ac_cv_type_ssize_t" >&5
+ echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
+ if test "$ac_cv_type_ssize_t" = yes; then
+   :
+@@ -22762,14 +22765,14 @@
+ 
+ fi
+ 
+-echo "$as_me:22765: checking for type sigaction_t" >&5
++echo "$as_me:22768: checking for type sigaction_t" >&5
+ echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6
+ if test "${cf_cv_type_sigaction+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22772 "configure"
++#line 22775 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22782,16 +22785,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22785: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22788: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22788: \$? = $ac_status" >&5
++  echo "$as_me:22791: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22791: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22794: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22794: \$? = $ac_status" >&5
++  echo "$as_me:22797: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_type_sigaction=yes
+ else
+@@ -22802,14 +22805,14 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ 
+-echo "$as_me:22805: result: $cf_cv_type_sigaction" >&5
++echo "$as_me:22808: result: $cf_cv_type_sigaction" >&5
+ echo "${ECHO_T}$cf_cv_type_sigaction" >&6
+ test "$cf_cv_type_sigaction" = yes &&
+ cat >>confdefs.h <<\EOF
+ #define HAVE_TYPE_SIGACTION 1
+ EOF
+ 
+-echo "$as_me:22812: checking declaration of size-change" >&5
++echo "$as_me:22815: checking declaration of size-change" >&5
+ echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6
+ if test "${cf_cv_sizechange+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22830,7 +22833,7 @@
+ 
+ 	fi
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22833 "configure"
++#line 22836 "configure"
+ #include "confdefs.h"
+ #include 
+ #ifdef HAVE_TERMIOS_H
+@@ -22880,16 +22883,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22883: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22886: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22886: \$? = $ac_status" >&5
++  echo "$as_me:22889: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22889: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22892: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22892: \$? = $ac_status" >&5
++  echo "$as_me:22895: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sizechange=yes
+ else
+@@ -22908,7 +22911,7 @@
+ done
+ 
+ fi
+-echo "$as_me:22911: result: $cf_cv_sizechange" >&5
++echo "$as_me:22914: result: $cf_cv_sizechange" >&5
+ echo "${ECHO_T}$cf_cv_sizechange" >&6
+ if test "$cf_cv_sizechange" != no ; then
+ 
+@@ -22926,13 +22929,13 @@
+ 	esac
+ fi
+ 
+-echo "$as_me:22929: checking for memmove" >&5
++echo "$as_me:22932: checking for memmove" >&5
+ echo $ECHO_N "checking for memmove... $ECHO_C" >&6
+ if test "${ac_cv_func_memmove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22935 "configure"
++#line 22938 "configure"
+ #include "confdefs.h"
+ #define memmove autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22963,16 +22966,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22966: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22969: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22969: \$? = $ac_status" >&5
++  echo "$as_me:22972: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22972: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22975: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22975: \$? = $ac_status" >&5
++  echo "$as_me:22978: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_memmove=yes
+ else
+@@ -22982,19 +22985,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22985: result: $ac_cv_func_memmove" >&5
++echo "$as_me:22988: result: $ac_cv_func_memmove" >&5
+ echo "${ECHO_T}$ac_cv_func_memmove" >&6
+ if test "$ac_cv_func_memmove" = yes; then
+   :
+ else
+ 
+-echo "$as_me:22991: checking for bcopy" >&5
++echo "$as_me:22994: checking for bcopy" >&5
+ echo $ECHO_N "checking for bcopy... $ECHO_C" >&6
+ if test "${ac_cv_func_bcopy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22997 "configure"
++#line 23000 "configure"
+ #include "confdefs.h"
+ #define bcopy autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23025,16 +23028,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23028: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23031: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23031: \$? = $ac_status" >&5
++  echo "$as_me:23034: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23034: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23037: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23037: \$? = $ac_status" >&5
++  echo "$as_me:23040: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_bcopy=yes
+ else
+@@ -23044,11 +23047,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23047: result: $ac_cv_func_bcopy" >&5
++echo "$as_me:23050: result: $ac_cv_func_bcopy" >&5
+ echo "${ECHO_T}$ac_cv_func_bcopy" >&6
+ if test "$ac_cv_func_bcopy" = yes; then
+ 
+-	echo "$as_me:23051: checking if bcopy does overlapping moves" >&5
++	echo "$as_me:23054: checking if bcopy does overlapping moves" >&5
+ echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6
+ if test "${cf_cv_good_bcopy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -23058,7 +23061,7 @@
+   cf_cv_good_bcopy=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23061 "configure"
++#line 23064 "configure"
+ #include "confdefs.h"
+ 
+ int main(void) {
+@@ -23072,15 +23075,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23075: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23078: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23078: \$? = $ac_status" >&5
++  echo "$as_me:23081: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23080: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23083: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23083: \$? = $ac_status" >&5
++  echo "$as_me:23086: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_good_bcopy=yes
+ else
+@@ -23093,7 +23096,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:23096: result: $cf_cv_good_bcopy" >&5
++echo "$as_me:23099: result: $cf_cv_good_bcopy" >&5
+ echo "${ECHO_T}$cf_cv_good_bcopy" >&6
+ 
+ else
+@@ -23120,13 +23123,13 @@
+ for ac_func in posix_openpt
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:23123: checking for $ac_func" >&5
++echo "$as_me:23126: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23129 "configure"
++#line 23132 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23157,16 +23160,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23160: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23163: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23163: \$? = $ac_status" >&5
++  echo "$as_me:23166: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23166: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23169: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23169: \$? = $ac_status" >&5
++  echo "$as_me:23172: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -23176,7 +23179,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23179: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:23182: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:23192: checking if poll really works" >&5
+ echo $ECHO_N "checking if poll really works... $ECHO_C" >&6
+ if test "${cf_cv_working_poll+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -23196,7 +23199,7 @@
+   cf_cv_working_poll=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23199 "configure"
++#line 23202 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23248,15 +23251,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23251: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23254: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23254: \$? = $ac_status" >&5
++  echo "$as_me:23257: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23256: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23259: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23259: \$? = $ac_status" >&5
++  echo "$as_me:23262: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_working_poll=yes
+ else
+@@ -23268,21 +23271,21 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:23271: result: $cf_cv_working_poll" >&5
++echo "$as_me:23274: result: $cf_cv_working_poll" >&5
+ echo "${ECHO_T}$cf_cv_working_poll" >&6
+ test "$cf_cv_working_poll" = "yes" &&
+ cat >>confdefs.h <<\EOF
+ #define HAVE_WORKING_POLL 1
+ EOF
+ 
+-echo "$as_me:23278: checking for va_copy" >&5
++echo "$as_me:23281: checking for va_copy" >&5
+ echo $ECHO_N "checking for va_copy... $ECHO_C" >&6
+ if test "${cf_cv_have_va_copy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23285 "configure"
++#line 23288 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23299,16 +23302,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23302: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23305: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23305: \$? = $ac_status" >&5
++  echo "$as_me:23308: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23308: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23311: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23311: \$? = $ac_status" >&5
++  echo "$as_me:23314: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_va_copy=yes
+ else
+@@ -23318,7 +23321,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23321: result: $cf_cv_have_va_copy" >&5
++echo "$as_me:23324: result: $cf_cv_have_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have_va_copy" >&6
+ 
+ if test "$cf_cv_have_va_copy" = yes;
+@@ -23330,14 +23333,14 @@
+ 
+ else # !cf_cv_have_va_copy
+ 
+-echo "$as_me:23333: checking for __va_copy" >&5
++echo "$as_me:23336: checking for __va_copy" >&5
+ echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6
+ if test "${cf_cv_have___va_copy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23340 "configure"
++#line 23343 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23354,16 +23357,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23357: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23360: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23360: \$? = $ac_status" >&5
++  echo "$as_me:23363: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23363: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23366: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23366: \$? = $ac_status" >&5
++  echo "$as_me:23369: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___va_copy=yes
+ else
+@@ -23373,7 +23376,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23376: result: $cf_cv_have___va_copy" >&5
++echo "$as_me:23379: result: $cf_cv_have___va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___va_copy" >&6
+ 
+ if test "$cf_cv_have___va_copy" = yes
+@@ -23385,14 +23388,14 @@
+ 
+ else # !cf_cv_have___va_copy
+ 
+-echo "$as_me:23388: checking for __builtin_va_copy" >&5
++echo "$as_me:23391: checking for __builtin_va_copy" >&5
+ echo $ECHO_N "checking for __builtin_va_copy... $ECHO_C" >&6
+ if test "${cf_cv_have___builtin_va_copy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23395 "configure"
++#line 23398 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23409,16 +23412,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23412: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23415: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23415: \$? = $ac_status" >&5
++  echo "$as_me:23418: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23418: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23421: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23421: \$? = $ac_status" >&5
++  echo "$as_me:23424: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___builtin_va_copy=yes
+ else
+@@ -23428,7 +23431,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23431: result: $cf_cv_have___builtin_va_copy" >&5
++echo "$as_me:23434: result: $cf_cv_have___builtin_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___builtin_va_copy" >&6
+ 
+ test "$cf_cv_have___builtin_va_copy" = yes &&
+@@ -23446,14 +23449,14 @@
+ 	;;
+ 
+ (*)
+-	echo "$as_me:23449: checking if we can simply copy va_list" >&5
++	echo "$as_me:23452: checking if we can simply copy va_list" >&5
+ echo $ECHO_N "checking if we can simply copy va_list... $ECHO_C" >&6
+ if test "${cf_cv_pointer_va_list+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23456 "configure"
++#line 23459 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23470,16 +23473,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23473: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23476: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23476: \$? = $ac_status" >&5
++  echo "$as_me:23479: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23479: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23482: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23482: \$? = $ac_status" >&5
++  echo "$as_me:23485: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_pointer_va_list=yes
+ else
+@@ -23489,19 +23492,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23492: result: $cf_cv_pointer_va_list" >&5
++echo "$as_me:23495: result: $cf_cv_pointer_va_list" >&5
+ echo "${ECHO_T}$cf_cv_pointer_va_list" >&6
+ 
+ 	if test "$cf_cv_pointer_va_list" = no
+ 	then
+-		echo "$as_me:23497: checking if we can copy va_list indirectly" >&5
++		echo "$as_me:23500: checking if we can copy va_list indirectly" >&5
+ echo $ECHO_N "checking if we can copy va_list indirectly... $ECHO_C" >&6
+ if test "${cf_cv_array_va_list+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23504 "configure"
++#line 23507 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23518,16 +23521,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23521: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23524: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23524: \$? = $ac_status" >&5
++  echo "$as_me:23527: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23527: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23530: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23530: \$? = $ac_status" >&5
++  echo "$as_me:23533: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_array_va_list=yes
+ else
+@@ -23537,7 +23540,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23540: result: $cf_cv_array_va_list" >&5
++echo "$as_me:23543: result: $cf_cv_array_va_list" >&5
+ echo "${ECHO_T}$cf_cv_array_va_list" >&6
+ 		test "$cf_cv_array_va_list" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -23548,13 +23551,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:23551: checking for pid_t" >&5
++echo "$as_me:23554: checking for pid_t" >&5
+ echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
+ if test "${ac_cv_type_pid_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23557 "configure"
++#line 23560 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23569,16 +23572,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23572: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23575: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23575: \$? = $ac_status" >&5
++  echo "$as_me:23578: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23578: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23581: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23581: \$? = $ac_status" >&5
++  echo "$as_me:23584: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_pid_t=yes
+ else
+@@ -23588,7 +23591,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23591: result: $ac_cv_type_pid_t" >&5
++echo "$as_me:23594: result: $ac_cv_type_pid_t" >&5
+ echo "${ECHO_T}$ac_cv_type_pid_t" >&6
+ if test "$ac_cv_type_pid_t" = yes; then
+   :
+@@ -23603,23 +23606,23 @@
+ for ac_header in unistd.h vfork.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:23606: checking for $ac_header" >&5
++echo "$as_me:23609: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23612 "configure"
++#line 23615 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:23616: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23619: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:23622: \$? = $ac_status" >&5
++  echo "$as_me:23625: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23638,7 +23641,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23641: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:23644: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:23657: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23660 "configure"
++#line 23663 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23688,16 +23691,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23691: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23694: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23694: \$? = $ac_status" >&5
++  echo "$as_me:23697: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23697: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23700: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23700: \$? = $ac_status" >&5
++  echo "$as_me:23703: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -23707,7 +23710,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23710: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:23713: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
+   cat >>confdefs.h <&5
++  echo "$as_me:23725: checking for working fork" >&5
+ echo $ECHO_N "checking for working fork... $ECHO_C" >&6
+ if test "${ac_cv_func_fork_works+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -23742,15 +23745,15 @@
+       }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23745: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23748: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23748: \$? = $ac_status" >&5
++  echo "$as_me:23751: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23750: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23753: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23753: \$? = $ac_status" >&5
++  echo "$as_me:23756: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fork_works=yes
+ else
+@@ -23762,7 +23765,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:23765: result: $ac_cv_func_fork_works" >&5
++echo "$as_me:23768: result: $ac_cv_func_fork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+ 
+ fi
+@@ -23776,12 +23779,12 @@
+       ac_cv_func_fork_works=yes
+       ;;
+   esac
+-  { echo "$as_me:23779: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:23782: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+ echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;}
+ fi
+ ac_cv_func_vfork_works=$ac_cv_func_vfork
+ if test "x$ac_cv_func_vfork" = xyes; then
+-  echo "$as_me:23784: checking for working vfork" >&5
++  echo "$as_me:23787: checking for working vfork" >&5
+ echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
+ if test "${ac_cv_func_vfork_works+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -23790,7 +23793,7 @@
+   ac_cv_func_vfork_works=cross
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23793 "configure"
++#line 23796 "configure"
+ #include "confdefs.h"
+ /* Thanks to Paul Eggert for this test.  */
+ #include 
+@@ -23887,15 +23890,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23890: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23893: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23893: \$? = $ac_status" >&5
++  echo "$as_me:23896: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23895: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23898: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23898: \$? = $ac_status" >&5
++  echo "$as_me:23901: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_vfork_works=yes
+ else
+@@ -23907,13 +23910,13 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:23910: result: $ac_cv_func_vfork_works" >&5
++echo "$as_me:23913: result: $ac_cv_func_vfork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
+ 
+ fi;
+ if test "x$ac_cv_func_fork_works" = xcross; then
+   ac_cv_func_vfork_works=ac_cv_func_vfork
+-  { echo "$as_me:23916: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:23919: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+ echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;}
+ fi
+ 
+@@ -23938,7 +23941,7 @@
+ 
+ fi
+ 
+-echo "$as_me:23941: checking if fopen accepts explicit binary mode" >&5
++echo "$as_me:23944: checking if fopen accepts explicit binary mode" >&5
+ echo $ECHO_N "checking if fopen accepts explicit binary mode... $ECHO_C" >&6
+ if test "${cf_cv_fopen_bin_r+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -23948,7 +23951,7 @@
+   cf_cv_fopen_bin_r=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23951 "configure"
++#line 23954 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23981,15 +23984,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23984: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23987: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23987: \$? = $ac_status" >&5
++  echo "$as_me:23990: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23989: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23992: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23992: \$? = $ac_status" >&5
++  echo "$as_me:23995: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fopen_bin_r=yes
+ else
+@@ -24002,7 +24005,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:24005: result: $cf_cv_fopen_bin_r" >&5
++echo "$as_me:24008: result: $cf_cv_fopen_bin_r" >&5
+ echo "${ECHO_T}$cf_cv_fopen_bin_r" >&6
+ test "x$cf_cv_fopen_bin_r" != xno &&
+ cat >>confdefs.h <<\EOF
+@@ -24011,7 +24014,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:24014: checking for openpty in -lutil" >&5
++echo "$as_me:24017: checking for openpty in -lutil" >&5
+ echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
+ if test "${ac_cv_lib_util_openpty+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -24019,7 +24022,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24022 "configure"
++#line 24025 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -24038,16 +24041,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24041: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24044: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24044: \$? = $ac_status" >&5
++  echo "$as_me:24047: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24047: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24050: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24050: \$? = $ac_status" >&5
++  echo "$as_me:24053: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -24058,7 +24061,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:24061: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:24064: result: $ac_cv_lib_util_openpty" >&5
+ echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
+ if test "$ac_cv_lib_util_openpty" = yes; then
+   cf_cv_lib_util=yes
+@@ -24066,7 +24069,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:24069: checking for openpty header" >&5
++echo "$as_me:24072: checking for openpty header" >&5
+ echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
+ if test "${cf_cv_func_openpty+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -24093,7 +24096,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24096 "configure"
++#line 24099 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -24110,16 +24113,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24113: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24116: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24116: \$? = $ac_status" >&5
++  echo "$as_me:24119: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24119: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24122: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24122: \$? = $ac_status" >&5
++  echo "$as_me:24125: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -24137,7 +24140,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:24140: result: $cf_cv_func_openpty" >&5
++echo "$as_me:24143: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -24210,7 +24213,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24213 "configure"
++#line 24216 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -24222,16 +24225,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24225: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24228: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24228: \$? = $ac_status" >&5
++  echo "$as_me:24231: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24231: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24234: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24234: \$? = $ac_status" >&5
++  echo "$as_me:24237: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -24248,7 +24251,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:24251: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:24254: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -24284,7 +24287,7 @@
+ 			if test "$cf_have_libdir" = no ; then
+ 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+ 
+-echo "${as_me:-configure}:24287: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:24290: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -24295,7 +24298,7 @@
+ 	else
+ 		case "$with_hashed_db" in
+ 		(./*|../*|/*)
+-			{ echo "$as_me:24298: WARNING: no such directory $with_hashed_db" >&5
++			{ echo "$as_me:24301: WARNING: no such directory $with_hashed_db" >&5
+ echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
+ 			;;
+ 		(*)
+@@ -24367,7 +24370,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24370 "configure"
++#line 24373 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -24379,16 +24382,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24382: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24385: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24385: \$? = $ac_status" >&5
++  echo "$as_me:24388: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24388: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24391: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24391: \$? = $ac_status" >&5
++  echo "$as_me:24394: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -24405,7 +24408,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:24408: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:24411: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -24485,7 +24488,7 @@
+ 			if test "$cf_have_libdir" = no ; then
+ 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+ 
+-echo "${as_me:-configure}:24488: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:24491: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -24502,23 +24505,23 @@
+ 	fi
+ esac
+ 
+-echo "$as_me:24505: checking for db.h" >&5
++echo "$as_me:24508: checking for db.h" >&5
+ echo $ECHO_N "checking for db.h... $ECHO_C" >&6
+ if test "${ac_cv_header_db_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24511 "configure"
++#line 24514 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:24515: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:24518: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:24521: \$? = $ac_status" >&5
++  echo "$as_me:24524: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -24537,11 +24540,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:24540: result: $ac_cv_header_db_h" >&5
++echo "$as_me:24543: result: $ac_cv_header_db_h" >&5
+ echo "${ECHO_T}$ac_cv_header_db_h" >&6
+ if test "$ac_cv_header_db_h" = yes; then
+ 
+-echo "$as_me:24544: checking for version of db" >&5
++echo "$as_me:24547: checking for version of db" >&5
+ echo $ECHO_N "checking for version of db... $ECHO_C" >&6
+ if test "${cf_cv_hashed_db_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -24552,10 +24555,10 @@
+ for cf_db_version in 1 2 3 4 5 6
+ do
+ 
+-echo "${as_me:-configure}:24555: testing checking for db version $cf_db_version ..." 1>&5
++echo "${as_me:-configure}:24558: testing checking for db version $cf_db_version ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24558 "configure"
++#line 24561 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24585,16 +24588,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24588: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24591: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24591: \$? = $ac_status" >&5
++  echo "$as_me:24594: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24594: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24597: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24597: \$? = $ac_status" >&5
++  echo "$as_me:24600: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_hashed_db_version=$cf_db_version
+@@ -24608,16 +24611,16 @@
+ done
+ 
+ fi
+-echo "$as_me:24611: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:24614: result: $cf_cv_hashed_db_version" >&5
+ echo "${ECHO_T}$cf_cv_hashed_db_version" >&6
+ 
+ if test "$cf_cv_hashed_db_version" = unknown ; then
+-	{ { echo "$as_me:24615: error: Cannot determine version of db" >&5
++	{ { echo "$as_me:24618: error: Cannot determine version of db" >&5
+ echo "$as_me: error: Cannot determine version of db" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+ 
+-echo "$as_me:24620: checking for db libraries" >&5
++echo "$as_me:24623: checking for db libraries" >&5
+ echo $ECHO_N "checking for db libraries... $ECHO_C" >&6
+ if test "${cf_cv_hashed_db_libs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -24647,10 +24650,10 @@
+ 
+ 	fi
+ 
+-echo "${as_me:-configure}:24650: testing checking for library $cf_db_libs ..." 1>&5
++echo "${as_me:-configure}:24653: testing checking for library $cf_db_libs ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24653 "configure"
++#line 24656 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24705,16 +24708,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24708: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24711: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24711: \$? = $ac_status" >&5
++  echo "$as_me:24714: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24714: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24717: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24717: \$? = $ac_status" >&5
++  echo "$as_me:24720: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	if test -n "$cf_db_libs" ; then
+@@ -24734,11 +24737,11 @@
+ done
+ 
+ fi
+-echo "$as_me:24737: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:24740: result: $cf_cv_hashed_db_libs" >&5
+ echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6
+ 
+ 	if test "$cf_cv_hashed_db_libs" = unknown ; then
+-		{ { echo "$as_me:24741: error: Cannot determine library for db" >&5
++		{ { echo "$as_me:24744: error: Cannot determine library for db" >&5
+ echo "$as_me: error: Cannot determine library for db" >&2;}
+    { (exit 1); exit 1; }; }
+ 	elif test "$cf_cv_hashed_db_libs" != default ; then
+@@ -24764,7 +24767,7 @@
+ 
+ else
+ 
+-	{ { echo "$as_me:24767: error: Cannot find db.h" >&5
++	{ { echo "$as_me:24770: error: Cannot find db.h" >&5
+ echo "$as_me: error: Cannot find db.h" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -24779,7 +24782,7 @@
+ 
+ # Just in case, check if the C compiler has a bool type.
+ 
+-echo "$as_me:24782: checking if we should include stdbool.h" >&5
++echo "$as_me:24785: checking if we should include stdbool.h" >&5
+ echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
+ 
+ if test "${cf_cv_header_stdbool_h+set}" = set; then
+@@ -24787,7 +24790,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24790 "configure"
++#line 24793 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -24799,23 +24802,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24802: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24805: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24805: \$? = $ac_status" >&5
++  echo "$as_me:24808: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24808: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24811: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24811: \$? = $ac_status" >&5
++  echo "$as_me:24814: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=0
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24818 "configure"
++#line 24821 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -24831,16 +24834,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24834: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24837: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24837: \$? = $ac_status" >&5
++  echo "$as_me:24840: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24840: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24843: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24843: \$? = $ac_status" >&5
++  echo "$as_me:24846: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -24854,13 +24857,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:24857: result: yes" >&5
++then	echo "$as_me:24860: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:24859: result: no" >&5
++else	echo "$as_me:24862: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:24863: checking for builtin bool type" >&5
++echo "$as_me:24866: checking for builtin bool type" >&5
+ echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
+ 
+ if test "${cf_cv_cc_bool_type+set}" = set; then
+@@ -24868,7 +24871,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24871 "configure"
++#line 24874 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24883,16 +24886,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24886: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24889: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24889: \$? = $ac_status" >&5
++  echo "$as_me:24892: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24892: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24895: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24895: \$? = $ac_status" >&5
++  echo "$as_me:24898: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cc_bool_type=1
+ else
+@@ -24905,9 +24908,9 @@
+ fi
+ 
+ if test "$cf_cv_cc_bool_type" = 1
+-then	echo "$as_me:24908: result: yes" >&5
++then	echo "$as_me:24911: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:24910: result: no" >&5
++else	echo "$as_me:24913: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -24924,10 +24927,10 @@
+ 
+ 	cf_save="$LIBS"
+ 	LIBS="$LIBS $CXXLIBS"
+-	echo "$as_me:24927: checking if we already have C++ library" >&5
++	echo "$as_me:24930: checking if we already have C++ library" >&5
+ echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24930 "configure"
++#line 24933 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -24941,16 +24944,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24944: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24947: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24947: \$? = $ac_status" >&5
++  echo "$as_me:24950: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24950: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24953: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24953: \$? = $ac_status" >&5
++  echo "$as_me:24956: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_libstdcpp=yes
+ else
+@@ -24959,7 +24962,7 @@
+ cf_have_libstdcpp=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-	echo "$as_me:24962: result: $cf_have_libstdcpp" >&5
++	echo "$as_me:24965: result: $cf_have_libstdcpp" >&5
+ echo "${ECHO_T}$cf_have_libstdcpp" >&6
+ 	LIBS="$cf_save"
+ 
+@@ -24978,7 +24981,7 @@
+ 			;;
+ 		esac
+ 
+-		echo "$as_me:24981: checking for library $cf_stdcpp_libname" >&5
++		echo "$as_me:24984: checking for library $cf_stdcpp_libname" >&5
+ echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6
+ if test "${cf_cv_libstdcpp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -25004,7 +25007,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25007 "configure"
++#line 25010 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -25018,16 +25021,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25021: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25024: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25024: \$? = $ac_status" >&5
++  echo "$as_me:25027: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25027: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25030: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25030: \$? = $ac_status" >&5
++  echo "$as_me:25033: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_libstdcpp=yes
+ else
+@@ -25039,7 +25042,7 @@
+ 			LIBS="$cf_save"
+ 
+ fi
+-echo "$as_me:25042: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:25045: result: $cf_cv_libstdcpp" >&5
+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
+ 		test "$cf_cv_libstdcpp" = yes && {
+ cf_add_libs="$CXXLIBS"
+@@ -25061,7 +25064,7 @@
+ 	fi
+ fi
+ 
+-	echo "$as_me:25064: checking whether $CXX understands -c and -o together" >&5
++	echo "$as_me:25067: checking whether $CXX understands -c and -o together" >&5
+ echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6
+ if test "${cf_cv_prog_CXX_c_o+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -25076,15 +25079,15 @@
+ # We do the test twice because some compilers refuse to overwrite an
+ # existing .o file with -o, though they will create one.
+ ac_try='$CXX $CXXFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+-if { (eval echo "$as_me:25079: \"$ac_try\"") >&5
++if { (eval echo "$as_me:25082: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25082: \$? = $ac_status" >&5
++  echo "$as_me:25085: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:25084: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:25087: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25087: \$? = $ac_status" >&5
++  echo "$as_me:25090: \$? = $ac_status" >&5
+   (exit "$ac_status"); };
+ then
+   eval cf_cv_prog_CXX_c_o=yes
+@@ -25095,10 +25098,10 @@
+ 
+ fi
+ if test "$cf_cv_prog_CXX_c_o" = yes; then
+-  echo "$as_me:25098: result: yes" >&5
++  echo "$as_me:25101: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:25101: result: no" >&5
++  echo "$as_me:25104: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -25118,7 +25121,7 @@
+ 	;;
+ esac
+ if test "$GXX" = yes; then
+-	echo "$as_me:25121: checking for lib$cf_gpp_libname" >&5
++	echo "$as_me:25124: checking for lib$cf_gpp_libname" >&5
+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
+ 	cf_save="$LIBS"
+ 
+@@ -25139,7 +25142,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25142 "configure"
++#line 25145 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_gpp_libname/builtin.h>
+@@ -25153,16 +25156,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25156: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25159: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25159: \$? = $ac_status" >&5
++  echo "$as_me:25162: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25162: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25165: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25165: \$? = $ac_status" >&5
++  echo "$as_me:25168: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -25199,7 +25202,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25202 "configure"
++#line 25205 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -25213,16 +25216,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25216: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25219: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25219: \$? = $ac_status" >&5
++  echo "$as_me:25222: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25222: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25225: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25225: \$? = $ac_status" >&5
++  echo "$as_me:25228: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -25255,7 +25258,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	LIBS="$cf_save"
+-	echo "$as_me:25258: result: $cf_cxx_library" >&5
++	echo "$as_me:25261: result: $cf_cxx_library" >&5
+ echo "${ECHO_T}$cf_cxx_library" >&6
+ fi
+ 
+@@ -25271,7 +25274,7 @@
+ ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ ac_main_return="return"
+-echo "$as_me:25274: checking how to run the C++ preprocessor" >&5
++echo "$as_me:25277: checking how to run the C++ preprocessor" >&5
+ echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
+ if test -z "$CXXCPP"; then
+   if test "${ac_cv_prog_CXXCPP+set}" = set; then
+@@ -25288,18 +25291,18 @@
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp. "Syntax error" is here to catch this case.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25291 "configure"
++#line 25294 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:25296: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25299: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:25302: \$? = $ac_status" >&5
++  echo "$as_me:25305: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25322,17 +25325,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25325 "configure"
++#line 25328 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:25329: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25332: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:25335: \$? = $ac_status" >&5
++  echo "$as_me:25338: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25369,7 +25372,7 @@
+ else
+   ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:25372: result: $CXXCPP" >&5
++echo "$as_me:25375: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -25379,18 +25382,18 @@
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp. "Syntax error" is here to catch this case.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25382 "configure"
++#line 25385 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:25387: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25390: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:25393: \$? = $ac_status" >&5
++  echo "$as_me:25396: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25413,17 +25416,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25416 "configure"
++#line 25419 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:25420: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25423: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:25426: \$? = $ac_status" >&5
++  echo "$as_me:25429: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25451,7 +25454,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:25454: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++  { { echo "$as_me:25457: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -25466,23 +25469,23 @@
+ for ac_header in typeinfo
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:25469: checking for $ac_header" >&5
++echo "$as_me:25472: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25475 "configure"
++#line 25478 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:25479: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25482: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:25485: \$? = $ac_status" >&5
++  echo "$as_me:25488: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25501,7 +25504,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:25504: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:25507: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:25520: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25523 "configure"
++#line 25526 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:25527: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25530: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:25533: \$? = $ac_status" >&5
++  echo "$as_me:25536: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25549,7 +25552,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:25552: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:25555: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++	echo "$as_me:25566: checking if iostream uses std-namespace" >&5
+ echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25566 "configure"
++#line 25569 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -25580,16 +25583,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25583: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25586: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25586: \$? = $ac_status" >&5
++  echo "$as_me:25589: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25589: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25592: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25592: \$? = $ac_status" >&5
++  echo "$as_me:25595: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_iostream_namespace=yes
+ else
+@@ -25598,7 +25601,7 @@
+ cf_iostream_namespace=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:25601: result: $cf_iostream_namespace" >&5
++	echo "$as_me:25604: result: $cf_iostream_namespace" >&5
+ echo "${ECHO_T}$cf_iostream_namespace" >&6
+ 	if test "$cf_iostream_namespace" = yes ; then
+ 
+@@ -25609,7 +25612,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:25612: checking if we should include stdbool.h" >&5
++echo "$as_me:25615: checking if we should include stdbool.h" >&5
+ echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
+ 
+ if test "${cf_cv_header_stdbool_h+set}" = set; then
+@@ -25617,7 +25620,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25620 "configure"
++#line 25623 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -25629,23 +25632,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25632: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25635: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25635: \$? = $ac_status" >&5
++  echo "$as_me:25638: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25638: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25641: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25641: \$? = $ac_status" >&5
++  echo "$as_me:25644: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=0
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25648 "configure"
++#line 25651 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -25661,16 +25664,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25664: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25667: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25667: \$? = $ac_status" >&5
++  echo "$as_me:25670: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25670: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25673: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25673: \$? = $ac_status" >&5
++  echo "$as_me:25676: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -25684,13 +25687,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:25687: result: yes" >&5
++then	echo "$as_me:25690: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:25689: result: no" >&5
++else	echo "$as_me:25692: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:25693: checking for builtin bool type" >&5
++echo "$as_me:25696: checking for builtin bool type" >&5
+ echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
+ 
+ if test "${cf_cv_builtin_bool+set}" = set; then
+@@ -25698,7 +25701,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25701 "configure"
++#line 25704 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -25713,16 +25716,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25716: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25719: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25719: \$? = $ac_status" >&5
++  echo "$as_me:25722: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25722: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25725: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25725: \$? = $ac_status" >&5
++  echo "$as_me:25728: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_builtin_bool=1
+ else
+@@ -25735,19 +25738,19 @@
+ fi
+ 
+ if test "$cf_cv_builtin_bool" = 1
+-then	echo "$as_me:25738: result: yes" >&5
++then	echo "$as_me:25741: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:25740: result: no" >&5
++else	echo "$as_me:25743: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:25744: checking for bool" >&5
++echo "$as_me:25747: checking for bool" >&5
+ echo $ECHO_N "checking for bool... $ECHO_C" >&6
+ if test "${ac_cv_type_bool+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25750 "configure"
++#line 25753 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -25783,16 +25786,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25786: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25789: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25789: \$? = $ac_status" >&5
++  echo "$as_me:25792: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25792: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25795: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25795: \$? = $ac_status" >&5
++  echo "$as_me:25798: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -25802,10 +25805,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:25805: result: $ac_cv_type_bool" >&5
++echo "$as_me:25808: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:25808: checking size of bool" >&5
++echo "$as_me:25811: checking size of bool" >&5
+ echo $ECHO_N "checking size of bool... $ECHO_C" >&6
+ if test "${ac_cv_sizeof_bool+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -25814,7 +25817,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25817 "configure"
++#line 25820 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -25847,21 +25850,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25850: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25853: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25853: \$? = $ac_status" >&5
++  echo "$as_me:25856: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25856: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25859: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25859: \$? = $ac_status" >&5
++  echo "$as_me:25862: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25864 "configure"
++#line 25867 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -25894,16 +25897,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25897: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25900: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25900: \$? = $ac_status" >&5
++  echo "$as_me:25903: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25903: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25906: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25906: \$? = $ac_status" >&5
++  echo "$as_me:25909: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -25919,7 +25922,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25922 "configure"
++#line 25925 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -25952,16 +25955,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25955: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25958: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25958: \$? = $ac_status" >&5
++  echo "$as_me:25961: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25961: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25964: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25964: \$? = $ac_status" >&5
++  echo "$as_me:25967: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -25977,7 +25980,7 @@
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25980 "configure"
++#line 25983 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26010,16 +26013,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26013: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26016: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26016: \$? = $ac_status" >&5
++  echo "$as_me:26019: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26019: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26022: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26022: \$? = $ac_status" >&5
++  echo "$as_me:26025: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -26032,12 +26035,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:26035: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:26038: error: cannot run test program while cross compiling" >&5
+ echo "$as_me: error: cannot run test program while cross compiling" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26040 "configure"
++#line 26043 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26074,15 +26077,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26077: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26080: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26080: \$? = $ac_status" >&5
++  echo "$as_me:26083: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26082: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26085: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26085: \$? = $ac_status" >&5
++  echo "$as_me:26088: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -26098,13 +26101,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:26101: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:26104: result: $ac_cv_sizeof_bool" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:26110: checking for type of bool" >&5
+ echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
+ if test "${cf_cv_type_of_bool+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -26123,7 +26126,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26126 "configure"
++#line 26129 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26165,15 +26168,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26168: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26171: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26171: \$? = $ac_status" >&5
++  echo "$as_me:26174: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26173: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26176: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26176: \$? = $ac_status" >&5
++  echo "$as_me:26179: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_type_of_bool=`cat cf_test.out`
+ 		 if test -z "$cf_cv_type_of_bool"; then
+@@ -26190,19 +26193,19 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:26193: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:26196: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ 
+ if test "$cf_cv_type_of_bool" = unknown ; then
+ 	case .$NCURSES_BOOL in
+ 	(.auto|.) NCURSES_BOOL=unsigned;;
+ 	esac
+-	{ echo "$as_me:26200: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:26203: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+ echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
+ 	cf_cv_type_of_bool=$NCURSES_BOOL
+ fi
+ 
+-echo "$as_me:26205: checking for special defines needed for etip.h" >&5
++echo "$as_me:26208: checking for special defines needed for etip.h" >&5
+ echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6
+ cf_save_CXXFLAGS="$CXXFLAGS"
+ cf_result="none"
+@@ -26220,7 +26223,7 @@
+ 	test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}"
+ 	test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26223 "configure"
++#line 26226 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26234,16 +26237,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26237: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26240: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26240: \$? = $ac_status" >&5
++  echo "$as_me:26243: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26243: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26246: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26246: \$? = $ac_status" >&5
++  echo "$as_me:26249: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	test -n "$cf_math" && cat >>confdefs.h <&5
++echo "$as_me:26270: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ CXXFLAGS="$cf_save_CXXFLAGS"
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:26272: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:26275: checking if $CXX accepts parameter initialization" >&5
+ echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6
+ if test "${cf_cv_cpp_param_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -26286,7 +26289,7 @@
+   cf_cv_cpp_param_init=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26289 "configure"
++#line 26292 "configure"
+ #include "confdefs.h"
+ 
+ class TEST {
+@@ -26305,15 +26308,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26308: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26311: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26311: \$? = $ac_status" >&5
++  echo "$as_me:26314: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26313: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26316: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26316: \$? = $ac_status" >&5
++  echo "$as_me:26319: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_param_init=yes
+ else
+@@ -26332,7 +26335,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:26335: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:26338: result: $cf_cv_cpp_param_init" >&5
+ echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
+ fi
+ test "$cf_cv_cpp_param_init" = yes &&
+@@ -26342,7 +26345,7 @@
+ 
+ if test -n "$CXX"; then
+ 
+-echo "$as_me:26345: checking if $CXX accepts static_cast" >&5
++echo "$as_me:26348: checking if $CXX accepts static_cast" >&5
+ echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6
+ if test "${cf_cv_cpp_static_cast+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -26356,7 +26359,7 @@
+ ac_main_return="return"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26359 "configure"
++#line 26362 "configure"
+ #include "confdefs.h"
+ 
+ class NCursesPanel
+@@ -26400,16 +26403,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26403: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26406: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26406: \$? = $ac_status" >&5
++  echo "$as_me:26409: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26409: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26412: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26412: \$? = $ac_status" >&5
++  echo "$as_me:26415: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_static_cast=yes
+ else
+@@ -26427,7 +26430,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:26430: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:26433: result: $cf_cv_cpp_static_cast" >&5
+ echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
+ 
+ fi
+@@ -26476,13 +26479,13 @@
+ 	else
+ 		if test "$cf_cv_header_stdbool_h" = 1 ; then
+ 
+-echo "$as_me:26479: checking for bool" >&5
++echo "$as_me:26482: checking for bool" >&5
+ echo $ECHO_N "checking for bool... $ECHO_C" >&6
+ if test "${ac_cv_type_bool+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26485 "configure"
++#line 26488 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26518,16 +26521,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26521: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26524: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26524: \$? = $ac_status" >&5
++  echo "$as_me:26527: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26527: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26530: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26530: \$? = $ac_status" >&5
++  echo "$as_me:26533: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -26537,10 +26540,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:26540: result: $ac_cv_type_bool" >&5
++echo "$as_me:26543: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:26543: checking size of bool" >&5
++echo "$as_me:26546: checking size of bool" >&5
+ echo $ECHO_N "checking size of bool... $ECHO_C" >&6
+ if test "${ac_cv_sizeof_bool+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -26549,7 +26552,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26552 "configure"
++#line 26555 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26582,21 +26585,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26585: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26588: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26588: \$? = $ac_status" >&5
++  echo "$as_me:26591: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26591: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26594: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26594: \$? = $ac_status" >&5
++  echo "$as_me:26597: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26599 "configure"
++#line 26602 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26629,16 +26632,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26632: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26635: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26635: \$? = $ac_status" >&5
++  echo "$as_me:26638: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26638: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26641: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26641: \$? = $ac_status" >&5
++  echo "$as_me:26644: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -26654,7 +26657,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26657 "configure"
++#line 26660 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26687,16 +26690,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26690: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26693: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26693: \$? = $ac_status" >&5
++  echo "$as_me:26696: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26696: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26699: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26699: \$? = $ac_status" >&5
++  echo "$as_me:26702: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -26712,7 +26715,7 @@
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26715 "configure"
++#line 26718 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26745,16 +26748,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26748: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26751: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26751: \$? = $ac_status" >&5
++  echo "$as_me:26754: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26754: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26757: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26757: \$? = $ac_status" >&5
++  echo "$as_me:26760: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -26767,12 +26770,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:26770: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:26773: error: cannot run test program while cross compiling" >&5
+ echo "$as_me: error: cannot run test program while cross compiling" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26775 "configure"
++#line 26778 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26809,15 +26812,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26812: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26815: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26815: \$? = $ac_status" >&5
++  echo "$as_me:26818: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26817: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26820: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26820: \$? = $ac_status" >&5
++  echo "$as_me:26823: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -26833,13 +26836,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:26836: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:26839: result: $ac_cv_sizeof_bool" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:26845: checking for type of bool" >&5
+ echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
+ if test "${cf_cv_type_of_bool+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -26858,7 +26861,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26861 "configure"
++#line 26864 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26900,15 +26903,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26903: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26906: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26906: \$? = $ac_status" >&5
++  echo "$as_me:26909: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26908: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26911: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26911: \$? = $ac_status" >&5
++  echo "$as_me:26914: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_type_of_bool=`cat cf_test.out`
+ 		 if test -z "$cf_cv_type_of_bool"; then
+@@ -26925,26 +26928,26 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:26928: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:26931: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ 
+ if test "$cf_cv_type_of_bool" = unknown ; then
+ 	case .$NCURSES_BOOL in
+ 	(.auto|.) NCURSES_BOOL=unsigned;;
+ 	esac
+-	{ echo "$as_me:26935: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:26938: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+ echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
+ 	cf_cv_type_of_bool=$NCURSES_BOOL
+ fi
+ 
+ 		else
+-			echo "$as_me:26941: checking for fallback type of bool" >&5
++			echo "$as_me:26944: checking for fallback type of bool" >&5
+ echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
+ 			case "$host_cpu" in
+ 			(i?86)	cf_cv_type_of_bool=char	;;
+ 			(*)	cf_cv_type_of_bool=int	;;
+ 			esac
+-			echo "$as_me:26947: result: $cf_cv_type_of_bool" >&5
++			echo "$as_me:26950: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ 		fi
+ 	fi
+@@ -26973,7 +26976,7 @@
+ 
+ 	if test "$cf_with_ada" != "no" ; then
+ 		if test "$with_libtool" != "no"; then
+-			{ echo "$as_me:26976: WARNING: libtool does not support Ada - disabling feature" >&5
++			{ echo "$as_me:26979: WARNING: libtool does not support Ada - disabling feature" >&5
+ echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
+ 			cf_with_ada=no
+ 		fi
+@@ -26990,7 +26993,7 @@
+ 	unset cf_TEMP_gnat
+ 	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
+ set dummy $cf_prog_gnat; ac_word=$2
+-echo "$as_me:26993: checking for $ac_word" >&5
++echo "$as_me:26996: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -27007,7 +27010,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
+-   echo "$as_me:27010: found $ac_dir/$ac_word" >&5
++   echo "$as_me:27013: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -27019,10 +27022,10 @@
+ cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
+ 
+ if test -n "$cf_TEMP_gnat"; then
+-  echo "$as_me:27022: result: $cf_TEMP_gnat" >&5
++  echo "$as_me:27025: result: $cf_TEMP_gnat" >&5
+ echo "${ECHO_T}$cf_TEMP_gnat" >&6
+ else
+-  echo "$as_me:27025: result: no" >&5
++  echo "$as_me:27028: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -27032,7 +27035,7 @@
+ 		unset cf_cv_gnat_version
+ 		unset cf_TEMP_gnat
+ 
+-echo "$as_me:27035: checking for $cf_prog_gnat version" >&5
++echo "$as_me:27038: checking for $cf_prog_gnat version" >&5
+ echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
+ if test "${cf_cv_gnat_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -27043,7 +27046,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:27046: result: $cf_cv_gnat_version" >&5
++echo "$as_me:27049: result: $cf_cv_gnat_version" >&5
+ echo "${ECHO_T}$cf_cv_gnat_version" >&6
+ test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
+ eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
+@@ -27072,7 +27075,7 @@
+ 			cd conftest.src
+ 			for cf_gprconfig in Ada C
+ 			do
+-				echo "$as_me:27075: checking for gprconfig name for $cf_gprconfig" >&5
++				echo "$as_me:27078: checking for gprconfig name for $cf_gprconfig" >&5
+ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
+ 				if test "$cf_gprconfig" = C
+ 				then
+@@ -27091,10 +27094,10 @@
+ 				if test -n "$cf_gprconfig_value"
+ 				then
+ 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
+-					echo "$as_me:27094: result: $cf_gprconfig_value" >&5
++					echo "$as_me:27097: result: $cf_gprconfig_value" >&5
+ echo "${ECHO_T}$cf_gprconfig_value" >&6
+ 				else
+-					echo "$as_me:27097: result: missing" >&5
++					echo "$as_me:27100: result: missing" >&5
+ echo "${ECHO_T}missing" >&6
+ 					cf_ada_config="#"
+ 					break
+@@ -27107,7 +27110,7 @@
+ 	if test "x$cf_ada_config" != "x#"
+ 	then
+ 
+-echo "$as_me:27110: checking for gnat version" >&5
++echo "$as_me:27113: checking for gnat version" >&5
+ echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
+ if test "${cf_cv_gnat_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -27118,7 +27121,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:27121: result: $cf_cv_gnat_version" >&5
++echo "$as_me:27124: result: $cf_cv_gnat_version" >&5
+ echo "${ECHO_T}$cf_cv_gnat_version" >&6
+ test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
+ 
+@@ -27127,7 +27130,7 @@
+ 	cf_cv_prog_gnat_correct=yes
+ 	;;
+ (*)
+-	{ echo "$as_me:27130: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
++	{ echo "$as_me:27133: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+ echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
+ 	cf_cv_prog_gnat_correct=no
+ 	;;
+@@ -27135,7 +27138,7 @@
+ 
+ 		# Extract the first word of "m4", so it can be a program name with args.
+ set dummy m4; ac_word=$2
+-echo "$as_me:27138: checking for $ac_word" >&5
++echo "$as_me:27141: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_M4_exists+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -27150,7 +27153,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_M4_exists="yes"
+-echo "$as_me:27153: found $ac_dir/$ac_word" >&5
++echo "$as_me:27156: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -27159,20 +27162,20 @@
+ fi
+ M4_exists=$ac_cv_prog_M4_exists
+ if test -n "$M4_exists"; then
+-  echo "$as_me:27162: result: $M4_exists" >&5
++  echo "$as_me:27165: result: $M4_exists" >&5
+ echo "${ECHO_T}$M4_exists" >&6
+ else
+-  echo "$as_me:27165: result: no" >&5
++  echo "$as_me:27168: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ 		if test "$ac_cv_prog_M4_exists" = no; then
+ 			cf_cv_prog_gnat_correct=no
+-			{ echo "$as_me:27171: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
++			{ echo "$as_me:27174: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+ echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
+ 		fi
+ 		if test "$cf_cv_prog_gnat_correct" = yes; then
+-			echo "$as_me:27175: checking if GNAT works" >&5
++			echo "$as_me:27178: checking if GNAT works" >&5
+ echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
+ 
+ rm -rf ./conftest* ./*~conftest*
+@@ -27200,7 +27203,7 @@
+ fi
+ rm -rf ./conftest* ./*~conftest*
+ 
+-			echo "$as_me:27203: result: $cf_cv_prog_gnat_correct" >&5
++			echo "$as_me:27206: result: $cf_cv_prog_gnat_correct" >&5
+ echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
+ 		fi
+ 	else
+@@ -27212,7 +27215,7 @@
+ 
+  	ADAFLAGS="$ADAFLAGS -gnatpn"
+ 
+-	echo "$as_me:27215: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:27218: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -27229,10 +27232,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:27232: result: $ADAFLAGS" >&5
++	echo "$as_me:27235: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:27235: checking if GNATPREP supports -T option" >&5
++echo "$as_me:27238: checking if GNATPREP supports -T option" >&5
+ echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6
+ if test "${cf_cv_gnatprep_opt_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -27242,11 +27245,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:27245: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:27248: result: $cf_cv_gnatprep_opt_t" >&5
+ echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
+ test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
+ 
+-echo "$as_me:27249: checking if GNAT supports generics" >&5
++echo "$as_me:27252: checking if GNAT supports generics" >&5
+ echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
+ case "$cf_cv_gnat_version" in
+ (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
+@@ -27256,7 +27259,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:27259: result: $cf_gnat_generics" >&5
++echo "$as_me:27262: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -27268,7 +27271,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:27271: checking if GNAT supports SIGINT" >&5
++echo "$as_me:27274: checking if GNAT supports SIGINT" >&5
+ echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
+ if test "${cf_cv_gnat_sigint+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -27316,7 +27319,7 @@
+ rm -rf ./conftest* ./*~conftest*
+ 
+ fi
+-echo "$as_me:27319: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:27322: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -27329,7 +27332,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:27332: checking if GNAT supports project files" >&5
++echo "$as_me:27335: checking if GNAT supports project files" >&5
+ echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
+ case "$cf_cv_gnat_version" in
+ (3.[0-9]*)
+@@ -27392,15 +27395,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:27395: result: $cf_gnat_projects" >&5
++echo "$as_me:27398: result: $cf_gnat_projects" >&5
+ echo "${ECHO_T}$cf_gnat_projects" >&6
+ fi # enable_gnat_projects
+ 
+ if test "$cf_gnat_projects" = yes
+ then
+-	echo "$as_me:27401: checking if GNAT supports libraries" >&5
++	echo "$as_me:27404: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:27403: result: $cf_gnat_libraries" >&5
++	echo "$as_me:27406: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -27420,7 +27423,7 @@
+ 	then
+ 		USE_GNAT_MAKE_GPR=""
+ 	else
+-		{ echo "$as_me:27423: WARNING: use old makefile rules since tools are missing" >&5
++		{ echo "$as_me:27426: WARNING: use old makefile rules since tools are missing" >&5
+ echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
+ 	fi
+ fi
+@@ -27432,7 +27435,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:27435: checking for ada-compiler" >&5
++echo "$as_me:27438: checking for ada-compiler" >&5
+ echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -27443,12 +27446,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:27446: result: $cf_ada_compiler" >&5
++echo "$as_me:27449: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 			cf_ada_package=terminal_interface
+ 
+-echo "$as_me:27451: checking for ada-include" >&5
++echo "$as_me:27454: checking for ada-include" >&5
+ echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -27484,7 +27487,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:27487: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:27490: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -27493,10 +27496,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:27496: result: $ADA_INCLUDE" >&5
++echo "$as_me:27499: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:27499: checking for ada-objects" >&5
++echo "$as_me:27502: checking for ada-objects" >&5
+ echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -27532,7 +27535,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:27535: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:27538: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -27541,10 +27544,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:27544: result: $ADA_OBJECTS" >&5
++echo "$as_me:27547: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:27547: checking if an Ada95 shared-library should be built" >&5
++echo "$as_me:27550: checking if an Ada95 shared-library should be built" >&5
+ echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -27554,14 +27557,14 @@
+ else
+   with_ada_sharedlib=no
+ fi;
+-echo "$as_me:27557: result: $with_ada_sharedlib" >&5
++echo "$as_me:27560: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ 
+ if test "x$with_ada_sharedlib" != xno
+ then
+ 	if test "x$cf_gnat_projects" != xyes
+ 	then
+-		{ echo "$as_me:27564: WARNING: disabling shared-library since GNAT projects are not supported" >&5
++		{ echo "$as_me:27567: WARNING: disabling shared-library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;}
+ 		with_ada_sharedlib=no
+ 	fi
+@@ -27581,7 +27584,7 @@
+ 
+ 			# allow the Ada binding to be renamed
+ 
+-echo "$as_me:27584: checking for ada-libname" >&5
++echo "$as_me:27587: checking for ada-libname" >&5
+ echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-libname or --without-ada-libname was given.
+@@ -27597,7 +27600,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:27600: result: $ADA_LIBNAME" >&5
++echo "$as_me:27603: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 		fi
+@@ -27608,13 +27611,13 @@
+ 
+ # do this "late" to avoid conflict with header-checks
+ if test "x$with_widec" = xyes ; then
+-	echo "$as_me:27611: checking for wchar_t" >&5
++	echo "$as_me:27614: checking for wchar_t" >&5
+ echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6
+ if test "${ac_cv_type_wchar_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27617 "configure"
++#line 27620 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27629,16 +27632,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27632: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27635: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27635: \$? = $ac_status" >&5
++  echo "$as_me:27638: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27638: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27641: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27641: \$? = $ac_status" >&5
++  echo "$as_me:27644: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_wchar_t=yes
+ else
+@@ -27648,10 +27651,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:27651: result: $ac_cv_type_wchar_t" >&5
++echo "$as_me:27654: result: $ac_cv_type_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
+ 
+-echo "$as_me:27654: checking size of wchar_t" >&5
++echo "$as_me:27657: checking size of wchar_t" >&5
+ echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6
+ if test "${ac_cv_sizeof_wchar_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -27660,7 +27663,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27663 "configure"
++#line 27666 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27672,21 +27675,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27675: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27678: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27678: \$? = $ac_status" >&5
++  echo "$as_me:27681: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27681: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27684: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27684: \$? = $ac_status" >&5
++  echo "$as_me:27687: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27689 "configure"
++#line 27692 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27698,16 +27701,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27701: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27704: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27704: \$? = $ac_status" >&5
++  echo "$as_me:27707: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27707: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27710: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27710: \$? = $ac_status" >&5
++  echo "$as_me:27713: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -27723,7 +27726,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27726 "configure"
++#line 27729 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27735,16 +27738,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27738: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27741: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27741: \$? = $ac_status" >&5
++  echo "$as_me:27744: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27744: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27747: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27747: \$? = $ac_status" >&5
++  echo "$as_me:27750: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -27760,7 +27763,7 @@
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27763 "configure"
++#line 27766 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27772,16 +27775,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27775: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27778: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27778: \$? = $ac_status" >&5
++  echo "$as_me:27781: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27781: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27784: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27784: \$? = $ac_status" >&5
++  echo "$as_me:27787: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -27794,12 +27797,12 @@
+ ac_cv_sizeof_wchar_t=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:27797: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:27800: error: cannot run test program while cross compiling" >&5
+ echo "$as_me: error: cannot run test program while cross compiling" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27802 "configure"
++#line 27805 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27815,15 +27818,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27818: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27821: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27821: \$? = $ac_status" >&5
++  echo "$as_me:27824: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27823: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27826: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27826: \$? = $ac_status" >&5
++  echo "$as_me:27829: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_wchar_t=`cat conftest.val`
+ else
+@@ -27839,7 +27842,7 @@
+   ac_cv_sizeof_wchar_t=0
+ fi
+ fi
+-echo "$as_me:27842: result: $ac_cv_sizeof_wchar_t" >&5
++echo "$as_me:27845: result: $ac_cv_sizeof_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
+ cat >>confdefs.h <&6
+ 
+-echo "${as_me:-configure}:27855: testing test failed (assume 2) ..." 1>&5
++echo "${as_me:-configure}:27858: testing test failed (assume 2) ..." 1>&5
+ 
+ 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
+ 		mv confdefs.tmp confdefs.h
+@@ -27870,7 +27873,7 @@
+ ### chooses to split module lists into libraries.
+ ###
+ ### (see CF_LIB_RULES).
+-echo "$as_me:27873: checking for library subsets" >&5
++echo "$as_me:27876: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+ 
+@@ -27924,7 +27927,7 @@
+ test "x$with_widec"     = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
+ test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
+ 
+-echo "$as_me:27927: result: $LIB_SUBSETS" >&5
++echo "$as_me:27930: result: $LIB_SUBSETS" >&5
+ echo "${ECHO_T}$LIB_SUBSETS" >&6
+ 
+ ### Construct the list of include-directories to be generated
+@@ -27955,7 +27958,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:27958: checking default library suffix" >&5
++echo "$as_me:27961: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -27966,10 +27969,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:27969: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:27972: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:27972: checking default library-dependency suffix" >&5
++echo "$as_me:27975: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -28052,10 +28055,10 @@
+ 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
+ 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
+ 	fi
+-echo "$as_me:28055: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:28058: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:28058: checking default object directory" >&5
++echo "$as_me:28061: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -28071,11 +28074,11 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:28074: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:28077: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ if test "x$cf_with_cxx" = xyes ; then
+-echo "$as_me:28078: checking c++ library-dependency suffix" >&5
++echo "$as_me:28081: checking c++ library-dependency suffix" >&5
+ echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
+ if test "$with_libtool" != "no"; then
+ 	# libtool thinks it can make c++ shared libraries (perhaps only g++)
+@@ -28168,7 +28171,7 @@
+ 	fi
+ 
+ fi
+-echo "$as_me:28171: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:28174: result: $CXX_LIB_SUFFIX" >&5
+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
+ 
+ fi
+@@ -28344,19 +28347,19 @@
+ 
+ if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
+ then
+-	echo "$as_me:28347: checking if linker supports switching between static/dynamic" >&5
++	echo "$as_me:28350: checking if linker supports switching between static/dynamic" >&5
+ echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6
+ 
+ 	rm -f libconftest.a
+ 	cat >conftest.$ac_ext <
+ int cf_ldflags_static(FILE *fp) { return fflush(fp); }
+ EOF
+-	if { (eval echo "$as_me:28356: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:28359: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28359: \$? = $ac_status" >&5
++  echo "$as_me:28362: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+ 		( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null
+ 		( eval $RANLIB libconftest.a ) 2>&5 >/dev/null
+@@ -28367,10 +28370,10 @@
+ 
+ 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28370 "configure"
++#line 28373 "configure"
+ #include "confdefs.h"
+ 
+-#line 28373 "configure"
++#line 28376 "configure"
+ #include 
+ int cf_ldflags_static(FILE *fp);
+ 
+@@ -28385,16 +28388,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:28388: \"$ac_link\"") >&5
++if { (eval echo "$as_me:28391: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:28391: \$? = $ac_status" >&5
++  echo "$as_me:28394: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:28394: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28397: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28397: \$? = $ac_status" >&5
++  echo "$as_me:28400: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	# some linkers simply ignore the -dynamic
+@@ -28417,7 +28420,7 @@
+ 	rm -f libconftest.*
+ 	LIBS="$cf_save_LIBS"
+ 
+-	echo "$as_me:28420: result: $cf_ldflags_static" >&5
++	echo "$as_me:28423: result: $cf_ldflags_static" >&5
+ echo "${ECHO_T}$cf_ldflags_static" >&6
+ 
+ 	if test "$cf_ldflags_static" != yes
+@@ -28433,7 +28436,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28436: checking where we will install curses.h" >&5
++echo "$as_me:28439: checking where we will install curses.h" >&5
+ echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
+ 
+ includesubdir=
+@@ -28443,7 +28446,7 @@
+ then
+ 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
+ fi
+-echo "$as_me:28446: result: ${includedir}${includesubdir}" >&5
++echo "$as_me:28449: result: ${includedir}${includesubdir}" >&5
+ echo "${ECHO_T}${includedir}${includesubdir}" >&6
+ 
+ ### Resolve a conflict between normal and wide-curses by forcing applications
+@@ -28451,7 +28454,7 @@
+ if test "$with_overwrite" != no ; then
+ if test "$NCURSES_LIBUTF8" = 1 ; then
+ 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
+-	{ echo "$as_me:28454: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++	{ echo "$as_me:28457: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+ echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
+ fi
+ fi
+@@ -28479,7 +28482,7 @@
+ 
+ # pkgsrc uses these
+ 
+-echo "$as_me:28482: checking for desired basename for form library" >&5
++echo "$as_me:28485: checking for desired basename for form library" >&5
+ echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
+ 
+ # Check whether --with-form-libname or --without-form-libname was given.
+@@ -28499,10 +28502,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28502: result: $FORM_NAME" >&5
++echo "$as_me:28505: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+ 
+-echo "$as_me:28505: checking for desired basename for menu library" >&5
++echo "$as_me:28508: checking for desired basename for menu library" >&5
+ echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
+ 
+ # Check whether --with-menu-libname or --without-menu-libname was given.
+@@ -28522,10 +28525,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28525: result: $MENU_NAME" >&5
++echo "$as_me:28528: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+ 
+-echo "$as_me:28528: checking for desired basename for panel library" >&5
++echo "$as_me:28531: checking for desired basename for panel library" >&5
+ echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
+ 
+ # Check whether --with-panel-libname or --without-panel-libname was given.
+@@ -28545,10 +28548,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28548: result: $PANEL_NAME" >&5
++echo "$as_me:28551: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+ 
+-echo "$as_me:28551: checking for desired basename for cxx library" >&5
++echo "$as_me:28554: checking for desired basename for cxx library" >&5
+ echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
+ 
+ # Check whether --with-cxx-libname or --without-cxx-libname was given.
+@@ -28568,13 +28571,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28571: result: $CXX_NAME" >&5
++echo "$as_me:28574: result: $CXX_NAME" >&5
+ echo "${ECHO_T}$CXX_NAME" >&6
+ 
+ ### Construct the list of subdirectories for which we'll customize makefiles
+ ### with the appropriate compile-rules.
+ 
+-echo "$as_me:28577: checking for src modules" >&5
++echo "$as_me:28580: checking for src modules" >&5
+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
+ 
+ # dependencies and linker-arguments for test-programs
+@@ -28643,7 +28646,7 @@
+ 		fi
+ 	fi
+ done
+-echo "$as_me:28646: result: $cf_cv_src_modules" >&5
++echo "$as_me:28649: result: $cf_cv_src_modules" >&5
+ echo "${ECHO_T}$cf_cv_src_modules" >&6
+ 
+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+@@ -28804,7 +28807,7 @@
+ 	(*-D_XOPEN_SOURCE_EXTENDED*)
+ 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
+ 
+-echo "${as_me:-configure}:28807: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
++echo "${as_me:-configure}:28810: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+ 
+ 		CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
+ 		CPPFLAGS=`echo "x$CPPFLAGS" | sed -e  's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'`
+@@ -28815,7 +28818,7 @@
+ 
+ # Help to automatically enable the extended curses features when using either
+ # the *-config or the ".pc" files by adding defines.
+-echo "$as_me:28818: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
++echo "$as_me:28821: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
+ echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6
+ PKG_CFLAGS=
+ for cf_loop1 in $CPPFLAGS_after_XOPEN
+@@ -28831,7 +28834,7 @@
+ 	done
+ 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
+ done
+-echo "$as_me:28834: result: $PKG_CFLAGS" >&5
++echo "$as_me:28837: result: $PKG_CFLAGS" >&5
+ echo "${ECHO_T}$PKG_CFLAGS" >&6
+ 
+ # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
+@@ -28892,7 +28895,7 @@
+ 	cf_filter_syms=$cf_dft_filter_syms
+ 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_version" 1>&6
+ 
+-echo "${as_me:-configure}:28895: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
++echo "${as_me:-configure}:28898: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
+ 
+ fi
+ 
+@@ -28919,7 +28922,7 @@
+ 
+ # This is used for the *-config script and *.pc data files.
+ 
+-echo "$as_me:28922: checking for linker search path" >&5
++echo "$as_me:28925: checking for linker search path" >&5
+ echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
+ if test "${cf_cv_ld_searchpath+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -28967,7 +28970,7 @@
+ 			cf_pathlist="$cf_pathlist /lib /usr/lib"
+ 			;;
+ 		(*)
+-			{ echo "$as_me:28970: WARNING: problem with Solaris architecture" >&5
++			{ echo "$as_me:28973: WARNING: problem with Solaris architecture" >&5
+ echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
+ 			;;
+ 		esac
+@@ -29008,7 +29011,7 @@
+ test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
+ 
+ fi
+-echo "$as_me:29011: result: $cf_cv_ld_searchpath" >&5
++echo "$as_me:29014: result: $cf_cv_ld_searchpath" >&5
+ echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
+ 
+ LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
+@@ -29098,7 +29101,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:29101: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:29104: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -29277,7 +29280,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:29280: error: ambiguous option: $1
++    { { echo "$as_me:29283: error: ambiguous option: $1
+ Try \`$0 --help' for more information." >&5
+ echo "$as_me: error: ambiguous option: $1
+ Try \`$0 --help' for more information." >&2;}
+@@ -29296,7 +29299,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:29299: error: unrecognized option: $1
++  -*) { { echo "$as_me:29302: error: unrecognized option: $1
+ Try \`$0 --help' for more information." >&5
+ echo "$as_me: error: unrecognized option: $1
+ Try \`$0 --help' for more information." >&2;}
+@@ -29422,7 +29425,7 @@
+   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
+   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
+-  *) { { echo "$as_me:29425: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:29428: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -29934,7 +29937,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:29937: creating $ac_file" >&5
++    { echo "$as_me:29940: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -29952,7 +29955,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:29955: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:29958: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -29965,7 +29968,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:29968: error: cannot find input file: $f" >&5
++           { { echo "$as_me:29971: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -29981,7 +29984,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:29984: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:29987: WARNING: datarootdir was used implicitly but not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: datarootdir was used implicitly but not set:
+ $ac_seen" >&2;}
+@@ -29990,7 +29993,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:29993: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:29996: WARNING: datarootdir was used explicitly but not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: datarootdir was used explicitly but not set:
+ $ac_seen" >&2;}
+@@ -30027,7 +30030,7 @@
+             ac_init=`${EGREP-egrep} '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
+-              { echo "$as_me:30030: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:30033: WARNING: Variable $ac_name is used but was not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Variable $ac_name is used but was not set:
+ $ac_seen" >&2;}
+@@ -30038,7 +30041,7 @@
+     ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out
+     if test -s $tmp/out; then
+       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
+-      { echo "$as_me:30041: WARNING: Some variables may not be substituted:
++      { echo "$as_me:30044: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -30087,7 +30090,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:30090: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:30093: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -30098,7 +30101,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30101: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30104: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -30111,7 +30114,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30114: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30117: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -30169,7 +30172,7 @@
+   rm -f $tmp/in
+   if test x"$ac_file" != x-; then
+     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
+-      { echo "$as_me:30172: $ac_file is unchanged" >&5
++      { echo "$as_me:30175: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -30556,7 +30559,7 @@
+ 				(cygdll|msysdll|mingw|msvcdll)
+ 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
+ 
+-echo "${as_me:-configure}:30559: testing overriding CXX_MODEL to SHARED ..." 1>&5
++echo "${as_me:-configure}:30562: testing overriding CXX_MODEL to SHARED ..." 1>&5
+ 
+ 					with_shared_cxx=yes
+ 					;;
+Index: dist.mk
+Prereq:  1.1463 
+--- ncurses-6.3-20220122+/dist.mk	2022-01-22 15:48:54.000000000 +0000
++++ ncurses-6.3-20220129/dist.mk	2022-01-29 12:21:50.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1463 2022/01/22 15:48:54 tom Exp $
++# $Id: dist.mk,v 1.1464 2022/01/29 12:21:50 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -38,7 +38,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 3
+-NCURSES_PATCH = 20220122
++NCURSES_PATCH = 20220129
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: misc/terminfo.src
+--- ncurses-6.3-20220122+/misc/terminfo.src	2021-11-27 21:53:31.000000000 +0000
++++ ncurses-6.3-20220129/misc/terminfo.src	2022-01-23 22:33:01.000000000 +0000
+@@ -6,8 +6,8 @@
+ # Report bugs and new terminal descriptions to
+ #	bug-ncurses@gnu.org
+ #
+-#	$Revision: 1.970 $
+-#	$Date: 2021/11/27 21:53:31 $
++#	$Revision: 1.974 $
++#	$Date: 2022/01/23 22:33:01 $
+ #
+ # The original header is preserved below for reference.  It is noted that there
+ # is a "newer" version which differs in some cosmetic details (but actually
+@@ -7531,7 +7531,26 @@
+ #	http://lists.gnu.org/archive/html/bug-ncurses/2018-09/msg00005.html
+ #	https://github.com/kovidgoyal/kitty/issues/879
+ #
+-# Version 0.19.1
++# Version 0.21.2 (June 28, 2021)
++# changes since 0.19.1
++# Notes:
++#	Repeatable tests with tack and vttest assume a standard screensize --
++#	measured in characters.  However, kitty uses pixel-measurements and
++#	does not readily use characters.
++#	Resizing with twm shows only pixel-based hint rather than characters
++#	manual page states that it is possible to override initial window size,
++#	but configuration file has no effect on initial window size.
++#	The same problem with XFCE4, but editing the cached json file works
++#	for setting the window size (the "c" suffix for cells does not):
++#		{"window-size": [720, 440]}
++#	though the values depend upon the font in use.
++# vttest
++# tack
++#	flash works
++#	invisible text still does not work
++#	function/special key modifiers finally work
++#
++# Version 0.19.1 (October 6, 2020)
+ # changes since 0.13.3:
+ # vttest
+ #	ISO-6429
+@@ -7547,7 +7566,7 @@
+ #	rs1 adds an empty string for resetting title- and other OSC-strings.
+ #	italics work
+ #
+-# Version 0.13.3
++# Version 0.13.3 (January 19, 2019)
+ # Notes:
+ #	initial screensize 71x22
+ #	does not respond to "resize -s"
+@@ -7625,30 +7644,31 @@
+ 	dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
+ 	flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
+ 	ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L,
+-	ind=\n, kbs=^?, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB,
+-	kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kend=\EOF, kf1=\EOP,
+-	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[1;2P,
+-	kf14=\E[1;2Q, kf15=\E[1;2R, kf16=\E[1;2S, kf17=\E[15;2~,
+-	kf18=\E[17;2~, kf19=\E[18;2~, kf2=\EOQ, kf20=\E[19;2~,
+-	kf21=\E[20;2~, kf22=\E[21;2~, kf23=\E[23;2~,
+-	kf24=\E[24;2~, kf25=\E[1;5P, kf26=\E[1;5Q, kf27=\E[1;5R,
+-	kf28=\E[1;5S, kf29=\E[15;5~, kf3=\EOR, kf30=\E[17;5~,
+-	kf31=\E[18;5~, kf32=\E[19;5~, kf33=\E[20;5~,
+-	kf34=\E[21;5~, kf35=\E[23;5~, kf36=\E[24;5~, kf4=\EOS,
+-	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+-	khome=\EOH, kich1=\E[2~, kind=\E[1;2B, knp=\E[6~,
+-	kpp=\E[5~, kri=\E[1;2A, op=\E[39;49m, rc=\E8, rev=\E[7m,
+-	ri=\EM, rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l,
++	ind=\n, kBEG=\E[1;2E, kbeg=\EOE, kbs=^?, kcbt=\E[Z,
++	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
++	kdch1=\E[3~, kend=\EOF, kf1=\EOP, kf10=\E[21~, kf11=\E[23~,
++	kf12=\E[24~, kf13=\E[1;2P, kf14=\E[1;2Q, kf15=\E[1;2R,
++	kf16=\E[1;2S, kf17=\E[15;2~, kf18=\E[17;2~,
++	kf19=\E[18;2~, kf2=\EOQ, kf20=\E[19;2~, kf21=\E[20;2~,
++	kf22=\E[21;2~, kf23=\E[23;2~, kf24=\E[24;2~,
++	kf25=\E[1;5P, kf26=\E[1;5Q, kf27=\E[1;5R, kf28=\E[1;5S,
++	kf29=\E[15;5~, kf3=\EOR, kf30=\E[17;5~, kf31=\E[18;5~,
++	kf32=\E[19;5~, kf33=\E[20;5~, kf34=\E[21;5~,
++	kf35=\E[23;5~, kf36=\E[24;5~, kf4=\EOS, kf5=\E[15~,
++	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\EOH,
++	kich1=\E[2~, kind=\E[1;2B, knp=\E[6~, kpp=\E[5~,
++	kri=\E[1;2A, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM,
++	rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l,
+ 	rmso=\E[27m, rmul=\E[24m, rs1=\E]\E\\\Ec, sc=\E7,
+ 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;
+ 	    %?%p1%p3%|%t;7%;m,
+ 	sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smir=\E[4h,
+ 	smkx=\E[?1h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+-	vpa=\E[%i%p1%dd, use=ansi+enq, use=ansi+rep,
+-	use=xterm+sm+1006, use=ecma+index, use=xterm+sl-twm,
+-	use=ecma+strikeout, use=xterm+pce2, use=xterm+pcc2,
+-	use=ecma+italics, use=xterm+alt1049, use=att610+cvis,
+-	use=xterm+tmux,
++	vpa=\E[%i%p1%dd, Smulx=\E[4:%p1%dm, use=ansi+enq,
++	use=ansi+rep, use=xterm+sm+1006, use=ecma+index,
++	use=xterm+pcfkeys, use=xterm+sl-twm,
++	use=ecma+strikeout, use=ecma+italics,
++	use=xterm+alt1049, use=att610+cvis, use=xterm+tmux,
+ 
+ ######## WAYLAND CLIENTS
+ 
+@@ -27320,4 +27340,7 @@
+ #	+ fix errata in description fields (report by Eric Lindblad) -TD
+ #	+ add x10term+sl, aixterm+sl, ncr260vp+sl, ncr260vp+vt, wyse+sl -TD
+ #
++# 2022-01-23
++#	+ update kitty -TD
++#
+ ######## SHANTIH!  SHANTIH!  SHANTIH!
+Index: package/debian-mingw/changelog
+--- ncurses-6.3-20220122+/package/debian-mingw/changelog	2022-01-22 15:48:54.000000000 +0000
++++ ncurses-6.3-20220129/package/debian-mingw/changelog	2022-01-29 12:21:50.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.3+20220122) unstable; urgency=low
++ncurses6 (6.3+20220129) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 22 Jan 2022 10:48:54 -0500
++ -- Thomas E. Dickey   Sat, 29 Jan 2022 07:21:50 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.3-20220122+/package/debian-mingw64/changelog	2022-01-22 15:48:54.000000000 +0000
++++ ncurses-6.3-20220129/package/debian-mingw64/changelog	2022-01-29 12:21:50.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.3+20220122) unstable; urgency=low
++ncurses6 (6.3+20220129) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 22 Jan 2022 10:48:54 -0500
++ -- Thomas E. Dickey   Sat, 29 Jan 2022 07:21:50 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.3-20220122+/package/debian/changelog	2022-01-22 15:48:54.000000000 +0000
++++ ncurses-6.3-20220129/package/debian/changelog	2022-01-29 12:21:50.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.3+20220122) unstable; urgency=low
++ncurses6 (6.3+20220129) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 22 Jan 2022 10:48:54 -0500
++ -- Thomas E. Dickey   Sat, 29 Jan 2022 07:21:49 -0500
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/debian/ncurses6.lintian-overrides
+--- ncurses-6.3-20220122+/package/debian/ncurses6.lintian-overrides	2018-08-18 20:35:02.000000000 +0000
++++ ncurses-6.3-20220129/package/debian/ncurses6.lintian-overrides	2022-01-30 01:01:57.000000000 +0000
+@@ -1,15 +1,17 @@
+ # This is intentional.
+ ncurses6: package-name-doesnt-match-sonames libformw6-6 libmenuw6-6 libncurses++w6-6 libncursesw6-6 libpanelw6-6 libticw6-6 libtinfow6-6
+ 
+-# This works around a bug in Debian's build-scripts.
+-ncurses6: latest-debian-changelog-entry-changed-to-native
++# This worked around a bug in Debian's build-scripts.
++#ncurses6: latest-debian-changelog-entry-changed-to-native
+ 
+ ncurses6: hardening-no-fortify-functions usr/lib/libncurses++w6.so.6.1
++#ncurses6: hardening-no-fortify-functions usr/lib/libformw6.so.6.1
++ncurses6: hardening-no-fortify-functions usr/lib/libmenuw6.so.6.1
+ 
+ # This is intentional.
+ ncurses6: binary-without-manpage
+ ncurses6: non-dev-pkg-with-shlib-symlink
+-ncurses6: embedded-library usr/lib/libtinfow6.so.6.1: ncurses
+-ncurses6: postinst-must-call-ldconfig usr/lib/libtinfow6.so.6.1
++ncurses6: embedded-library ncurses usr/lib/libtinfow6.so.6.1
++#ncurses6: postinst-must-call-ldconfig usr/lib/libtinfow6.so.6.1
+ 
+ # vile: confmode
+Index: package/debian/ncursest6.lintian-overrides
+--- ncurses-6.3-20220122+/package/debian/ncursest6.lintian-overrides	2018-08-18 20:35:07.000000000 +0000
++++ ncurses-6.3-20220129/package/debian/ncursest6.lintian-overrides	2022-01-30 01:02:06.000000000 +0000
+@@ -1,15 +1,17 @@
+ # This is intentional.
+ ncursest6: package-name-doesnt-match-sonames libformtw6-6 libmenutw6-6 libncurses++tw6-6 libncursestw6-6 libpaneltw6-6 libtictw6-6 libtinfotw6-6
+ 
+-# This works around a bug in Debian's build-scripts.
+-ncursest6: latest-debian-changelog-entry-changed-to-native
++# This worked around a bug in Debian's build-scripts.
++#ncursest6: latest-debian-changelog-entry-changed-to-native
+ 
+ ncursest6: hardening-no-fortify-functions usr/lib/libncurses++tw6.so.6.1
++#ncursest6: hardening-no-fortify-functions usr/lib/libformtw6.so.6.1
++ncursest6: hardening-no-fortify-functions usr/lib/libmenutw6.so.6.1
+ 
+ # This is intentional.
+ ncursest6: binary-without-manpage
+ ncursest6: non-dev-pkg-with-shlib-symlink
+-ncursest6: embedded-library usr/lib/libtinfotw6.so.6.1: ncurses
+-ncursest6: postinst-must-call-ldconfig usr/lib/libtinfotw6.so.6.1
++ncursest6: embedded-library ncurses usr/lib/libtinfotw6.so.6.1
++#ncursest6: postinst-must-call-ldconfig usr/lib/libtinfotw6.so.6.1
+ 
+ # vile: confmode
+Index: package/debian/rules
+Prereq:  1.42 
+--- ncurses-6.3-20220122+/package/debian/rules	2021-11-20 15:51:09.000000000 +0000
++++ ncurses-6.3-20220129/package/debian/rules	2022-01-30 01:09:39.000000000 +0000
+@@ -1,5 +1,5 @@
+ #!/usr/bin/make -f
+-# $Id: rules,v 1.42 2021/11/20 15:51:09 tom Exp $
++# $Id: rules,v 1.44 2022/01/30 01:09:39 tom Exp $
+ 
+ # Uncomment this to turn on verbose mode.
+ #export DH_VERBOSE=1
+@@ -254,6 +254,13 @@
+ 	rm -f $(PACKAGES.arch:%=install-%-stamp)
+ 	dh_testdir
+ 	dh_testroot
++
++	version=`set -x; awk 'BEGIN{major=minor=0} /^NCURSES_MAJOR/{major=$$3} /^NCURSES_MINOR/{minor=$$3} END{print major "." minor}' < dist.mk`; \
++	sed -i \
++		-e "s, usr/lib, usr/lib/$(DEB_HOST_MULTIARCH)," \
++		-e "s,6\.1,$${version}," \
++		debian/*.lintian-overrides
++
+ 	dh_lintian           $(verbose) $(PACKAGES.arch:%=-p%)
+ 	dh_installdocs       $(verbose) $(PACKAGES.arch:%=-p%)
+ 	dh_installchangelogs $(verbose) $(PACKAGES.arch:%=-p%)  NEWS
+Index: package/mingw-ncurses.nsi
+Prereq:  1.503 
+--- ncurses-6.3-20220122+/package/mingw-ncurses.nsi	2022-01-22 15:48:54.000000000 +0000
++++ ncurses-6.3-20220129/package/mingw-ncurses.nsi	2022-01-29 12:21:50.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.503 2022/01/22 15:48:54 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.504 2022/01/29 12:21:50 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "3"
+ !define VERSION_YYYY  "2022"
+-!define VERSION_MMDD  "0122"
++!define VERSION_MMDD  "0129"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.3-20220122+/package/mingw-ncurses.spec	2022-01-22 15:48:54.000000000 +0000
++++ ncurses-6.3-20220129/package/mingw-ncurses.spec	2022-01-29 12:21:50.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.3
+-Release: 20220122
++Release: 20220129
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.3-20220122+/package/ncurses.spec	2022-01-22 15:48:54.000000000 +0000
++++ ncurses-6.3-20220129/package/ncurses.spec	2022-01-29 12:21:50.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.3
+-Release: 20220122
++Release: 20220129
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncursest.spec
+--- ncurses-6.3-20220122+/package/ncursest.spec	2022-01-22 15:48:54.000000000 +0000
++++ ncurses-6.3-20220129/package/ncursest.spec	2022-01-29 12:21:50.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.3
+-Release: 20220122
++Release: 20220129
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
diff --git a/system/ncurses/ncurses-6.3-20220205.patch b/system/ncurses/ncurses-6.3-20220205.patch
new file mode 100644
index 000000000..353def0f8
--- /dev/null
+++ b/system/ncurses/ncurses-6.3-20220205.patch
@@ -0,0 +1,9177 @@
+# ncurses 6.3 - patch 20220205 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.3 is at
+# 	ftp://ftp.invisible-island.net/ncurses/
+#	https://invisible-mirror.net/archives/ncurses/
+#	https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.3 can be found at
+# 	ftp://ftp.invisible-island.net/ncurses/6.3
+#	https://invisible-mirror.net/archives/ncurses/6.3
+#
+# ------------------------------------------------------------------------------
+# ftp://ftp.invisible-island.net/ncurses/6.3/ncurses-6.3-20220205.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Feb  6 01:46:24 UTC 2022
+# ------------------------------------------------------------------------------
+# Ada95/make-tar.sh                |    7 
+# NEWS                             |    7 
+# VERSION                          |    2 
+# aclocal.m4                       |    7 
+# config.guess                     |   16 
+# config.sub                       |   20 
+# configure                        | 2469 ++++++++++++++++++-------------------
+# dist.mk                          |    4 
+# include/MKkey_defs.sh            |    7 
+# include/edit_cfg.sh              |    7 
+# man/make_sed.sh                  |    7 
+# ncurses/base/MKlib_gen.sh        |    7 
+# ncurses/tinfo/MKkeys_list.sh     |    7 
+# ncurses/tty/MKexpanded.sh        |    5 
+# package/debian-mingw/changelog   |    4 
+# package/debian-mingw64/changelog |    4 
+# package/debian/changelog         |    4 
+# package/mingw-ncurses.nsi        |    4 
+# package/mingw-ncurses.spec       |    2 
+# package/ncurses.spec             |    2 
+# package/ncursest.spec            |    2 
+# progs/MKtermsort.sh              |    6 
+# progs/capconvert                 |    7 
+# test/make-tar.sh                 |    7 
+# test/picsmap.c                   |   65 
+# test/savescreen.sh               |    7 
+# 26 files changed, 1382 insertions(+), 1304 deletions(-)
+# ------------------------------------------------------------------------------
+Index: Ada95/make-tar.sh
+Prereq:  1.20 
+--- ncurses-6.3-20220129+/Ada95/make-tar.sh	2021-10-12 21:11:33.000000000 +0000
++++ ncurses-6.3-20220205/Ada95/make-tar.sh	2022-02-05 17:57:20.000000000 +0000
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+-# $Id: make-tar.sh,v 1.20 2021/10/12 21:11:33 tom Exp $
++# $Id: make-tar.sh,v 1.21 2022/02/05 17:57:20 tom Exp $
+ ##############################################################################
+-# Copyright 2019-2020,2021 Thomas E. Dickey                                  #
++# Copyright 2019-2021,2022 Thomas E. Dickey                                  #
+ # Copyright 2010-2015,2017 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -84,7 +84,8 @@
+ SOURCE=`cd ..;pwd`
+ 
+ BUILD=$TMPDIR/make-tar$$
+-trap "cd /; rm -rf $BUILD; exit 0" EXIT INT QUIT TERM HUP
++trap "cd /; rm -rf $BUILD; exit 1" 1 2 3 15
++trap "cd /; rm -rf $BUILD" 0
+ 
+ umask 077
+ if ! ( mkdir $BUILD )
+Index: NEWS
+Prereq:  1.3774 
+--- ncurses-6.3-20220129+/NEWS	2022-01-30 01:11:51.000000000 +0000
++++ ncurses-6.3-20220205/NEWS	2022-02-06 00:37:58.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.3774 2022/01/30 01:11:51 tom Exp $
++-- $Id: NEWS,v 1.3776 2022/02/06 00:37:58 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -46,6 +46,11 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20220205
++	+ workaround in test/picsmap.c for use of floating point for rgb values
++	  by ImageMagick 6.9.11, which appears to use the wrong upper limit.
++	+ improve use of "trap" in shell scripts, using "fixup-trap".
++
+ 20220129
+ 	+ minor updates for test-packages
+ 	+ improve handling of --with-pkg-config-libdir option, allowing for the
+Index: VERSION
+--- ncurses-6.3-20220129+/VERSION	2022-01-29 12:21:50.000000000 +0000
++++ ncurses-6.3-20220205/VERSION	2022-02-05 11:10:39.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.3	20220129
++5:0:10	6.3	20220205
+Index: aclocal.m4
+Prereq:  1.1003 
+--- ncurses-6.3-20220129+/aclocal.m4	2022-01-29 22:05:06.000000000 +0000
++++ ncurses-6.3-20220205/aclocal.m4	2022-02-05 17:48:07.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: aclocal.m4,v 1.1003 2022/01/29 22:05:06 tom Exp $
++dnl $Id: aclocal.m4,v 1.1004 2022/02/05 17:48:07 tom Exp $
+ dnl Macros used in NCURSES auto-configuration script.
+ dnl
+ dnl These macros are maintained separately from NCURSES.  The copyright on
+@@ -5740,7 +5740,7 @@
+ AC_MSG_RESULT($MANPAGE_TBL)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_MAN_PAGES version: 51 updated: 2021/01/05 16:29:19
++dnl CF_MAN_PAGES version: 52 updated: 2022/02/05 12:31:08
+ dnl ------------
+ dnl Try to determine if the man-pages on the system are compressed, and if
+ dnl so, what format is used.  Use this information to construct a script that
+@@ -5813,7 +5813,8 @@
+ transform="$program_transform_name"
+ 
+ TMP=\${TMPDIR:=/tmp}/man\$\$
+-trap "rm -f \$TMP" 0 1 2 3 15
++trap "rm -f \$TMP; exit 1" 1 2 3 15
++trap "rm -f \$TMP" 0
+ 
+ form=\[$]1
+ shift || exit 1
+Index: config.guess
+--- ncurses-6.3-20220129+/config.guess	2021-06-04 04:01:25.000000000 +0000
++++ ncurses-6.3-20220205/config.guess	2022-01-09 21:53:25.000000000 +0000
+@@ -1,14 +1,14 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+-#   Copyright 1992-2021 Free Software Foundation, Inc.
++#   Copyright 1992-2022 Free Software Foundation, Inc.
+ 
+ # shellcheck disable=SC2006,SC2268 # see below for rationale
+ 
+-timestamp='2021-06-03'
++timestamp='2022-01-09'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 3 of the License, or
++# the Free Software Foundation, either version 3 of the License, or
+ # (at your option) any later version.
+ #
+ # This program is distributed in the hope that it will be useful, but
+@@ -60,7 +60,7 @@
+ GNU config.guess ($timestamp)
+ 
+ Originally written by Per Bothner.
+-Copyright 1992-2021 Free Software Foundation, Inc.
++Copyright 1992-2022 Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -437,7 +437,7 @@
+ 	# This test works for both compilers.
+ 	if test "$CC_FOR_BUILD" != no_compiler_found; then
+ 	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+-		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
++		(CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) | \
+ 		grep IS_64BIT_ARCH >/dev/null
+ 	    then
+ 		SUN_ARCH=x86_64
+@@ -929,6 +929,9 @@
+     i*:PW*:*)
+ 	GUESS=$UNAME_MACHINE-pc-pw32
+ 	;;
++    *:SerenityOS:*:*)
++        GUESS=$UNAME_MACHINE-pc-serenity
++        ;;
+     *:Interix*:*)
+ 	case $UNAME_MACHINE in
+ 	    x86)
+@@ -1522,6 +1525,9 @@
+     i*86:rdos:*:*)
+ 	GUESS=$UNAME_MACHINE-pc-rdos
+ 	;;
++    i*86:Fiwix:*:*)
++	GUESS=$UNAME_MACHINE-pc-fiwix
++	;;
+     *:AROS:*:*)
+ 	GUESS=$UNAME_MACHINE-unknown-aros
+ 	;;
+Index: config.sub
+--- ncurses-6.3-20220129+/config.sub	2021-08-14 16:20:38.000000000 +0000
++++ ncurses-6.3-20220205/config.sub	2022-01-03 23:16:50.000000000 +0000
+@@ -1,14 +1,14 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+-#   Copyright 1992-2021 Free Software Foundation, Inc.
++#   Copyright 1992-2022 Free Software Foundation, Inc.
+ 
+ # shellcheck disable=SC2006,SC2268 # see below for rationale
+ 
+-timestamp='2021-08-14'
++timestamp='2022-01-03'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 3 of the License, or
++# the Free Software Foundation, either version 3 of the License, or
+ # (at your option) any later version.
+ #
+ # This program is distributed in the hope that it will be useful, but
+@@ -76,7 +76,7 @@
+ version="\
+ GNU config.sub ($timestamp)
+ 
+-Copyright 1992-2021 Free Software Foundation, Inc.
++Copyright 1992-2022 Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -1020,6 +1020,11 @@
+ 		;;
+ 
+ 	# Here we normalize CPU types with a missing or matching vendor
++	armh-unknown | armh-alt)
++		cpu=armv7l
++		vendor=alt
++		basic_os=${basic_os:-linux-gnueabihf}
++		;;
+ 	dpx20-unknown | dpx20-bull)
+ 		cpu=rs6000
+ 		vendor=bull
+@@ -1121,7 +1126,7 @@
+ 	xscale-* | xscalee[bl]-*)
+ 		cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
+ 		;;
+-	arm64-*)
++	arm64-* | aarch64le-*)
+ 		cpu=aarch64
+ 		;;
+ 
+@@ -1304,7 +1309,7 @@
+ if test x$basic_os != x
+ then
+ 
+-# First recognize some ad-hoc caes, or perhaps split kernel-os, or else just
++# First recognize some ad-hoc cases, or perhaps split kernel-os, or else just
+ # set os.
+ case $basic_os in
+ 	gnu/linux*)
+@@ -1748,7 +1753,8 @@
+ 	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
+ 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
+ 	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
+-	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr*)
++	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
++	     | fiwix* )
+ 		;;
+ 	# This one is extra strict with allowed versions
+ 	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
+Index: configure
+--- ncurses-6.3-20220129+/configure	2022-01-29 22:05:31.000000000 +0000
++++ ncurses-6.3-20220205/configure	2022-02-05 17:56:41.000000000 +0000
+@@ -14775,7 +14775,8 @@
+ transform="$program_transform_name"
+ 
+ TMP=\${TMPDIR:=/tmp}/man\$\$
+-trap "rm -f \$TMP" 0 1 2 3 15
++trap "rm -f \$TMP; exit 1" 1 2 3 15
++trap "rm -f \$TMP" 0
+ 
+ form=\$1
+ shift || exit 1
+@@ -15045,7 +15046,7 @@
+ ###############################################################################
+ 
+ ### Note that some functions (such as const) are normally disabled anyway.
+-echo "$as_me:15048: checking if you want to build with function extensions" >&5
++echo "$as_me:15049: checking if you want to build with function extensions" >&5
+ echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6
+ 
+ # Check whether --enable-ext-funcs or --disable-ext-funcs was given.
+@@ -15055,7 +15056,7 @@
+ else
+   with_ext_funcs=yes
+ fi;
+-echo "$as_me:15058: result: $with_ext_funcs" >&5
++echo "$as_me:15059: result: $with_ext_funcs" >&5
+ echo "${ECHO_T}$with_ext_funcs" >&6
+ if test "x$with_ext_funcs" = xyes ; then
+ 	NCURSES_EXT_FUNCS=1
+@@ -15115,7 +15116,7 @@
+ 	GENERATED_EXT_FUNCS=
+ fi
+ 
+-echo "$as_me:15118: checking if you want to build with SCREEN extensions" >&5
++echo "$as_me:15119: checking if you want to build with SCREEN extensions" >&5
+ echo $ECHO_N "checking if you want to build with SCREEN extensions... $ECHO_C" >&6
+ 
+ # Check whether --enable-sp-funcs or --disable-sp-funcs was given.
+@@ -15125,7 +15126,7 @@
+ else
+   with_sp_funcs=$cf_dft_ext_spfuncs
+ fi;
+-echo "$as_me:15128: result: $with_sp_funcs" >&5
++echo "$as_me:15129: result: $with_sp_funcs" >&5
+ echo "${ECHO_T}$with_sp_funcs" >&6
+ if test "x$with_sp_funcs" = xyes ; then
+ 	NCURSES_SP_FUNCS=1
+@@ -15144,7 +15145,7 @@
+ 	GENERATED_SP_FUNCS=
+ fi
+ 
+-echo "$as_me:15147: checking if you want to build with terminal-driver" >&5
++echo "$as_me:15148: checking if you want to build with terminal-driver" >&5
+ echo $ECHO_N "checking if you want to build with terminal-driver... $ECHO_C" >&6
+ 
+ # Check whether --enable-term-driver or --disable-term-driver was given.
+@@ -15154,7 +15155,7 @@
+ else
+   with_term_driver=no
+ fi;
+-echo "$as_me:15157: result: $with_term_driver" >&5
++echo "$as_me:15158: result: $with_term_driver" >&5
+ echo "${ECHO_T}$with_term_driver" >&6
+ if test "x$with_term_driver" = xyes ; then
+ 
+@@ -15163,19 +15164,19 @@
+ EOF
+ 
+ 	if test "x$with_termlib" != xno ; then
+-		{ { echo "$as_me:15166: error: The term-driver option conflicts with the termlib option" >&5
++		{ { echo "$as_me:15167: error: The term-driver option conflicts with the termlib option" >&5
+ echo "$as_me: error: The term-driver option conflicts with the termlib option" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+ 	if test "x$with_sp_funcs" != xyes ; then
+-		{ { echo "$as_me:15171: error: The term-driver option relies upon sp-funcs" >&5
++		{ { echo "$as_me:15172: error: The term-driver option relies upon sp-funcs" >&5
+ echo "$as_me: error: The term-driver option relies upon sp-funcs" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+ fi
+ 
+ ###   use option --enable-const to turn on use of const beyond that in XSI.
+-echo "$as_me:15178: checking for extended use of const keyword" >&5
++echo "$as_me:15179: checking for extended use of const keyword" >&5
+ echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
+ 
+ # Check whether --enable-const or --disable-const was given.
+@@ -15185,7 +15186,7 @@
+ else
+   with_ext_const=$cf_dft_ext_const
+ fi;
+-echo "$as_me:15188: result: $with_ext_const" >&5
++echo "$as_me:15189: result: $with_ext_const" >&5
+ echo "${ECHO_T}$with_ext_const" >&6
+ NCURSES_CONST='/*nothing*/'
+ if test "x$with_ext_const" = xyes ; then
+@@ -15193,7 +15194,7 @@
+ fi
+ 
+ ###   use option --enable-ext-colors to turn on use of colors beyond 16.
+-echo "$as_me:15196: checking if you want to use extended colors" >&5
++echo "$as_me:15197: checking if you want to use extended colors" >&5
+ echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6
+ 
+ # Check whether --enable-ext-colors or --disable-ext-colors was given.
+@@ -15203,12 +15204,12 @@
+ else
+   with_ext_colors=$cf_dft_ext_colors
+ fi;
+-echo "$as_me:15206: result: $with_ext_colors" >&5
++echo "$as_me:15207: result: $with_ext_colors" >&5
+ echo "${ECHO_T}$with_ext_colors" >&6
+ NCURSES_EXT_COLORS=0
+ if test "x$with_ext_colors" = xyes ; then
+ 	if test "x$with_widec" != xyes ; then
+-		{ echo "$as_me:15211: WARNING: This option applies only to wide-character library" >&5
++		{ echo "$as_me:15212: WARNING: This option applies only to wide-character library" >&5
+ echo "$as_me: WARNING: This option applies only to wide-character library" >&2;}
+ 	else
+ 		# cannot be ABI 5 since it changes sizeof(cchar_t)
+@@ -15218,7 +15219,7 @@
+ 	(5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:15221: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:15222: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -15246,7 +15247,7 @@
+ fi
+ 
+ ###   use option --enable-ext-mouse to modify coding to support 5-button mice
+-echo "$as_me:15249: checking if you want to use extended mouse encoding" >&5
++echo "$as_me:15250: checking if you want to use extended mouse encoding" >&5
+ echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6
+ 
+ # Check whether --enable-ext-mouse or --disable-ext-mouse was given.
+@@ -15256,7 +15257,7 @@
+ else
+   with_ext_mouse=$cf_dft_ext_mouse
+ fi;
+-echo "$as_me:15259: result: $with_ext_mouse" >&5
++echo "$as_me:15260: result: $with_ext_mouse" >&5
+ echo "${ECHO_T}$with_ext_mouse" >&6
+ if test "x$with_ext_mouse" = xyes ; then
+ 
+@@ -15265,7 +15266,7 @@
+ 	(5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:15268: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:15269: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -15286,7 +15287,7 @@
+ esac
+ 
+ ###   use option --enable-ext-putwin to turn on extended screendumps
+-echo "$as_me:15289: checking if you want to use extended putwin/screendump" >&5
++echo "$as_me:15290: checking if you want to use extended putwin/screendump" >&5
+ echo $ECHO_N "checking if you want to use extended putwin/screendump... $ECHO_C" >&6
+ 
+ # Check whether --enable-ext-putwin or --disable-ext-putwin was given.
+@@ -15296,7 +15297,7 @@
+ else
+   with_ext_putwin=$cf_dft_ext_putwin
+ fi;
+-echo "$as_me:15299: result: $with_ext_putwin" >&5
++echo "$as_me:15300: result: $with_ext_putwin" >&5
+ echo "${ECHO_T}$with_ext_putwin" >&6
+ if test "x$with_ext_putwin" = xyes ; then
+ 
+@@ -15306,7 +15307,7 @@
+ 
+ fi
+ 
+-echo "$as_me:15309: checking if you want \$NCURSES_NO_PADDING code" >&5
++echo "$as_me:15310: checking if you want \$NCURSES_NO_PADDING code" >&5
+ echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6
+ 
+ # Check whether --enable-no-padding or --disable-no-padding was given.
+@@ -15316,7 +15317,7 @@
+ else
+   with_no_padding=$with_ext_funcs
+ fi;
+-echo "$as_me:15319: result: $with_no_padding" >&5
++echo "$as_me:15320: result: $with_no_padding" >&5
+ echo "${ECHO_T}$with_no_padding" >&6
+ test "x$with_no_padding" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15324,7 +15325,7 @@
+ EOF
+ 
+ ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
+-echo "$as_me:15327: checking if you want SIGWINCH handler" >&5
++echo "$as_me:15328: checking if you want SIGWINCH handler" >&5
+ echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6
+ 
+ # Check whether --enable-sigwinch or --disable-sigwinch was given.
+@@ -15334,7 +15335,7 @@
+ else
+   with_sigwinch=$with_ext_funcs
+ fi;
+-echo "$as_me:15337: result: $with_sigwinch" >&5
++echo "$as_me:15338: result: $with_sigwinch" >&5
+ echo "${ECHO_T}$with_sigwinch" >&6
+ test "x$with_sigwinch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15342,7 +15343,7 @@
+ EOF
+ 
+ ###   use option --enable-tcap-names to allow user to define new capabilities
+-echo "$as_me:15345: checking if you want user-definable terminal capabilities like termcap" >&5
++echo "$as_me:15346: checking if you want user-definable terminal capabilities like termcap" >&5
+ echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6
+ 
+ # Check whether --enable-tcap-names or --disable-tcap-names was given.
+@@ -15352,14 +15353,14 @@
+ else
+   with_tcap_names=$with_ext_funcs
+ fi;
+-echo "$as_me:15355: result: $with_tcap_names" >&5
++echo "$as_me:15356: result: $with_tcap_names" >&5
+ echo "${ECHO_T}$with_tcap_names" >&6
+ NCURSES_XNAMES=0
+ test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1
+ 
+ ##############################################################################
+ 
+-echo "$as_me:15362: checking if you want to link with the pthread library" >&5
++echo "$as_me:15363: checking if you want to link with the pthread library" >&5
+ echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6
+ 
+ # Check whether --with-pthread or --without-pthread was given.
+@@ -15369,27 +15370,27 @@
+ else
+   with_pthread=no
+ fi;
+-echo "$as_me:15372: result: $with_pthread" >&5
++echo "$as_me:15373: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 
+ if test "$with_pthread" != no ; then
+-	echo "$as_me:15376: checking for pthread.h" >&5
++	echo "$as_me:15377: checking for pthread.h" >&5
+ echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
+ if test "${ac_cv_header_pthread_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15382 "configure"
++#line 15383 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:15386: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:15387: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:15392: \$? = $ac_status" >&5
++  echo "$as_me:15393: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -15408,7 +15409,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:15411: result: $ac_cv_header_pthread_h" >&5
++echo "$as_me:15412: result: $ac_cv_header_pthread_h" >&5
+ echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
+ if test "$ac_cv_header_pthread_h" = yes; then
+ 
+@@ -15418,7 +15419,7 @@
+ 
+ 	for cf_lib_pthread in pthread c_r
+ 	do
+-	    echo "$as_me:15421: checking if we can link with the $cf_lib_pthread library" >&5
++	    echo "$as_me:15422: checking if we can link with the $cf_lib_pthread library" >&5
+ echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6
+ 	    cf_save_LIBS="$LIBS"
+ 
+@@ -15439,7 +15440,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	    cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15442 "configure"
++#line 15443 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -15456,16 +15457,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15459: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15460: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15462: \$? = $ac_status" >&5
++  echo "$as_me:15463: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15465: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15466: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15468: \$? = $ac_status" >&5
++  echo "$as_me:15469: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   with_pthread=yes
+ else
+@@ -15475,7 +15476,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	    LIBS="$cf_save_LIBS"
+-	    echo "$as_me:15478: result: $with_pthread" >&5
++	    echo "$as_me:15479: result: $with_pthread" >&5
+ echo "${ECHO_T}$with_pthread" >&6
+ 	    test "$with_pthread" = yes && break
+ 	done
+@@ -15503,7 +15504,7 @@
+ EOF
+ 
+ 	else
+-	    { { echo "$as_me:15506: error: Cannot link with pthread library" >&5
++	    { { echo "$as_me:15507: error: Cannot link with pthread library" >&5
+ echo "$as_me: error: Cannot link with pthread library" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+@@ -15513,13 +15514,13 @@
+ fi
+ 
+ if test "x$with_pthread" != xno; then
+-	echo "$as_me:15516: checking for pthread_kill" >&5
++	echo "$as_me:15517: checking for pthread_kill" >&5
+ echo $ECHO_N "checking for pthread_kill... $ECHO_C" >&6
+ if test "${ac_cv_func_pthread_kill+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15522 "configure"
++#line 15523 "configure"
+ #include "confdefs.h"
+ #define pthread_kill autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -15550,16 +15551,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:15553: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15554: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15556: \$? = $ac_status" >&5
++  echo "$as_me:15557: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:15559: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15560: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15562: \$? = $ac_status" >&5
++  echo "$as_me:15563: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_pthread_kill=yes
+ else
+@@ -15569,11 +15570,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:15572: result: $ac_cv_func_pthread_kill" >&5
++echo "$as_me:15573: result: $ac_cv_func_pthread_kill" >&5
+ echo "${ECHO_T}$ac_cv_func_pthread_kill" >&6
+ if test "$ac_cv_func_pthread_kill" = yes; then
+ 
+-		echo "$as_me:15576: checking if you want to allow EINTR in wgetch with pthreads" >&5
++		echo "$as_me:15577: checking if you want to allow EINTR in wgetch with pthreads" >&5
+ echo $ECHO_N "checking if you want to allow EINTR in wgetch with pthreads... $ECHO_C" >&6
+ 
+ # Check whether --enable-pthreads-eintr or --disable-pthreads-eintr was given.
+@@ -15583,7 +15584,7 @@
+ else
+   use_pthreads_eintr=no
+ fi;
+-		echo "$as_me:15586: result: $use_pthreads_eintr" >&5
++		echo "$as_me:15587: result: $use_pthreads_eintr" >&5
+ echo "${ECHO_T}$use_pthreads_eintr" >&6
+ 		if test "x$use_pthreads_eintr" = xyes ; then
+ 
+@@ -15594,7 +15595,7 @@
+ 		fi
+ fi
+ 
+-	echo "$as_me:15597: checking if you want to use weak-symbols for pthreads" >&5
++	echo "$as_me:15598: checking if you want to use weak-symbols for pthreads" >&5
+ echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6
+ 
+ # Check whether --enable-weak-symbols or --disable-weak-symbols was given.
+@@ -15604,18 +15605,18 @@
+ else
+   use_weak_symbols=no
+ fi;
+-	echo "$as_me:15607: result: $use_weak_symbols" >&5
++	echo "$as_me:15608: result: $use_weak_symbols" >&5
+ echo "${ECHO_T}$use_weak_symbols" >&6
+ 	if test "x$use_weak_symbols" = xyes ; then
+ 
+-echo "$as_me:15611: checking if $CC supports weak symbols" >&5
++echo "$as_me:15612: checking if $CC supports weak symbols" >&5
+ echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6
+ if test "${cf_cv_weak_symbols+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 15618 "configure"
++#line 15619 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -15641,16 +15642,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:15644: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15645: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:15647: \$? = $ac_status" >&5
++  echo "$as_me:15648: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:15650: \"$ac_try\"") >&5
++  { (eval echo "$as_me:15651: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15653: \$? = $ac_status" >&5
++  echo "$as_me:15654: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_weak_symbols=yes
+ else
+@@ -15661,7 +15662,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:15664: result: $cf_cv_weak_symbols" >&5
++echo "$as_me:15665: result: $cf_cv_weak_symbols" >&5
+ echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+ 
+ 	else
+@@ -15711,7 +15712,7 @@
+ # opaque outside of that, so there is no --enable-opaque option.  We can use
+ # this option without --with-pthreads, but this will be always set for
+ # pthreads.
+-echo "$as_me:15714: checking if you want reentrant code" >&5
++echo "$as_me:15715: checking if you want reentrant code" >&5
+ echo $ECHO_N "checking if you want reentrant code... $ECHO_C" >&6
+ 
+ # Check whether --enable-reentrant or --disable-reentrant was given.
+@@ -15721,7 +15722,7 @@
+ else
+   with_reentrant=no
+ fi;
+-echo "$as_me:15724: result: $with_reentrant" >&5
++echo "$as_me:15725: result: $with_reentrant" >&5
+ echo "${ECHO_T}$with_reentrant" >&6
+ if test "x$with_reentrant" = xyes ; then
+ 	cf_cv_enable_reentrant=1
+@@ -15809,7 +15810,7 @@
+ 	(5.*)
+ 		cf_cv_rel_version=6.0
+ 		cf_cv_abi_version=6
+-		{ echo "$as_me:15812: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
++		{ echo "$as_me:15813: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+ echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
+ 		;;
+ 	esac
+@@ -15821,7 +15822,7 @@
+ 	NCURSES_SIZE_T=$cf_dft_ordinate_type
+ fi
+ 
+-echo "$as_me:15824: checking if you want opaque curses-library structures" >&5
++echo "$as_me:15825: checking if you want opaque curses-library structures" >&5
+ echo $ECHO_N "checking if you want opaque curses-library structures... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
+@@ -15843,16 +15844,16 @@
+ 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses
+ 
+ fi;
+-echo "$as_me:15846: result: $enable_opaque_curses" >&5
++echo "$as_me:15847: result: $enable_opaque_curses" >&5
+ echo "${ECHO_T}$enable_opaque_curses" >&6
+ 
+ test "$cf_cv_enable_reentrant" = 1 && \
+ test "$enable_opaque_curses" = no && \
+-{ { echo "$as_me:15851: error: reentrant configuration requires opaque library" >&5
++{ { echo "$as_me:15852: error: reentrant configuration requires opaque library" >&5
+ echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:15855: checking if you want opaque form-library structures" >&5
++echo "$as_me:15856: checking if you want opaque form-library structures" >&5
+ echo $ECHO_N "checking if you want opaque form-library structures... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-form or --disable-opaque-form was given.
+@@ -15862,10 +15863,10 @@
+ else
+   enable_opaque_form=no
+ fi;
+-echo "$as_me:15865: result: $enable_opaque_form" >&5
++echo "$as_me:15866: result: $enable_opaque_form" >&5
+ echo "${ECHO_T}$enable_opaque_form" >&6
+ 
+-echo "$as_me:15868: checking if you want opaque menu-library structures" >&5
++echo "$as_me:15869: checking if you want opaque menu-library structures" >&5
+ echo $ECHO_N "checking if you want opaque menu-library structures... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
+@@ -15875,10 +15876,10 @@
+ else
+   enable_opaque_menu=no
+ fi;
+-echo "$as_me:15878: result: $enable_opaque_menu" >&5
++echo "$as_me:15879: result: $enable_opaque_menu" >&5
+ echo "${ECHO_T}$enable_opaque_menu" >&6
+ 
+-echo "$as_me:15881: checking if you want opaque panel-library structures" >&5
++echo "$as_me:15882: checking if you want opaque panel-library structures" >&5
+ echo $ECHO_N "checking if you want opaque panel-library structures... $ECHO_C" >&6
+ 
+ # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
+@@ -15888,7 +15889,7 @@
+ else
+   enable_opaque_panel=no
+ fi;
+-echo "$as_me:15891: result: $enable_opaque_panel" >&5
++echo "$as_me:15892: result: $enable_opaque_panel" >&5
+ echo "${ECHO_T}$enable_opaque_panel" >&6
+ 
+ NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
+@@ -15898,7 +15899,7 @@
+ 
+ ### Allow using a different wrap-prefix
+ if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
+-	echo "$as_me:15901: checking for prefix used to wrap public variables" >&5
++	echo "$as_me:15902: checking for prefix used to wrap public variables" >&5
+ echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6
+ 
+ # Check whether --with-wrap-prefix or --without-wrap-prefix was given.
+@@ -15908,7 +15909,7 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-	echo "$as_me:15911: result: $NCURSES_WRAP_PREFIX" >&5
++	echo "$as_me:15912: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ else
+ 	NCURSES_WRAP_PREFIX=_nc_
+@@ -15921,7 +15922,7 @@
+ ###############################################################################
+ # These options are relatively safe to experiment with.
+ 
+-echo "$as_me:15924: checking if you want all development code" >&5
++echo "$as_me:15925: checking if you want all development code" >&5
+ echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
+ 
+ # Check whether --with-develop or --without-develop was given.
+@@ -15931,11 +15932,11 @@
+ else
+   with_develop=no
+ fi;
+-echo "$as_me:15934: result: $with_develop" >&5
++echo "$as_me:15935: result: $with_develop" >&5
+ echo "${ECHO_T}$with_develop" >&6
+ 
+ ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
+-echo "$as_me:15938: checking if you want hard-tabs code" >&5
++echo "$as_me:15939: checking if you want hard-tabs code" >&5
+ echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6
+ 
+ # Check whether --enable-hard-tabs or --disable-hard-tabs was given.
+@@ -15945,7 +15946,7 @@
+ else
+   enable_hard_tabs=$with_develop
+ fi;
+-echo "$as_me:15948: result: $enable_hard_tabs" >&5
++echo "$as_me:15949: result: $enable_hard_tabs" >&5
+ echo "${ECHO_T}$enable_hard_tabs" >&6
+ test "x$enable_hard_tabs" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15953,7 +15954,7 @@
+ EOF
+ 
+ ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
+-echo "$as_me:15956: checking if you want limited support for xmc" >&5
++echo "$as_me:15957: checking if you want limited support for xmc" >&5
+ echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6
+ 
+ # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given.
+@@ -15963,7 +15964,7 @@
+ else
+   enable_xmc_glitch=$with_develop
+ fi;
+-echo "$as_me:15966: result: $enable_xmc_glitch" >&5
++echo "$as_me:15967: result: $enable_xmc_glitch" >&5
+ echo "${ECHO_T}$enable_xmc_glitch" >&6
+ test "x$enable_xmc_glitch" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15973,7 +15974,7 @@
+ ###############################################################################
+ # These are just experimental, probably should not be in a package:
+ 
+-echo "$as_me:15976: checking if you do not want to assume colors are white-on-black" >&5
++echo "$as_me:15977: checking if you do not want to assume colors are white-on-black" >&5
+ echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6
+ 
+ # Check whether --enable-assumed-color or --disable-assumed-color was given.
+@@ -15983,7 +15984,7 @@
+ else
+   with_assumed_color=yes
+ fi;
+-echo "$as_me:15986: result: $with_assumed_color" >&5
++echo "$as_me:15987: result: $with_assumed_color" >&5
+ echo "${ECHO_T}$with_assumed_color" >&6
+ test "x$with_assumed_color" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -15991,7 +15992,7 @@
+ EOF
+ 
+ ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
+-echo "$as_me:15994: checking if you want hashmap scrolling-optimization code" >&5
++echo "$as_me:15995: checking if you want hashmap scrolling-optimization code" >&5
+ echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6
+ 
+ # Check whether --enable-hashmap or --disable-hashmap was given.
+@@ -16001,7 +16002,7 @@
+ else
+   with_hashmap=yes
+ fi;
+-echo "$as_me:16004: result: $with_hashmap" >&5
++echo "$as_me:16005: result: $with_hashmap" >&5
+ echo "${ECHO_T}$with_hashmap" >&6
+ test "x$with_hashmap" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16009,7 +16010,7 @@
+ EOF
+ 
+ ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
+-echo "$as_me:16012: checking if you want colorfgbg code" >&5
++echo "$as_me:16013: checking if you want colorfgbg code" >&5
+ echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6
+ 
+ # Check whether --enable-colorfgbg or --disable-colorfgbg was given.
+@@ -16019,7 +16020,7 @@
+ else
+   with_colorfgbg=no
+ fi;
+-echo "$as_me:16022: result: $with_colorfgbg" >&5
++echo "$as_me:16023: result: $with_colorfgbg" >&5
+ echo "${ECHO_T}$with_colorfgbg" >&6
+ test "x$with_colorfgbg" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16027,7 +16028,7 @@
+ EOF
+ 
+ ###   use option --enable-fvisibility to turn on use of gcc-specific feature
+-echo "$as_me:16030: checking if you want to use gcc -fvisibility option" >&5
++echo "$as_me:16031: checking if you want to use gcc -fvisibility option" >&5
+ echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6
+ 
+ # Check whether --enable-fvisibility or --disable-fvisibility was given.
+@@ -16037,14 +16038,14 @@
+ else
+   cf_with_fvisibility=no
+ fi;
+-echo "$as_me:16040: result: $cf_with_fvisibility" >&5
++echo "$as_me:16041: result: $cf_with_fvisibility" >&5
+ echo "${ECHO_T}$cf_with_fvisibility" >&6
+ 
+ NCURSES_IMPEXP=
+ NCURSES_CXX_IMPEXP=
+ if test "x$cf_with_fvisibility" = xyes; then
+ 
+-echo "$as_me:16047: checking if $CC -fvisibility=hidden option works" >&5
++echo "$as_me:16048: checking if $CC -fvisibility=hidden option works" >&5
+ echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6
+ if test "${cf_cv_fvisibility_hidden+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16053,7 +16054,7 @@
+     cf_save_cflags="$CFLAGS"
+     CFLAGS="$CFLAGS -fvisibility=hidden"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16056 "configure"
++#line 16057 "configure"
+ #include "confdefs.h"
+ 
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -16069,16 +16070,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16072: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16073: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16075: \$? = $ac_status" >&5
++  echo "$as_me:16076: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16078: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16079: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16081: \$? = $ac_status" >&5
++  echo "$as_me:16082: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fvisibility_hidden=yes
+ else
+@@ -16090,7 +16091,7 @@
+     CFLAGS=$cf_save_cflags
+ 
+ fi
+-echo "$as_me:16093: result: $cf_cv_fvisibility_hidden" >&5
++echo "$as_me:16094: result: $cf_cv_fvisibility_hidden" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
+ 
+ 	if test "x$cf_cv_fvisibility_hidden" = xyes
+@@ -16205,7 +16206,7 @@
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:16208: checking if $CXX -fvisibility=hidden option works" >&5
++echo "$as_me:16209: checking if $CXX -fvisibility=hidden option works" >&5
+ echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6
+ if test "${cf_cv_fvisibility_hidden2+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16214,7 +16215,7 @@
+     cf_save_cflags="$CXXFLAGS"
+     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16217 "configure"
++#line 16218 "configure"
+ #include "confdefs.h"
+ 
+ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
+@@ -16230,16 +16231,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:16233: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16234: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:16236: \$? = $ac_status" >&5
++  echo "$as_me:16237: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:16239: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16240: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16242: \$? = $ac_status" >&5
++  echo "$as_me:16243: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fvisibility_hidden2=yes
+ else
+@@ -16251,7 +16252,7 @@
+     CXXFLAGS=$cf_save_cflags
+ 
+ fi
+-echo "$as_me:16254: result: $cf_cv_fvisibility_hidden2" >&5
++echo "$as_me:16255: result: $cf_cv_fvisibility_hidden2" >&5
+ echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
+ 
+ 		if test "x$cf_cv_fvisibility_hidden2" = xyes
+@@ -16374,7 +16375,7 @@
+ fi
+ 
+ ###   use option --enable-interop to turn on use of bindings used for interop
+-echo "$as_me:16377: checking if you want interop bindings" >&5
++echo "$as_me:16378: checking if you want interop bindings" >&5
+ echo $ECHO_N "checking if you want interop bindings... $ECHO_C" >&6
+ 
+ # Check whether --enable-interop or --disable-interop was given.
+@@ -16384,13 +16385,13 @@
+ else
+   with_exp_interop=$cf_dft_interop
+ fi;
+-echo "$as_me:16387: result: $with_exp_interop" >&5
++echo "$as_me:16388: result: $with_exp_interop" >&5
+ echo "${ECHO_T}$with_exp_interop" >&6
+ 
+ NCURSES_INTEROP_FUNCS=0
+ test "x$with_exp_interop" = xyes && NCURSES_INTEROP_FUNCS=1
+ 
+-echo "$as_me:16393: checking if you want experimental safe-sprintf code" >&5
++echo "$as_me:16394: checking if you want experimental safe-sprintf code" >&5
+ echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6
+ 
+ # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given.
+@@ -16400,13 +16401,13 @@
+ else
+   with_safe_sprintf=no
+ fi;
+-echo "$as_me:16403: result: $with_safe_sprintf" >&5
++echo "$as_me:16404: result: $with_safe_sprintf" >&5
+ echo "${ECHO_T}$with_safe_sprintf" >&6
+ 
+ ###   use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
+ # when hashmap is used scroll hints are useless
+ if test "$with_hashmap" = no ; then
+-echo "$as_me:16409: checking if you want to experiment without scrolling-hints code" >&5
++echo "$as_me:16410: checking if you want to experiment without scrolling-hints code" >&5
+ echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6
+ 
+ # Check whether --enable-scroll-hints or --disable-scroll-hints was given.
+@@ -16416,7 +16417,7 @@
+ else
+   with_scroll_hints=yes
+ fi;
+-echo "$as_me:16419: result: $with_scroll_hints" >&5
++echo "$as_me:16420: result: $with_scroll_hints" >&5
+ echo "${ECHO_T}$with_scroll_hints" >&6
+ test "x$with_scroll_hints" = xyes &&
+ cat >>confdefs.h <<\EOF
+@@ -16425,7 +16426,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16428: checking if you want wgetch-events code" >&5
++echo "$as_me:16429: checking if you want wgetch-events code" >&5
+ echo $ECHO_N "checking if you want wgetch-events code... $ECHO_C" >&6
+ 
+ # Check whether --enable-wgetch-events or --disable-wgetch-events was given.
+@@ -16435,7 +16436,7 @@
+ else
+   with_wgetch_events=no
+ fi;
+-echo "$as_me:16438: result: $with_wgetch_events" >&5
++echo "$as_me:16439: result: $with_wgetch_events" >&5
+ echo "${ECHO_T}$with_wgetch_events" >&6
+ if test "x$with_wgetch_events" = xyes ; then
+ 
+@@ -16450,7 +16451,7 @@
+ 
+ case "$cf_cv_system_name" in
+ (*mingw32*|*mingw64*|*-msvc*)
+-	echo "$as_me:16453: checking if you want experimental-Windows driver" >&5
++	echo "$as_me:16454: checking if you want experimental-Windows driver" >&5
+ echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6
+ 
+ # Check whether --enable-exp-win32 or --disable-exp-win32 was given.
+@@ -16460,7 +16461,7 @@
+ else
+   with_exp_win32=no
+ fi;
+-	echo "$as_me:16463: result: $with_exp_win32" >&5
++	echo "$as_me:16464: result: $with_exp_win32" >&5
+ echo "${ECHO_T}$with_exp_win32" >&6
+ 	if test "x$with_exp_win32" = xyes
+ 	then
+@@ -16486,7 +16487,7 @@
+ 
+ ###	use option --disable-echo to suppress full display compiling commands
+ 
+-echo "$as_me:16489: checking if you want to see long compiling messages" >&5
++echo "$as_me:16490: checking if you want to see long compiling messages" >&5
+ echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
+ 
+ # Check whether --enable-echo or --disable-echo was given.
+@@ -16520,7 +16521,7 @@
+ 	ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:16523: result: $enableval" >&5
++echo "$as_me:16524: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+ if test "x$enable_echo" = xyes; then
+@@ -16533,7 +16534,7 @@
+ 
+ # --disable-stripping is used for debugging
+ 
+-echo "$as_me:16536: checking if you want to install stripped executables" >&5
++echo "$as_me:16537: checking if you want to install stripped executables" >&5
+ echo $ECHO_N "checking if you want to install stripped executables... $ECHO_C" >&6
+ 
+ # Check whether --enable-stripping or --disable-stripping was given.
+@@ -16550,7 +16551,7 @@
+ 	enable_stripping=yes
+ 
+ fi;
+-echo "$as_me:16553: result: $enable_stripping" >&5
++echo "$as_me:16554: result: $enable_stripping" >&5
+ echo "${ECHO_T}$enable_stripping" >&6
+ 
+ if test "$enable_stripping" = yes
+@@ -16561,7 +16562,7 @@
+ fi
+ 
+ : "${INSTALL:=install}"
+-echo "$as_me:16564: checking if install accepts -p option" >&5
++echo "$as_me:16565: checking if install accepts -p option" >&5
+ echo $ECHO_N "checking if install accepts -p option... $ECHO_C" >&6
+ if test "${cf_cv_install_p+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16592,10 +16593,10 @@
+ 	rm -rf ./conftest*
+ 
+ fi
+-echo "$as_me:16595: result: $cf_cv_install_p" >&5
++echo "$as_me:16596: result: $cf_cv_install_p" >&5
+ echo "${ECHO_T}$cf_cv_install_p" >&6
+ 
+-echo "$as_me:16598: checking if install needs to be told about ownership" >&5
++echo "$as_me:16599: checking if install needs to be told about ownership" >&5
+ echo $ECHO_N "checking if install needs to be told about ownership... $ECHO_C" >&6
+ case `$ac_config_guess` in
+ (*minix)
+@@ -16606,7 +16607,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:16609: result: $with_install_o" >&5
++echo "$as_me:16610: result: $with_install_o" >&5
+ echo "${ECHO_T}$with_install_o" >&6
+ if test "x$with_install_o" = xyes
+ then
+@@ -16631,7 +16632,7 @@
+ 
+ ###	use option --enable-warnings to turn on all gcc warnings
+ 
+-echo "$as_me:16634: checking if you want to use C11 _Noreturn feature" >&5
++echo "$as_me:16635: checking if you want to use C11 _Noreturn feature" >&5
+ echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
+ 
+ # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
+@@ -16648,17 +16649,17 @@
+ 	enable_stdnoreturn=no
+ 
+ fi;
+-echo "$as_me:16651: result: $enable_stdnoreturn" >&5
++echo "$as_me:16652: result: $enable_stdnoreturn" >&5
+ echo "${ECHO_T}$enable_stdnoreturn" >&6
+ 
+ if test $enable_stdnoreturn = yes; then
+-echo "$as_me:16655: checking for C11 _Noreturn feature" >&5
++echo "$as_me:16656: checking for C11 _Noreturn feature" >&5
+ echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
+ if test "${cf_cv_c11_noreturn+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16661 "configure"
++#line 16662 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16675,16 +16676,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16678: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16679: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16681: \$? = $ac_status" >&5
++  echo "$as_me:16682: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16684: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16685: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16687: \$? = $ac_status" >&5
++  echo "$as_me:16688: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_c11_noreturn=yes
+ else
+@@ -16695,7 +16696,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16698: result: $cf_cv_c11_noreturn" >&5
++echo "$as_me:16699: result: $cf_cv_c11_noreturn" >&5
+ echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
+ else
+ 	cf_cv_c11_noreturn=no,
+@@ -16751,16 +16752,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16754: testing repairing CFLAGS: $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16755: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+ 
+ 			CFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16759: testing ... fixed $CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16760: testing ... fixed $CFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16763: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16764: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -16799,16 +16800,16 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16802: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:16803: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+ 
+ 			CPPFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16807: testing ... fixed $CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:16808: testing ... fixed $CPPFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16811: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16812: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+@@ -16847,23 +16848,23 @@
+ 		then
+ 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16850: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:16851: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+ 
+ 			LDFLAGS="$cf_temp_flags"
+ 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16855: testing ... fixed $LDFLAGS ..." 1>&5
++echo "${as_me:-configure}:16856: testing ... fixed $LDFLAGS ..." 1>&5
+ 
+ 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:16859: testing ... extra $EXTRA_CFLAGS ..." 1>&5
++echo "${as_me:-configure}:16860: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+ 
+ 		fi
+ 		;;
+ 	esac
+ fi
+ 
+-echo "$as_me:16866: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:16867: checking if you want to turn on gcc warnings" >&5
+ echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6
+ 
+ # Check whether --enable-warnings or --disable-warnings was given.
+@@ -16880,7 +16881,7 @@
+ 	enable_warnings=no
+ 
+ fi;
+-echo "$as_me:16883: result: $enable_warnings" >&5
++echo "$as_me:16884: result: $enable_warnings" >&5
+ echo "${ECHO_T}$enable_warnings" >&6
+ if test "$enable_warnings" = "yes"
+ then
+@@ -16904,7 +16905,7 @@
+ done
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16907 "configure"
++#line 16908 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -16919,26 +16920,26 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16922: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16923: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16925: \$? = $ac_status" >&5
++  echo "$as_me:16926: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16928: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16929: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16931: \$? = $ac_status" >&5
++  echo "$as_me:16932: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+-echo "$as_me:16934: checking for X11/Xt const-feature" >&5
++echo "$as_me:16935: checking for X11/Xt const-feature" >&5
+ echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
+ if test "${cf_cv_const_x_string+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 16941 "configure"
++#line 16942 "configure"
+ #include "confdefs.h"
+ 
+ #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
+@@ -16955,16 +16956,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:16958: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16959: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:16961: \$? = $ac_status" >&5
++  echo "$as_me:16962: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:16964: \"$ac_try\"") >&5
++  { (eval echo "$as_me:16965: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:16967: \$? = $ac_status" >&5
++  echo "$as_me:16968: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_const_x_string=no
+@@ -16979,7 +16980,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:16982: result: $cf_cv_const_x_string" >&5
++echo "$as_me:16983: result: $cf_cv_const_x_string" >&5
+ echo "${ECHO_T}$cf_cv_const_x_string" >&6
+ 
+ LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
+@@ -17008,7 +17009,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  fi
+ cat > "conftest.$ac_ext" <&5
++	{ echo "$as_me:17028: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
+@@ -17040,12 +17041,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:17043: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17044: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17046: \$? = $ac_status" >&5
++  echo "$as_me:17047: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17048: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17049: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -17053,7 +17054,7 @@
+ 	CFLAGS="$cf_save_CFLAGS"
+ elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
+ then
+-	{ echo "$as_me:17056: checking for $CC warning options..." >&5
++	{ echo "$as_me:17057: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	cf_warn_CONST=""
+@@ -17076,12 +17077,12 @@
+ 		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:17079: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17080: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17082: \$? = $ac_status" >&5
++  echo "$as_me:17083: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17084: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17085: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case "$cf_opt" in
+ 			(Winline)
+@@ -17089,7 +17090,7 @@
+ 				([34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:17092: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17093: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -17099,7 +17100,7 @@
+ 				([12].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:17102: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:17103: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -17132,10 +17133,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:17135: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:17136: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > "conftest.$ac_ext" <&5
++		if { (eval echo "$as_me:17188: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17190: \$? = $ac_status" >&5
++  echo "$as_me:17191: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17192: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:17193: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case "$cf_attribute" in
+@@ -17261,12 +17262,12 @@
+ if test "$GCC" = yes ; then
+ 	case "$host_os" in
+ 	(linux*|gnu*)
+-		echo "$as_me:17264: checking if this is really Intel C++ compiler" >&5
++		echo "$as_me:17265: checking if this is really Intel C++ compiler" >&5
+ echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6
+ 		cf_save_CFLAGS="$CXXFLAGS"
+ 		CXXFLAGS="$CXXFLAGS -no-gcc"
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17269 "configure"
++#line 17270 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17283,16 +17284,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17286: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17287: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17289: \$? = $ac_status" >&5
++  echo "$as_me:17290: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17292: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17293: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17295: \$? = $ac_status" >&5
++  echo "$as_me:17296: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   INTEL_CPLUSPLUS=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
+@@ -17303,7 +17304,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 		CXXFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:17306: result: $INTEL_CPLUSPLUS" >&5
++		echo "$as_me:17307: result: $INTEL_CPLUSPLUS" >&5
+ echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
+ 		;;
+ 	esac
+@@ -17312,11 +17313,11 @@
+ CLANG_CPLUSPLUS=no
+ 
+ if test "$GCC" = yes ; then
+-	echo "$as_me:17315: checking if this is really Clang C++ compiler" >&5
++	echo "$as_me:17316: checking if this is really Clang C++ compiler" >&5
+ echo $ECHO_N "checking if this is really Clang C++ compiler... $ECHO_C" >&6
+ 	cf_save_CFLAGS="$CXXFLAGS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17319 "configure"
++#line 17320 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17333,16 +17334,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:17336: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17337: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17339: \$? = $ac_status" >&5
++  echo "$as_me:17340: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:17342: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17343: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17345: \$? = $ac_status" >&5
++  echo "$as_me:17346: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   CLANG_CPLUSPLUS=yes
+ 
+@@ -17352,7 +17353,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 	CXXFLAGS="$cf_save_CFLAGS"
+-	echo "$as_me:17355: result: $CLANG_CPLUSPLUS" >&5
++	echo "$as_me:17356: result: $CLANG_CPLUSPLUS" >&5
+ echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
+ fi
+ 
+@@ -17361,30 +17362,30 @@
+ if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
+ 	case "$CC" in
+ 	(c[1-9][0-9]|*/c[1-9][0-9])
+-		{ echo "$as_me:17364: WARNING: replacing broken compiler alias $CC" >&5
++		{ echo "$as_me:17365: WARNING: replacing broken compiler alias $CC" >&5
+ echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
+ 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
+ 		CC=clang
+ 		;;
+ 	esac
+ 
+-	echo "$as_me:17371: checking version of $CC" >&5
++	echo "$as_me:17372: checking version of $CC" >&5
+ echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
+ 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+ 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
+-	echo "$as_me:17375: result: $CLANG_VERSION" >&5
++	echo "$as_me:17376: result: $CLANG_VERSION" >&5
+ echo "${ECHO_T}$CLANG_VERSION" >&6
+ 
+ 	for cf_clang_opt in \
+ 		-Qunused-arguments \
+ 		-Wno-error=implicit-function-declaration
+ 	do
+-		echo "$as_me:17382: checking if option $cf_clang_opt works" >&5
++		echo "$as_me:17383: checking if option $cf_clang_opt works" >&5
+ echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
+ 		cf_save_CFLAGS="$CFLAGS"
+ 		CFLAGS="$CFLAGS $cf_clang_opt"
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17387 "configure"
++#line 17388 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -17398,16 +17399,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17401: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17402: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17404: \$? = $ac_status" >&5
++  echo "$as_me:17405: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17407: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17408: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17410: \$? = $ac_status" >&5
++  echo "$as_me:17411: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_clang_optok=yes
+@@ -17418,13 +17419,13 @@
+ 			cf_clang_optok=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-		echo "$as_me:17421: result: $cf_clang_optok" >&5
++		echo "$as_me:17422: result: $cf_clang_optok" >&5
+ echo "${ECHO_T}$cf_clang_optok" >&6
+ 		CFLAGS="$cf_save_CFLAGS"
+ 		if test "$cf_clang_optok" = yes; then
+ 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
+ 
+-echo "${as_me:-configure}:17427: testing adding option $cf_clang_opt ..." 1>&5
++echo "${as_me:-configure}:17428: testing adding option $cf_clang_opt ..." 1>&5
+ 
+ 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+ 	CFLAGS="${CFLAGS}$cf_clang_opt"
+@@ -17441,7 +17442,7 @@
+ ac_main_return="return"
+ 
+ cat > conftest.$ac_ext <&5
++	{ echo "$as_me:17463: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-Wall"
+@@ -17476,12 +17477,12 @@
+ 		wd981
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:17479: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17480: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17482: \$? = $ac_status" >&5
++  echo "$as_me:17483: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17484: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17485: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		fi
+@@ -17490,7 +17491,7 @@
+ 
+ elif test "$GXX" = yes
+ then
+-	{ echo "$as_me:17493: checking for $CXX warning options..." >&5
++	{ echo "$as_me:17494: checking for $CXX warning options..." >&5
+ echo "$as_me: checking for $CXX warning options..." >&6;}
+ 	cf_save_CXXFLAGS="$CXXFLAGS"
+ 	EXTRA_CXXFLAGS="-W -Wall"
+@@ -17520,16 +17521,16 @@
+ 		Wundef $cf_gxx_extra_warnings Wno-unused
+ 	do
+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
+-		if { (eval echo "$as_me:17523: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:17524: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:17526: \$? = $ac_status" >&5
++  echo "$as_me:17527: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+-			test -n "$verbose" && echo "$as_me:17528: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17529: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
+ 		else
+-			test -n "$verbose" && echo "$as_me:17532: result: ... no -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:17533: result: ... no -$cf_opt" >&5
+ echo "${ECHO_T}... no -$cf_opt" >&6
+ 		fi
+ 	done
+@@ -17547,7 +17548,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:17550: checking if you want to work around bogus compiler/loader warnings" >&5
++echo "$as_me:17551: checking if you want to work around bogus compiler/loader warnings" >&5
+ echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6
+ 
+ # Check whether --enable-string-hacks or --disable-string-hacks was given.
+@@ -17557,7 +17558,7 @@
+ else
+   enable_string_hacks=no
+ fi;
+-echo "$as_me:17560: result: $enable_string_hacks" >&5
++echo "$as_me:17561: result: $enable_string_hacks" >&5
+ echo "${ECHO_T}$enable_string_hacks" >&6
+ 
+ if test "x$enable_string_hacks" = "xyes"; then
+@@ -17566,15 +17567,15 @@
+ #define USE_STRING_HACKS 1
+ EOF
+ 
+-	{ echo "$as_me:17569: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
++	{ echo "$as_me:17570: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+ echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;}
+-	echo "$as_me:17571: checking for strlcat" >&5
++	echo "$as_me:17572: checking for strlcat" >&5
+ echo $ECHO_N "checking for strlcat... $ECHO_C" >&6
+ if test "${ac_cv_func_strlcat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17577 "configure"
++#line 17578 "configure"
+ #include "confdefs.h"
+ #define strlcat autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17605,16 +17606,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17608: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17609: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17611: \$? = $ac_status" >&5
++  echo "$as_me:17612: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17614: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17615: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17617: \$? = $ac_status" >&5
++  echo "$as_me:17618: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_strlcat=yes
+ else
+@@ -17624,7 +17625,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17627: result: $ac_cv_func_strlcat" >&5
++echo "$as_me:17628: result: $ac_cv_func_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_func_strlcat" >&6
+ if test "$ac_cv_func_strlcat" = yes; then
+ 
+@@ -17634,7 +17635,7 @@
+ 
+ else
+ 
+-		echo "$as_me:17637: checking for strlcat in -lbsd" >&5
++		echo "$as_me:17638: checking for strlcat in -lbsd" >&5
+ echo $ECHO_N "checking for strlcat in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_strlcat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17642,7 +17643,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17645 "configure"
++#line 17646 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -17661,16 +17662,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17664: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17665: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17667: \$? = $ac_status" >&5
++  echo "$as_me:17668: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17670: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17671: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17673: \$? = $ac_status" >&5
++  echo "$as_me:17674: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_strlcat=yes
+ else
+@@ -17681,7 +17682,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:17684: result: $ac_cv_lib_bsd_strlcat" >&5
++echo "$as_me:17685: result: $ac_cv_lib_bsd_strlcat" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6
+ if test "$ac_cv_lib_bsd_strlcat" = yes; then
+ 
+@@ -17704,23 +17705,23 @@
+ for ac_header in bsd/string.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:17707: checking for $ac_header" >&5
++echo "$as_me:17708: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17713 "configure"
++#line 17714 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:17717: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:17718: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:17723: \$? = $ac_status" >&5
++  echo "$as_me:17724: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -17739,7 +17740,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:17742: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:17743: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:17764: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 17769 "configure"
++#line 17770 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -17797,16 +17798,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:17800: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17801: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:17803: \$? = $ac_status" >&5
++  echo "$as_me:17804: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:17806: \"$ac_try\"") >&5
++  { (eval echo "$as_me:17807: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:17809: \$? = $ac_status" >&5
++  echo "$as_me:17810: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -17816,7 +17817,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:17819: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:17820: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:17833: checking if you want to enable runtime assertions" >&5
+ echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
+ 
+ # Check whether --enable-assertions or --disable-assertions was given.
+@@ -17839,7 +17840,7 @@
+ else
+   with_assertions=no
+ fi;
+-echo "$as_me:17842: result: $with_assertions" >&5
++echo "$as_me:17843: result: $with_assertions" >&5
+ echo "${ECHO_T}$with_assertions" >&6
+ if test -n "$GCC"
+ then
+@@ -17855,7 +17856,7 @@
+ 
+ ###	use option --disable-leaks to suppress "permanent" leaks, for testing
+ 
+-echo "$as_me:17858: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:17859: checking if you want to use dmalloc for testing" >&5
+ echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
+ 
+ # Check whether --with-dmalloc or --without-dmalloc was given.
+@@ -17877,7 +17878,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:17880: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:17881: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -17991,23 +17992,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:17994: checking for dmalloc.h" >&5
++	echo "$as_me:17995: checking for dmalloc.h" >&5
+ echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
+ if test "${ac_cv_header_dmalloc_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18000 "configure"
++#line 18001 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:18004: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18005: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:18010: \$? = $ac_status" >&5
++  echo "$as_me:18011: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18026,11 +18027,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18029: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:18030: result: $ac_cv_header_dmalloc_h" >&5
+ echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
+ if test "$ac_cv_header_dmalloc_h" = yes; then
+ 
+-echo "$as_me:18033: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:18034: checking for dmalloc_debug in -ldmalloc" >&5
+ echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
+ if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18038,7 +18039,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18041 "configure"
++#line 18042 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18057,16 +18058,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18060: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18061: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18063: \$? = $ac_status" >&5
++  echo "$as_me:18064: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18066: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18067: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18069: \$? = $ac_status" >&5
++  echo "$as_me:18070: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -18077,7 +18078,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18080: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:18081: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+ echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
+ if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:18096: checking if you want to use dbmalloc for testing" >&5
+ echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
+ 
+ # Check whether --with-dbmalloc or --without-dbmalloc was given.
+@@ -18114,7 +18115,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:18117: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:18118: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -18228,23 +18229,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:18231: checking for dbmalloc.h" >&5
++	echo "$as_me:18232: checking for dbmalloc.h" >&5
+ echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
+ if test "${ac_cv_header_dbmalloc_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18237 "configure"
++#line 18238 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:18241: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:18242: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:18247: \$? = $ac_status" >&5
++  echo "$as_me:18248: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -18263,11 +18264,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:18266: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:18267: result: $ac_cv_header_dbmalloc_h" >&5
+ echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
+ if test "$ac_cv_header_dbmalloc_h" = yes; then
+ 
+-echo "$as_me:18270: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:18271: checking for debug_malloc in -ldbmalloc" >&5
+ echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
+ if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18275,7 +18276,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18278 "configure"
++#line 18279 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18294,16 +18295,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18297: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18298: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18300: \$? = $ac_status" >&5
++  echo "$as_me:18301: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18303: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18304: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18306: \$? = $ac_status" >&5
++  echo "$as_me:18307: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -18314,7 +18315,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18317: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:18318: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+ echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
+ if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:18333: checking if you want to use valgrind for testing" >&5
+ echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
+ 
+ # Check whether --with-valgrind or --without-valgrind was given.
+@@ -18351,7 +18352,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:18354: result: ${with_valgrind:-no}" >&5
++echo "$as_me:18355: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case ".$with_cflags" in
+@@ -18464,7 +18465,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:18467: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:18468: checking if you want to perform memory-leak testing" >&5
+ echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
+ 
+ # Check whether --enable-leaks or --disable-leaks was given.
+@@ -18475,7 +18476,7 @@
+   enable_leaks=yes
+ fi;
+ if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
+-echo "$as_me:18478: result: $with_no_leaks" >&5
++echo "$as_me:18479: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$enable_leaks" = no ; then
+@@ -18527,7 +18528,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:18530: checking whether to add trace feature to all models" >&5
++echo "$as_me:18531: checking whether to add trace feature to all models" >&5
+ echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
+ 
+ # Check whether --with-trace or --without-trace was given.
+@@ -18537,7 +18538,7 @@
+ else
+   cf_with_trace=$cf_all_traces
+ fi;
+-echo "$as_me:18540: result: $cf_with_trace" >&5
++echo "$as_me:18541: result: $cf_with_trace" >&5
+ echo "${ECHO_T}$cf_with_trace" >&6
+ 
+ if test "x$cf_with_trace" = xyes ; then
+@@ -18651,7 +18652,7 @@
+ 	ADA_TRACE=FALSE
+ fi
+ 
+-echo "$as_me:18654: checking if we want to use GNAT projects" >&5
++echo "$as_me:18655: checking if we want to use GNAT projects" >&5
+ echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6
+ 
+ # Check whether --enable-gnat-projects or --disable-gnat-projects was given.
+@@ -18668,7 +18669,7 @@
+ 	enable_gnat_projects=yes
+ 
+ fi;
+-echo "$as_me:18671: result: $enable_gnat_projects" >&5
++echo "$as_me:18672: result: $enable_gnat_projects" >&5
+ echo "${ECHO_T}$enable_gnat_projects" >&6
+ 
+ ###	Checks for libraries.
+@@ -18681,14 +18682,14 @@
+ 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN"
+ 	fi
+ 
+-echo "$as_me:18684: checking if ssp library is needed" >&5
++echo "$as_me:18685: checking if ssp library is needed" >&5
+ echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6
+ if test "${cf_cv_need_libssp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18691 "configure"
++#line 18692 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -18705,16 +18706,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18708: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18709: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18711: \$? = $ac_status" >&5
++  echo "$as_me:18712: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18714: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18715: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18717: \$? = $ac_status" >&5
++  echo "$as_me:18718: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=no
+ else
+@@ -18724,7 +18725,7 @@
+ 	cf_save_LIBS="$LIBS"
+ 	LIBS="$LIBS -lssp"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18727 "configure"
++#line 18728 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -18741,16 +18742,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18744: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18745: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18747: \$? = $ac_status" >&5
++  echo "$as_me:18748: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18750: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18751: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18753: \$? = $ac_status" >&5
++  echo "$as_me:18754: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libssp=yes
+ else
+@@ -18764,7 +18765,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18767: result: $cf_cv_need_libssp" >&5
++echo "$as_me:18768: result: $cf_cv_need_libssp" >&5
+ echo "${ECHO_T}$cf_cv_need_libssp" >&6
+ 
+ if test "x$cf_cv_need_libssp" = xyes
+@@ -18790,13 +18791,13 @@
+ 
+ 	;;
+ (*)
+-echo "$as_me:18793: checking for gettimeofday" >&5
++echo "$as_me:18794: checking for gettimeofday" >&5
+ echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
+ if test "${ac_cv_func_gettimeofday+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18799 "configure"
++#line 18800 "configure"
+ #include "confdefs.h"
+ #define gettimeofday autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -18827,16 +18828,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18830: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18831: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18833: \$? = $ac_status" >&5
++  echo "$as_me:18834: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18836: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18837: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18839: \$? = $ac_status" >&5
++  echo "$as_me:18840: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_gettimeofday=yes
+ else
+@@ -18846,7 +18847,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18849: result: $ac_cv_func_gettimeofday" >&5
++echo "$as_me:18850: result: $ac_cv_func_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+ if test "$ac_cv_func_gettimeofday" = yes; then
+ 
+@@ -18856,7 +18857,7 @@
+ 
+ else
+ 
+-echo "$as_me:18859: checking for gettimeofday in -lbsd" >&5
++echo "$as_me:18860: checking for gettimeofday in -lbsd" >&5
+ echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18864,7 +18865,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18867 "configure"
++#line 18868 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -18883,16 +18884,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18886: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18887: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18889: \$? = $ac_status" >&5
++  echo "$as_me:18890: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18892: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18893: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18895: \$? = $ac_status" >&5
++  echo "$as_me:18896: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_bsd_gettimeofday=yes
+ else
+@@ -18903,7 +18904,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:18906: result: $ac_cv_lib_bsd_gettimeofday" >&5
++echo "$as_me:18907: result: $ac_cv_lib_bsd_gettimeofday" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
+ if test "$ac_cv_lib_bsd_gettimeofday" = yes; then
+ 
+@@ -18933,14 +18934,14 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:18936: checking if -lm needed for math functions" >&5
++echo "$as_me:18937: checking if -lm needed for math functions" >&5
+ echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6
+ if test "${cf_cv_need_libm+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18943 "configure"
++#line 18944 "configure"
+ #include "confdefs.h"
+ 
+ 	#include 
+@@ -18956,16 +18957,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:18959: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18960: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:18962: \$? = $ac_status" >&5
++  echo "$as_me:18963: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:18965: \"$ac_try\"") >&5
++  { (eval echo "$as_me:18966: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:18968: \$? = $ac_status" >&5
++  echo "$as_me:18969: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_need_libm=no
+ else
+@@ -18975,7 +18976,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:18978: result: $cf_cv_need_libm" >&5
++echo "$as_me:18979: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+ if test "$cf_cv_need_libm" = yes
+ then
+@@ -18983,13 +18984,13 @@
+ fi
+ 
+ ###	Checks for header files.
+-echo "$as_me:18986: checking for ANSI C header files" >&5
++echo "$as_me:18987: checking for ANSI C header files" >&5
+ echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+ if test "${ac_cv_header_stdc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 18992 "configure"
++#line 18993 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -18997,13 +18998,13 @@
+ #include 
+ 
+ _ACEOF
+-if { (eval echo "$as_me:19000: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:19001: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:19006: \$? = $ac_status" >&5
++  echo "$as_me:19007: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -19025,7 +19026,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19028 "configure"
++#line 19029 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -19043,7 +19044,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19046 "configure"
++#line 19047 "configure"
+ #include "confdefs.h"
+ #include 
+ 
+@@ -19064,7 +19065,7 @@
+   :
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19067 "configure"
++#line 19068 "configure"
+ #include "confdefs.h"
+ #include 
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -19090,15 +19091,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:19093: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19094: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19096: \$? = $ac_status" >&5
++  echo "$as_me:19097: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:19098: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19099: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19101: \$? = $ac_status" >&5
++  echo "$as_me:19102: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -19111,7 +19112,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:19114: result: $ac_cv_header_stdc" >&5
++echo "$as_me:19115: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -19124,13 +19125,13 @@
+ ac_header_dirent=no
+ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
+   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+-echo "$as_me:19127: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:19128: checking for $ac_hdr that defines DIR" >&5
+ echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19133 "configure"
++#line 19134 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$ac_hdr>
+@@ -19145,16 +19146,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19148: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19149: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19151: \$? = $ac_status" >&5
++  echo "$as_me:19152: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19154: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19155: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19157: \$? = $ac_status" >&5
++  echo "$as_me:19158: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -19164,7 +19165,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19167: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:19168: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++  echo "$as_me:19181: checking for opendir in -ldir" >&5
+ echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
+ if test "${ac_cv_lib_dir_opendir+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19185,7 +19186,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldir  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19188 "configure"
++#line 19189 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19204,16 +19205,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19207: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19208: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19210: \$? = $ac_status" >&5
++  echo "$as_me:19211: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19213: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19214: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19216: \$? = $ac_status" >&5
++  echo "$as_me:19217: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_dir_opendir=yes
+ else
+@@ -19224,14 +19225,14 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19227: result: $ac_cv_lib_dir_opendir" >&5
++echo "$as_me:19228: result: $ac_cv_lib_dir_opendir" >&5
+ echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
+ if test "$ac_cv_lib_dir_opendir" = yes; then
+   LIBS="$LIBS -ldir"
+ fi
+ 
+ else
+-  echo "$as_me:19234: checking for opendir in -lx" >&5
++  echo "$as_me:19235: checking for opendir in -lx" >&5
+ echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
+ if test "${ac_cv_lib_x_opendir+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19239,7 +19240,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19242 "configure"
++#line 19243 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19258,16 +19259,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19261: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19262: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19264: \$? = $ac_status" >&5
++  echo "$as_me:19265: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19267: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19268: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19270: \$? = $ac_status" >&5
++  echo "$as_me:19271: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_x_opendir=yes
+ else
+@@ -19278,7 +19279,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19281: result: $ac_cv_lib_x_opendir" >&5
++echo "$as_me:19282: result: $ac_cv_lib_x_opendir" >&5
+ echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
+ if test "$ac_cv_lib_x_opendir" = yes; then
+   LIBS="$LIBS -lx"
+@@ -19286,13 +19287,13 @@
+ 
+ fi
+ 
+-echo "$as_me:19289: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:19290: checking whether time.h and sys/time.h may both be included" >&5
+ echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
+ if test "${ac_cv_header_time+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19295 "configure"
++#line 19296 "configure"
+ #include "confdefs.h"
+ #include 
+ #include 
+@@ -19308,16 +19309,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:19311: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:19312: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:19314: \$? = $ac_status" >&5
++  echo "$as_me:19315: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:19317: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19318: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19320: \$? = $ac_status" >&5
++  echo "$as_me:19321: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -19327,7 +19328,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19330: result: $ac_cv_header_time" >&5
++echo "$as_me:19331: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -19342,7 +19343,7 @@
+ case "$host_os" in
+ (mingw*)
+ 	# -lsystre -ltre -lintl -liconv
+-	echo "$as_me:19345: checking for regcomp in -lsystre" >&5
++	echo "$as_me:19346: checking for regcomp in -lsystre" >&5
+ echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6
+ if test "${ac_cv_lib_systre_regcomp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19350,7 +19351,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsystre  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19353 "configure"
++#line 19354 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19369,16 +19370,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19372: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19373: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19375: \$? = $ac_status" >&5
++  echo "$as_me:19376: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19378: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19379: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19381: \$? = $ac_status" >&5
++  echo "$as_me:19382: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_systre_regcomp=yes
+ else
+@@ -19389,11 +19390,11 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19392: result: $ac_cv_lib_systre_regcomp" >&5
++echo "$as_me:19393: result: $ac_cv_lib_systre_regcomp" >&5
+ echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6
+ if test "$ac_cv_lib_systre_regcomp" = yes; then
+ 
+-		echo "$as_me:19396: checking for libiconv_open in -liconv" >&5
++		echo "$as_me:19397: checking for libiconv_open in -liconv" >&5
+ echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
+ if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19401,7 +19402,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-liconv  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19404 "configure"
++#line 19405 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19420,16 +19421,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19423: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19424: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19426: \$? = $ac_status" >&5
++  echo "$as_me:19427: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19429: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19430: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19432: \$? = $ac_status" >&5
++  echo "$as_me:19433: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_iconv_libiconv_open=yes
+ else
+@@ -19440,7 +19441,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19443: result: $ac_cv_lib_iconv_libiconv_open" >&5
++echo "$as_me:19444: result: $ac_cv_lib_iconv_libiconv_open" >&5
+ echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6
+ if test "$ac_cv_lib_iconv_libiconv_open" = yes; then
+ 
+@@ -19462,7 +19463,7 @@
+ 
+ fi
+ 
+-		echo "$as_me:19465: checking for libintl_gettext in -lintl" >&5
++		echo "$as_me:19466: checking for libintl_gettext in -lintl" >&5
+ echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6
+ if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19470,7 +19471,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19473 "configure"
++#line 19474 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19489,16 +19490,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19492: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19493: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19495: \$? = $ac_status" >&5
++  echo "$as_me:19496: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19498: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19499: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19501: \$? = $ac_status" >&5
++  echo "$as_me:19502: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_intl_libintl_gettext=yes
+ else
+@@ -19509,7 +19510,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19512: result: $ac_cv_lib_intl_libintl_gettext" >&5
++echo "$as_me:19513: result: $ac_cv_lib_intl_libintl_gettext" >&5
+ echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6
+ if test "$ac_cv_lib_intl_libintl_gettext" = yes; then
+ 
+@@ -19531,7 +19532,7 @@
+ 
+ fi
+ 
+-		echo "$as_me:19534: checking for tre_regcomp in -ltre" >&5
++		echo "$as_me:19535: checking for tre_regcomp in -ltre" >&5
+ echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6
+ if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19539,7 +19540,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ltre  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19542 "configure"
++#line 19543 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19558,16 +19559,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19561: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19562: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19564: \$? = $ac_status" >&5
++  echo "$as_me:19565: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19567: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19568: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19570: \$? = $ac_status" >&5
++  echo "$as_me:19571: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_tre_tre_regcomp=yes
+ else
+@@ -19578,7 +19579,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19581: result: $ac_cv_lib_tre_tre_regcomp" >&5
++echo "$as_me:19582: result: $ac_cv_lib_tre_tre_regcomp" >&5
+ echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6
+ if test "$ac_cv_lib_tre_tre_regcomp" = yes; then
+ 
+@@ -19620,7 +19621,7 @@
+ 
+ else
+ 
+-		echo "$as_me:19623: checking for regcomp in -lgnurx" >&5
++		echo "$as_me:19624: checking for regcomp in -lgnurx" >&5
+ echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6
+ if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19628,7 +19629,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgnurx  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19631 "configure"
++#line 19632 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19647,16 +19648,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19650: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19651: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19653: \$? = $ac_status" >&5
++  echo "$as_me:19654: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19656: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19657: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19659: \$? = $ac_status" >&5
++  echo "$as_me:19660: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gnurx_regcomp=yes
+ else
+@@ -19667,7 +19668,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19670: result: $ac_cv_lib_gnurx_regcomp" >&5
++echo "$as_me:19671: result: $ac_cv_lib_gnurx_regcomp" >&5
+ echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6
+ if test "$ac_cv_lib_gnurx_regcomp" = yes; then
+ 
+@@ -19695,13 +19696,13 @@
+ 	;;
+ (*)
+ 	cf_regex_libs="regex re"
+-	echo "$as_me:19698: checking for regcomp" >&5
++	echo "$as_me:19699: checking for regcomp" >&5
+ echo $ECHO_N "checking for regcomp... $ECHO_C" >&6
+ if test "${ac_cv_func_regcomp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19704 "configure"
++#line 19705 "configure"
+ #include "confdefs.h"
+ #define regcomp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19732,16 +19733,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19735: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19736: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19738: \$? = $ac_status" >&5
++  echo "$as_me:19739: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19741: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19742: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19744: \$? = $ac_status" >&5
++  echo "$as_me:19745: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_regcomp=yes
+ else
+@@ -19751,7 +19752,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19754: result: $ac_cv_func_regcomp" >&5
++echo "$as_me:19755: result: $ac_cv_func_regcomp" >&5
+ echo "${ECHO_T}$ac_cv_func_regcomp" >&6
+ if test "$ac_cv_func_regcomp" = yes; then
+   cf_regex_func=regcomp
+@@ -19760,7 +19761,7 @@
+ 		for cf_regex_lib in $cf_regex_libs
+ 		do
+ 			as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh`
+-echo "$as_me:19763: checking for regcomp in -l$cf_regex_lib" >&5
++echo "$as_me:19764: checking for regcomp in -l$cf_regex_lib" >&5
+ echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19768,7 +19769,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_regex_lib  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19771 "configure"
++#line 19772 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19787,16 +19788,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19790: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19791: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19793: \$? = $ac_status" >&5
++  echo "$as_me:19794: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19796: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19797: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19799: \$? = $ac_status" >&5
++  echo "$as_me:19800: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -19807,7 +19808,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19810: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
++echo "$as_me:19811: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then
+ 
+@@ -19839,13 +19840,13 @@
+ esac
+ 
+ if test "$cf_regex_func" = no ; then
+-	echo "$as_me:19842: checking for compile" >&5
++	echo "$as_me:19843: checking for compile" >&5
+ echo $ECHO_N "checking for compile... $ECHO_C" >&6
+ if test "${ac_cv_func_compile+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19848 "configure"
++#line 19849 "configure"
+ #include "confdefs.h"
+ #define compile autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -19876,16 +19877,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19879: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19880: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19882: \$? = $ac_status" >&5
++  echo "$as_me:19883: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19885: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19886: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19888: \$? = $ac_status" >&5
++  echo "$as_me:19889: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_compile=yes
+ else
+@@ -19895,13 +19896,13 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:19898: result: $ac_cv_func_compile" >&5
++echo "$as_me:19899: result: $ac_cv_func_compile" >&5
+ echo "${ECHO_T}$ac_cv_func_compile" >&6
+ if test "$ac_cv_func_compile" = yes; then
+   cf_regex_func=compile
+ else
+ 
+-		echo "$as_me:19904: checking for compile in -lgen" >&5
++		echo "$as_me:19905: checking for compile in -lgen" >&5
+ echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6
+ if test "${ac_cv_lib_gen_compile+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19909,7 +19910,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgen  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19912 "configure"
++#line 19913 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -19928,16 +19929,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:19931: \"$ac_link\"") >&5
++if { (eval echo "$as_me:19932: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:19934: \$? = $ac_status" >&5
++  echo "$as_me:19935: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:19937: \"$ac_try\"") >&5
++  { (eval echo "$as_me:19938: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:19940: \$? = $ac_status" >&5
++  echo "$as_me:19941: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_gen_compile=yes
+ else
+@@ -19948,7 +19949,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:19951: result: $ac_cv_lib_gen_compile" >&5
++echo "$as_me:19952: result: $ac_cv_lib_gen_compile" >&5
+ echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6
+ if test "$ac_cv_lib_gen_compile" = yes; then
+ 
+@@ -19976,11 +19977,11 @@
+ fi
+ 
+ if test "$cf_regex_func" = no ; then
+-	{ echo "$as_me:19979: WARNING: cannot find regular expression library" >&5
++	{ echo "$as_me:19980: WARNING: cannot find regular expression library" >&5
+ echo "$as_me: WARNING: cannot find regular expression library" >&2;}
+ fi
+ 
+-echo "$as_me:19983: checking for regular-expression headers" >&5
++echo "$as_me:19984: checking for regular-expression headers" >&5
+ echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
+ if test "${cf_cv_regex_hdrs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19992,7 +19993,7 @@
+ 	for cf_regex_hdr in regexp.h regexpr.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 19995 "configure"
++#line 19996 "configure"
+ #include "confdefs.h"
+ #include <$cf_regex_hdr>
+ int
+@@ -20009,16 +20010,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20012: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20013: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20015: \$? = $ac_status" >&5
++  echo "$as_me:20016: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20018: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20019: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20021: \$? = $ac_status" >&5
++  echo "$as_me:20022: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20035,7 +20036,7 @@
+ 	for cf_regex_hdr in regex.h
+ 	do
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20038 "configure"
++#line 20039 "configure"
+ #include "confdefs.h"
+ #include 
+ #include <$cf_regex_hdr>
+@@ -20055,16 +20056,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20058: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20059: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20061: \$? = $ac_status" >&5
++  echo "$as_me:20062: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20064: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20065: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20067: \$? = $ac_status" >&5
++  echo "$as_me:20068: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 			cf_cv_regex_hdrs=$cf_regex_hdr
+@@ -20080,11 +20081,11 @@
+ esac
+ 
+ fi
+-echo "$as_me:20083: result: $cf_cv_regex_hdrs" >&5
++echo "$as_me:20084: result: $cf_cv_regex_hdrs" >&5
+ echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
+ 
+ case "$cf_cv_regex_hdrs" in
+-	(no)		{ echo "$as_me:20087: WARNING: no regular expression header found" >&5
++	(no)		{ echo "$as_me:20088: WARNING: no regular expression header found" >&5
+ echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
+ 	(regex.h)
+ cat >>confdefs.h <<\EOF
+@@ -20121,23 +20122,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:20124: checking for $ac_header" >&5
++echo "$as_me:20125: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20130 "configure"
++#line 20131 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20134: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20135: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:20140: \$? = $ac_status" >&5
++  echo "$as_me:20141: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20156,7 +20157,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20159: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20160: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:20173: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20178 "configure"
++#line 20179 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:20182: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:20183: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:20188: \$? = $ac_status" >&5
++  echo "$as_me:20189: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -20204,7 +20205,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:20207: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:20208: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:20218: checking for header declaring getopt variables" >&5
+ echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6
+ if test "${cf_cv_getopt_header+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20224,7 +20225,7 @@
+ for cf_header in stdio.h stdlib.h unistd.h getopt.h
+ do
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20227 "configure"
++#line 20228 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -20237,16 +20238,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20240: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20241: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20243: \$? = $ac_status" >&5
++  echo "$as_me:20244: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20246: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20247: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20249: \$? = $ac_status" >&5
++  echo "$as_me:20250: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_getopt_header=$cf_header
+  break
+@@ -20258,7 +20259,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20261: result: $cf_cv_getopt_header" >&5
++echo "$as_me:20262: result: $cf_cv_getopt_header" >&5
+ echo "${ECHO_T}$cf_cv_getopt_header" >&6
+ if test "$cf_cv_getopt_header" != none ; then
+ 
+@@ -20275,14 +20276,14 @@
+ 
+ fi
+ 
+-echo "$as_me:20278: checking if external environ is declared" >&5
++echo "$as_me:20279: checking if external environ is declared" >&5
+ echo $ECHO_N "checking if external environ is declared... $ECHO_C" >&6
+ if test "${cf_cv_dcl_environ+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20285 "configure"
++#line 20286 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_STDLIB_H
+@@ -20298,16 +20299,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20301: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20302: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20304: \$? = $ac_status" >&5
++  echo "$as_me:20305: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20307: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20308: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20310: \$? = $ac_status" >&5
++  echo "$as_me:20311: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_environ=yes
+ else
+@@ -20318,7 +20319,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20321: result: $cf_cv_dcl_environ" >&5
++echo "$as_me:20322: result: $cf_cv_dcl_environ" >&5
+ echo "${ECHO_T}$cf_cv_dcl_environ" >&6
+ 
+ if test "$cf_cv_dcl_environ" = no ; then
+@@ -20333,14 +20334,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:20336: checking if external environ exists" >&5
++echo "$as_me:20337: checking if external environ exists" >&5
+ echo $ECHO_N "checking if external environ exists... $ECHO_C" >&6
+ if test "${cf_cv_have_environ+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20343 "configure"
++#line 20344 "configure"
+ #include "confdefs.h"
+ 
+ #undef environ
+@@ -20355,16 +20356,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20358: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20359: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20361: \$? = $ac_status" >&5
++  echo "$as_me:20362: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20364: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20365: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20367: \$? = $ac_status" >&5
++  echo "$as_me:20368: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_environ=yes
+ else
+@@ -20375,7 +20376,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:20378: result: $cf_cv_have_environ" >&5
++echo "$as_me:20379: result: $cf_cv_have_environ" >&5
+ echo "${ECHO_T}$cf_cv_have_environ" >&6
+ 
+ if test "$cf_cv_have_environ" = yes ; then
+@@ -20388,13 +20389,13 @@
+ 
+ fi
+ 
+-echo "$as_me:20391: checking for getenv" >&5
++echo "$as_me:20392: checking for getenv" >&5
+ echo $ECHO_N "checking for getenv... $ECHO_C" >&6
+ if test "${ac_cv_func_getenv+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20397 "configure"
++#line 20398 "configure"
+ #include "confdefs.h"
+ #define getenv autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20425,16 +20426,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20428: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20429: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20431: \$? = $ac_status" >&5
++  echo "$as_me:20432: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20434: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20435: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20437: \$? = $ac_status" >&5
++  echo "$as_me:20438: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_getenv=yes
+ else
+@@ -20444,19 +20445,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20447: result: $ac_cv_func_getenv" >&5
++echo "$as_me:20448: result: $ac_cv_func_getenv" >&5
+ echo "${ECHO_T}$ac_cv_func_getenv" >&6
+ 
+ for ac_func in putenv setenv strdup
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:20453: checking for $ac_func" >&5
++echo "$as_me:20454: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20459 "configure"
++#line 20460 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -20487,16 +20488,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:20490: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20491: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20493: \$? = $ac_status" >&5
++  echo "$as_me:20494: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:20496: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20497: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20499: \$? = $ac_status" >&5
++  echo "$as_me:20500: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -20506,7 +20507,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20509: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:20510: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:20520: checking if getenv returns consistent values" >&5
+ echo $ECHO_N "checking if getenv returns consistent values... $ECHO_C" >&6
+ if test "${cf_cv_consistent_getenv+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20526,7 +20527,7 @@
+   cf_cv_consistent_getenv=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20529 "configure"
++#line 20530 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20635,15 +20636,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:20638: \"$ac_link\"") >&5
++if { (eval echo "$as_me:20639: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:20641: \$? = $ac_status" >&5
++  echo "$as_me:20642: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:20643: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20644: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20646: \$? = $ac_status" >&5
++  echo "$as_me:20647: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_consistent_getenv=yes
+ else
+@@ -20656,7 +20657,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:20659: result: $cf_cv_consistent_getenv" >&5
++echo "$as_me:20660: result: $cf_cv_consistent_getenv" >&5
+ echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
+ 
+ if test "x$cf_cv_consistent_getenv" = xno
+@@ -20671,18 +20672,18 @@
+ if test "x$cf_cv_consistent_getenv" = xno && \
+ 	test "x$cf_with_trace" = xyes
+ then
+-	{ echo "$as_me:20674: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
++	{ echo "$as_me:20675: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
+ echo "$as_me: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&2;}
+ fi
+ 
+-echo "$as_me:20678: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:20679: checking if sys/time.h works with sys/select.h" >&5
+ echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
+ if test "${cf_cv_sys_time_select+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20685 "configure"
++#line 20686 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -20702,16 +20703,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20705: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20706: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20708: \$? = $ac_status" >&5
++  echo "$as_me:20709: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20711: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20712: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20714: \$? = $ac_status" >&5
++  echo "$as_me:20715: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -20723,7 +20724,7 @@
+ 
+ fi
+ 
+-echo "$as_me:20726: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:20727: result: $cf_cv_sys_time_select" >&5
+ echo "${ECHO_T}$cf_cv_sys_time_select" >&6
+ test "$cf_cv_sys_time_select" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -20738,13 +20739,13 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ac_main_return="return"
+ 
+-echo "$as_me:20741: checking for an ANSI C-conforming const" >&5
++echo "$as_me:20742: checking for an ANSI C-conforming const" >&5
+ echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
+ if test "${ac_cv_c_const+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20747 "configure"
++#line 20748 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -20802,16 +20803,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20805: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20806: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20808: \$? = $ac_status" >&5
++  echo "$as_me:20809: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20811: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20812: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20814: \$? = $ac_status" >&5
++  echo "$as_me:20815: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -20821,7 +20822,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:20824: result: $ac_cv_c_const" >&5
++echo "$as_me:20825: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -20831,7 +20832,7 @@
+ 
+ fi
+ 
+-echo "$as_me:20834: checking for inline" >&5
++echo "$as_me:20835: checking for inline" >&5
+ echo $ECHO_N "checking for inline... $ECHO_C" >&6
+ if test "${ac_cv_c_inline+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20839,7 +20840,7 @@
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20842 "configure"
++#line 20843 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo () {return 0; }
+@@ -20848,16 +20849,16 @@
+ 
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20851: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20852: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20854: \$? = $ac_status" >&5
++  echo "$as_me:20855: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20857: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20858: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20860: \$? = $ac_status" >&5
++  echo "$as_me:20861: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -20868,7 +20869,7 @@
+ done
+ 
+ fi
+-echo "$as_me:20871: result: $ac_cv_c_inline" >&5
++echo "$as_me:20872: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -20894,7 +20895,7 @@
+ 		:
+ 	elif test "$GCC" = yes
+ 	then
+-		echo "$as_me:20897: checking if $CC supports options to tune inlining" >&5
++		echo "$as_me:20898: checking if $CC supports options to tune inlining" >&5
+ echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6
+ if test "${cf_cv_gcc_inline+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -20903,7 +20904,7 @@
+ 		cf_save_CFLAGS=$CFLAGS
+ 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 20906 "configure"
++#line 20907 "configure"
+ #include "confdefs.h"
+ inline int foo(void) { return 1; }
+ int
+@@ -20915,16 +20916,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:20918: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:20919: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:20921: \$? = $ac_status" >&5
++  echo "$as_me:20922: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:20924: \"$ac_try\"") >&5
++  { (eval echo "$as_me:20925: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:20927: \$? = $ac_status" >&5
++  echo "$as_me:20928: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_gcc_inline=yes
+ else
+@@ -20936,7 +20937,7 @@
+ 		CFLAGS=$cf_save_CFLAGS
+ 
+ fi
+-echo "$as_me:20939: result: $cf_cv_gcc_inline" >&5
++echo "$as_me:20940: result: $cf_cv_gcc_inline" >&5
+ echo "${ECHO_T}$cf_cv_gcc_inline" >&6
+ 		if test "$cf_cv_gcc_inline" = yes ; then
+ 
+@@ -21042,7 +21043,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:21045: checking for signal global datatype" >&5
++echo "$as_me:21046: checking for signal global datatype" >&5
+ echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6
+ if test "${cf_cv_sig_atomic_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21054,7 +21055,7 @@
+ 		"int"
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21057 "configure"
++#line 21058 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21078,16 +21079,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21081: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21082: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21084: \$? = $ac_status" >&5
++  echo "$as_me:21085: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21087: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21088: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21090: \$? = $ac_status" >&5
++  echo "$as_me:21091: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -21101,7 +21102,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21104: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:21105: result: $cf_cv_sig_atomic_t" >&5
+ echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
+ test "$cf_cv_sig_atomic_t" != no &&
+ cat >>confdefs.h <&5
++echo "$as_me:21114: checking for type of chtype" >&5
+ echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
+ if test "${cf_cv_typeof_chtype+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21120,7 +21121,7 @@
+   cf_cv_typeof_chtype=long
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21123 "configure"
++#line 21124 "configure"
+ #include "confdefs.h"
+ 
+ #define WANT_BITS 31
+@@ -21155,15 +21156,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21158: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21159: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21161: \$? = $ac_status" >&5
++  echo "$as_me:21162: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21163: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21164: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21166: \$? = $ac_status" >&5
++  echo "$as_me:21167: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_typeof_chtype=`cat cf_test.out`
+ else
+@@ -21178,7 +21179,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21181: result: $cf_cv_typeof_chtype" >&5
++echo "$as_me:21182: result: $cf_cv_typeof_chtype" >&5
+ echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
+ 
+ cat >>confdefs.h <&5
++echo "$as_me:21194: checking if unsigned literals are legal" >&5
+ echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6
+ if test "${cf_cv_unsigned_literals+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21200 "configure"
++#line 21201 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -21209,16 +21210,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21212: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21213: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21215: \$? = $ac_status" >&5
++  echo "$as_me:21216: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21218: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21219: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21221: \$? = $ac_status" >&5
++  echo "$as_me:21222: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_unsigned_literals=yes
+ else
+@@ -21230,7 +21231,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21233: result: $cf_cv_unsigned_literals" >&5
++echo "$as_me:21234: result: $cf_cv_unsigned_literals" >&5
+ echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
+ 
+ cf_cv_1UL="1"
+@@ -21246,14 +21247,14 @@
+ 
+ ###	Checks for external-data
+ 
+-echo "$as_me:21249: checking if external errno is declared" >&5
++echo "$as_me:21250: checking if external errno is declared" >&5
+ echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6
+ if test "${cf_cv_dcl_errno+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21256 "configure"
++#line 21257 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_STDLIB_H
+@@ -21271,16 +21272,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21274: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21275: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21277: \$? = $ac_status" >&5
++  echo "$as_me:21278: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21280: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21281: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21283: \$? = $ac_status" >&5
++  echo "$as_me:21284: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_dcl_errno=yes
+ else
+@@ -21291,7 +21292,7 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21294: result: $cf_cv_dcl_errno" >&5
++echo "$as_me:21295: result: $cf_cv_dcl_errno" >&5
+ echo "${ECHO_T}$cf_cv_dcl_errno" >&6
+ 
+ if test "$cf_cv_dcl_errno" = no ; then
+@@ -21306,14 +21307,14 @@
+ 
+ # It's possible (for near-UNIX clones) that the data doesn't exist
+ 
+-echo "$as_me:21309: checking if external errno exists" >&5
++echo "$as_me:21310: checking if external errno exists" >&5
+ echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6
+ if test "${cf_cv_have_errno+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21316 "configure"
++#line 21317 "configure"
+ #include "confdefs.h"
+ 
+ #undef errno
+@@ -21328,16 +21329,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21331: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21332: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21334: \$? = $ac_status" >&5
++  echo "$as_me:21335: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21337: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21338: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21340: \$? = $ac_status" >&5
++  echo "$as_me:21341: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_errno=yes
+ else
+@@ -21348,7 +21349,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21351: result: $cf_cv_have_errno" >&5
++echo "$as_me:21352: result: $cf_cv_have_errno" >&5
+ echo "${ECHO_T}$cf_cv_have_errno" >&6
+ 
+ if test "$cf_cv_have_errno" = yes ; then
+@@ -21361,7 +21362,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21364: checking if data-only library module links" >&5
++echo "$as_me:21365: checking if data-only library module links" >&5
+ echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
+ if test "${cf_cv_link_dataonly+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21369,20 +21370,20 @@
+ 
+ 	rm -f conftest.a
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:21376: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21378: \$? = $ac_status" >&5
++  echo "$as_me:21379: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+ 		mv conftest.o data.o && \
+ 		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
+ 	fi
+ 	rm -f conftest.$ac_ext data.o
+ 	cat >conftest.$ac_ext <&5
++	if { (eval echo "$as_me:21399: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21401: \$? = $ac_status" >&5
++  echo "$as_me:21402: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; then
+ 		mv conftest.o func.o && \
+ 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
+@@ -21411,7 +21412,7 @@
+   cf_cv_link_dataonly=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21414 "configure"
++#line 21415 "configure"
+ #include "confdefs.h"
+ 
+ 	int main(void)
+@@ -21422,15 +21423,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21425: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21426: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21428: \$? = $ac_status" >&5
++  echo "$as_me:21429: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21430: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21431: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21433: \$? = $ac_status" >&5
++  echo "$as_me:21434: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_link_dataonly=yes
+ else
+@@ -21445,7 +21446,7 @@
+ 
+ fi
+ 
+-echo "$as_me:21448: result: $cf_cv_link_dataonly" >&5
++echo "$as_me:21449: result: $cf_cv_link_dataonly" >&5
+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
+ 
+ if test "$cf_cv_link_dataonly" = no ; then
+@@ -21488,13 +21489,13 @@
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:21491: checking for $ac_func" >&5
++echo "$as_me:21492: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21497 "configure"
++#line 21498 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -21525,16 +21526,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21528: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21529: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21531: \$? = $ac_status" >&5
++  echo "$as_me:21532: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21534: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21535: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21537: \$? = $ac_status" >&5
++  echo "$as_me:21538: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -21544,7 +21545,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21547: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:21548: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:21558: checking if _PATH_TTYS is defined in ttyent.h" >&5
+ echo $ECHO_N "checking if _PATH_TTYS is defined in ttyent.h... $ECHO_C" >&6
+ if test "${cf_cv_PATH_TTYS+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21564 "configure"
++#line 21565 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21576,16 +21577,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21579: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21580: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21582: \$? = $ac_status" >&5
++  echo "$as_me:21583: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21585: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21586: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21588: \$? = $ac_status" >&5
++  echo "$as_me:21589: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_PATH_TTYS=yes
+ else
+@@ -21595,7 +21596,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21598: result: $cf_cv_PATH_TTYS" >&5
++echo "$as_me:21599: result: $cf_cv_PATH_TTYS" >&5
+ echo "${ECHO_T}$cf_cv_PATH_TTYS" >&6
+ 
+ if test $cf_cv_PATH_TTYS = no
+@@ -21617,7 +21618,7 @@
+ 
+ if test $cf_cv_PATH_TTYS != no
+ then
+-	echo "$as_me:21620: checking if _PATH_TTYS file exists" >&5
++	echo "$as_me:21621: checking if _PATH_TTYS file exists" >&5
+ echo $ECHO_N "checking if _PATH_TTYS file exists... $ECHO_C" >&6
+ if test "${cf_cv_have_PATH_TTYS+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21627,7 +21628,7 @@
+   cf_cv_have_PATH_TTYS=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21630 "configure"
++#line 21631 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21638,15 +21639,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:21641: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21642: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21644: \$? = $ac_status" >&5
++  echo "$as_me:21645: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:21646: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21647: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21649: \$? = $ac_status" >&5
++  echo "$as_me:21650: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_PATH_TTYS=yes
+ else
+@@ -21658,7 +21659,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:21661: result: $cf_cv_have_PATH_TTYS" >&5
++echo "$as_me:21662: result: $cf_cv_have_PATH_TTYS" >&5
+ echo "${ECHO_T}$cf_cv_have_PATH_TTYS" >&6
+ 	test "$cf_cv_have_PATH_TTYS" = no && cf_cv_PATH_TTYS=no
+ fi
+@@ -21670,14 +21671,14 @@
+ #define HAVE_PATH_TTYS 1
+ EOF
+ 
+-	echo "$as_me:21673: checking for getttynam" >&5
++	echo "$as_me:21674: checking for getttynam" >&5
+ echo $ECHO_N "checking for getttynam... $ECHO_C" >&6
+ if test "${cf_cv_func_getttynam+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21680 "configure"
++#line 21681 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -21689,16 +21690,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21692: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21693: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21695: \$? = $ac_status" >&5
++  echo "$as_me:21696: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21698: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21699: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21701: \$? = $ac_status" >&5
++  echo "$as_me:21702: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_getttynam=yes
+ else
+@@ -21708,7 +21709,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:21711: result: $cf_cv_func_getttynam" >&5
++echo "$as_me:21712: result: $cf_cv_func_getttynam" >&5
+ echo "${ECHO_T}$cf_cv_func_getttynam" >&6
+ 	test "$cf_cv_func_getttynam" = yes && cat >>confdefs.h <<\EOF
+ #define HAVE_GETTTYNAM 1
+@@ -21718,7 +21719,7 @@
+ 
+ if test "x$ac_cv_func_getopt" = xno && \
+    test "x$cf_with_progs$cf_with_tests" != xnono; then
+-	{ { echo "$as_me:21721: error: getopt is required for building programs" >&5
++	{ { echo "$as_me:21722: error: getopt is required for building programs" >&5
+ echo "$as_me: error: getopt is required for building programs" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -21727,7 +21728,7 @@
+ then
+ 	if test "x$ac_cv_func_vsnprintf" = xyes
+ 	then
+-		{ echo "$as_me:21730: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
++		{ echo "$as_me:21731: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+ echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
+ 	else
+ 
+@@ -21740,14 +21741,14 @@
+ 
+ if test "x$with_getcap" = "xyes" ; then
+ 
+-echo "$as_me:21743: checking for terminal-capability database functions" >&5
++echo "$as_me:21744: checking for terminal-capability database functions" >&5
+ echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6
+ if test "${cf_cv_cgetent+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21750 "configure"
++#line 21751 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21767,16 +21768,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21770: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21771: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21773: \$? = $ac_status" >&5
++  echo "$as_me:21774: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21776: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21777: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21779: \$? = $ac_status" >&5
++  echo "$as_me:21780: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent=yes
+ else
+@@ -21787,7 +21788,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21790: result: $cf_cv_cgetent" >&5
++echo "$as_me:21791: result: $cf_cv_cgetent" >&5
+ echo "${ECHO_T}$cf_cv_cgetent" >&6
+ 
+ if test "$cf_cv_cgetent" = yes
+@@ -21797,14 +21798,14 @@
+ #define HAVE_BSD_CGETENT 1
+ EOF
+ 
+-echo "$as_me:21800: checking if cgetent uses const parameter" >&5
++echo "$as_me:21801: checking if cgetent uses const parameter" >&5
+ echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6
+ if test "${cf_cv_cgetent_const+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21807 "configure"
++#line 21808 "configure"
+ #include "confdefs.h"
+ 
+ #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
+@@ -21827,16 +21828,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21830: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21831: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21833: \$? = $ac_status" >&5
++  echo "$as_me:21834: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21836: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21837: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21839: \$? = $ac_status" >&5
++  echo "$as_me:21840: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cgetent_const=yes
+ else
+@@ -21847,7 +21848,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21850: result: $cf_cv_cgetent_const" >&5
++echo "$as_me:21851: result: $cf_cv_cgetent_const" >&5
+ echo "${ECHO_T}$cf_cv_cgetent_const" >&6
+ 	if test "$cf_cv_cgetent_const" = yes
+ 	then
+@@ -21861,14 +21862,14 @@
+ 
+ fi
+ 
+-echo "$as_me:21864: checking for isascii" >&5
++echo "$as_me:21865: checking for isascii" >&5
+ echo $ECHO_N "checking for isascii... $ECHO_C" >&6
+ if test "${cf_cv_have_isascii+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21871 "configure"
++#line 21872 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -21880,16 +21881,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:21883: \"$ac_link\"") >&5
++if { (eval echo "$as_me:21884: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:21886: \$? = $ac_status" >&5
++  echo "$as_me:21887: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:21889: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21890: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21892: \$? = $ac_status" >&5
++  echo "$as_me:21893: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_isascii=yes
+ else
+@@ -21900,7 +21901,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 
+ fi
+-echo "$as_me:21903: result: $cf_cv_have_isascii" >&5
++echo "$as_me:21904: result: $cf_cv_have_isascii" >&5
+ echo "${ECHO_T}$cf_cv_have_isascii" >&6
+ test "$cf_cv_have_isascii" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -21908,10 +21909,10 @@
+ EOF
+ 
+ if test "$ac_cv_func_sigaction" = yes; then
+-echo "$as_me:21911: checking whether sigaction needs _POSIX_SOURCE" >&5
++echo "$as_me:21912: checking whether sigaction needs _POSIX_SOURCE" >&5
+ echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21914 "configure"
++#line 21915 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -21925,16 +21926,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21928: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21929: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21931: \$? = $ac_status" >&5
++  echo "$as_me:21932: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21934: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21935: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21937: \$? = $ac_status" >&5
++  echo "$as_me:21938: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=no
+ else
+@@ -21942,7 +21943,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21945 "configure"
++#line 21946 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -21957,16 +21958,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:21960: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:21961: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:21963: \$? = $ac_status" >&5
++  echo "$as_me:21964: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:21966: \"$ac_try\"") >&5
++  { (eval echo "$as_me:21967: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:21969: \$? = $ac_status" >&5
++  echo "$as_me:21970: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   sigact_bad=yes
+ 
+@@ -21982,11 +21983,11 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-echo "$as_me:21985: result: $sigact_bad" >&5
++echo "$as_me:21986: result: $sigact_bad" >&5
+ echo "${ECHO_T}$sigact_bad" >&6
+ fi
+ 
+-echo "$as_me:21989: checking if nanosleep really works" >&5
++echo "$as_me:21990: checking if nanosleep really works" >&5
+ echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6
+ if test "${cf_cv_func_nanosleep+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -21996,7 +21997,7 @@
+   cf_cv_func_nanosleep=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 21999 "configure"
++#line 22000 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22021,15 +22022,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22024: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22025: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22027: \$? = $ac_status" >&5
++  echo "$as_me:22028: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22029: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22030: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22032: \$? = $ac_status" >&5
++  echo "$as_me:22033: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_nanosleep=yes
+ else
+@@ -22041,7 +22042,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:22044: result: $cf_cv_func_nanosleep" >&5
++echo "$as_me:22045: result: $cf_cv_func_nanosleep" >&5
+ echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
+ 
+ test "$cf_cv_func_nanosleep" = "yes" &&
+@@ -22058,23 +22059,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:22061: checking for $ac_header" >&5
++echo "$as_me:22062: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22067 "configure"
++#line 22068 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:22071: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:22072: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:22077: \$? = $ac_status" >&5
++  echo "$as_me:22078: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -22093,7 +22094,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:22096: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:22097: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++	echo "$as_me:22114: checking whether termios.h needs _POSIX_SOURCE" >&5
+ echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22116 "configure"
++#line 22117 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -22125,16 +22126,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22128: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22129: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22131: \$? = $ac_status" >&5
++  echo "$as_me:22132: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22134: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22135: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22137: \$? = $ac_status" >&5
++  echo "$as_me:22138: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=no
+ else
+@@ -22142,7 +22143,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22145 "configure"
++#line 22146 "configure"
+ #include "confdefs.h"
+ 
+ #define _POSIX_SOURCE
+@@ -22156,16 +22157,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22159: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22160: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22162: \$? = $ac_status" >&5
++  echo "$as_me:22163: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22165: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22166: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22168: \$? = $ac_status" >&5
++  echo "$as_me:22169: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   termios_bad=unknown
+ else
+@@ -22181,19 +22182,19 @@
+ 
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:22184: result: $termios_bad" >&5
++	echo "$as_me:22185: result: $termios_bad" >&5
+ echo "${ECHO_T}$termios_bad" >&6
+ 	fi
+ fi
+ 
+-echo "$as_me:22189: checking for tcgetattr" >&5
++echo "$as_me:22190: checking for tcgetattr" >&5
+ echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6
+ if test "${cf_cv_have_tcgetattr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22196 "configure"
++#line 22197 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22221,16 +22222,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22224: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22225: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22227: \$? = $ac_status" >&5
++  echo "$as_me:22228: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22230: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22231: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22233: \$? = $ac_status" >&5
++  echo "$as_me:22234: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_tcgetattr=yes
+ else
+@@ -22240,21 +22241,21 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22243: result: $cf_cv_have_tcgetattr" >&5
++echo "$as_me:22244: result: $cf_cv_have_tcgetattr" >&5
+ echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6
+ test "$cf_cv_have_tcgetattr" = yes &&
+ cat >>confdefs.h <<\EOF
+ #define HAVE_TCGETATTR 1
+ EOF
+ 
+-echo "$as_me:22250: checking for vsscanf function or workaround" >&5
++echo "$as_me:22251: checking for vsscanf function or workaround" >&5
+ echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6
+ if test "${cf_cv_func_vsscanf+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22257 "configure"
++#line 22258 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22270,16 +22271,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22273: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22274: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22276: \$? = $ac_status" >&5
++  echo "$as_me:22277: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22279: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22280: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22282: \$? = $ac_status" >&5
++  echo "$as_me:22283: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vsscanf
+ else
+@@ -22287,7 +22288,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22290 "configure"
++#line 22291 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22309,16 +22310,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22312: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22313: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22315: \$? = $ac_status" >&5
++  echo "$as_me:22316: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22318: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22319: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22321: \$? = $ac_status" >&5
++  echo "$as_me:22322: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=vfscanf
+ else
+@@ -22326,7 +22327,7 @@
+ cat "conftest.$ac_ext" >&5
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22329 "configure"
++#line 22330 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22348,16 +22349,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22351: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22352: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22354: \$? = $ac_status" >&5
++  echo "$as_me:22355: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22357: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22358: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22360: \$? = $ac_status" >&5
++  echo "$as_me:22361: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_vsscanf=_doscan
+ else
+@@ -22372,7 +22373,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22375: result: $cf_cv_func_vsscanf" >&5
++echo "$as_me:22376: result: $cf_cv_func_vsscanf" >&5
+ echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
+ 
+ case "$cf_cv_func_vsscanf" in
+@@ -22398,23 +22399,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:22401: checking for $ac_header" >&5
++echo "$as_me:22402: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22407 "configure"
++#line 22408 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:22411: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:22412: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:22417: \$? = $ac_status" >&5
++  echo "$as_me:22418: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -22433,7 +22434,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:22436: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:22437: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:22447: checking for working mkstemp" >&5
+ echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
+ if test "${cf_cv_func_mkstemp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22454,7 +22455,7 @@
+   cf_cv_func_mkstemp=maybe
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22457 "configure"
++#line 22458 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22495,15 +22496,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22498: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22499: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22501: \$? = $ac_status" >&5
++  echo "$as_me:22502: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22503: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22504: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22506: \$? = $ac_status" >&5
++  echo "$as_me:22507: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_func_mkstemp=yes
+ 
+@@ -22518,16 +22519,16 @@
+ fi
+ 
+ fi
+-echo "$as_me:22521: result: $cf_cv_func_mkstemp" >&5
++echo "$as_me:22522: result: $cf_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
+ if test "x$cf_cv_func_mkstemp" = xmaybe ; then
+-	echo "$as_me:22524: checking for mkstemp" >&5
++	echo "$as_me:22525: checking for mkstemp" >&5
+ echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
+ if test "${ac_cv_func_mkstemp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22530 "configure"
++#line 22531 "configure"
+ #include "confdefs.h"
+ #define mkstemp autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22558,16 +22559,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22561: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22562: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22564: \$? = $ac_status" >&5
++  echo "$as_me:22565: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22567: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22568: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22570: \$? = $ac_status" >&5
++  echo "$as_me:22571: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_mkstemp=yes
+ else
+@@ -22577,7 +22578,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22580: result: $ac_cv_func_mkstemp" >&5
++echo "$as_me:22581: result: $ac_cv_func_mkstemp" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+ 
+ fi
+@@ -22598,21 +22599,21 @@
+ fi
+ 
+ if test "x$cross_compiling" = xyes ; then
+-	{ echo "$as_me:22601: WARNING: cross compiling: assume setvbuf params not reversed" >&5
++	{ echo "$as_me:22602: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+ echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;}
+ else
+-	echo "$as_me:22604: checking whether setvbuf arguments are reversed" >&5
++	echo "$as_me:22605: checking whether setvbuf arguments are reversed" >&5
+ echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6
+ if test "${ac_cv_func_setvbuf_reversed+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:22610: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:22611: error: cannot run test program while cross compiling" >&5
+ echo "$as_me: error: cannot run test program while cross compiling" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22615 "configure"
++#line 22616 "configure"
+ #include "confdefs.h"
+ #include 
+ /* If setvbuf has the reversed format, exit 0. */
+@@ -22629,15 +22630,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:22632: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22633: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22635: \$? = $ac_status" >&5
++  echo "$as_me:22636: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:22637: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22638: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22640: \$? = $ac_status" >&5
++  echo "$as_me:22641: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_setvbuf_reversed=yes
+ else
+@@ -22650,7 +22651,7 @@
+ fi
+ rm -f core ./core.* ./*.core
+ fi
+-echo "$as_me:22653: result: $ac_cv_func_setvbuf_reversed" >&5
++echo "$as_me:22654: result: $ac_cv_func_setvbuf_reversed" >&5
+ echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6
+ if test $ac_cv_func_setvbuf_reversed = yes; then
+ 
+@@ -22661,13 +22662,13 @@
+ fi
+ 
+ fi
+-echo "$as_me:22664: checking for intptr_t" >&5
++echo "$as_me:22665: checking for intptr_t" >&5
+ echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6
+ if test "${ac_cv_type_intptr_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22670 "configure"
++#line 22671 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -22682,16 +22683,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22685: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22686: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22688: \$? = $ac_status" >&5
++  echo "$as_me:22689: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22691: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22692: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22694: \$? = $ac_status" >&5
++  echo "$as_me:22695: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_intptr_t=yes
+ else
+@@ -22701,7 +22702,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22704: result: $ac_cv_type_intptr_t" >&5
++echo "$as_me:22705: result: $ac_cv_type_intptr_t" >&5
+ echo "${ECHO_T}$ac_cv_type_intptr_t" >&6
+ if test "$ac_cv_type_intptr_t" = yes; then
+   :
+@@ -22713,13 +22714,13 @@
+ 
+ fi
+ 
+-echo "$as_me:22716: checking for ssize_t" >&5
++echo "$as_me:22717: checking for ssize_t" >&5
+ echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
+ if test "${ac_cv_type_ssize_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22722 "configure"
++#line 22723 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -22734,16 +22735,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22737: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22738: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22740: \$? = $ac_status" >&5
++  echo "$as_me:22741: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22743: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22744: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22746: \$? = $ac_status" >&5
++  echo "$as_me:22747: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_ssize_t=yes
+ else
+@@ -22753,7 +22754,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22756: result: $ac_cv_type_ssize_t" >&5
++echo "$as_me:22757: result: $ac_cv_type_ssize_t" >&5
+ echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
+ if test "$ac_cv_type_ssize_t" = yes; then
+   :
+@@ -22765,14 +22766,14 @@
+ 
+ fi
+ 
+-echo "$as_me:22768: checking for type sigaction_t" >&5
++echo "$as_me:22769: checking for type sigaction_t" >&5
+ echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6
+ if test "${cf_cv_type_sigaction+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22775 "configure"
++#line 22776 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -22785,16 +22786,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22788: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22789: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22791: \$? = $ac_status" >&5
++  echo "$as_me:22792: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22794: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22795: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22797: \$? = $ac_status" >&5
++  echo "$as_me:22798: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_type_sigaction=yes
+ else
+@@ -22805,14 +22806,14 @@
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ 
+-echo "$as_me:22808: result: $cf_cv_type_sigaction" >&5
++echo "$as_me:22809: result: $cf_cv_type_sigaction" >&5
+ echo "${ECHO_T}$cf_cv_type_sigaction" >&6
+ test "$cf_cv_type_sigaction" = yes &&
+ cat >>confdefs.h <<\EOF
+ #define HAVE_TYPE_SIGACTION 1
+ EOF
+ 
+-echo "$as_me:22815: checking declaration of size-change" >&5
++echo "$as_me:22816: checking declaration of size-change" >&5
+ echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6
+ if test "${cf_cv_sizechange+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -22833,7 +22834,7 @@
+ 
+ 	fi
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22836 "configure"
++#line 22837 "configure"
+ #include "confdefs.h"
+ #include 
+ #ifdef HAVE_TERMIOS_H
+@@ -22883,16 +22884,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:22886: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:22887: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:22889: \$? = $ac_status" >&5
++  echo "$as_me:22890: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:22892: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22893: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22895: \$? = $ac_status" >&5
++  echo "$as_me:22896: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_sizechange=yes
+ else
+@@ -22911,7 +22912,7 @@
+ done
+ 
+ fi
+-echo "$as_me:22914: result: $cf_cv_sizechange" >&5
++echo "$as_me:22915: result: $cf_cv_sizechange" >&5
+ echo "${ECHO_T}$cf_cv_sizechange" >&6
+ if test "$cf_cv_sizechange" != no ; then
+ 
+@@ -22929,13 +22930,13 @@
+ 	esac
+ fi
+ 
+-echo "$as_me:22932: checking for memmove" >&5
++echo "$as_me:22933: checking for memmove" >&5
+ echo $ECHO_N "checking for memmove... $ECHO_C" >&6
+ if test "${ac_cv_func_memmove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 22938 "configure"
++#line 22939 "configure"
+ #include "confdefs.h"
+ #define memmove autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -22966,16 +22967,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:22969: \"$ac_link\"") >&5
++if { (eval echo "$as_me:22970: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:22972: \$? = $ac_status" >&5
++  echo "$as_me:22973: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:22975: \"$ac_try\"") >&5
++  { (eval echo "$as_me:22976: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:22978: \$? = $ac_status" >&5
++  echo "$as_me:22979: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_memmove=yes
+ else
+@@ -22985,19 +22986,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:22988: result: $ac_cv_func_memmove" >&5
++echo "$as_me:22989: result: $ac_cv_func_memmove" >&5
+ echo "${ECHO_T}$ac_cv_func_memmove" >&6
+ if test "$ac_cv_func_memmove" = yes; then
+   :
+ else
+ 
+-echo "$as_me:22994: checking for bcopy" >&5
++echo "$as_me:22995: checking for bcopy" >&5
+ echo $ECHO_N "checking for bcopy... $ECHO_C" >&6
+ if test "${ac_cv_func_bcopy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23000 "configure"
++#line 23001 "configure"
+ #include "confdefs.h"
+ #define bcopy autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23028,16 +23029,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23031: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23032: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23034: \$? = $ac_status" >&5
++  echo "$as_me:23035: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23037: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23038: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23040: \$? = $ac_status" >&5
++  echo "$as_me:23041: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_bcopy=yes
+ else
+@@ -23047,11 +23048,11 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23050: result: $ac_cv_func_bcopy" >&5
++echo "$as_me:23051: result: $ac_cv_func_bcopy" >&5
+ echo "${ECHO_T}$ac_cv_func_bcopy" >&6
+ if test "$ac_cv_func_bcopy" = yes; then
+ 
+-	echo "$as_me:23054: checking if bcopy does overlapping moves" >&5
++	echo "$as_me:23055: checking if bcopy does overlapping moves" >&5
+ echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6
+ if test "${cf_cv_good_bcopy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -23061,7 +23062,7 @@
+   cf_cv_good_bcopy=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23064 "configure"
++#line 23065 "configure"
+ #include "confdefs.h"
+ 
+ int main(void) {
+@@ -23075,15 +23076,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23078: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23079: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23081: \$? = $ac_status" >&5
++  echo "$as_me:23082: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23083: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23084: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23086: \$? = $ac_status" >&5
++  echo "$as_me:23087: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_good_bcopy=yes
+ else
+@@ -23096,7 +23097,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:23099: result: $cf_cv_good_bcopy" >&5
++echo "$as_me:23100: result: $cf_cv_good_bcopy" >&5
+ echo "${ECHO_T}$cf_cv_good_bcopy" >&6
+ 
+ else
+@@ -23123,13 +23124,13 @@
+ for ac_func in posix_openpt
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:23126: checking for $ac_func" >&5
++echo "$as_me:23127: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23132 "configure"
++#line 23133 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23160,16 +23161,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23163: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23164: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23166: \$? = $ac_status" >&5
++  echo "$as_me:23167: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23169: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23170: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23172: \$? = $ac_status" >&5
++  echo "$as_me:23173: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -23179,7 +23180,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23182: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:23183: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:23193: checking if poll really works" >&5
+ echo $ECHO_N "checking if poll really works... $ECHO_C" >&6
+ if test "${cf_cv_working_poll+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -23199,7 +23200,7 @@
+   cf_cv_working_poll=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23202 "configure"
++#line 23203 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23251,15 +23252,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23254: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23255: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23257: \$? = $ac_status" >&5
++  echo "$as_me:23258: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23259: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23260: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23262: \$? = $ac_status" >&5
++  echo "$as_me:23263: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_working_poll=yes
+ else
+@@ -23271,21 +23272,21 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:23274: result: $cf_cv_working_poll" >&5
++echo "$as_me:23275: result: $cf_cv_working_poll" >&5
+ echo "${ECHO_T}$cf_cv_working_poll" >&6
+ test "$cf_cv_working_poll" = "yes" &&
+ cat >>confdefs.h <<\EOF
+ #define HAVE_WORKING_POLL 1
+ EOF
+ 
+-echo "$as_me:23281: checking for va_copy" >&5
++echo "$as_me:23282: checking for va_copy" >&5
+ echo $ECHO_N "checking for va_copy... $ECHO_C" >&6
+ if test "${cf_cv_have_va_copy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23288 "configure"
++#line 23289 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23302,16 +23303,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23305: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23306: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23308: \$? = $ac_status" >&5
++  echo "$as_me:23309: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23311: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23312: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23314: \$? = $ac_status" >&5
++  echo "$as_me:23315: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have_va_copy=yes
+ else
+@@ -23321,7 +23322,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23324: result: $cf_cv_have_va_copy" >&5
++echo "$as_me:23325: result: $cf_cv_have_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have_va_copy" >&6
+ 
+ if test "$cf_cv_have_va_copy" = yes;
+@@ -23333,14 +23334,14 @@
+ 
+ else # !cf_cv_have_va_copy
+ 
+-echo "$as_me:23336: checking for __va_copy" >&5
++echo "$as_me:23337: checking for __va_copy" >&5
+ echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6
+ if test "${cf_cv_have___va_copy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23343 "configure"
++#line 23344 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23357,16 +23358,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23360: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23361: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23363: \$? = $ac_status" >&5
++  echo "$as_me:23364: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23366: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23367: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23369: \$? = $ac_status" >&5
++  echo "$as_me:23370: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___va_copy=yes
+ else
+@@ -23376,7 +23377,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23379: result: $cf_cv_have___va_copy" >&5
++echo "$as_me:23380: result: $cf_cv_have___va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___va_copy" >&6
+ 
+ if test "$cf_cv_have___va_copy" = yes
+@@ -23388,14 +23389,14 @@
+ 
+ else # !cf_cv_have___va_copy
+ 
+-echo "$as_me:23391: checking for __builtin_va_copy" >&5
++echo "$as_me:23392: checking for __builtin_va_copy" >&5
+ echo $ECHO_N "checking for __builtin_va_copy... $ECHO_C" >&6
+ if test "${cf_cv_have___builtin_va_copy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23398 "configure"
++#line 23399 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23412,16 +23413,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23415: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23416: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23418: \$? = $ac_status" >&5
++  echo "$as_me:23419: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23421: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23422: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23424: \$? = $ac_status" >&5
++  echo "$as_me:23425: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_have___builtin_va_copy=yes
+ else
+@@ -23431,7 +23432,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23434: result: $cf_cv_have___builtin_va_copy" >&5
++echo "$as_me:23435: result: $cf_cv_have___builtin_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___builtin_va_copy" >&6
+ 
+ test "$cf_cv_have___builtin_va_copy" = yes &&
+@@ -23449,14 +23450,14 @@
+ 	;;
+ 
+ (*)
+-	echo "$as_me:23452: checking if we can simply copy va_list" >&5
++	echo "$as_me:23453: checking if we can simply copy va_list" >&5
+ echo $ECHO_N "checking if we can simply copy va_list... $ECHO_C" >&6
+ if test "${cf_cv_pointer_va_list+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23459 "configure"
++#line 23460 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23473,16 +23474,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23476: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23477: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23479: \$? = $ac_status" >&5
++  echo "$as_me:23480: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23482: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23483: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23485: \$? = $ac_status" >&5
++  echo "$as_me:23486: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_pointer_va_list=yes
+ else
+@@ -23492,19 +23493,19 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23495: result: $cf_cv_pointer_va_list" >&5
++echo "$as_me:23496: result: $cf_cv_pointer_va_list" >&5
+ echo "${ECHO_T}$cf_cv_pointer_va_list" >&6
+ 
+ 	if test "$cf_cv_pointer_va_list" = no
+ 	then
+-		echo "$as_me:23500: checking if we can copy va_list indirectly" >&5
++		echo "$as_me:23501: checking if we can copy va_list indirectly" >&5
+ echo $ECHO_N "checking if we can copy va_list indirectly... $ECHO_C" >&6
+ if test "${cf_cv_array_va_list+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23507 "configure"
++#line 23508 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23521,16 +23522,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23524: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23525: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23527: \$? = $ac_status" >&5
++  echo "$as_me:23528: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23530: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23531: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23533: \$? = $ac_status" >&5
++  echo "$as_me:23534: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_array_va_list=yes
+ else
+@@ -23540,7 +23541,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23543: result: $cf_cv_array_va_list" >&5
++echo "$as_me:23544: result: $cf_cv_array_va_list" >&5
+ echo "${ECHO_T}$cf_cv_array_va_list" >&6
+ 		test "$cf_cv_array_va_list" = yes &&
+ cat >>confdefs.h <<\EOF
+@@ -23551,13 +23552,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:23554: checking for pid_t" >&5
++echo "$as_me:23555: checking for pid_t" >&5
+ echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
+ if test "${ac_cv_type_pid_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23560 "configure"
++#line 23561 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -23572,16 +23573,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:23575: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:23576: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:23578: \$? = $ac_status" >&5
++  echo "$as_me:23579: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:23581: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23582: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23584: \$? = $ac_status" >&5
++  echo "$as_me:23585: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_pid_t=yes
+ else
+@@ -23591,7 +23592,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23594: result: $ac_cv_type_pid_t" >&5
++echo "$as_me:23595: result: $ac_cv_type_pid_t" >&5
+ echo "${ECHO_T}$ac_cv_type_pid_t" >&6
+ if test "$ac_cv_type_pid_t" = yes; then
+   :
+@@ -23606,23 +23607,23 @@
+ for ac_header in unistd.h vfork.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:23609: checking for $ac_header" >&5
++echo "$as_me:23610: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23615 "configure"
++#line 23616 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:23619: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:23620: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:23625: \$? = $ac_status" >&5
++  echo "$as_me:23626: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -23641,7 +23642,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:23644: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:23645: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:23658: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23663 "configure"
++#line 23664 "configure"
+ #include "confdefs.h"
+ #define $ac_func autoconf_temporary
+ #include 	/* least-intrusive standard header which defines gcc2 __stub macros */
+@@ -23691,16 +23692,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:23694: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23695: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23697: \$? = $ac_status" >&5
++  echo "$as_me:23698: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:23700: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23701: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23703: \$? = $ac_status" >&5
++  echo "$as_me:23704: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -23710,7 +23711,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:23713: result: `eval echo '${'"$as_ac_var"'}'`" >&5
++echo "$as_me:23714: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
+   cat >>confdefs.h <&5
++  echo "$as_me:23726: checking for working fork" >&5
+ echo $ECHO_N "checking for working fork... $ECHO_C" >&6
+ if test "${ac_cv_func_fork_works+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -23745,15 +23746,15 @@
+       }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23748: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23749: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23751: \$? = $ac_status" >&5
++  echo "$as_me:23752: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23753: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23754: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23756: \$? = $ac_status" >&5
++  echo "$as_me:23757: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_fork_works=yes
+ else
+@@ -23765,7 +23766,7 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:23768: result: $ac_cv_func_fork_works" >&5
++echo "$as_me:23769: result: $ac_cv_func_fork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+ 
+ fi
+@@ -23779,12 +23780,12 @@
+       ac_cv_func_fork_works=yes
+       ;;
+   esac
+-  { echo "$as_me:23782: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:23783: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+ echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;}
+ fi
+ ac_cv_func_vfork_works=$ac_cv_func_vfork
+ if test "x$ac_cv_func_vfork" = xyes; then
+-  echo "$as_me:23787: checking for working vfork" >&5
++  echo "$as_me:23788: checking for working vfork" >&5
+ echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
+ if test "${ac_cv_func_vfork_works+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -23793,7 +23794,7 @@
+   ac_cv_func_vfork_works=cross
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23796 "configure"
++#line 23797 "configure"
+ #include "confdefs.h"
+ /* Thanks to Paul Eggert for this test.  */
+ #include 
+@@ -23890,15 +23891,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23893: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23894: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23896: \$? = $ac_status" >&5
++  echo "$as_me:23897: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23898: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23899: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23901: \$? = $ac_status" >&5
++  echo "$as_me:23902: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_func_vfork_works=yes
+ else
+@@ -23910,13 +23911,13 @@
+ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+ fi
+-echo "$as_me:23913: result: $ac_cv_func_vfork_works" >&5
++echo "$as_me:23914: result: $ac_cv_func_vfork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
+ 
+ fi;
+ if test "x$ac_cv_func_fork_works" = xcross; then
+   ac_cv_func_vfork_works=ac_cv_func_vfork
+-  { echo "$as_me:23919: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
++  { echo "$as_me:23920: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+ echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;}
+ fi
+ 
+@@ -23941,7 +23942,7 @@
+ 
+ fi
+ 
+-echo "$as_me:23944: checking if fopen accepts explicit binary mode" >&5
++echo "$as_me:23945: checking if fopen accepts explicit binary mode" >&5
+ echo $ECHO_N "checking if fopen accepts explicit binary mode... $ECHO_C" >&6
+ if test "${cf_cv_fopen_bin_r+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -23951,7 +23952,7 @@
+   cf_cv_fopen_bin_r=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 23954 "configure"
++#line 23955 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -23984,15 +23985,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:23987: \"$ac_link\"") >&5
++if { (eval echo "$as_me:23988: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:23990: \$? = $ac_status" >&5
++  echo "$as_me:23991: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:23992: \"$ac_try\"") >&5
++  { (eval echo "$as_me:23993: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:23995: \$? = $ac_status" >&5
++  echo "$as_me:23996: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_fopen_bin_r=yes
+ else
+@@ -24005,7 +24006,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:24008: result: $cf_cv_fopen_bin_r" >&5
++echo "$as_me:24009: result: $cf_cv_fopen_bin_r" >&5
+ echo "${ECHO_T}$cf_cv_fopen_bin_r" >&6
+ test "x$cf_cv_fopen_bin_r" != xno &&
+ cat >>confdefs.h <<\EOF
+@@ -24014,7 +24015,7 @@
+ 
+ # special check for test/ditto.c
+ 
+-echo "$as_me:24017: checking for openpty in -lutil" >&5
++echo "$as_me:24018: checking for openpty in -lutil" >&5
+ echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
+ if test "${ac_cv_lib_util_openpty+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -24022,7 +24023,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24025 "configure"
++#line 24026 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -24041,16 +24042,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24044: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24045: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24047: \$? = $ac_status" >&5
++  echo "$as_me:24048: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24050: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24051: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24053: \$? = $ac_status" >&5
++  echo "$as_me:24054: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_lib_util_openpty=yes
+ else
+@@ -24061,7 +24062,7 @@
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:24064: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:24065: result: $ac_cv_lib_util_openpty" >&5
+ echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
+ if test "$ac_cv_lib_util_openpty" = yes; then
+   cf_cv_lib_util=yes
+@@ -24069,7 +24070,7 @@
+   cf_cv_lib_util=no
+ fi
+ 
+-echo "$as_me:24072: checking for openpty header" >&5
++echo "$as_me:24073: checking for openpty header" >&5
+ echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
+ if test "${cf_cv_func_openpty+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -24096,7 +24097,7 @@
+ 	for cf_header in pty.h libutil.h util.h
+ 	do
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24099 "configure"
++#line 24100 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -24113,16 +24114,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24116: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24117: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24119: \$? = $ac_status" >&5
++  echo "$as_me:24120: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24122: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24123: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24125: \$? = $ac_status" >&5
++  echo "$as_me:24126: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 		cf_cv_func_openpty=$cf_header
+@@ -24140,7 +24141,7 @@
+ 	LIBS="$cf_save_LIBS"
+ 
+ fi
+-echo "$as_me:24143: result: $cf_cv_func_openpty" >&5
++echo "$as_me:24144: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+ 
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -24213,7 +24214,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24216 "configure"
++#line 24217 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -24225,16 +24226,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24228: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24229: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24231: \$? = $ac_status" >&5
++  echo "$as_me:24232: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24234: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24235: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24237: \$? = $ac_status" >&5
++  echo "$as_me:24238: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -24251,7 +24252,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:24254: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:24255: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -24287,7 +24288,7 @@
+ 			if test "$cf_have_libdir" = no ; then
+ 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+ 
+-echo "${as_me:-configure}:24290: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:24291: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -24298,7 +24299,7 @@
+ 	else
+ 		case "$with_hashed_db" in
+ 		(./*|../*|/*)
+-			{ echo "$as_me:24301: WARNING: no such directory $with_hashed_db" >&5
++			{ echo "$as_me:24302: WARNING: no such directory $with_hashed_db" >&5
+ echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
+ 			;;
+ 		(*)
+@@ -24370,7 +24371,7 @@
+ 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+ 
+ 			  cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24373 "configure"
++#line 24374 "configure"
+ #include "confdefs.h"
+ #include 
+ int
+@@ -24382,16 +24383,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24385: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24386: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24388: \$? = $ac_status" >&5
++  echo "$as_me:24389: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24391: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24392: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24394: \$? = $ac_status" >&5
++  echo "$as_me:24395: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   :
+ else
+@@ -24408,7 +24409,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:24411: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:24412: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -24488,7 +24489,7 @@
+ 			if test "$cf_have_libdir" = no ; then
+ 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+ 
+-echo "${as_me:-configure}:24491: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:24492: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+ 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ 			fi
+@@ -24505,23 +24506,23 @@
+ 	fi
+ esac
+ 
+-echo "$as_me:24508: checking for db.h" >&5
++echo "$as_me:24509: checking for db.h" >&5
+ echo $ECHO_N "checking for db.h... $ECHO_C" >&6
+ if test "${ac_cv_header_db_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24514 "configure"
++#line 24515 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:24518: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:24519: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:24524: \$? = $ac_status" >&5
++  echo "$as_me:24525: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -24540,11 +24541,11 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:24543: result: $ac_cv_header_db_h" >&5
++echo "$as_me:24544: result: $ac_cv_header_db_h" >&5
+ echo "${ECHO_T}$ac_cv_header_db_h" >&6
+ if test "$ac_cv_header_db_h" = yes; then
+ 
+-echo "$as_me:24547: checking for version of db" >&5
++echo "$as_me:24548: checking for version of db" >&5
+ echo $ECHO_N "checking for version of db... $ECHO_C" >&6
+ if test "${cf_cv_hashed_db_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -24555,10 +24556,10 @@
+ for cf_db_version in 1 2 3 4 5 6
+ do
+ 
+-echo "${as_me:-configure}:24558: testing checking for db version $cf_db_version ..." 1>&5
++echo "${as_me:-configure}:24559: testing checking for db version $cf_db_version ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24561 "configure"
++#line 24562 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24588,16 +24589,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24591: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24592: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24594: \$? = $ac_status" >&5
++  echo "$as_me:24595: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24597: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24598: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24600: \$? = $ac_status" >&5
++  echo "$as_me:24601: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	cf_cv_hashed_db_version=$cf_db_version
+@@ -24611,16 +24612,16 @@
+ done
+ 
+ fi
+-echo "$as_me:24614: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:24615: result: $cf_cv_hashed_db_version" >&5
+ echo "${ECHO_T}$cf_cv_hashed_db_version" >&6
+ 
+ if test "$cf_cv_hashed_db_version" = unknown ; then
+-	{ { echo "$as_me:24618: error: Cannot determine version of db" >&5
++	{ { echo "$as_me:24619: error: Cannot determine version of db" >&5
+ echo "$as_me: error: Cannot determine version of db" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+ 
+-echo "$as_me:24623: checking for db libraries" >&5
++echo "$as_me:24624: checking for db libraries" >&5
+ echo $ECHO_N "checking for db libraries... $ECHO_C" >&6
+ if test "${cf_cv_hashed_db_libs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -24650,10 +24651,10 @@
+ 
+ 	fi
+ 
+-echo "${as_me:-configure}:24653: testing checking for library $cf_db_libs ..." 1>&5
++echo "${as_me:-configure}:24654: testing checking for library $cf_db_libs ..." 1>&5
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24656 "configure"
++#line 24657 "configure"
+ #include "confdefs.h"
+ 
+ $ac_includes_default
+@@ -24708,16 +24709,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24711: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24712: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24714: \$? = $ac_status" >&5
++  echo "$as_me:24715: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24717: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24718: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24720: \$? = $ac_status" >&5
++  echo "$as_me:24721: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	if test -n "$cf_db_libs" ; then
+@@ -24737,11 +24738,11 @@
+ done
+ 
+ fi
+-echo "$as_me:24740: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:24741: result: $cf_cv_hashed_db_libs" >&5
+ echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6
+ 
+ 	if test "$cf_cv_hashed_db_libs" = unknown ; then
+-		{ { echo "$as_me:24744: error: Cannot determine library for db" >&5
++		{ { echo "$as_me:24745: error: Cannot determine library for db" >&5
+ echo "$as_me: error: Cannot determine library for db" >&2;}
+    { (exit 1); exit 1; }; }
+ 	elif test "$cf_cv_hashed_db_libs" != default ; then
+@@ -24767,7 +24768,7 @@
+ 
+ else
+ 
+-	{ { echo "$as_me:24770: error: Cannot find db.h" >&5
++	{ { echo "$as_me:24771: error: Cannot find db.h" >&5
+ echo "$as_me: error: Cannot find db.h" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+@@ -24782,7 +24783,7 @@
+ 
+ # Just in case, check if the C compiler has a bool type.
+ 
+-echo "$as_me:24785: checking if we should include stdbool.h" >&5
++echo "$as_me:24786: checking if we should include stdbool.h" >&5
+ echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
+ 
+ if test "${cf_cv_header_stdbool_h+set}" = set; then
+@@ -24790,7 +24791,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24793 "configure"
++#line 24794 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -24802,23 +24803,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24805: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24806: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24808: \$? = $ac_status" >&5
++  echo "$as_me:24809: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24811: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24812: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24814: \$? = $ac_status" >&5
++  echo "$as_me:24815: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=0
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24821 "configure"
++#line 24822 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -24834,16 +24835,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24837: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24838: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24840: \$? = $ac_status" >&5
++  echo "$as_me:24841: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24843: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24844: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24846: \$? = $ac_status" >&5
++  echo "$as_me:24847: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -24857,13 +24858,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:24860: result: yes" >&5
++then	echo "$as_me:24861: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:24862: result: no" >&5
++else	echo "$as_me:24863: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:24866: checking for builtin bool type" >&5
++echo "$as_me:24867: checking for builtin bool type" >&5
+ echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
+ 
+ if test "${cf_cv_cc_bool_type+set}" = set; then
+@@ -24871,7 +24872,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24874 "configure"
++#line 24875 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -24886,16 +24887,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:24889: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:24890: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:24892: \$? = $ac_status" >&5
++  echo "$as_me:24893: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:24895: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24896: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24898: \$? = $ac_status" >&5
++  echo "$as_me:24899: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cc_bool_type=1
+ else
+@@ -24908,9 +24909,9 @@
+ fi
+ 
+ if test "$cf_cv_cc_bool_type" = 1
+-then	echo "$as_me:24911: result: yes" >&5
++then	echo "$as_me:24912: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:24913: result: no" >&5
++else	echo "$as_me:24914: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -24927,10 +24928,10 @@
+ 
+ 	cf_save="$LIBS"
+ 	LIBS="$LIBS $CXXLIBS"
+-	echo "$as_me:24930: checking if we already have C++ library" >&5
++	echo "$as_me:24931: checking if we already have C++ library" >&5
+ echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 24933 "configure"
++#line 24934 "configure"
+ #include "confdefs.h"
+ 
+ 			#include 
+@@ -24944,16 +24945,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:24947: \"$ac_link\"") >&5
++if { (eval echo "$as_me:24948: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:24950: \$? = $ac_status" >&5
++  echo "$as_me:24951: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:24953: \"$ac_try\"") >&5
++  { (eval echo "$as_me:24954: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:24956: \$? = $ac_status" >&5
++  echo "$as_me:24957: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_have_libstdcpp=yes
+ else
+@@ -24962,7 +24963,7 @@
+ cf_have_libstdcpp=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+-	echo "$as_me:24965: result: $cf_have_libstdcpp" >&5
++	echo "$as_me:24966: result: $cf_have_libstdcpp" >&5
+ echo "${ECHO_T}$cf_have_libstdcpp" >&6
+ 	LIBS="$cf_save"
+ 
+@@ -24981,7 +24982,7 @@
+ 			;;
+ 		esac
+ 
+-		echo "$as_me:24984: checking for library $cf_stdcpp_libname" >&5
++		echo "$as_me:24985: checking for library $cf_stdcpp_libname" >&5
+ echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6
+ if test "${cf_cv_libstdcpp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -25007,7 +25008,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 		cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25010 "configure"
++#line 25011 "configure"
+ #include "confdefs.h"
+ 
+ 				#include 
+@@ -25021,16 +25022,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25024: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25025: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25027: \$? = $ac_status" >&5
++  echo "$as_me:25028: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25030: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25031: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25033: \$? = $ac_status" >&5
++  echo "$as_me:25034: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_libstdcpp=yes
+ else
+@@ -25042,7 +25043,7 @@
+ 			LIBS="$cf_save"
+ 
+ fi
+-echo "$as_me:25045: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:25046: result: $cf_cv_libstdcpp" >&5
+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
+ 		test "$cf_cv_libstdcpp" = yes && {
+ cf_add_libs="$CXXLIBS"
+@@ -25064,7 +25065,7 @@
+ 	fi
+ fi
+ 
+-	echo "$as_me:25067: checking whether $CXX understands -c and -o together" >&5
++	echo "$as_me:25068: checking whether $CXX understands -c and -o together" >&5
+ echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6
+ if test "${cf_cv_prog_CXX_c_o+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -25079,15 +25080,15 @@
+ # We do the test twice because some compilers refuse to overwrite an
+ # existing .o file with -o, though they will create one.
+ ac_try='$CXX $CXXFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+-if { (eval echo "$as_me:25082: \"$ac_try\"") >&5
++if { (eval echo "$as_me:25083: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25085: \$? = $ac_status" >&5
++  echo "$as_me:25086: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:25087: \"$ac_try\"") >&5
++  test -f conftest2.$ac_objext && { (eval echo "$as_me:25088: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25090: \$? = $ac_status" >&5
++  echo "$as_me:25091: \$? = $ac_status" >&5
+   (exit "$ac_status"); };
+ then
+   eval cf_cv_prog_CXX_c_o=yes
+@@ -25098,10 +25099,10 @@
+ 
+ fi
+ if test "$cf_cv_prog_CXX_c_o" = yes; then
+-  echo "$as_me:25101: result: yes" >&5
++  echo "$as_me:25102: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:25104: result: no" >&5
++  echo "$as_me:25105: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -25121,7 +25122,7 @@
+ 	;;
+ esac
+ if test "$GXX" = yes; then
+-	echo "$as_me:25124: checking for lib$cf_gpp_libname" >&5
++	echo "$as_me:25125: checking for lib$cf_gpp_libname" >&5
+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
+ 	cf_save="$LIBS"
+ 
+@@ -25142,7 +25143,7 @@
+ LIBS="$cf_add_libs"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25145 "configure"
++#line 25146 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_gpp_libname/builtin.h>
+@@ -25156,16 +25157,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25159: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25160: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25162: \$? = $ac_status" >&5
++  echo "$as_me:25163: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25165: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25166: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25168: \$? = $ac_status" >&5
++  echo "$as_me:25169: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -25202,7 +25203,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25205 "configure"
++#line 25206 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -25216,16 +25217,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:25219: \"$ac_link\"") >&5
++if { (eval echo "$as_me:25220: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:25222: \$? = $ac_status" >&5
++  echo "$as_me:25223: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:25225: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25226: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25228: \$? = $ac_status" >&5
++  echo "$as_me:25229: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cxx_library=yes
+ 
+@@ -25258,7 +25259,7 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+ 	LIBS="$cf_save"
+-	echo "$as_me:25261: result: $cf_cxx_library" >&5
++	echo "$as_me:25262: result: $cf_cxx_library" >&5
+ echo "${ECHO_T}$cf_cxx_library" >&6
+ fi
+ 
+@@ -25274,7 +25275,7 @@
+ ac_link='$CXX -o "conftest$ac_exeext" $CXXFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ ac_main_return="return"
+-echo "$as_me:25277: checking how to run the C++ preprocessor" >&5
++echo "$as_me:25278: checking how to run the C++ preprocessor" >&5
+ echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
+ if test -z "$CXXCPP"; then
+   if test "${ac_cv_prog_CXXCPP+set}" = set; then
+@@ -25291,18 +25292,18 @@
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp. "Syntax error" is here to catch this case.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25294 "configure"
++#line 25295 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:25299: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25300: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:25305: \$? = $ac_status" >&5
++  echo "$as_me:25306: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25325,17 +25326,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25328 "configure"
++#line 25329 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:25332: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25333: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:25338: \$? = $ac_status" >&5
++  echo "$as_me:25339: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25372,7 +25373,7 @@
+ else
+   ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:25375: result: $CXXCPP" >&5
++echo "$as_me:25376: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -25382,18 +25383,18 @@
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp. "Syntax error" is here to catch this case.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25385 "configure"
++#line 25386 "configure"
+ #include "confdefs.h"
+ #include 
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:25390: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25391: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:25396: \$? = $ac_status" >&5
++  echo "$as_me:25397: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25416,17 +25417,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25419 "configure"
++#line 25420 "configure"
+ #include "confdefs.h"
+ #include 
+ _ACEOF
+-if { (eval echo "$as_me:25423: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25424: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:25429: \$? = $ac_status" >&5
++  echo "$as_me:25430: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25454,7 +25455,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:25457: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++  { { echo "$as_me:25458: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -25469,23 +25470,23 @@
+ for ac_header in typeinfo
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:25472: checking for $ac_header" >&5
++echo "$as_me:25473: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25478 "configure"
++#line 25479 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:25482: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25483: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:25488: \$? = $ac_status" >&5
++  echo "$as_me:25489: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25504,7 +25505,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:25507: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:25508: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++echo "$as_me:25521: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25526 "configure"
++#line 25527 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:25530: \"$ac_cpp "conftest.$ac_ext"\"") >&5
++if { (eval echo "$as_me:25531: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   $EGREP -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:25536: \$? = $ac_status" >&5
++  echo "$as_me:25537: \$? = $ac_status" >&5
+   (exit "$ac_status"); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -25552,7 +25553,7 @@
+ fi
+ rm -f conftest.err "conftest.$ac_ext"
+ fi
+-echo "$as_me:25555: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
++echo "$as_me:25556: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+ if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+   cat >>confdefs.h <&5
++	echo "$as_me:25567: checking if iostream uses std-namespace" >&5
+ echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25569 "configure"
++#line 25570 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -25583,16 +25584,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25586: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25587: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25589: \$? = $ac_status" >&5
++  echo "$as_me:25590: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25592: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25593: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25595: \$? = $ac_status" >&5
++  echo "$as_me:25596: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_iostream_namespace=yes
+ else
+@@ -25601,7 +25602,7 @@
+ cf_iostream_namespace=no
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+-	echo "$as_me:25604: result: $cf_iostream_namespace" >&5
++	echo "$as_me:25605: result: $cf_iostream_namespace" >&5
+ echo "${ECHO_T}$cf_iostream_namespace" >&6
+ 	if test "$cf_iostream_namespace" = yes ; then
+ 
+@@ -25612,7 +25613,7 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:25615: checking if we should include stdbool.h" >&5
++echo "$as_me:25616: checking if we should include stdbool.h" >&5
+ echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
+ 
+ if test "${cf_cv_header_stdbool_h+set}" = set; then
+@@ -25620,7 +25621,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25623 "configure"
++#line 25624 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -25632,23 +25633,23 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25635: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25636: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25638: \$? = $ac_status" >&5
++  echo "$as_me:25639: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25641: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25642: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25644: \$? = $ac_status" >&5
++  echo "$as_me:25645: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=0
+ else
+   echo "$as_me: failed program was:" >&5
+ cat "conftest.$ac_ext" >&5
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25651 "configure"
++#line 25652 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef __BEOS__
+@@ -25664,16 +25665,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25667: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25668: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25670: \$? = $ac_status" >&5
++  echo "$as_me:25671: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25673: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25674: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25676: \$? = $ac_status" >&5
++  echo "$as_me:25677: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_header_stdbool_h=1
+ else
+@@ -25687,13 +25688,13 @@
+ fi
+ 
+ if test "$cf_cv_header_stdbool_h" = 1
+-then	echo "$as_me:25690: result: yes" >&5
++then	echo "$as_me:25691: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:25692: result: no" >&5
++else	echo "$as_me:25693: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:25696: checking for builtin bool type" >&5
++echo "$as_me:25697: checking for builtin bool type" >&5
+ echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
+ 
+ if test "${cf_cv_builtin_bool+set}" = set; then
+@@ -25701,7 +25702,7 @@
+ else
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25704 "configure"
++#line 25705 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -25716,16 +25717,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25719: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25720: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25722: \$? = $ac_status" >&5
++  echo "$as_me:25723: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25725: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25726: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25728: \$? = $ac_status" >&5
++  echo "$as_me:25729: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_builtin_bool=1
+ else
+@@ -25738,19 +25739,19 @@
+ fi
+ 
+ if test "$cf_cv_builtin_bool" = 1
+-then	echo "$as_me:25741: result: yes" >&5
++then	echo "$as_me:25742: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else	echo "$as_me:25743: result: no" >&5
++else	echo "$as_me:25744: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:25747: checking for bool" >&5
++echo "$as_me:25748: checking for bool" >&5
+ echo $ECHO_N "checking for bool... $ECHO_C" >&6
+ if test "${ac_cv_type_bool+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25753 "configure"
++#line 25754 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -25786,16 +25787,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25789: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25790: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25792: \$? = $ac_status" >&5
++  echo "$as_me:25793: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25795: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25796: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25798: \$? = $ac_status" >&5
++  echo "$as_me:25799: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -25805,10 +25806,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:25808: result: $ac_cv_type_bool" >&5
++echo "$as_me:25809: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:25811: checking size of bool" >&5
++echo "$as_me:25812: checking size of bool" >&5
+ echo $ECHO_N "checking size of bool... $ECHO_C" >&6
+ if test "${ac_cv_sizeof_bool+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -25817,7 +25818,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25820 "configure"
++#line 25821 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -25850,21 +25851,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25853: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25854: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25856: \$? = $ac_status" >&5
++  echo "$as_me:25857: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25859: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25860: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25862: \$? = $ac_status" >&5
++  echo "$as_me:25863: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25867 "configure"
++#line 25868 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -25897,16 +25898,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25900: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25901: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25903: \$? = $ac_status" >&5
++  echo "$as_me:25904: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25906: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25907: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25909: \$? = $ac_status" >&5
++  echo "$as_me:25910: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -25922,7 +25923,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25925 "configure"
++#line 25926 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -25955,16 +25956,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:25958: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:25959: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:25961: \$? = $ac_status" >&5
++  echo "$as_me:25962: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:25964: \"$ac_try\"") >&5
++  { (eval echo "$as_me:25965: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:25967: \$? = $ac_status" >&5
++  echo "$as_me:25968: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -25980,7 +25981,7 @@
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 25983 "configure"
++#line 25984 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26013,16 +26014,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26016: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26017: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26019: \$? = $ac_status" >&5
++  echo "$as_me:26020: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26022: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26023: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26025: \$? = $ac_status" >&5
++  echo "$as_me:26026: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -26035,12 +26036,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:26038: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:26039: error: cannot run test program while cross compiling" >&5
+ echo "$as_me: error: cannot run test program while cross compiling" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26043 "configure"
++#line 26044 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26077,15 +26078,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26080: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26081: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26083: \$? = $ac_status" >&5
++  echo "$as_me:26084: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26085: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26086: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26088: \$? = $ac_status" >&5
++  echo "$as_me:26089: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -26101,13 +26102,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:26104: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:26105: result: $ac_cv_sizeof_bool" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:26111: checking for type of bool" >&5
+ echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
+ if test "${cf_cv_type_of_bool+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -26126,7 +26127,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26129 "configure"
++#line 26130 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26168,15 +26169,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26171: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26172: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26174: \$? = $ac_status" >&5
++  echo "$as_me:26175: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26176: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26177: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26179: \$? = $ac_status" >&5
++  echo "$as_me:26180: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_type_of_bool=`cat cf_test.out`
+ 		 if test -z "$cf_cv_type_of_bool"; then
+@@ -26193,19 +26194,19 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:26196: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:26197: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ 
+ if test "$cf_cv_type_of_bool" = unknown ; then
+ 	case .$NCURSES_BOOL in
+ 	(.auto|.) NCURSES_BOOL=unsigned;;
+ 	esac
+-	{ echo "$as_me:26203: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:26204: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+ echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
+ 	cf_cv_type_of_bool=$NCURSES_BOOL
+ fi
+ 
+-echo "$as_me:26208: checking for special defines needed for etip.h" >&5
++echo "$as_me:26209: checking for special defines needed for etip.h" >&5
+ echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6
+ cf_save_CXXFLAGS="$CXXFLAGS"
+ cf_result="none"
+@@ -26223,7 +26224,7 @@
+ 	test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}"
+ 	test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26226 "configure"
++#line 26227 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26237,16 +26238,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26240: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26241: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26243: \$? = $ac_status" >&5
++  echo "$as_me:26244: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26246: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26247: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26249: \$? = $ac_status" >&5
++  echo "$as_me:26250: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	test -n "$cf_math" && cat >>confdefs.h <&5
++echo "$as_me:26271: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ CXXFLAGS="$cf_save_CXXFLAGS"
+ 
+ if test -n "$CXX"; then
+-echo "$as_me:26275: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:26276: checking if $CXX accepts parameter initialization" >&5
+ echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6
+ if test "${cf_cv_cpp_param_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -26289,7 +26290,7 @@
+   cf_cv_cpp_param_init=unknown
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26292 "configure"
++#line 26293 "configure"
+ #include "confdefs.h"
+ 
+ class TEST {
+@@ -26308,15 +26309,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26311: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26312: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26314: \$? = $ac_status" >&5
++  echo "$as_me:26315: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26316: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26317: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26319: \$? = $ac_status" >&5
++  echo "$as_me:26320: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_param_init=yes
+ else
+@@ -26335,7 +26336,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:26338: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:26339: result: $cf_cv_cpp_param_init" >&5
+ echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
+ fi
+ test "$cf_cv_cpp_param_init" = yes &&
+@@ -26345,7 +26346,7 @@
+ 
+ if test -n "$CXX"; then
+ 
+-echo "$as_me:26348: checking if $CXX accepts static_cast" >&5
++echo "$as_me:26349: checking if $CXX accepts static_cast" >&5
+ echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6
+ if test "${cf_cv_cpp_static_cast+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -26359,7 +26360,7 @@
+ ac_main_return="return"
+ 
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26362 "configure"
++#line 26363 "configure"
+ #include "confdefs.h"
+ 
+ class NCursesPanel
+@@ -26403,16 +26404,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26406: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26407: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26409: \$? = $ac_status" >&5
++  echo "$as_me:26410: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26412: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26413: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26415: \$? = $ac_status" >&5
++  echo "$as_me:26416: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_cpp_static_cast=yes
+ else
+@@ -26430,7 +26431,7 @@
+ ac_main_return="return"
+ 
+ fi
+-echo "$as_me:26433: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:26434: result: $cf_cv_cpp_static_cast" >&5
+ echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
+ 
+ fi
+@@ -26479,13 +26480,13 @@
+ 	else
+ 		if test "$cf_cv_header_stdbool_h" = 1 ; then
+ 
+-echo "$as_me:26482: checking for bool" >&5
++echo "$as_me:26483: checking for bool" >&5
+ echo $ECHO_N "checking for bool... $ECHO_C" >&6
+ if test "${ac_cv_type_bool+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26488 "configure"
++#line 26489 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26521,16 +26522,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26524: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26525: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26527: \$? = $ac_status" >&5
++  echo "$as_me:26528: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26530: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26531: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26533: \$? = $ac_status" >&5
++  echo "$as_me:26534: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_bool=yes
+ else
+@@ -26540,10 +26541,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:26543: result: $ac_cv_type_bool" >&5
++echo "$as_me:26544: result: $ac_cv_type_bool" >&5
+ echo "${ECHO_T}$ac_cv_type_bool" >&6
+ 
+-echo "$as_me:26546: checking size of bool" >&5
++echo "$as_me:26547: checking size of bool" >&5
+ echo $ECHO_N "checking size of bool... $ECHO_C" >&6
+ if test "${ac_cv_sizeof_bool+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -26552,7 +26553,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26555 "configure"
++#line 26556 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26585,21 +26586,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26588: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26589: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26591: \$? = $ac_status" >&5
++  echo "$as_me:26592: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26594: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26595: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26597: \$? = $ac_status" >&5
++  echo "$as_me:26598: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26602 "configure"
++#line 26603 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26632,16 +26633,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26635: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26636: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26638: \$? = $ac_status" >&5
++  echo "$as_me:26639: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26641: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26642: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26644: \$? = $ac_status" >&5
++  echo "$as_me:26645: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -26657,7 +26658,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26660 "configure"
++#line 26661 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26690,16 +26691,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26693: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26694: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26696: \$? = $ac_status" >&5
++  echo "$as_me:26697: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26699: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26700: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26702: \$? = $ac_status" >&5
++  echo "$as_me:26703: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -26715,7 +26716,7 @@
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26718 "configure"
++#line 26719 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26748,16 +26749,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:26751: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:26752: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:26754: \$? = $ac_status" >&5
++  echo "$as_me:26755: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:26757: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26758: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26760: \$? = $ac_status" >&5
++  echo "$as_me:26761: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -26770,12 +26771,12 @@
+ ac_cv_sizeof_bool=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:26773: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:26774: error: cannot run test program while cross compiling" >&5
+ echo "$as_me: error: cannot run test program while cross compiling" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26778 "configure"
++#line 26779 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26812,15 +26813,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26815: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26816: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26818: \$? = $ac_status" >&5
++  echo "$as_me:26819: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26820: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26821: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26823: \$? = $ac_status" >&5
++  echo "$as_me:26824: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_bool=`cat conftest.val`
+ else
+@@ -26836,13 +26837,13 @@
+   ac_cv_sizeof_bool=0
+ fi
+ fi
+-echo "$as_me:26839: result: $ac_cv_sizeof_bool" >&5
++echo "$as_me:26840: result: $ac_cv_sizeof_bool" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
+ cat >>confdefs.h <&5
++echo "$as_me:26846: checking for type of bool" >&5
+ echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
+ if test "${cf_cv_type_of_bool+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -26861,7 +26862,7 @@
+ 
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 26864 "configure"
++#line 26865 "configure"
+ #include "confdefs.h"
+ 
+ #include 
+@@ -26903,15 +26904,15 @@
+ 
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:26906: \"$ac_link\"") >&5
++if { (eval echo "$as_me:26907: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:26909: \$? = $ac_status" >&5
++  echo "$as_me:26910: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:26911: \"$ac_try\"") >&5
++  { (eval echo "$as_me:26912: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:26914: \$? = $ac_status" >&5
++  echo "$as_me:26915: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   cf_cv_type_of_bool=`cat cf_test.out`
+ 		 if test -z "$cf_cv_type_of_bool"; then
+@@ -26928,26 +26929,26 @@
+ 	rm -f cf_test.out
+ 
+ fi
+-echo "$as_me:26931: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:26932: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ 
+ if test "$cf_cv_type_of_bool" = unknown ; then
+ 	case .$NCURSES_BOOL in
+ 	(.auto|.) NCURSES_BOOL=unsigned;;
+ 	esac
+-	{ echo "$as_me:26938: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++	{ echo "$as_me:26939: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+ echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
+ 	cf_cv_type_of_bool=$NCURSES_BOOL
+ fi
+ 
+ 		else
+-			echo "$as_me:26944: checking for fallback type of bool" >&5
++			echo "$as_me:26945: checking for fallback type of bool" >&5
+ echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
+ 			case "$host_cpu" in
+ 			(i?86)	cf_cv_type_of_bool=char	;;
+ 			(*)	cf_cv_type_of_bool=int	;;
+ 			esac
+-			echo "$as_me:26950: result: $cf_cv_type_of_bool" >&5
++			echo "$as_me:26951: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ 		fi
+ 	fi
+@@ -26976,7 +26977,7 @@
+ 
+ 	if test "$cf_with_ada" != "no" ; then
+ 		if test "$with_libtool" != "no"; then
+-			{ echo "$as_me:26979: WARNING: libtool does not support Ada - disabling feature" >&5
++			{ echo "$as_me:26980: WARNING: libtool does not support Ada - disabling feature" >&5
+ echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
+ 			cf_with_ada=no
+ 		fi
+@@ -26993,7 +26994,7 @@
+ 	unset cf_TEMP_gnat
+ 	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
+ set dummy $cf_prog_gnat; ac_word=$2
+-echo "$as_me:26996: checking for $ac_word" >&5
++echo "$as_me:26997: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -27010,7 +27011,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
+-   echo "$as_me:27013: found $ac_dir/$ac_word" >&5
++   echo "$as_me:27014: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -27022,10 +27023,10 @@
+ cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
+ 
+ if test -n "$cf_TEMP_gnat"; then
+-  echo "$as_me:27025: result: $cf_TEMP_gnat" >&5
++  echo "$as_me:27026: result: $cf_TEMP_gnat" >&5
+ echo "${ECHO_T}$cf_TEMP_gnat" >&6
+ else
+-  echo "$as_me:27028: result: no" >&5
++  echo "$as_me:27029: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -27035,7 +27036,7 @@
+ 		unset cf_cv_gnat_version
+ 		unset cf_TEMP_gnat
+ 
+-echo "$as_me:27038: checking for $cf_prog_gnat version" >&5
++echo "$as_me:27039: checking for $cf_prog_gnat version" >&5
+ echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
+ if test "${cf_cv_gnat_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -27046,7 +27047,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:27049: result: $cf_cv_gnat_version" >&5
++echo "$as_me:27050: result: $cf_cv_gnat_version" >&5
+ echo "${ECHO_T}$cf_cv_gnat_version" >&6
+ test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
+ eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
+@@ -27075,7 +27076,7 @@
+ 			cd conftest.src
+ 			for cf_gprconfig in Ada C
+ 			do
+-				echo "$as_me:27078: checking for gprconfig name for $cf_gprconfig" >&5
++				echo "$as_me:27079: checking for gprconfig name for $cf_gprconfig" >&5
+ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
+ 				if test "$cf_gprconfig" = C
+ 				then
+@@ -27094,10 +27095,10 @@
+ 				if test -n "$cf_gprconfig_value"
+ 				then
+ 					eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
+-					echo "$as_me:27097: result: $cf_gprconfig_value" >&5
++					echo "$as_me:27098: result: $cf_gprconfig_value" >&5
+ echo "${ECHO_T}$cf_gprconfig_value" >&6
+ 				else
+-					echo "$as_me:27100: result: missing" >&5
++					echo "$as_me:27101: result: missing" >&5
+ echo "${ECHO_T}missing" >&6
+ 					cf_ada_config="#"
+ 					break
+@@ -27110,7 +27111,7 @@
+ 	if test "x$cf_ada_config" != "x#"
+ 	then
+ 
+-echo "$as_me:27113: checking for gnat version" >&5
++echo "$as_me:27114: checking for gnat version" >&5
+ echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
+ if test "${cf_cv_gnat_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -27121,7 +27122,7 @@
+ 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+ 
+ fi
+-echo "$as_me:27124: result: $cf_cv_gnat_version" >&5
++echo "$as_me:27125: result: $cf_cv_gnat_version" >&5
+ echo "${ECHO_T}$cf_cv_gnat_version" >&6
+ test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
+ 
+@@ -27130,7 +27131,7 @@
+ 	cf_cv_prog_gnat_correct=yes
+ 	;;
+ (*)
+-	{ echo "$as_me:27133: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
++	{ echo "$as_me:27134: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+ echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
+ 	cf_cv_prog_gnat_correct=no
+ 	;;
+@@ -27138,7 +27139,7 @@
+ 
+ 		# Extract the first word of "m4", so it can be a program name with args.
+ set dummy m4; ac_word=$2
+-echo "$as_me:27141: checking for $ac_word" >&5
++echo "$as_me:27142: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_M4_exists+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -27153,7 +27154,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_M4_exists="yes"
+-echo "$as_me:27156: found $ac_dir/$ac_word" >&5
++echo "$as_me:27157: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -27162,20 +27163,20 @@
+ fi
+ M4_exists=$ac_cv_prog_M4_exists
+ if test -n "$M4_exists"; then
+-  echo "$as_me:27165: result: $M4_exists" >&5
++  echo "$as_me:27166: result: $M4_exists" >&5
+ echo "${ECHO_T}$M4_exists" >&6
+ else
+-  echo "$as_me:27168: result: no" >&5
++  echo "$as_me:27169: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ 		if test "$ac_cv_prog_M4_exists" = no; then
+ 			cf_cv_prog_gnat_correct=no
+-			{ echo "$as_me:27174: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
++			{ echo "$as_me:27175: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+ echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
+ 		fi
+ 		if test "$cf_cv_prog_gnat_correct" = yes; then
+-			echo "$as_me:27178: checking if GNAT works" >&5
++			echo "$as_me:27179: checking if GNAT works" >&5
+ echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
+ 
+ rm -rf ./conftest* ./*~conftest*
+@@ -27203,7 +27204,7 @@
+ fi
+ rm -rf ./conftest* ./*~conftest*
+ 
+-			echo "$as_me:27206: result: $cf_cv_prog_gnat_correct" >&5
++			echo "$as_me:27207: result: $cf_cv_prog_gnat_correct" >&5
+ echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
+ 		fi
+ 	else
+@@ -27215,7 +27216,7 @@
+ 
+  	ADAFLAGS="$ADAFLAGS -gnatpn"
+ 
+-	echo "$as_me:27218: checking optimization options for ADAFLAGS" >&5
++	echo "$as_me:27219: checking optimization options for ADAFLAGS" >&5
+ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
+ 	case "$CFLAGS" in
+ 	(*-g*)
+@@ -27232,10 +27233,10 @@
+ 
+ 		;;
+ 	esac
+-	echo "$as_me:27235: result: $ADAFLAGS" >&5
++	echo "$as_me:27236: result: $ADAFLAGS" >&5
+ echo "${ECHO_T}$ADAFLAGS" >&6
+ 
+-echo "$as_me:27238: checking if GNATPREP supports -T option" >&5
++echo "$as_me:27239: checking if GNATPREP supports -T option" >&5
+ echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6
+ if test "${cf_cv_gnatprep_opt_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -27245,11 +27246,11 @@
+ gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+ 
+ fi
+-echo "$as_me:27248: result: $cf_cv_gnatprep_opt_t" >&5
++echo "$as_me:27249: result: $cf_cv_gnatprep_opt_t" >&5
+ echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
+ test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
+ 
+-echo "$as_me:27252: checking if GNAT supports generics" >&5
++echo "$as_me:27253: checking if GNAT supports generics" >&5
+ echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
+ case "$cf_cv_gnat_version" in
+ (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
+@@ -27259,7 +27260,7 @@
+ 	cf_gnat_generics=no
+ 	;;
+ esac
+-echo "$as_me:27262: result: $cf_gnat_generics" >&5
++echo "$as_me:27263: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+ 
+ if test "$cf_gnat_generics" = yes
+@@ -27271,7 +27272,7 @@
+ 	cf_generic_objects=
+ fi
+ 
+-echo "$as_me:27274: checking if GNAT supports SIGINT" >&5
++echo "$as_me:27275: checking if GNAT supports SIGINT" >&5
+ echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
+ if test "${cf_cv_gnat_sigint+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -27319,7 +27320,7 @@
+ rm -rf ./conftest* ./*~conftest*
+ 
+ fi
+-echo "$as_me:27322: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:27323: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+ 
+ if test "$cf_cv_gnat_sigint" = yes ; then
+@@ -27332,7 +27333,7 @@
+ cf_gnat_projects=no
+ 
+ if test "$enable_gnat_projects" != no ; then
+-echo "$as_me:27335: checking if GNAT supports project files" >&5
++echo "$as_me:27336: checking if GNAT supports project files" >&5
+ echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
+ case "$cf_cv_gnat_version" in
+ (3.[0-9]*)
+@@ -27395,15 +27396,15 @@
+ 	esac
+ 	;;
+ esac
+-echo "$as_me:27398: result: $cf_gnat_projects" >&5
++echo "$as_me:27399: result: $cf_gnat_projects" >&5
+ echo "${ECHO_T}$cf_gnat_projects" >&6
+ fi # enable_gnat_projects
+ 
+ if test "$cf_gnat_projects" = yes
+ then
+-	echo "$as_me:27404: checking if GNAT supports libraries" >&5
++	echo "$as_me:27405: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+-	echo "$as_me:27406: result: $cf_gnat_libraries" >&5
++	echo "$as_me:27407: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+ 
+@@ -27423,7 +27424,7 @@
+ 	then
+ 		USE_GNAT_MAKE_GPR=""
+ 	else
+-		{ echo "$as_me:27426: WARNING: use old makefile rules since tools are missing" >&5
++		{ echo "$as_me:27427: WARNING: use old makefile rules since tools are missing" >&5
+ echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
+ 	fi
+ fi
+@@ -27435,7 +27436,7 @@
+ 	USE_GNAT_LIBRARIES="#"
+ fi
+ 
+-echo "$as_me:27438: checking for ada-compiler" >&5
++echo "$as_me:27439: checking for ada-compiler" >&5
+ echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -27446,12 +27447,12 @@
+   cf_ada_compiler=gnatmake
+ fi;
+ 
+-echo "$as_me:27449: result: $cf_ada_compiler" >&5
++echo "$as_me:27450: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+ 
+ 			cf_ada_package=terminal_interface
+ 
+-echo "$as_me:27454: checking for ada-include" >&5
++echo "$as_me:27455: checking for ada-include" >&5
+ echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -27487,7 +27488,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:27490: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:27491: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -27496,10 +27497,10 @@
+ fi
+ eval ADA_INCLUDE="$withval"
+ 
+-echo "$as_me:27499: result: $ADA_INCLUDE" >&5
++echo "$as_me:27500: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+ 
+-echo "$as_me:27502: checking for ada-objects" >&5
++echo "$as_me:27503: checking for ada-objects" >&5
+ echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -27535,7 +27536,7 @@
+ 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
+ 	;;
+ (*)
+-	{ { echo "$as_me:27538: error: expected a pathname, not \"$withval\"" >&5
++	{ { echo "$as_me:27539: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+ 	;;
+@@ -27544,10 +27545,10 @@
+ fi
+ eval ADA_OBJECTS="$withval"
+ 
+-echo "$as_me:27547: result: $ADA_OBJECTS" >&5
++echo "$as_me:27548: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+ 
+-echo "$as_me:27550: checking if an Ada95 shared-library should be built" >&5
++echo "$as_me:27551: checking if an Ada95 shared-library should be built" >&5
+ echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -27557,14 +27558,14 @@
+ else
+   with_ada_sharedlib=no
+ fi;
+-echo "$as_me:27560: result: $with_ada_sharedlib" >&5
++echo "$as_me:27561: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+ 
+ if test "x$with_ada_sharedlib" != xno
+ then
+ 	if test "x$cf_gnat_projects" != xyes
+ 	then
+-		{ echo "$as_me:27567: WARNING: disabling shared-library since GNAT projects are not supported" >&5
++		{ echo "$as_me:27568: WARNING: disabling shared-library since GNAT projects are not supported" >&5
+ echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;}
+ 		with_ada_sharedlib=no
+ 	fi
+@@ -27584,7 +27585,7 @@
+ 
+ 			# allow the Ada binding to be renamed
+ 
+-echo "$as_me:27587: checking for ada-libname" >&5
++echo "$as_me:27588: checking for ada-libname" >&5
+ echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6
+ 
+ # Check whether --with-ada-libname or --without-ada-libname was given.
+@@ -27600,7 +27601,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:27603: result: $ADA_LIBNAME" >&5
++echo "$as_me:27604: result: $ADA_LIBNAME" >&5
+ echo "${ECHO_T}$ADA_LIBNAME" >&6
+ 
+ 		fi
+@@ -27611,13 +27612,13 @@
+ 
+ # do this "late" to avoid conflict with header-checks
+ if test "x$with_widec" = xyes ; then
+-	echo "$as_me:27614: checking for wchar_t" >&5
++	echo "$as_me:27615: checking for wchar_t" >&5
+ echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6
+ if test "${ac_cv_type_wchar_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27620 "configure"
++#line 27621 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27632,16 +27633,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27635: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27636: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27638: \$? = $ac_status" >&5
++  echo "$as_me:27639: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27641: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27642: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27644: \$? = $ac_status" >&5
++  echo "$as_me:27645: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_type_wchar_t=yes
+ else
+@@ -27651,10 +27652,10 @@
+ fi
+ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+ fi
+-echo "$as_me:27654: result: $ac_cv_type_wchar_t" >&5
++echo "$as_me:27655: result: $ac_cv_type_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
+ 
+-echo "$as_me:27657: checking size of wchar_t" >&5
++echo "$as_me:27658: checking size of wchar_t" >&5
+ echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6
+ if test "${ac_cv_sizeof_wchar_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -27663,7 +27664,7 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27666 "configure"
++#line 27667 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27675,21 +27676,21 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27678: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27679: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27681: \$? = $ac_status" >&5
++  echo "$as_me:27682: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27684: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27685: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27687: \$? = $ac_status" >&5
++  echo "$as_me:27688: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27692 "configure"
++#line 27693 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27701,16 +27702,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27704: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27705: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27707: \$? = $ac_status" >&5
++  echo "$as_me:27708: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27710: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27711: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27713: \$? = $ac_status" >&5
++  echo "$as_me:27714: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid; break
+ else
+@@ -27726,7 +27727,7 @@
+ ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27729 "configure"
++#line 27730 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27738,16 +27739,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27741: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27742: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27744: \$? = $ac_status" >&5
++  echo "$as_me:27745: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27747: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27748: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27750: \$? = $ac_status" >&5
++  echo "$as_me:27751: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_lo=$ac_mid; break
+ else
+@@ -27763,7 +27764,7 @@
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27766 "configure"
++#line 27767 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27775,16 +27776,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext"
+-if { (eval echo "$as_me:27778: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:27779: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:27781: \$? = $ac_status" >&5
++  echo "$as_me:27782: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest.$ac_objext"'
+-  { (eval echo "$as_me:27784: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27785: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27787: \$? = $ac_status" >&5
++  echo "$as_me:27788: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_hi=$ac_mid
+ else
+@@ -27797,12 +27798,12 @@
+ ac_cv_sizeof_wchar_t=$ac_lo
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:27800: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:27801: error: cannot run test program while cross compiling" >&5
+ echo "$as_me: error: cannot run test program while cross compiling" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >"conftest.$ac_ext" <<_ACEOF
+-#line 27805 "configure"
++#line 27806 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -27818,15 +27819,15 @@
+ }
+ _ACEOF
+ rm -f "conftest$ac_exeext"
+-if { (eval echo "$as_me:27821: \"$ac_link\"") >&5
++if { (eval echo "$as_me:27822: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:27824: \$? = $ac_status" >&5
++  echo "$as_me:27825: \$? = $ac_status" >&5
+   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+-  { (eval echo "$as_me:27826: \"$ac_try\"") >&5
++  { (eval echo "$as_me:27827: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:27829: \$? = $ac_status" >&5
++  echo "$as_me:27830: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+   ac_cv_sizeof_wchar_t=`cat conftest.val`
+ else
+@@ -27842,7 +27843,7 @@
+   ac_cv_sizeof_wchar_t=0
+ fi
+ fi
+-echo "$as_me:27845: result: $ac_cv_sizeof_wchar_t" >&5
++echo "$as_me:27846: result: $ac_cv_sizeof_wchar_t" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
+ cat >>confdefs.h <&6
+ 
+-echo "${as_me:-configure}:27858: testing test failed (assume 2) ..." 1>&5
++echo "${as_me:-configure}:27859: testing test failed (assume 2) ..." 1>&5
+ 
+ 		sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
+ 		mv confdefs.tmp confdefs.h
+@@ -27873,7 +27874,7 @@
+ ### chooses to split module lists into libraries.
+ ###
+ ### (see CF_LIB_RULES).
+-echo "$as_me:27876: checking for library subsets" >&5
++echo "$as_me:27877: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+ 
+@@ -27927,7 +27928,7 @@
+ test "x$with_widec"     = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
+ test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
+ 
+-echo "$as_me:27930: result: $LIB_SUBSETS" >&5
++echo "$as_me:27931: result: $LIB_SUBSETS" >&5
+ echo "${ECHO_T}$LIB_SUBSETS" >&6
+ 
+ ### Construct the list of include-directories to be generated
+@@ -27958,7 +27959,7 @@
+ fi
+ 
+ ### Build up pieces for makefile rules
+-echo "$as_me:27961: checking default library suffix" >&5
++echo "$as_me:27962: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -27969,10 +27970,10 @@
+ 	(shared)  DFT_ARG_SUFFIX=''   ;;
+ 	esac
+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:27972: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:27973: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+ 
+-echo "$as_me:27975: checking default library-dependency suffix" >&5
++echo "$as_me:27976: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+ 
+ 	case X$DFT_LWR_MODEL in
+@@ -28055,10 +28056,10 @@
+ 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
+ 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
+ 	fi
+-echo "$as_me:28058: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:28059: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+ 
+-echo "$as_me:28061: checking default object directory" >&5
++echo "$as_me:28062: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+ 
+ 	case $DFT_LWR_MODEL in
+@@ -28074,11 +28075,11 @@
+ 			DFT_OBJ_SUBDIR='obj_s' ;;
+ 		esac
+ 	esac
+-echo "$as_me:28077: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:28078: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+ 
+ if test "x$cf_with_cxx" = xyes ; then
+-echo "$as_me:28081: checking c++ library-dependency suffix" >&5
++echo "$as_me:28082: checking c++ library-dependency suffix" >&5
+ echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
+ if test "$with_libtool" != "no"; then
+ 	# libtool thinks it can make c++ shared libraries (perhaps only g++)
+@@ -28171,7 +28172,7 @@
+ 	fi
+ 
+ fi
+-echo "$as_me:28174: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:28175: result: $CXX_LIB_SUFFIX" >&5
+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
+ 
+ fi
+@@ -28347,19 +28348,19 @@
+ 
+ if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
+ then
+-	echo "$as_me:28350: checking if linker supports switching between static/dynamic" >&5
++	echo "$as_me:28351: checking if linker supports switching between static/dynamic" >&5
+ echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6
+ 
+ 	rm -f libconftest.a
+ 	cat >conftest.$ac_ext <
+ int cf_ldflags_static(FILE *fp) { return fflush(fp); }
+ EOF
+-	if { (eval echo "$as_me:28359: \"$ac_compile\"") >&5
++	if { (eval echo "$as_me:28360: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:28362: \$? = $ac_status" >&5
++  echo "$as_me:28363: \$? = $ac_status" >&5
+   (exit "$ac_status"); } ; then
+ 		( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null
+ 		( eval $RANLIB libconftest.a ) 2>&5 >/dev/null
+@@ -28370,10 +28371,10 @@
+ 
+ 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
+ 	cat >"conftest.$ac_ext" <<_ACEOF
+-#line 28373 "configure"
++#line 28374 "configure"
+ #include "confdefs.h"
+ 
+-#line 28376 "configure"
++#line 28377 "configure"
+ #include 
+ int cf_ldflags_static(FILE *fp);
+ 
+@@ -28388,16 +28389,16 @@
+ }
+ _ACEOF
+ rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+-if { (eval echo "$as_me:28391: \"$ac_link\"") >&5
++if { (eval echo "$as_me:28392: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:28394: \$? = $ac_status" >&5
++  echo "$as_me:28395: \$? = $ac_status" >&5
+   (exit "$ac_status"); } &&
+          { ac_try='test -s "conftest$ac_exeext"'
+-  { (eval echo "$as_me:28397: \"$ac_try\"") >&5
++  { (eval echo "$as_me:28398: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:28400: \$? = $ac_status" >&5
++  echo "$as_me:28401: \$? = $ac_status" >&5
+   (exit "$ac_status"); }; }; then
+ 
+ 	# some linkers simply ignore the -dynamic
+@@ -28420,7 +28421,7 @@
+ 	rm -f libconftest.*
+ 	LIBS="$cf_save_LIBS"
+ 
+-	echo "$as_me:28423: result: $cf_ldflags_static" >&5
++	echo "$as_me:28424: result: $cf_ldflags_static" >&5
+ echo "${ECHO_T}$cf_ldflags_static" >&6
+ 
+ 	if test "$cf_ldflags_static" != yes
+@@ -28436,7 +28437,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28439: checking where we will install curses.h" >&5
++echo "$as_me:28440: checking where we will install curses.h" >&5
+ echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
+ 
+ includesubdir=
+@@ -28446,7 +28447,7 @@
+ then
+ 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
+ fi
+-echo "$as_me:28449: result: ${includedir}${includesubdir}" >&5
++echo "$as_me:28450: result: ${includedir}${includesubdir}" >&5
+ echo "${ECHO_T}${includedir}${includesubdir}" >&6
+ 
+ ### Resolve a conflict between normal and wide-curses by forcing applications
+@@ -28454,7 +28455,7 @@
+ if test "$with_overwrite" != no ; then
+ if test "$NCURSES_LIBUTF8" = 1 ; then
+ 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
+-	{ echo "$as_me:28457: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++	{ echo "$as_me:28458: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+ echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
+ fi
+ fi
+@@ -28482,7 +28483,7 @@
+ 
+ # pkgsrc uses these
+ 
+-echo "$as_me:28485: checking for desired basename for form library" >&5
++echo "$as_me:28486: checking for desired basename for form library" >&5
+ echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
+ 
+ # Check whether --with-form-libname or --without-form-libname was given.
+@@ -28502,10 +28503,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28505: result: $FORM_NAME" >&5
++echo "$as_me:28506: result: $FORM_NAME" >&5
+ echo "${ECHO_T}$FORM_NAME" >&6
+ 
+-echo "$as_me:28508: checking for desired basename for menu library" >&5
++echo "$as_me:28509: checking for desired basename for menu library" >&5
+ echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
+ 
+ # Check whether --with-menu-libname or --without-menu-libname was given.
+@@ -28525,10 +28526,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28528: result: $MENU_NAME" >&5
++echo "$as_me:28529: result: $MENU_NAME" >&5
+ echo "${ECHO_T}$MENU_NAME" >&6
+ 
+-echo "$as_me:28531: checking for desired basename for panel library" >&5
++echo "$as_me:28532: checking for desired basename for panel library" >&5
+ echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
+ 
+ # Check whether --with-panel-libname or --without-panel-libname was given.
+@@ -28548,10 +28549,10 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28551: result: $PANEL_NAME" >&5
++echo "$as_me:28552: result: $PANEL_NAME" >&5
+ echo "${ECHO_T}$PANEL_NAME" >&6
+ 
+-echo "$as_me:28554: checking for desired basename for cxx library" >&5
++echo "$as_me:28555: checking for desired basename for cxx library" >&5
+ echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
+ 
+ # Check whether --with-cxx-libname or --without-cxx-libname was given.
+@@ -28571,13 +28572,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:28574: result: $CXX_NAME" >&5
++echo "$as_me:28575: result: $CXX_NAME" >&5
+ echo "${ECHO_T}$CXX_NAME" >&6
+ 
+ ### Construct the list of subdirectories for which we'll customize makefiles
+ ### with the appropriate compile-rules.
+ 
+-echo "$as_me:28580: checking for src modules" >&5
++echo "$as_me:28581: checking for src modules" >&5
+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
+ 
+ # dependencies and linker-arguments for test-programs
+@@ -28646,7 +28647,7 @@
+ 		fi
+ 	fi
+ done
+-echo "$as_me:28649: result: $cf_cv_src_modules" >&5
++echo "$as_me:28650: result: $cf_cv_src_modules" >&5
+ echo "${ECHO_T}$cf_cv_src_modules" >&6
+ 
+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+@@ -28807,7 +28808,7 @@
+ 	(*-D_XOPEN_SOURCE_EXTENDED*)
+ 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
+ 
+-echo "${as_me:-configure}:28810: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
++echo "${as_me:-configure}:28811: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+ 
+ 		CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
+ 		CPPFLAGS=`echo "x$CPPFLAGS" | sed -e  's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'`
+@@ -28818,7 +28819,7 @@
+ 
+ # Help to automatically enable the extended curses features when using either
+ # the *-config or the ".pc" files by adding defines.
+-echo "$as_me:28821: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
++echo "$as_me:28822: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
+ echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6
+ PKG_CFLAGS=
+ for cf_loop1 in $CPPFLAGS_after_XOPEN
+@@ -28834,7 +28835,7 @@
+ 	done
+ 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
+ done
+-echo "$as_me:28837: result: $PKG_CFLAGS" >&5
++echo "$as_me:28838: result: $PKG_CFLAGS" >&5
+ echo "${ECHO_T}$PKG_CFLAGS" >&6
+ 
+ # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
+@@ -28895,7 +28896,7 @@
+ 	cf_filter_syms=$cf_dft_filter_syms
+ 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_version" 1>&6
+ 
+-echo "${as_me:-configure}:28898: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
++echo "${as_me:-configure}:28899: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
+ 
+ fi
+ 
+@@ -28922,7 +28923,7 @@
+ 
+ # This is used for the *-config script and *.pc data files.
+ 
+-echo "$as_me:28925: checking for linker search path" >&5
++echo "$as_me:28926: checking for linker search path" >&5
+ echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
+ if test "${cf_cv_ld_searchpath+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -28970,7 +28971,7 @@
+ 			cf_pathlist="$cf_pathlist /lib /usr/lib"
+ 			;;
+ 		(*)
+-			{ echo "$as_me:28973: WARNING: problem with Solaris architecture" >&5
++			{ echo "$as_me:28974: WARNING: problem with Solaris architecture" >&5
+ echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
+ 			;;
+ 		esac
+@@ -29011,7 +29012,7 @@
+ test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
+ 
+ fi
+-echo "$as_me:29014: result: $cf_cv_ld_searchpath" >&5
++echo "$as_me:29015: result: $cf_cv_ld_searchpath" >&5
+ echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
+ 
+ LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
+@@ -29101,7 +29102,7 @@
+ : "${CONFIG_STATUS=./config.status}"
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:29104: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:29105: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >"$CONFIG_STATUS" <<_ACEOF
+ #! $SHELL
+@@ -29280,7 +29281,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:29283: error: ambiguous option: $1
++    { { echo "$as_me:29284: error: ambiguous option: $1
+ Try \`$0 --help' for more information." >&5
+ echo "$as_me: error: ambiguous option: $1
+ Try \`$0 --help' for more information." >&2;}
+@@ -29299,7 +29300,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:29302: error: unrecognized option: $1
++  -*) { { echo "$as_me:29303: error: unrecognized option: $1
+ Try \`$0 --help' for more information." >&5
+ echo "$as_me: error: unrecognized option: $1
+ Try \`$0 --help' for more information." >&2;}
+@@ -29425,7 +29426,7 @@
+   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
+   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
+-  *) { { echo "$as_me:29428: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:29429: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -29937,7 +29938,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:29940: creating $ac_file" >&5
++    { echo "$as_me:29941: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -29955,7 +29956,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:29958: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:29959: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -29968,7 +29969,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:29971: error: cannot find input file: $f" >&5
++           { { echo "$as_me:29972: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -29984,7 +29985,7 @@
+       if test -n "$ac_seen"; then
+         ac_used=`grep '@datarootdir@' "$ac_item"`
+         if test -z "$ac_used"; then
+-          { echo "$as_me:29987: WARNING: datarootdir was used implicitly but not set:
++          { echo "$as_me:29988: WARNING: datarootdir was used implicitly but not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: datarootdir was used implicitly but not set:
+ $ac_seen" >&2;}
+@@ -29993,7 +29994,7 @@
+       fi
+       ac_seen=`grep '${datarootdir}' "$ac_item"`
+       if test -n "$ac_seen"; then
+-        { echo "$as_me:29996: WARNING: datarootdir was used explicitly but not set:
++        { echo "$as_me:29997: WARNING: datarootdir was used explicitly but not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: datarootdir was used explicitly but not set:
+ $ac_seen" >&2;}
+@@ -30030,7 +30031,7 @@
+             ac_init=`${EGREP-egrep} '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
+             if test -z "$ac_init"; then
+               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
+-              { echo "$as_me:30033: WARNING: Variable $ac_name is used but was not set:
++              { echo "$as_me:30034: WARNING: Variable $ac_name is used but was not set:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Variable $ac_name is used but was not set:
+ $ac_seen" >&2;}
+@@ -30041,7 +30042,7 @@
+     ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out
+     if test -s $tmp/out; then
+       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
+-      { echo "$as_me:30044: WARNING: Some variables may not be substituted:
++      { echo "$as_me:30045: WARNING: Some variables may not be substituted:
+ $ac_seen" >&5
+ echo "$as_me: WARNING: Some variables may not be substituted:
+ $ac_seen" >&2;}
+@@ -30090,7 +30091,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:30093: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:30094: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -30101,7 +30102,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:30104: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:30105: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -30114,7 +30115,7 @@
+            echo "$srcdir/$f"
+          else
+            # /dev/null tree
+-           { { echo "$as_me:30117: error: cannot find input file: $f" >&5
++           { { echo "$as_me:30118: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -30172,7 +30173,7 @@
+   rm -f $tmp/in
+   if test x"$ac_file" != x-; then
+     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
+-      { echo "$as_me:30175: $ac_file is unchanged" >&5
++      { echo "$as_me:30176: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+@@ -30559,7 +30560,7 @@
+ 				(cygdll|msysdll|mingw|msvcdll)
+ 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
+ 
+-echo "${as_me:-configure}:30562: testing overriding CXX_MODEL to SHARED ..." 1>&5
++echo "${as_me:-configure}:30563: testing overriding CXX_MODEL to SHARED ..." 1>&5
+ 
+ 					with_shared_cxx=yes
+ 					;;
+Index: dist.mk
+Prereq:  1.1464 
+--- ncurses-6.3-20220129+/dist.mk	2022-01-29 12:21:50.000000000 +0000
++++ ncurses-6.3-20220205/dist.mk	2022-02-05 11:10:39.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1464 2022/01/29 12:21:50 tom Exp $
++# $Id: dist.mk,v 1.1465 2022/02/05 11:10:39 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -38,7 +38,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 3
+-NCURSES_PATCH = 20220129
++NCURSES_PATCH = 20220205
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: include/MKkey_defs.sh
+Prereq:  1.21 
+--- ncurses-6.3-20220129+/include/MKkey_defs.sh	2020-08-17 10:45:33.000000000 +0000
++++ ncurses-6.3-20220205/include/MKkey_defs.sh	2022-02-05 20:38:31.000000000 +0000
+@@ -1,7 +1,7 @@
+ #! /bin/sh
+-# $Id: MKkey_defs.sh,v 1.21 2020/08/17 10:45:33 tom Exp $
++# $Id: MKkey_defs.sh,v 1.22 2022/02/05 20:38:31 tom Exp $
+ ##############################################################################
+-# Copyright 2019,2020 Thomas E. Dickey                                       #
++# Copyright 2019-2020,2022 Thomas E. Dickey                                  #
+ # Copyright 2001-2013,2017 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -44,7 +44,8 @@
+ pass2=pass2_$$
+ pass3=pass3_$$
+ pass4=pass4_$$
+-trap 'rm -f $data pass[1234]_$$' EXIT INT QUIT TERM HUP
++trap 'rm -f $data pass[1234]_$$; exit 1' 1 2 3 15
++trap 'rm -f $data pass[1234]_$$' 0
+ 
+ # change repeated tabs (used for readability) to single tabs (needed to make
+ # awk see the right field alignment of the corresponding columns):
+Index: include/edit_cfg.sh
+Prereq:  1.14 
+--- ncurses-6.3-20220129+/include/edit_cfg.sh	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.3-20220205/include/edit_cfg.sh	2022-02-05 20:38:40.000000000 +0000
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+-# $Id: edit_cfg.sh,v 1.14 2020/02/02 23:34:34 tom Exp $
++# $Id: edit_cfg.sh,v 1.15 2022/02/05 20:38:40 tom Exp $
+ ##############################################################################
+-# Copyright 2020 Thomas E. Dickey                                            #
++# Copyright 2020,2022 Thomas E. Dickey                                       #
+ # Copyright 1998-2001,2017 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -39,7 +39,8 @@
+ #
+ BAK=save$$
+ TMP=edit$$
+-trap "rm -f $BAK $TMP" 0 1 2 3 15
++trap "rm -f $BAK $TMP; exit 1" 1 2 3 15
++trap "rm -f $BAK $TMP" 0
+ for name in \
+ 	HAVE_TCGETATTR \
+ 	HAVE_TERMIOS_H \
+Index: man/make_sed.sh
+Prereq:  1.13 
+--- ncurses-6.3-20220129+/man/make_sed.sh	2021-12-25 17:39:16.000000000 +0000
++++ ncurses-6.3-20220205/man/make_sed.sh	2022-02-05 20:38:54.000000000 +0000
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+-# $Id: make_sed.sh,v 1.13 2021/12/25 17:39:16 tom Exp $
++# $Id: make_sed.sh,v 1.14 2022/02/05 20:38:54 tom Exp $
+ ##############################################################################
+-# Copyright 2020,2021 Thomas E. Dickey                                       #
++# Copyright 2020-2021,2022 Thomas E. Dickey                                  #
+ # Copyright 1998-2005,2017 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -46,7 +46,8 @@
+ SCRIPT=script$$
+ RESULT=result$$
+ rm -f $UPPER $SCRIPT $RESULT
+-trap "rm -f $COL.* $INPUT $UPPER $SCRIPT $RESULT" 0 1 2 3 15
++trap "rm -f $COL.* $INPUT $UPPER $SCRIPT $RESULT; exit 1" 1 2 3 15
++trap "rm -f $COL.* $INPUT $UPPER $SCRIPT $RESULT" 0
+ fgrep -v \# $1 | \
+ sed	-e 's/[	][	]*/	/g' >$INPUT
+ 
+Index: ncurses/base/MKlib_gen.sh
+Prereq:  1.71 
+--- ncurses-6.3-20220129+/ncurses/base/MKlib_gen.sh	2021-09-26 22:08:53.000000000 +0000
++++ ncurses-6.3-20220205/ncurses/base/MKlib_gen.sh	2022-02-05 20:39:10.000000000 +0000
+@@ -2,10 +2,10 @@
+ #
+ # MKlib_gen.sh -- generate sources from curses.h macro definitions
+ #
+-# ($Id: MKlib_gen.sh,v 1.71 2021/09/26 22:08:53 tom Exp $)
++# ($Id: MKlib_gen.sh,v 1.72 2022/02/05 20:39:10 tom Exp $)
+ #
+ ##############################################################################
+-# Copyright 2018-2020,2021 Thomas E. Dickey                                  #
++# Copyright 2018-2021,2022 Thomas E. Dickey                                  #
+ # Copyright 1998-2016,2017 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -101,7 +101,8 @@
+ AW1=awk1_${PID}.awk
+ AW2=awk2_${PID}.awk
+ TMP=gen__${PID}.c
+-trap "rm -f $ED1 $ED2 $ED3 $ED4 $AW1 $AW2 $TMP" 0 1 2 3 15
++trap "rm -f $ED1 $ED2 $ED3 $ED4 $AW1 $AW2 $TMP; exit 1" 1 2 3 15
++trap "rm -f $ED1 $ED2 $ED3 $ED4 $AW1 $AW2 $TMP" 0
+ 
+ ALL=$USE
+ if test "$USE" = implemented ; then
+Index: ncurses/tinfo/MKkeys_list.sh
+Prereq:  1.7 
+--- ncurses-6.3-20220129+/ncurses/tinfo/MKkeys_list.sh	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.3-20220205/ncurses/tinfo/MKkeys_list.sh	2022-02-05 20:40:20.000000000 +0000
+@@ -1,7 +1,7 @@
+ #! /bin/sh
+-# $Id: MKkeys_list.sh,v 1.7 2020/02/02 23:34:34 tom Exp $
++# $Id: MKkeys_list.sh,v 1.8 2022/02/05 20:40:20 tom Exp $
+ ##############################################################################
+-# Copyright 2019,2020 Thomas E. Dickey                                       #
++# Copyright 2019-2020,2022 Thomas E. Dickey                                  #
+ # Copyright 2001-2003,2017 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -44,7 +44,8 @@
+ fi
+ 
+ data=data$$
+-trap 'rm -f $data' EXIT INT QUIT TERM HUP
++trap 'rm -f $data; exit 1' 1 2 3 15
++trap 'rm -f $data' 0
+ cat $DATA | sed -e 's/[	][	]*/	/g' >$data
+ 
+ cat <  Sat, 29 Jan 2022 07:21:50 -0500
++ -- Thomas E. Dickey   Sat, 05 Feb 2022 06:10:39 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.3-20220129+/package/debian-mingw64/changelog	2022-01-29 12:21:50.000000000 +0000
++++ ncurses-6.3-20220205/package/debian-mingw64/changelog	2022-02-05 11:10:39.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.3+20220129) unstable; urgency=low
++ncurses6 (6.3+20220205) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 29 Jan 2022 07:21:50 -0500
++ -- Thomas E. Dickey   Sat, 05 Feb 2022 06:10:39 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.3-20220129+/package/debian/changelog	2022-01-29 12:21:50.000000000 +0000
++++ ncurses-6.3-20220205/package/debian/changelog	2022-02-05 11:10:39.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.3+20220129) unstable; urgency=low
++ncurses6 (6.3+20220205) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 29 Jan 2022 07:21:49 -0500
++ -- Thomas E. Dickey   Sat, 05 Feb 2022 06:10:39 -0500
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.504 
+--- ncurses-6.3-20220129+/package/mingw-ncurses.nsi	2022-01-29 12:21:50.000000000 +0000
++++ ncurses-6.3-20220205/package/mingw-ncurses.nsi	2022-02-05 11:10:39.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.504 2022/01/29 12:21:50 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.505 2022/02/05 11:10:39 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "3"
+ !define VERSION_YYYY  "2022"
+-!define VERSION_MMDD  "0129"
++!define VERSION_MMDD  "0205"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.3-20220129+/package/mingw-ncurses.spec	2022-01-29 12:21:50.000000000 +0000
++++ ncurses-6.3-20220205/package/mingw-ncurses.spec	2022-02-05 11:10:39.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.3
+-Release: 20220129
++Release: 20220205
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.3-20220129+/package/ncurses.spec	2022-01-29 12:21:50.000000000 +0000
++++ ncurses-6.3-20220205/package/ncurses.spec	2022-02-05 11:10:39.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.3
+-Release: 20220129
++Release: 20220205
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncursest.spec
+--- ncurses-6.3-20220129+/package/ncursest.spec	2022-01-29 12:21:50.000000000 +0000
++++ ncurses-6.3-20220205/package/ncursest.spec	2022-02-05 11:10:39.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.3
+-Release: 20220129
++Release: 20220205
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: progs/MKtermsort.sh
+Prereq:  1.16 
+--- ncurses-6.3-20220129+/progs/MKtermsort.sh	2021-04-18 20:12:50.000000000 +0000
++++ ncurses-6.3-20220205/progs/MKtermsort.sh	2022-02-05 20:39:41.000000000 +0000
+@@ -1,10 +1,10 @@
+ #!/bin/sh
+-# $Id: MKtermsort.sh,v 1.16 2021/04/18 20:12:50 tom Exp $
++# $Id: MKtermsort.sh,v 1.17 2022/02/05 20:39:41 tom Exp $
+ #
+ # MKtermsort.sh -- generate indirection vectors for the various sort methods
+ #
+ ##############################################################################
+-# Copyright 2020,2021 Thomas E. Dickey                                       #
++# Copyright 2020-2021,2022 Thomas E. Dickey                                  #
+ # Copyright 1998-2015,2017 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -47,7 +47,7 @@
+ DATA=${2-../include/Caps}
+ 
+ data=data$$
+-trap 'rm -f $data' 1 2 3 15
++trap 'rm -f $data; exit 1' 1 2 3 15
+ sed -e 's/[	][	]*/	/g' < "$DATA" >$data
+ DATA=$data
+ 
+Index: progs/capconvert
+Prereq:  1.10 
+--- ncurses-6.3-20220129+/progs/capconvert	2021-09-04 10:55:04.000000000 +0000
++++ ncurses-6.3-20220205/progs/capconvert	2022-02-05 20:39:49.000000000 +0000
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ ##############################################################################
+-# Copyright 2019-2020,2021 Thomas E. Dickey                                  #
++# Copyright 2019-2021,2022 Thomas E. Dickey                                  #
+ # Copyright 1998-2011,2017 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -27,7 +27,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: capconvert,v 1.10 2021/09/04 10:55:04 tom Exp $
++# $Id: capconvert,v 1.11 2022/02/05 20:39:49 tom Exp $
+ #
+ # capconvert -- automated conversion from termcap to terminfo
+ #
+@@ -206,7 +206,8 @@
+ #
+ # Kluge alert: we compile terminfo.src in two pieces because a lot of machines
+ # with < 16MB RAM choke on tic's core-hog habits.
+-trap "rm -f tsplit$$.*" EXIT INT QUIT TERM HUP
++trap "rm -f tsplit$$.*; exit 1" 1 2 3 15
++trap "rm -f tsplit$$.*" 0
+ sed -n $master \
+ 	-e '1,/SPLIT HERE/w 'tsplit$$.01 \
+ 	-e '/SPLIT HERE/,$w 'tsplit$$.02 \
+Index: test/make-tar.sh
+Prereq:  1.18 
+--- ncurses-6.3-20220129+/test/make-tar.sh	2021-10-12 21:12:16.000000000 +0000
++++ ncurses-6.3-20220205/test/make-tar.sh	2022-02-05 17:57:45.000000000 +0000
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+-# $Id: make-tar.sh,v 1.18 2021/10/12 21:12:16 tom Exp $
++# $Id: make-tar.sh,v 1.19 2022/02/05 17:57:45 tom Exp $
+ ##############################################################################
+-# Copyright 2019-2020,2021 Thomas E. Dickey                                  #
++# Copyright 2019-2021,2022 Thomas E. Dickey                                  #
+ # Copyright 2010-2015,2017 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -84,7 +84,8 @@
+ SOURCE=`cd ..;pwd`
+ 
+ BUILD=$TMPDIR/make-tar$$
+-trap "cd /; rm -rf $BUILD; exit 0" EXIT INT QUIT TERM HUP
++trap "cd /; rm -rf $BUILD; exit 0" 1 2 3 15
++trap "cd /; rm -rf $BUILD; exit 0" 0
+ 
+ umask 077
+ if ! ( mkdir $BUILD )
+Index: test/picsmap.c
+Prereq:  1.139 
+--- ncurses-6.3-20220129+/test/picsmap.c	2021-05-08 15:56:05.000000000 +0000
++++ ncurses-6.3-20220205/test/picsmap.c	2022-02-06 01:44:34.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
++ * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2017,2018 Free Software Foundation, Inc.                       *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: picsmap.c,v 1.139 2021/05/08 15:56:05 tom Exp $
++ * $Id: picsmap.c,v 1.142 2022/02/06 01:44:34 tom Exp $
+  *
+  * Author: Thomas E. Dickey
+  *
+@@ -797,6 +797,7 @@
+     int ch;
+     int *ip;
+     char *cp;
++    float *fp;
+     long lv;
+ 
+     va_start(ap, pattern);
+@@ -810,10 +811,13 @@
+ 	    continue;
+ 	}
+ 	/* %c, %d, %s are like sscanf except for special treatment of blanks */
+-	if (ch == '%' && *pattern != '\0' && strchr("cdnsx", *pattern)) {
++	if (ch == '%' && *pattern != '\0' && strchr("%cdnfsx", *pattern)) {
+ 	    bool found = FALSE;
+ 	    ch = *pattern++;
+ 	    switch (ch) {
++	    case '%':
++		source++;
++		break;
+ 	    case 'c':
+ 		cp = va_arg(ap, char *);
+ 		do {
+@@ -832,6 +836,29 @@
+ 		    goto finish;
+ 		}
+ 		break;
++	    case 'f':
++		/* floating point for pixels... */
++		fp = va_arg(ap, float *);
++		lv = strtol(source, &cp, 10);
++		if (cp == 0 || cp == source)
++		    goto finish;
++		*fp = (float) lv;
++		source = cp;
++		if (*source == '.') {
++		    lv = strtol(++source, &cp, 10);
++		    if (cp == 0 || cp == source)
++			goto finish;
++		    {
++			float scale = 1.0f;
++			int digits = (int) (cp - source);
++			while (digits-- > 0) {
++			    scale *= 10.0f;
++			}
++			*fp += (float) lv / scale;
++		    }
++		    source = cp;
++		}
++		break;
+ 	    case 'n':
+ 		/* not really sscanf... */
+ 		limit = *va_arg(ap, int *);
+@@ -1346,11 +1373,17 @@
+ 		    break;
+ 		}
+ 	    } else {
+-		/* subsequent lines begin "col,row: (r,g,b,a) #RGB" */
++		/*
++		 * subsequent lines begin "col,row: (r,g,b,a) #RGB".
++		 * Those r/g/b could be integers (0..255) or float-percentages.
++		 */
+ 		int r, g, b, nocolor;
++		float rf, gf, bf;
+ 		unsigned check;
+ 		char *t;
+ 		char *s = t = strchr(buffer, '#');
++		bool matched = FALSE;
++		bool blurred = FALSE;
+ 
+ 		if (s != 0) {
+ 		    /* after the "#RGB", there are differences - just ignore */
+@@ -1363,14 +1396,30 @@
+ 			    &col, &row,
+ 			    &r, &g, &b, &nocolor,
+ 			    &check)) {
++		    matched = TRUE;
++		} else if (match_c(buffer,
++				   "%d,%d: (%f%%,%f%%,%f%%,%d) #%x ",
++				   &col, &row,
++				   &rf, &gf, &bf, &nocolor,
++				   &check)) {
++		    matched = TRUE;
++		    blurred = TRUE;	/* 6.9.11 scaling is broken... */
++#define fp_fix(n) (int) (MaxRGB * (((n) > 100.0 ? 100.0 : (n)) / 100.0))
++		    r = fp_fix(rf);
++		    g = fp_fix(gf);
++		    b = fp_fix(bf);
++		}
++		if (matched) {
+ 		    int which, c;
+ 
+ 		    if ((s - t) > 8)	/* 6 hex digits vs 8 */
+ 			check /= 256;
+-		    if (r > MaxRGB ||
+-			g > MaxRGB ||
+-			b > MaxRGB ||
+-			check != (unsigned) ((r << 16) | (g << 8) | b)) {
++		    if (blurred) {
++			/* revisit this when ImageMagick is fixed */
++		    } else if (r > MaxRGB ||
++			       g > MaxRGB ||
++			       b > MaxRGB ||
++			       check != (unsigned) ((r << 16) | (g << 8) | b)) {
+ 			okay = FALSE;
+ 			break;
+ 		    }
+Index: test/savescreen.sh
+Prereq:  1.6 
+--- ncurses-6.3-20220129+/test/savescreen.sh	2020-02-02 23:34:34.000000000 +0000
++++ ncurses-6.3-20220205/test/savescreen.sh	2022-02-05 17:58:06.000000000 +0000
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ ##############################################################################
+-# Copyright 2020 Thomas E. Dickey                                            #
++# Copyright 2020,2022 Thomas E. Dickey                                       #
+ # Copyright 2007-2009,2018 Free Software Foundation, Inc.                    #
+ #                                                                            #
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+@@ -27,7 +27,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: savescreen.sh,v 1.6 2020/02/02 23:34:34 tom Exp $
++# $Id: savescreen.sh,v 1.7 2022/02/05 17:58:06 tom Exp $
+ #
+ # Use this script to exercise "savescreen".
+ # It starts by generating a series of temporary-filenames, which are passed
+@@ -37,7 +37,8 @@
+ 
+ # "mktemp -d" would be preferable, but is not standard.
+ MY_DIR=$TMPDIR/savescreen$$
+-trap "rm -rf $MY_DIR" EXIT INT QUIT HUP
++trap "rm -rf $MY_DIR; exit 1" 1 2 3
++trap "rm -rf $MY_DIR" 0
+ umask 077
+ mkdir $MY_DIR || exit 1
+ 
diff --git a/system/ncurses/ncurses-6.3-20220212.patch b/system/ncurses/ncurses-6.3-20220212.patch
new file mode 100644
index 000000000..e7e215c2a
--- /dev/null
+++ b/system/ncurses/ncurses-6.3-20220212.patch
@@ -0,0 +1,8924 @@
+# ncurses 6.3 - patch 20220212 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.3 is at
+# 	ftp://ftp.invisible-island.net/ncurses/
+#	https://invisible-mirror.net/archives/ncurses/
+#	https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.3 can be found at
+# 	ftp://ftp.invisible-island.net/ncurses/6.3
+#	https://invisible-mirror.net/archives/ncurses/6.3
+#
+# ------------------------------------------------------------------------------
+# ftp://ftp.invisible-island.net/ncurses/6.3/ncurses-6.3-20220212.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Feb 13 02:28:27 UTC 2022
+# ------------------------------------------------------------------------------
+# NEWS                                       |    7 
+# VERSION                                    |    2 
+# dist.mk                                    |    4 
+# doc/html/man/adacurses6-config.1.html      |    2 
+# doc/html/man/captoinfo.1m.html             |    6 
+# doc/html/man/clear.1.html                  |    6 
+# doc/html/man/curs_add_wchstr.3x.html       |    4 
+# doc/html/man/curs_addch.3x.html            |    4 
+# doc/html/man/curs_addchstr.3x.html         |    4 
+# doc/html/man/curs_addstr.3x.html           |    4 
+# doc/html/man/curs_addwstr.3x.html          |    4 
+# doc/html/man/curs_attr.3x.html             |    4 
+# doc/html/man/curs_bkgd.3x.html             |    4 
+# doc/html/man/curs_bkgrnd.3x.html           |    4 
+# doc/html/man/curs_border.3x.html           |    4 
+# doc/html/man/curs_border_set.3x.html       |    4 
+# doc/html/man/curs_clear.3x.html            |    4 
+# doc/html/man/curs_color.3x.html            |    4 
+# doc/html/man/curs_delch.3x.html            |    4 
+# doc/html/man/curs_deleteln.3x.html         |    4 
+# doc/html/man/curs_extend.3x.html           |    4 
+# doc/html/man/curs_get_wch.3x.html          |    4 
+# doc/html/man/curs_get_wstr.3x.html         |    4 
+# doc/html/man/curs_getch.3x.html            |   12 -
+# doc/html/man/curs_getstr.3x.html           |    4 
+# doc/html/man/curs_getyx.3x.html            |    4 
+# doc/html/man/curs_in_wch.3x.html           |    4 
+# doc/html/man/curs_in_wchstr.3x.html        |    4 
+# doc/html/man/curs_inch.3x.html             |    4 
+# doc/html/man/curs_inchstr.3x.html          |    4 
+# doc/html/man/curs_initscr.3x.html          |   10 -
+# doc/html/man/curs_inopts.3x.html           |    4 
+# doc/html/man/curs_ins_wch.3x.html          |    4 
+# doc/html/man/curs_ins_wstr.3x.html         |    4 
+# doc/html/man/curs_insch.3x.html            |    4 
+# doc/html/man/curs_insstr.3x.html           |    4 
+# doc/html/man/curs_instr.3x.html            |    4 
+# doc/html/man/curs_inwstr.3x.html           |    4 
+# doc/html/man/curs_kernel.3x.html           |    4 
+# doc/html/man/curs_legacy.3x.html           |    4 
+# doc/html/man/curs_memleaks.3x.html         |    4 
+# doc/html/man/curs_mouse.3x.html            |    4 
+# doc/html/man/curs_move.3x.html             |    4 
+# doc/html/man/curs_opaque.3x.html           |    4 
+# doc/html/man/curs_outopts.3x.html          |    4 
+# doc/html/man/curs_overlay.3x.html          |    4 
+# doc/html/man/curs_pad.3x.html              |    4 
+# doc/html/man/curs_print.3x.html            |    4 
+# doc/html/man/curs_printw.3x.html           |    4 
+# doc/html/man/curs_refresh.3x.html          |    4 
+# doc/html/man/curs_scanw.3x.html            |    4 
+# doc/html/man/curs_scr_dump.3x.html         |    4 
+# doc/html/man/curs_scroll.3x.html           |    4 
+# doc/html/man/curs_slk.3x.html              |    4 
+# doc/html/man/curs_sp_funcs.3x.html         |    4 
+# doc/html/man/curs_termattrs.3x.html        |    4 
+# doc/html/man/curs_termcap.3x.html          |    4 
+# doc/html/man/curs_terminfo.3x.html         |    4 
+# doc/html/man/curs_threads.3x.html          |    4 
+# doc/html/man/curs_touch.3x.html            |    4 
+# doc/html/man/curs_trace.3x.html            |    4 
+# doc/html/man/curs_util.3x.html             |    4 
+# doc/html/man/curs_window.3x.html           |    4 
+# doc/html/man/default_colors.3x.html        |    4 
+# doc/html/man/define_key.3x.html            |    4 
+# doc/html/man/form.3x.html                  |    2 
+# doc/html/man/form_cursor.3x.html           |    4 
+# doc/html/man/form_data.3x.html             |    4 
+# doc/html/man/form_driver.3x.html           |    4 
+# doc/html/man/form_field.3x.html            |    4 
+# doc/html/man/form_field_attributes.3x.html |    4 
+# doc/html/man/form_field_buffer.3x.html     |    4 
+# doc/html/man/form_field_info.3x.html       |    4 
+# doc/html/man/form_field_just.3x.html       |    4 
+# doc/html/man/form_field_new.3x.html        |    4 
+# doc/html/man/form_field_opts.3x.html       |    4 
+# doc/html/man/form_field_userptr.3x.html    |    4 
+# doc/html/man/form_field_validation.3x.html |    4 
+# doc/html/man/form_fieldtype.3x.html        |    4 
+# doc/html/man/form_hook.3x.html             |    4 
+# doc/html/man/form_new.3x.html              |    4 
+# doc/html/man/form_new_page.3x.html         |    4 
+# doc/html/man/form_opts.3x.html             |    4 
+# doc/html/man/form_page.3x.html             |    4 
+# doc/html/man/form_post.3x.html             |    4 
+# doc/html/man/form_requestname.3x.html      |    4 
+# doc/html/man/form_userptr.3x.html          |    4 
+# doc/html/man/form_win.3x.html              |    4 
+# doc/html/man/infocmp.1m.html               |    6 
+# doc/html/man/infotocap.1m.html             |    6 
+# doc/html/man/key_defined.3x.html           |    4 
+# doc/html/man/keybound.3x.html              |    4 
+# doc/html/man/keyok.3x.html                 |    4 
+# doc/html/man/legacy_coding.3x.html         |    4 
+# doc/html/man/menu.3x.html                  |    2 
+# doc/html/man/menu_attributes.3x.html       |    4 
+# doc/html/man/menu_cursor.3x.html           |    4 
+# doc/html/man/menu_driver.3x.html           |    4 
+# doc/html/man/menu_format.3x.html           |    4 
+# doc/html/man/menu_hook.3x.html             |    4 
+# doc/html/man/menu_items.3x.html            |    4 
+# doc/html/man/menu_mark.3x.html             |    4 
+# doc/html/man/menu_new.3x.html              |    4 
+# doc/html/man/menu_opts.3x.html             |    4 
+# doc/html/man/menu_pattern.3x.html          |    4 
+# doc/html/man/menu_post.3x.html             |    4 
+# doc/html/man/menu_requestname.3x.html      |    4 
+# doc/html/man/menu_spacing.3x.html          |    4 
+# doc/html/man/menu_userptr.3x.html          |    4 
+# doc/html/man/menu_win.3x.html              |    4 
+# doc/html/man/mitem_current.3x.html         |    4 
+# doc/html/man/mitem_name.3x.html            |    4 
+# doc/html/man/mitem_new.3x.html             |    4 
+# doc/html/man/mitem_opts.3x.html            |    4 
+# doc/html/man/mitem_userptr.3x.html         |    4 
+# doc/html/man/mitem_value.3x.html           |    4 
+# doc/html/man/mitem_visible.3x.html         |    4 
+# doc/html/man/ncurses.3x.html               |    2 
+# doc/html/man/ncurses6-config.1.html        |    2 
+# doc/html/man/new_pair.3x.html              |    4 
+# doc/html/man/panel.3x.html                 |    6 
+# doc/html/man/resizeterm.3x.html            |    4 
+# doc/html/man/tabs.1.html                   |    2 
+# doc/html/man/terminfo.5.html               |    2 
+# doc/html/man/tic.1m.html                   |    6 
+# doc/html/man/toe.1m.html                   |    6 
+# doc/html/man/tput.1.html                   |    6 
+# doc/html/man/tset.1.html                   |    6 
+# doc/html/man/wresize.3x.html               |    4 
+# man/captoinfo.1m                           |    6 
+# man/clear.1                                |    6 
+# man/curs_add_wchstr.3x                     |   20 +-
+# man/curs_addch.3x                          |   18 -
+# man/curs_addchstr.3x                       |   20 +-
+# man/curs_addstr.3x                         |   20 +-
+# man/curs_addwstr.3x                        |   20 +-
+# man/curs_attr.3x                           |   56 ++---
+# man/curs_bkgd.3x                           |   14 -
+# man/curs_bkgrnd.3x                         |   16 -
+# man/curs_border.3x                         |   38 +--
+# man/curs_border_set.3x                     |   62 +++---
+# man/curs_clear.3x                          |   12 -
+# man/curs_color.3x                          |   28 +-
+# man/curs_delch.3x                          |   10 -
+# man/curs_deleteln.3x                       |   12 -
+# man/curs_extend.3x                         |    6 
+# man/curs_get_wch.3x                        |   14 -
+# man/curs_get_wstr.3x                       |   22 +-
+# man/curs_getch.3x                          |   24 +-
+# man/curs_getstr.3x                         |   20 +-
+# man/curs_getyx.3x                          |   12 -
+# man/curs_in_wch.3x                         |   12 -
+# man/curs_in_wchstr.3x                      |   20 +-
+# man/curs_inch.3x                           |   10 -
+# man/curs_inchstr.3x                        |   20 +-
+# man/curs_initscr.3x                        |   34 +--
+# man/curs_inopts.3x                         |   24 +-
+# man/curs_ins_wch.3x                        |   12 -
+# man/curs_ins_wstr.3x                       |   22 +-
+# man/curs_insch.3x                          |   12 -
+# man/curs_insstr.3x                         |   20 +-
+# man/curs_instr.3x                          |   20 +-
+# man/curs_inwstr.3x                         |   20 +-
+# man/curs_kernel.3x                         |   14 -
+# man/curs_legacy.3x                         |   22 +-
+# man/curs_memleaks.3x                       |   12 -
+# man/curs_mouse.3x                          |   26 +-
+# man/curs_move.3x                           |    8 
+# man/curs_opaque.3x                         |   34 +--
+# man/curs_outopts.3x                        |   20 +-
+# man/curs_overlay.3x                        |   14 -
+# man/curs_pad.3x                            |   24 +-
+# man/curs_print.3x                          |    6 
+# man/curs_printw.3x                         |   16 -
+# man/curs_refresh.3x                        |   12 -
+# man/curs_scanw.3x                          |   16 -
+# man/curs_scr_dump.3x                       |   12 -
+# man/curs_scroll.3x                         |   10 -
+# man/curs_slk.3x                            |   28 +-
+# man/curs_sp_funcs.3x                       |  264 +++++++++++++--------------
+# man/curs_termattrs.3x                      |    8 
+# man/curs_termcap.3x                        |   16 -
+# man/curs_terminfo.3x                       |   42 ++--
+# man/curs_threads.3x                        |   12 -
+# man/curs_touch.3x                          |   20 +-
+# man/curs_trace.3x                          |   30 +--
+# man/curs_util.3x                           |   28 +-
+# man/curs_window.3x                         |   36 +--
+# man/default_colors.3x                      |    6 
+# man/define_key.3x                          |    6 
+# man/form_cursor.3x                         |    6 
+# man/form_data.3x                           |    8 
+# man/form_driver.3x                         |    8 
+# man/form_field.3x                          |   12 -
+# man/form_field_attributes.3x               |   16 -
+# man/form_field_buffer.3x                   |   14 -
+# man/form_field_info.3x                     |   16 -
+# man/form_field_just.3x                     |    8 
+# man/form_field_new.3x                      |   16 -
+# man/form_field_opts.3x                     |   12 -
+# man/form_field_userptr.3x                  |    8 
+# man/form_field_validation.3x               |   10 -
+# man/form_fieldtype.3x                      |   28 +-
+# man/form_hook.3x                           |   20 +-
+# man/form_new.3x                            |    8 
+# man/form_new_page.3x                       |    8 
+# man/form_opts.3x                           |   12 -
+# man/form_page.3x                           |   16 -
+# man/form_post.3x                           |    8 
+# man/form_requestname.3x                    |    8 
+# man/form_userptr.3x                        |    8 
+# man/form_win.3x                            |   14 -
+# man/infocmp.1m                             |   10 -
+# man/infotocap.1m                           |    6 
+# man/key_defined.3x                         |    6 
+# man/keybound.3x                            |    6 
+# man/keyok.3x                               |    6 
+# man/legacy_coding.3x                       |    6 
+# man/menu_attributes.3x                     |   20 +-
+# man/menu_cursor.3x                         |    6 
+# man/menu_driver.3x                         |    6 
+# man/menu_format.3x                         |    8 
+# man/menu_hook.3x                           |   20 +-
+# man/menu_items.3x                          |   10 -
+# man/menu_mark.3x                           |    8 
+# man/menu_new.3x                            |    8 
+# man/menu_opts.3x                           |   12 -
+# man/menu_pattern.3x                        |    8 
+# man/menu_post.3x                           |    8 
+# man/menu_requestname.3x                    |    8 
+# man/menu_spacing.3x                        |   20 +-
+# man/menu_userptr.3x                        |    8 
+# man/menu_win.3x                            |   14 -
+# man/mitem_current.3x                       |   14 -
+# man/mitem_name.3x                          |    8 
+# man/mitem_new.3x                           |    8 
+# man/mitem_opts.3x                          |   12 -
+# man/mitem_userptr.3x                       |    8 
+# man/mitem_value.3x                         |    8 
+# man/mitem_visible.3x                       |    6 
+# man/new_pair.3x                            |   14 -
+# man/panel.3x                               |   68 +++---
+# man/resizeterm.3x                          |   10 -
+# man/tic.1m                                 |   18 -
+# man/toe.1m                                 |    6 
+# man/tput.1                                 |   20 +-
+# man/tset.1                                 |    6 
+# man/wresize.3x                             |    6 
+# package/debian-mingw/changelog             |    4 
+# package/debian-mingw64/changelog           |    4 
+# package/debian/changelog                   |    4 
+# package/mingw-ncurses.nsi                  |    4 
+# package/mingw-ncurses.spec                 |    2 
+# package/ncurses.spec                       |    2 
+# package/ncursest.spec                      |    2 
+# 255 files changed, 1335 insertions(+), 1326 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.3776 
+--- ncurses-6.3-20220205+/NEWS	2022-02-06 00:37:58.000000000 +0000
++++ ncurses-6.3-20220212/NEWS	2022-02-12 20:15:29.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.3776 2022/02/06 00:37:58 tom Exp $
++-- $Id: NEWS,v 1.3778 2022/02/12 20:15:29 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -46,6 +46,11 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20220212
++	+ improve font-formatting in other manpages, for consistency.
++	+ correct/improve font-formatting in curs_wgetch.3x (patch by Benno
++	  Schulenberg).
++
+ 20220205
+ 	+ workaround in test/picsmap.c for use of floating point for rgb values
+ 	  by ImageMagick 6.9.11, which appears to use the wrong upper limit.
+Index: VERSION
+--- ncurses-6.3-20220205+/VERSION	2022-02-05 11:10:39.000000000 +0000
++++ ncurses-6.3-20220212/VERSION	2022-02-12 15:31:08.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.3	20220205
++5:0:10	6.3	20220212
+Index: dist.mk
+Prereq:  1.1465 
+--- ncurses-6.3-20220205+/dist.mk	2022-02-05 11:10:39.000000000 +0000
++++ ncurses-6.3-20220212/dist.mk	2022-02-12 15:31:08.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1465 2022/02/05 11:10:39 tom Exp $
++# $Id: dist.mk,v 1.1466 2022/02/12 15:31:08 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -38,7 +38,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 3
+-NCURSES_PATCH = 20220205
++NCURSES_PATCH = 20220212
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/man/adacurses6-config.1.html
+--- ncurses-6.3-20220205+/doc/html/man/adacurses6-config.1.html	2022-01-16 01:45:13.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/adacurses6-config.1.html	2022-02-12 19:58:31.000000000 +0000
+@@ -126,7 +126,7 @@
+

    SEE ALSO

    +        curses(3x)
+ 
+-       This describes ncurses version 6.3 (patch 20220115).
++       This describes ncurses version 6.3 (patch 20220212).
+ 
+ 
+ 
+Index: doc/html/man/captoinfo.1m.html
+--- ncurses-6.3-20220205+/doc/html/man/captoinfo.1m.html	2022-01-16 01:45:13.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/captoinfo.1m.html	2022-02-12 20:17:47.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -199,7 +199,7 @@
+

    SEE ALSO

    +        infocmp(1m), curses(3x), terminfo(5)
+ 
+-       This describes ncurses version 6.3 (patch 20220115).
++       This describes ncurses version 6.3 (patch 20220212).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/clear.1.html
+--- ncurses-6.3-20220205+/doc/html/man/clear.1.html	2022-01-16 01:45:13.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/clear.1.html	2022-02-12 20:17:47.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+@@ -150,7 +150,7 @@
+

    SEE ALSO

    +        tput(1), terminfo(5), xterm(1).
+ 
+-       This describes ncurses version 6.3 (patch 20220115).
++       This describes ncurses version 6.3 (patch 20220212).
+ 
+ 
+ 
+Index: doc/html/man/curs_add_wchstr.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_add_wchstr.3x.html	2021-12-25 22:12:43.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_add_wchstr.3x.html	2022-02-12 20:17:47.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_addch.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_addch.3x.html	2021-12-25 22:12:43.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_addch.3x.html	2022-02-12 20:17:47.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_addchstr.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_addchstr.3x.html	2021-12-25 22:12:43.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_addchstr.3x.html	2022-02-12 20:17:47.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_addstr.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_addstr.3x.html	2021-12-25 22:12:43.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_addstr.3x.html	2022-02-12 20:17:47.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_addwstr.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_addwstr.3x.html	2021-12-25 22:12:43.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_addwstr.3x.html	2022-02-12 20:17:47.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_attr.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_attr.3x.html	2021-12-25 22:12:43.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_attr.3x.html	2022-02-12 20:17:48.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_bkgrnd.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_bkgrnd.3x.html	2021-12-25 22:12:43.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_bkgrnd.3x.html	2022-02-12 20:17:48.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_border.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_border.3x.html	2021-12-25 22:12:43.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_border.3x.html	2022-02-12 20:17:48.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_border_set.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_border_set.3x.html	2021-12-25 22:12:43.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_border_set.3x.html	2022-02-12 20:17:48.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_clear.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_clear.3x.html	2021-12-25 22:12:43.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_clear.3x.html	2022-02-12 20:17:48.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_color.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_color.3x.html	2021-12-25 22:12:43.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_color.3x.html	2022-02-12 20:17:48.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_delch.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_delch.3x.html	2021-12-25 22:12:43.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_delch.3x.html	2022-02-12 20:17:48.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_deleteln.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_deleteln.3x.html	2021-12-25 22:12:44.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_deleteln.3x.html	2022-02-12 20:17:48.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_extend.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_extend.3x.html	2021-12-25 22:12:44.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_extend.3x.html	2022-02-12 20:17:48.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_get_wch.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_get_wch.3x.html	2021-12-25 22:12:44.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_get_wch.3x.html	2022-02-12 20:17:48.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_get_wstr.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_get_wstr.3x.html	2021-12-25 22:12:44.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_get_wstr.3x.html	2022-02-12 20:17:48.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_getch.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_getch.3x.html	2021-12-26 00:04:52.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_getch.3x.html	2022-02-12 20:17:48.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -56,7 +56,7 @@
+        #include <curses.h>
+ 
+        int getch(void);
+-       int wgetch(WINDOW *win);
++       int wgetch(WINDOW *win);
+ 
+        int mvgetch(int y, int x);
+        int mvwgetch(WINDOW *win, int y, int x);
+@@ -201,7 +201,7 @@
+                   KEY_HELP        Help key
+                   KEY_MARK        Mark key
+                   KEY_MESSAGE     Message key
+-                  KEY_MOUSE       Mouse event read
++                  KEY_MOUSE       Mouse event occurred
+                   KEY_MOVE        Move key
+                   KEY_NEXT        Next object key
+                   KEY_OPEN        Open key
+@@ -229,7 +229,7 @@
+                   KEY_SFIND       Shifted find key
+                   KEY_SHELP       Shifted help key
+                   KEY_SHOME       Shifted home key
+-                  KEY_SIC         Shifted input key
++                  KEY_SIC         Shifted insert key
+                   KEY_SLEFT       Shifted left arrow key
+                   KEY_SMESSAGE    Shifted message key
+                   KEY_SMOVE       Shifted move key
+@@ -239,7 +239,7 @@
+                   KEY_SPRINT      Shifted print key
+                   KEY_SREDO       Shifted redo key
+                   KEY_SREPLACE    Shifted replace key
+-                  KEY_SRIGHT      Shifted right arrow
++                  KEY_SRIGHT      Shifted right arrow key
+                   KEY_SRSUME      Shifted resume key
+                   KEY_SSAVE       Shifted save key
+                   KEY_SSUSPEND    Shifted suspend key
+Index: doc/html/man/curs_getstr.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_getstr.3x.html	2021-12-25 22:12:44.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_getstr.3x.html	2022-02-12 20:17:48.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_in_wch.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_in_wch.3x.html	2021-12-25 22:12:44.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_in_wch.3x.html	2022-02-12 20:17:48.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_in_wchstr.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_in_wchstr.3x.html	2021-12-25 22:12:44.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_in_wchstr.3x.html	2022-02-12 20:17:48.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_inch.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_inch.3x.html	2021-12-25 22:12:44.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_inch.3x.html	2022-02-12 20:17:48.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_inchstr.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_inchstr.3x.html	2021-12-25 22:12:44.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_inchstr.3x.html	2022-02-12 20:17:48.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_initscr.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_initscr.3x.html	2021-12-25 22:12:44.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_initscr.3x.html	2022-02-12 20:17:48.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -192,11 +192,11 @@
+ 
+             Curses  implementations  may  provide  for special handling of the
+             SIGINT, SIGQUIT  and  SIGTSTP  signals  if  their  disposition  is
+-            SIG_DFL at the time initscr is called ...
++            SIG_DFL at the time initscr is called ...
+ 
+             Any  special  handling  for these signals may remain in effect for
+-            the life of the process or until the process changes the  disposi-
+-            tion of the signal.
++            the  life  of  the  process  or  until  the  process  changes  the
++            disposition of the signal.
+ 
+             None  of the Curses functions are required to be safe with respect
+             to signals ...
+Index: doc/html/man/curs_inopts.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_inopts.3x.html	2021-12-25 22:12:44.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_inopts.3x.html	2022-02-12 20:17:48.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_ins_wch.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_ins_wch.3x.html	2021-12-25 22:12:44.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_ins_wch.3x.html	2022-02-12 20:17:48.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_ins_wstr.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_ins_wstr.3x.html	2021-12-25 22:12:44.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_ins_wstr.3x.html	2022-02-12 20:17:48.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_insch.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_insch.3x.html	2021-12-25 22:12:44.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_insch.3x.html	2022-02-12 20:17:48.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_insstr.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_insstr.3x.html	2021-12-25 22:12:44.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_insstr.3x.html	2022-02-12 20:17:48.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_instr.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_instr.3x.html	2021-12-25 22:12:44.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_instr.3x.html	2022-02-12 20:17:49.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_inwstr.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_inwstr.3x.html	2021-12-25 22:12:44.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_inwstr.3x.html	2022-02-12 20:17:49.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_kernel.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_kernel.3x.html	2021-12-25 22:12:44.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_kernel.3x.html	2022-02-12 20:17:49.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_legacy.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_legacy.3x.html	2021-12-25 22:12:44.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_legacy.3x.html	2022-02-12 20:17:49.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_memleaks.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_memleaks.3x.html	2021-12-25 22:12:44.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_memleaks.3x.html	2022-02-12 20:17:49.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_mouse.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_mouse.3x.html	2022-01-16 01:45:15.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_mouse.3x.html	2022-02-12 20:17:49.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_move.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_move.3x.html	2021-12-25 22:12:45.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_move.3x.html	2022-02-12 20:17:49.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_opaque.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_opaque.3x.html	2021-12-25 22:12:45.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_opaque.3x.html	2022-02-12 20:17:49.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_outopts.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_outopts.3x.html	2021-12-25 22:12:45.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_outopts.3x.html	2022-02-12 20:17:49.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_overlay.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_overlay.3x.html	2021-12-25 22:12:45.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_overlay.3x.html	2022-02-12 20:17:49.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_pad.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_pad.3x.html	2021-12-25 22:12:45.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_pad.3x.html	2022-02-12 20:17:49.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_print.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_print.3x.html	2021-12-25 22:12:45.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_print.3x.html	2022-02-12 20:17:49.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_printw.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_printw.3x.html	2021-12-25 22:12:45.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_printw.3x.html	2022-02-12 20:17:49.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_refresh.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_refresh.3x.html	2021-12-25 22:12:45.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_refresh.3x.html	2022-02-12 20:17:49.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_scanw.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_scanw.3x.html	2021-12-25 22:12:45.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_scanw.3x.html	2022-02-12 20:17:49.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_scr_dump.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_scr_dump.3x.html	2021-12-25 22:12:45.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_scr_dump.3x.html	2022-02-12 20:17:49.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_scroll.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_scroll.3x.html	2021-12-25 22:12:45.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_scroll.3x.html	2022-02-12 20:17:49.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_slk.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_slk.3x.html	2021-12-25 22:12:45.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_slk.3x.html	2022-02-12 20:17:49.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_sp_funcs.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_sp_funcs.3x.html	2021-12-25 22:12:45.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_sp_funcs.3x.html	2022-02-12 20:17:49.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_termcap.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_termcap.3x.html	2022-01-02 00:19:51.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_termcap.3x.html	2022-02-12 20:17:49.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_terminfo.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_terminfo.3x.html	2022-01-02 00:19:51.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_terminfo.3x.html	2022-02-12 20:17:49.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+Index: doc/html/man/curs_touch.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_touch.3x.html	2021-12-25 22:12:45.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_touch.3x.html	2022-02-12 20:17:49.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_trace.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_trace.3x.html	2021-12-25 22:12:45.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_trace.3x.html	2022-02-12 20:17:49.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_util.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_util.3x.html	2021-12-25 22:12:45.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_util.3x.html	2022-02-12 20:17:50.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/curs_window.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/curs_window.3x.html	2021-12-25 22:12:46.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/curs_window.3x.html	2022-02-12 20:17:50.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/default_colors.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/default_colors.3x.html	2021-12-25 22:12:46.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/default_colors.3x.html	2022-02-12 20:17:50.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/define_key.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/define_key.3x.html	2021-12-25 22:12:46.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/define_key.3x.html	2022-02-12 20:17:50.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/form.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/form.3x.html	2022-01-16 01:45:16.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/form.3x.html	2022-02-12 19:58:34.000000000 +0000
+@@ -248,7 +248,7 @@
+        curses(3x) and related pages whose names  begin  "form_"  for  detailed
+        descriptions of the entry points.
+ 
+-       This describes ncurses version 6.3 (patch 20220115).
++       This describes ncurses version 6.3 (patch 20220212).
+ 
+ 
+ 
+Index: doc/html/man/form_cursor.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/form_cursor.3x.html	2021-12-25 22:12:46.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/form_cursor.3x.html	2022-02-12 20:17:50.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/form_data.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/form_data.3x.html	2021-12-25 22:12:46.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/form_data.3x.html	2022-02-12 20:17:50.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/form_driver.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/form_driver.3x.html	2021-12-25 22:12:46.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/form_driver.3x.html	2022-02-12 20:17:50.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/form_field.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/form_field.3x.html	2021-12-25 22:12:46.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/form_field.3x.html	2022-02-12 20:17:50.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/form_field_attributes.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/form_field_attributes.3x.html	2021-12-25 22:12:46.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/form_field_attributes.3x.html	2022-02-12 20:17:50.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/form_field_buffer.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/form_field_buffer.3x.html	2021-12-25 22:12:46.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/form_field_buffer.3x.html	2022-02-12 20:17:50.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/form_field_info.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/form_field_info.3x.html	2021-12-25 22:12:46.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/form_field_info.3x.html	2022-02-12 20:17:50.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/form_field_just.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/form_field_just.3x.html	2021-12-25 22:12:46.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/form_field_just.3x.html	2022-02-12 20:17:50.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/form_field_new.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/form_field_new.3x.html	2021-12-25 22:12:46.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/form_field_new.3x.html	2022-02-12 20:17:50.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/form_field_opts.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/form_field_opts.3x.html	2021-12-25 22:12:46.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/form_field_opts.3x.html	2022-02-12 20:17:50.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/form_field_userptr.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/form_field_userptr.3x.html	2021-12-25 22:12:46.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/form_field_userptr.3x.html	2022-02-12 20:17:50.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/form_field_validation.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/form_field_validation.3x.html	2021-12-25 22:12:46.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/form_field_validation.3x.html	2022-02-12 20:17:50.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/form_fieldtype.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/form_fieldtype.3x.html	2021-12-25 22:12:46.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/form_fieldtype.3x.html	2022-02-12 20:17:50.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/form_hook.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/form_hook.3x.html	2021-12-25 22:12:46.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/form_hook.3x.html	2022-02-12 20:17:50.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/form_new.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/form_new.3x.html	2021-12-25 22:12:46.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/form_new.3x.html	2022-02-12 20:17:50.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/form_new_page.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/form_new_page.3x.html	2021-12-25 22:12:46.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/form_new_page.3x.html	2022-02-12 20:17:50.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/form_opts.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/form_opts.3x.html	2021-12-25 22:12:46.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/form_opts.3x.html	2022-02-12 20:17:50.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/form_page.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/form_page.3x.html	2021-12-25 22:12:46.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/form_page.3x.html	2022-02-12 20:17:50.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/form_post.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/form_post.3x.html	2021-12-25 22:12:46.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/form_post.3x.html	2022-02-12 20:17:50.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/form_requestname.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/form_requestname.3x.html	2021-12-25 22:12:46.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/form_requestname.3x.html	2022-02-12 20:17:50.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/form_userptr.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/form_userptr.3x.html	2021-12-25 22:12:46.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/form_userptr.3x.html	2022-02-12 20:17:50.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/form_win.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/form_win.3x.html	2021-12-25 22:12:47.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/form_win.3x.html	2022-02-12 20:17:51.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/infocmp.1m.html
+--- ncurses-6.3-20220205+/doc/html/man/infocmp.1m.html	2022-01-16 01:45:17.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/infocmp.1m.html	2022-02-12 20:17:51.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -514,7 +514,7 @@
+ 
+        https://invisible-island.net/ncurses/tctest.html
+ 
+-       This describes ncurses version 6.3 (patch 20220115).
++       This describes ncurses version 6.3 (patch 20220212).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/infotocap.1m.html
+--- ncurses-6.3-20220205+/doc/html/man/infotocap.1m.html	2022-01-16 01:45:17.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/infotocap.1m.html	2022-02-12 20:17:51.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -91,7 +91,7 @@
+

    SEE ALSO

    +        infocmp(1m), tic(1m), curses(3x), terminfo(5)
+ 
+-       This describes ncurses version 6.3 (patch 20220115).
++       This describes ncurses version 6.3 (patch 20220212).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/key_defined.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/key_defined.3x.html	2021-12-25 22:12:47.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/key_defined.3x.html	2022-02-12 20:17:51.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/keybound.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/keybound.3x.html	2021-12-25 22:12:47.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/keybound.3x.html	2022-02-12 20:17:51.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/keyok.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/keyok.3x.html	2021-12-25 22:12:47.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/keyok.3x.html	2022-02-12 20:17:51.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/legacy_coding.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/legacy_coding.3x.html	2021-12-25 22:12:47.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/legacy_coding.3x.html	2022-02-12 20:17:51.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/menu.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/menu.3x.html	2022-01-16 01:45:17.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/menu.3x.html	2022-02-12 19:58:35.000000000 +0000
+@@ -223,7 +223,7 @@
+        curses(3x) and related pages whose names  begin  "menu_"  for  detailed
+        descriptions of the entry points.
+ 
+-       This describes ncurses version 6.3 (patch 20220115).
++       This describes ncurses version 6.3 (patch 20220212).
+ 
+ 
+ 
+Index: doc/html/man/menu_attributes.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/menu_attributes.3x.html	2021-12-25 22:12:47.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/menu_attributes.3x.html	2022-02-12 20:17:51.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/menu_cursor.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/menu_cursor.3x.html	2021-12-25 22:12:47.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/menu_cursor.3x.html	2022-02-12 20:17:51.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/menu_driver.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/menu_driver.3x.html	2021-12-25 22:12:47.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/menu_driver.3x.html	2022-02-12 20:17:51.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/menu_format.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/menu_format.3x.html	2021-12-25 22:12:47.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/menu_format.3x.html	2022-02-12 20:17:51.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/menu_hook.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/menu_hook.3x.html	2021-12-25 22:12:47.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/menu_hook.3x.html	2022-02-12 20:17:51.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/menu_items.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/menu_items.3x.html	2021-12-25 22:12:47.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/menu_items.3x.html	2022-02-12 20:17:51.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/menu_mark.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/menu_mark.3x.html	2021-12-25 22:12:47.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/menu_mark.3x.html	2022-02-12 20:17:51.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/menu_new.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/menu_new.3x.html	2021-12-25 22:12:47.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/menu_new.3x.html	2022-02-12 20:17:51.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/menu_opts.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/menu_opts.3x.html	2021-12-25 22:12:47.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/menu_opts.3x.html	2022-02-12 20:17:51.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/menu_pattern.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/menu_pattern.3x.html	2021-12-25 22:12:47.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/menu_pattern.3x.html	2022-02-12 20:17:51.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/menu_post.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/menu_post.3x.html	2021-12-25 22:12:47.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/menu_post.3x.html	2022-02-12 20:17:51.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/menu_requestname.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/menu_requestname.3x.html	2021-12-25 22:12:48.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/menu_requestname.3x.html	2022-02-12 20:17:51.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/menu_spacing.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/menu_spacing.3x.html	2021-12-25 22:12:48.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/menu_spacing.3x.html	2022-02-12 20:17:51.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/menu_userptr.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/menu_userptr.3x.html	2021-12-25 22:12:48.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/menu_userptr.3x.html	2022-02-12 20:17:51.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/menu_win.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/menu_win.3x.html	2021-12-25 22:12:48.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/menu_win.3x.html	2022-02-12 20:17:51.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/mitem_current.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/mitem_current.3x.html	2021-12-25 22:12:48.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/mitem_current.3x.html	2022-02-12 20:17:51.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/mitem_name.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/mitem_name.3x.html	2021-12-25 22:12:48.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/mitem_name.3x.html	2022-02-12 20:17:51.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/mitem_new.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/mitem_new.3x.html	2021-12-25 22:12:48.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/mitem_new.3x.html	2022-02-12 20:17:51.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/mitem_opts.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/mitem_opts.3x.html	2021-12-25 22:12:48.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/mitem_opts.3x.html	2022-02-12 20:17:52.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/mitem_userptr.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/mitem_userptr.3x.html	2021-12-25 22:12:48.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/mitem_userptr.3x.html	2022-02-12 20:17:52.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/mitem_value.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/mitem_value.3x.html	2021-12-25 22:12:48.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/mitem_value.3x.html	2022-02-12 20:17:52.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/mitem_visible.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/mitem_visible.3x.html	2021-12-25 22:12:48.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/mitem_visible.3x.html	2022-02-12 20:17:52.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/ncurses.3x.html	2022-01-16 01:45:18.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/ncurses.3x.html	2022-02-12 19:58:36.000000000 +0000
+@@ -60,7 +60,7 @@
+        method of updating  character  screens  with  reasonable  optimization.
+        This  implementation  is  "new  curses"  (ncurses)  and is the approved
+        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
+-       This describes ncurses version 6.3 (patch 20220115).
++       This describes ncurses version 6.3 (patch 20220212).
+ 
+        The  ncurses  library emulates the curses library of System V Release 4
+        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
+Index: doc/html/man/ncurses6-config.1.html
+--- ncurses-6.3-20220205+/doc/html/man/ncurses6-config.1.html	2022-01-16 01:45:18.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/ncurses6-config.1.html	2022-02-12 19:58:36.000000000 +0000
+@@ -113,7 +113,7 @@
+

    SEE ALSO

    +        curses(3x)
+ 
+-       This describes ncurses version 6.3 (patch 20220115).
++       This describes ncurses version 6.3 (patch 20220212).
+ 
+ 
+ 
+Index: doc/html/man/new_pair.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/new_pair.3x.html	2021-12-25 22:12:48.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/new_pair.3x.html	2022-02-12 20:17:52.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/panel.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/panel.3x.html	2022-01-16 01:45:18.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/panel.3x.html	2022-02-12 20:17:52.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: doc/html/man/tabs.1.html
+--- ncurses-6.3-20220205+/doc/html/man/tabs.1.html	2022-01-16 01:45:18.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/tabs.1.html	2022-02-12 19:58:36.000000000 +0000
+@@ -252,7 +252,7 @@
+

    SEE ALSO

    +        infocmp(1m), tset(1), curses(3x), terminfo(5).
+ 
+-       This describes ncurses version 6.3 (patch 20220115).
++       This describes ncurses version 6.3 (patch 20220212).
+ 
+ 
+ 
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.3-20220205+/doc/html/man/terminfo.5.html	2022-01-16 01:45:18.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/terminfo.5.html	2022-02-12 19:58:36.000000000 +0000
+@@ -106,7 +106,7 @@
+        have, by specifying how to perform screen operations, and by specifying
+        padding requirements and initialization sequences.
+ 
+-       This manual describes ncurses version 6.3 (patch 20220115).
++       This manual describes ncurses version 6.3 (patch 20220212).
+ 
+ 
+

    Terminfo Entry Syntax

    +Index: doc/html/man/tic.1m.html
+--- ncurses-6.3-20220205+/doc/html/man/tic.1m.html	2022-01-16 01:45:18.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/tic.1m.html	2022-02-12 20:17:52.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -461,7 +461,7 @@
+        captoinfo(1m),   infocmp(1m),   infotocap(1m),   toe(1m),   curses(3x),
+        term(5).  terminfo(5).  user_caps(5).
+ 
+-       This describes ncurses version 6.3 (patch 20220115).
++       This describes ncurses version 6.3 (patch 20220212).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/toe.1m.html
+--- ncurses-6.3-20220205+/doc/html/man/toe.1m.html	2022-01-16 01:45:18.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/toe.1m.html	2022-02-12 20:17:52.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -171,7 +171,7 @@
+        captoinfo(1m),   infocmp(1m),   infotocap(1m),   tic(1m),   curses(3x),
+        terminfo(5).
+ 
+-       This describes ncurses version 6.3 (patch 20220115).
++       This describes ncurses version 6.3 (patch 20220212).
+ 
+ 
+ 
+Index: doc/html/man/tput.1.html
+--- ncurses-6.3-20220205+/doc/html/man/tput.1.html	2022-01-16 01:45:18.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/tput.1.html	2022-02-12 20:17:52.000000000 +0000
+@@ -1,7 +1,7 @@
+ 
+ 
+ 
+@@ -545,7 +545,7 @@
+

    SEE ALSO

    +        clear(1), stty(1), tabs(1), tset(1), curs_termcap(3x), terminfo(5).
+ 
+-       This describes ncurses version 6.3 (patch 20220115).
++       This describes ncurses version 6.3 (patch 20220212).
+ 
+ 
+ 
+Index: doc/html/man/tset.1.html
+--- ncurses-6.3-20220205+/doc/html/man/tset.1.html	2022-01-16 01:45:19.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/tset.1.html	2022-02-12 20:17:52.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+@@ -391,7 +391,7 @@
+        csh(1),   sh(1),   stty(1),   curs_terminfo(3x),  tty(4),  terminfo(5),
+        ttys(5), environ(7)
+ 
+-       This describes ncurses version 6.3 (patch 20220115).
++       This describes ncurses version 6.3 (patch 20220212).
+ 
+ 
+ 
+Index: doc/html/man/wresize.3x.html
+--- ncurses-6.3-20220205+/doc/html/man/wresize.3x.html	2021-12-25 22:12:51.000000000 +0000
++++ ncurses-6.3-20220212/doc/html/man/wresize.3x.html	2022-02-12 20:17:52.000000000 +0000
+@@ -1,6 +1,6 @@
+ 
+ 
+ 
+Index: man/captoinfo.1m
+Prereq:  1.32 
+--- ncurses-6.3-20220205+/man/captoinfo.1m	2021-12-25 21:37:49.000000000 +0000
++++ ncurses-6.3-20220212/man/captoinfo.1m	2022-02-12 20:07:29.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2016 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,14 +28,14 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: captoinfo.1m,v 1.32 2021/12/25 21:37:49 tom Exp $
++.\" $Id: captoinfo.1m,v 1.33 2022/02/12 20:07:29 tom Exp $
+ .TH @CAPTOINFO@ 1M ""
+ .ds n 5
+ .ds d @TERMINFO@
+ .SH NAME
+ \fB@CAPTOINFO@\fP \- convert a \fItermcap\fP description into a \fIterminfo\fP description
+ .SH SYNOPSIS
+-\fB@CAPTOINFO@\fP [\fB\-v\fP\fIn\fP \fIwidth\fP]  [\fB\-V\fP] [\fB\-1\fP] [\fB\-w\fP \fIwidth\fP] \fIfile\fP ...
++\fB@CAPTOINFO@\fR [\fB\-v\fIn\fR \fIwidth\fR]  [\fB\-V\fR] [\fB\-1\fR] [\fB\-w\fR \fIwidth\fR] \fIfile\fR ...
+ .SH DESCRIPTION
+ \fB@CAPTOINFO@\fP looks in each given text
+ \fIfile\fP for \fBtermcap\fP descriptions.
+Index: man/clear.1
+Prereq:  1.26 
+--- ncurses-6.3-20220205+/man/clear.1	2021-12-26 00:13:25.000000000 +0000
++++ ncurses-6.3-20220212/man/clear.1	2022-02-12 20:07:29.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: clear.1,v 1.26 2021/12/26 00:13:25 tom Exp $
++.\" $Id: clear.1,v 1.27 2022/02/12 20:07:29 tom Exp $
+ .TH @CLEAR@ 1 ""
+ .\" these would be fallbacks for DS/DE,
+ .\" but groff changed the meaning of the macros.
+@@ -57,7 +57,7 @@
+ .SH NAME
+ \fB@CLEAR@\fP \- clear the terminal screen
+ .SH SYNOPSIS
+-\fB@CLEAR@\fP [\fB\-T\fP\fItype\fP] [\fB\-V\fP] [\fB\-x\fP]
++\fB@CLEAR@\fR [\fB\-T\fItype\fR] [\fB\-V\fR] [\fB\-x\fR]
+ .br
+ .SH DESCRIPTION
+ \fB@CLEAR@\fP clears your terminal's screen if this is possible,
+Index: man/curs_add_wchstr.3x
+Prereq:  1.18 
+--- ncurses-6.3-20220205+/man/curs_add_wchstr.3x	2021-12-25 21:41:58.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_add_wchstr.3x	2022-02-12 20:07:29.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2019-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2019-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_add_wchstr.3x,v 1.18 2021/12/25 21:41:58 tom Exp $
++.\" $Id: curs_add_wchstr.3x,v 1.19 2022/02/12 20:07:29 tom Exp $
+ .TH curs_add_wchstr 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -54,21 +54,21 @@
+ .nf
+ \fB#include \fP
+ .PP
+-\fBint add_wchstr(const cchar_t *\fP\fIwchstr\fP\fB);\fP
++\fBint add_wchstr(const cchar_t *\fIwchstr\fB);\fR
+ .br
+-\fBint add_wchnstr(const cchar_t *\fP\fIwchstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint add_wchnstr(const cchar_t *\fIwchstr\fB, int \fIn\fB);\fR
+ .br
+-\fBint wadd_wchstr(WINDOW *\fP \fIwin\fP\fB, const cchar_t *\fP\fIwchstr\fP\fB);\fP
++\fBint wadd_wchstr(WINDOW *\fR \fIwin\fB, const cchar_t *\fIwchstr\fB);\fR
+ .br
+-\fBint wadd_wchnstr(WINDOW *\fP \fIwin\fP\fB, const cchar_t *\fP\fIwchstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint wadd_wchnstr(WINDOW *\fR \fIwin\fB, const cchar_t *\fIwchstr\fB, int \fIn\fB);\fR
+ .sp
+-\fBint mvadd_wchstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const cchar_t *\fP\fIwchstr\fP\fB);\fP
++\fBint mvadd_wchstr(int \fIy\fB, int \fIx\fB, const cchar_t *\fIwchstr\fB);\fR
+ .br
+-\fBint mvadd_wchnstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const cchar_t *\fP\fIwchstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint mvadd_wchnstr(int \fIy\fB, int \fIx\fB, const cchar_t *\fIwchstr\fB, int \fIn\fB);\fR
+ .br
+-\fBint mvwadd_wchstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const cchar_t *\fP\fIwchstr\fP\fB);\fP
++\fBint mvwadd_wchstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const cchar_t *\fIwchstr\fB);\fR
+ .br
+-\fBint mvwadd_wchnstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const cchar_t *\fP\fIwchstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint mvwadd_wchnstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const cchar_t *\fIwchstr\fB, int \fIn\fB);\fR
+ .fi
+ .SH DESCRIPTION
+ These functions copy the (null-terminated)
+Index: man/curs_addch.3x
+Prereq:  1.58 
+--- ncurses-6.3-20220205+/man/curs_addch.3x	2021-12-25 20:18:06.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_addch.3x	2022-02-12 20:07:29.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addch.3x,v 1.58 2021/12/25 20:18:06 tom Exp $
++.\" $Id: curs_addch.3x,v 1.59 2022/02/12 20:07:29 tom Exp $
+ .TH curs_addch 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -48,17 +48,17 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .PP
+-\fBint addch(const chtype \fP\fIch\fP\fB);\fP
++\fBint addch(const chtype \fIch\fB);\fR
+ .br
+-\fBint waddch(WINDOW *\fP\fIwin\fP\fB, const chtype \fP\fIch\fP\fB);\fP
++\fBint waddch(WINDOW *\fIwin\fB, const chtype \fIch\fB);\fR
+ .br
+-\fBint mvaddch(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const chtype \fP\fIch\fP\fB);\fP
++\fBint mvaddch(int \fIy\fB, int \fIx\fB, const chtype \fIch\fB);\fR
+ .br
+-\fBint mvwaddch(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const chtype \fP\fIch\fP\fB);\fP
++\fBint mvwaddch(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const chtype \fIch\fB);\fR
+ .sp
+-\fBint echochar(const chtype \fP\fIch\fP\fB);\fP
++\fBint echochar(const chtype \fIch\fB);\fR
+ .br
+-\fBint wechochar(WINDOW *\fP\fIwin\fP\fB, const chtype \fP\fIch\fP\fB);\fP
++\fBint wechochar(WINDOW *\fIwin\fB, const chtype \fIch\fB);\fR
+ .br
+ .SH DESCRIPTION
+ .SS Adding characters
+@@ -96,7 +96,7 @@
+ .PP
+ If \fIch\fP is any other nonprintable character,
+ it is drawn in printable form,
+-i.e., the \fB^\fP\fIX\fP notation used by \fBunctrl\fP(3X).
++i.e., the \fB^\fIX\fR notation used by \fBunctrl\fR(3X).
+ Calling \fBwinch\fP after adding a
+ nonprintable character does not return the character itself,
+ but instead returns the printable representation of the character.
+Index: man/curs_addchstr.3x
+Prereq:  1.24 
+--- ncurses-6.3-20220205+/man/curs_addchstr.3x	2021-12-25 21:41:58.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_addchstr.3x	2022-02-12 20:07:29.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2019-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2019-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2012,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addchstr.3x,v 1.24 2021/12/25 21:41:58 tom Exp $
++.\" $Id: curs_addchstr.3x,v 1.25 2022/02/12 20:07:29 tom Exp $
+ .TH curs_addchstr 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -54,21 +54,21 @@
+ .nf
+ \fB#include \fP
+ .PP
+-\fBint addchstr(const chtype *\fP\fIchstr\fP\fB);\fP
++\fBint addchstr(const chtype *\fIchstr\fB);\fR
+ .br
+-\fBint addchnstr(const chtype *\fP\fIchstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint addchnstr(const chtype *\fIchstr\fB, int \fIn\fB);\fR
+ .br
+-\fBint waddchstr(WINDOW *\fP\fIwin\fP\fB, const chtype *\fP\fIchstr\fP\fB);\fP
++\fBint waddchstr(WINDOW *\fIwin\fB, const chtype *\fIchstr\fB);\fR
+ .br
+-\fBint waddchnstr(WINDOW *\fP\fIwin\fP\fB, const chtype *\fP\fIchstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint waddchnstr(WINDOW *\fIwin\fB, const chtype *\fIchstr\fB, int \fIn\fB);\fR
+ .sp
+-\fBint mvaddchstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const chtype *\fP\fIchstr\fP\fB);\fP
++\fBint mvaddchstr(int \fIy\fB, int \fIx\fB, const chtype *\fIchstr\fB);\fR
+ .br
+-\fBint mvaddchnstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const chtype *\fP\fIchstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint mvaddchnstr(int \fIy\fB, int \fIx\fB, const chtype *\fIchstr\fB, int \fIn\fB);\fR
+ .br
+-\fBint mvwaddchstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const chtype *\fP\fIchstr\fP\fB);\fP
++\fBint mvwaddchstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const chtype *\fIchstr\fB);\fR
+ .br
+-\fBint mvwaddchnstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const chtype *\fP\fIchstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint mvwaddchnstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const chtype *\fIchstr\fB, int \fIn\fB);\fR
+ .fi
+ .SH DESCRIPTION
+ These functions copy the (null-terminated)
+Index: man/curs_addstr.3x
+Prereq:  1.25 
+--- ncurses-6.3-20220205+/man/curs_addstr.3x	2021-12-25 21:41:58.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_addstr.3x	2022-02-12 20:07:29.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2019-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2019-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2012,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addstr.3x,v 1.25 2021/12/25 21:41:58 tom Exp $
++.\" $Id: curs_addstr.3x,v 1.26 2022/02/12 20:07:29 tom Exp $
+ .TH curs_addstr 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -54,21 +54,21 @@
+ .nf
+ \fB#include \fP
+ .PP
+-\fBint addstr(const char *\fP\fIstr\fP\fB);\fP
++\fBint addstr(const char *\fIstr\fB);\fR
+ .br
+-\fBint addnstr(const char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint addnstr(const char *\fIstr\fB, int \fIn\fB);\fR
+ .br
+-\fBint waddstr(WINDOW *\fP\fIwin\fP\fB, const char *\fP\fIstr\fP\fB);\fP
++\fBint waddstr(WINDOW *\fIwin\fB, const char *\fIstr\fB);\fR
+ .br
+-\fBint waddnstr(WINDOW *\fP\fIwin\fP\fB, const char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint waddnstr(WINDOW *\fIwin\fB, const char *\fIstr\fB, int \fIn\fB);\fR
+ .sp
+-\fBint mvaddstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const char *\fP\fIstr\fP\fB);\fP
++\fBint mvaddstr(int \fIy\fB, int \fIx\fB, const char *\fIstr\fB);\fR
+ .br
+-\fBint mvaddnstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint mvaddnstr(int \fIy\fB, int \fIx\fB, const char *\fIstr\fB, int \fIn\fB);\fR
+ .br
+-\fBint mvwaddstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const char *\fP\fIstr\fP\fB);\fP
++\fBint mvwaddstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const char *\fIstr\fB);\fR
+ .br
+-\fBint mvwaddnstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const char *\fP\fIstr, int \fP\fIn\fP\fB);\fP
++\fBint mvwaddnstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const char *\fIstr, int \fIn\fB);\fR
+ .fi
+ .SH DESCRIPTION
+ These functions write the (null-terminated) character string
+Index: man/curs_addwstr.3x
+Prereq:  1.17 
+--- ncurses-6.3-20220205+/man/curs_addwstr.3x	2021-12-25 21:41:58.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_addwstr.3x	2022-02-12 20:07:29.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2019-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2019-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_addwstr.3x,v 1.17 2021/12/25 21:41:58 tom Exp $
++.\" $Id: curs_addwstr.3x,v 1.18 2022/02/12 20:07:29 tom Exp $
+ .TH curs_addwstr 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -54,21 +54,21 @@
+ .nf
+ \fB#include \fP
+ .PP
+-\fBint addwstr(const wchar_t *\fP\fIwstr\fP\fB);\fP
++\fBint addwstr(const wchar_t *\fIwstr\fB);\fR
+ .br
+-\fBint addnwstr(const wchar_t *\fP\fIwstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint addnwstr(const wchar_t *\fIwstr\fB, int \fIn\fB);\fR
+ .br
+-\fBint waddwstr(WINDOW *\fP\fIwin\fP\fB, const wchar_t *\fP\fIwstr\fP\fB);\fP
++\fBint waddwstr(WINDOW *\fIwin\fB, const wchar_t *\fIwstr\fB);\fR
+ .br
+-\fBint waddnwstr(WINDOW *\fP\fIwin\fP\fB, const wchar_t *\fP\fIwstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint waddnwstr(WINDOW *\fIwin\fB, const wchar_t *\fIwstr\fB, int \fIn\fB);\fR
+ .sp
+-\fBint mvaddwstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const wchar_t *\fP\fIwstr\fP\fB);\fP
++\fBint mvaddwstr(int \fIy\fB, int \fIx\fB, const wchar_t *\fIwstr\fB);\fR
+ .br
+-\fBint mvaddnwstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const wchar_t *\fP\fIwstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint mvaddnwstr(int \fIy\fB, int \fIx\fB, const wchar_t *\fIwstr\fB, int \fIn\fB);\fR
+ .br
+-\fBint mvwaddwstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const wchar_t *\fP\fIwstr\fP\fB);\fP
++\fBint mvwaddwstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const wchar_t *\fIwstr\fB);\fR
+ .br
+-\fBint mvwaddnwstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const wchar_t *\fP\fIwstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint mvwaddnwstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const wchar_t *\fIwstr\fB, int \fIn\fB);\fR
+ .fi
+ .SH DESCRIPTION
+ These functions write the characters of the
+Index: man/curs_attr.3x
+Prereq:  1.70 
+--- ncurses-6.3-20220205+/man/curs_attr.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_attr.3x	2022-02-12 20:07:29.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_attr.3x,v 1.70 2021/12/25 21:49:32 tom Exp $
++.\" $Id: curs_attr.3x,v 1.71 2022/02/12 20:07:29 tom Exp $
+ .TH curs_attr 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -92,56 +92,56 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint attr_get(attr_t *\fP\fIattrs\fP\fB, short *\fP\fIpair\fP\fB, void *\fP\fIopts\fP\fB);\fP
++\fBint attr_get(attr_t *\fIattrs\fB, short *\fIpair\fB, void *\fIopts\fB);\fR
+ .br
+-\fBint wattr_get(WINDOW *\fP\fIwin\fP\fB, attr_t *\fP\fIattrs\fP\fB, short *\fP\fIpair\fP\fB,\fP \fBvoid *\fP\fIopts\fP\fB);\fP
++\fBint wattr_get(WINDOW *\fIwin\fB, attr_t *\fIattrs\fB, short *\fIpair\fB,\fR \fBvoid *\fIopts\fB);\fR
+ .br
+-\fBint attr_set(attr_t \fP\fIattrs\fP\fB, short \fP\fIpair\fP\fB, void *\fP\fIopts\fP\fB);\fP
++\fBint attr_set(attr_t \fIattrs\fB, short \fIpair\fB, void *\fIopts\fB);\fR
+ .br
+-\fBint wattr_set(WINDOW *\fP\fIwin\fP\fB, attr_t \fP\fIattrs\fP\fB, short \fP\fIpair\fP\fB, void *\fP\fIopts\fP\fB);\fP
++\fBint wattr_set(WINDOW *\fIwin\fB, attr_t \fIattrs\fB, short \fIpair\fB, void *\fIopts\fB);\fR
+ .sp
+-\fBint attr_off(attr_t \fP\fIattrs\fP\fB, void *\fP\fIopts\fP\fB);\fP
++\fBint attr_off(attr_t \fIattrs\fB, void *\fIopts\fB);\fR
+ .br
+-\fBint wattr_off(WINDOW *\fP\fIwin\fP\fB, attr_t \fP\fIattrs\fP\fB, void *\fP\fIopts\fP\fB);\fP
++\fBint wattr_off(WINDOW *\fIwin\fB, attr_t \fIattrs\fB, void *\fIopts\fB);\fR
+ .br
+-\fBint attr_on(attr_t \fP\fIattrs\fP\fB, void *\fP\fIopts\fP\fB);\fP
++\fBint attr_on(attr_t \fIattrs\fB, void *\fIopts\fB);\fR
+ .br
+-\fBint wattr_on(WINDOW *\fP\fIwin\fP\fB, attr_t \fP\fIattrs\fP\fB, void *\fP\fIopts\fP\fB);\fP
++\fBint wattr_on(WINDOW *\fIwin\fB, attr_t \fIattrs\fB, void *\fIopts\fB);\fR
+ .sp
+-\fBint attroff(int \fP\fIattrs);\fP
++\fBint attroff(int \fIattrs);\fR
+ .br
+-\fBint wattroff(WINDOW *\fP\fIwin\fP\fB, int \fP\fIattrs\fP\fB);\fP
++\fBint wattroff(WINDOW *\fIwin\fB, int \fIattrs\fB);\fR
+ .br
+-\fBint attron(int \fP\fIattrs\fP\fB);\fP
++\fBint attron(int \fIattrs\fB);\fR
+ .br
+-\fBint wattron(WINDOW *\fP\fIwin\fP\fB, int \fP\fIattrs\fP\fB);\fP
++\fBint wattron(WINDOW *\fIwin\fB, int \fIattrs\fB);\fR
+ .br
+-\fBint attrset(int \fP\fIattrs\fP\fB);\fP
++\fBint attrset(int \fIattrs\fB);\fR
+ .br
+-\fBint wattrset(WINDOW *\fP\fIwin\fP\fB, int \fP\fIattrs\fP\fB);\fP
++\fBint wattrset(WINDOW *\fIwin\fB, int \fIattrs\fB);\fR
+ .sp
+-\fBint chgat(int \fP\fIn\fP\fB, attr_t \fP\fIattr\fP\fB, short \fP\fIpair\fP\fB,\fP \fBconst void *\fP\fIopts\fP\fB);\fP
++\fBint chgat(int \fIn\fB, attr_t \fIattr\fB, short \fIpair\fB,\fR \fBconst void *\fIopts\fB);\fR
+ .br
+-\fBint wchgat(WINDOW *\fP\fIwin\fP\fB,\fP
+-      \fBint \fP\fIn\fP\fB, attr_t \fP\fIattr\fP\fB,\fP \fBshort \fP\fIpair\fP\fB, const void *\fP\fIopts\fP\fB);\fP
++\fBint wchgat(WINDOW *\fIwin\fB,\fR
++      \fBint \fIn\fB, attr_t \fIattr\fB,\fR \fBshort \fIpair\fB, const void *\fIopts\fB);\fR
+ .br
+-\fBint mvchgat(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB,\fP
+-      \fBint \fP\fIn\fP\fB, attr_t \fP\fIattr\fP\fB,\fP \fBshort \fP\fIpair\fP\fB, const void *\fP\fIopts\fP\fB);\fP
++\fBint mvchgat(int \fIy\fB, int \fIx\fB,\fR
++      \fBint \fIn\fB, attr_t \fIattr\fB,\fR \fBshort \fIpair\fB, const void *\fIopts\fB);\fR
+ .br
+-\fBint mvwchgat(WINDOW *\fP\fIwin, int \fP\fIy, int \fP\fIx\fP\fB,\fP
+-      \fBint \fP\fIn,\fP \fBattr_t \fP\fIattr\fP\fB, short \fP\fIpair\fP\fB, const void *\fP\fIopts\fP\fB);\fP
++\fBint mvwchgat(WINDOW *\fIwin, int \fIy, int \fIx\fB,\fR
++      \fBint \fIn,\fR \fBattr_t \fIattr\fB, short \fIpair\fB, const void *\fIopts\fB);\fR
+ .sp
+-\fBint color_set(short \fP\fIpair\fP\fB, void* \fP\fIopts\fP\fB);\fP
++\fBint color_set(short \fIpair\fB, void* \fIopts\fB);\fR
+ .br
+-\fBint wcolor_set(WINDOW *\fP\fIwin\fP\fB, short \fP\fIpair\fP\fB,\fP \fBvoid* \fP\fIopts);\fP
++\fBint wcolor_set(WINDOW *\fIwin\fB, short \fIpair\fB,\fR \fBvoid* \fIopts);\fR
+ .sp
+ \fBint standend(void);\fP
+ .br
+-\fBint wstandend(WINDOW *\fP\fIwin\fP\fB);\fP
++\fBint wstandend(WINDOW *\fIwin\fB);\fR
+ .br
+ \fBint standout(void);\fP
+ .br
+-\fBint wstandout(WINDOW *\fP\fIwin\fP\fB);\fP
++\fBint wstandout(WINDOW *\fIwin\fB);\fR
+ .\" ---------------------------------------------------------------------------
+ .SH DESCRIPTION
+ .PP
+@@ -212,7 +212,7 @@
+ However, if the value does not fit, then the \fBCOLOR_PAIR\fP macro
+ uses only the bits that fit.
+ For example, because in ncurses \fBA_COLOR\fP has eight (8) bits,
+-then \fBCOLOR_PAIR(\fP\fI259\fP\fB)\fP is 4
++then \fBCOLOR_PAIR(\fI259\fB)\fR is 4
+ (i.e., 259 is 4 more than the limit 255).
+ .PP
+ The \fBPAIR_NUMBER\fP macro extracts a pair number from an \fBint\fP
+Index: man/curs_bkgd.3x
+Prereq:  1.33 
+--- ncurses-6.3-20220205+/man/curs_bkgd.3x	2021-12-25 17:39:16.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_bkgd.3x	2022-02-12 20:06:41.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_bkgd.3x,v 1.33 2021/12/25 17:39:16 tom Exp $
++.\" $Id: curs_bkgd.3x,v 1.34 2022/02/12 20:06:41 tom Exp $
+ .de bP
+ .ie n  .IP \(bu 4
+ .el    .IP \(bu 2
+@@ -40,15 +40,15 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .PP
+-\fBvoid bkgdset(chtype \fP\fIch\fP\fB);\fP
++\fBvoid bkgdset(chtype \fIch\fB);\fR
+ .br
+-\fBvoid wbkgdset(WINDOW *\fP\fIwin, chtype \fP\fIch\fP\fB);\fP
++\fBvoid wbkgdset(WINDOW *\fIwin, chtype \fIch\fB);\fR
+ .sp
+-\fBint bkgd(chtype \fP\fIch\fP\fB);\fP
++\fBint bkgd(chtype \fIch\fB);\fR
+ .br
+-\fBint wbkgd(WINDOW *\fP\fIwin\fP\fB, chtype \fP\fIch\fP\fB);\fP
++\fBint wbkgd(WINDOW *\fIwin\fB, chtype \fIch\fB);\fR
+ .sp
+-\fBchtype getbkgd(WINDOW *\fP\fIwin\fP\fB);\fP
++\fBchtype getbkgd(WINDOW *\fIwin\fB);\fR
+ .br
+ .SH DESCRIPTION
+ .SS bkgdset
+Index: man/curs_bkgrnd.3x
+Prereq:  1.14 
+--- ncurses-6.3-20220205+/man/curs_bkgrnd.3x	2021-12-25 21:41:58.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_bkgrnd.3x	2022-02-12 20:06:41.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 2002-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_bkgrnd.3x,v 1.14 2021/12/25 21:41:58 tom Exp $
++.\" $Id: curs_bkgrnd.3x,v 1.15 2022/02/12 20:06:41 tom Exp $
+ .de bP
+ .ie n  .IP \(bu 4
+ .el    .IP \(bu 2
+@@ -44,17 +44,17 @@
+ .PP
+ .B #include 
+ .sp
+-\fBint bkgrnd(\fP\fB const cchar_t *\fP\fIwch\fP\fB);\fP
++\fBint bkgrnd(\fB const cchar_t *\fIwch\fB);\fR
+ .br
+-\fBint wbkgrnd(\fP\fB WINDOW *\fP\fIwin\fP\fB, const cchar_t *\fP\fIwch\fP\fB);\fP
++\fBint wbkgrnd(\fB WINDOW *\fIwin\fB, const cchar_t *\fIwch\fB);\fR
+ .sp
+-\fBvoid bkgrndset(const cchar_t *\fP\fIwch\fP \fB);\fP
++\fBvoid bkgrndset(const cchar_t *\fIwch\fR \fB);\fR
+ .br
+-\fBvoid wbkgrndset(WINDOW *\fP\fIwin\fP\fB, const cchar_t *\fP\fIwch\fP\fB);\fP
++\fBvoid wbkgrndset(WINDOW *\fIwin\fB, const cchar_t *\fIwch\fB);\fR
+ .sp
+-\fBint getbkgrnd(cchar_t *\fP\fIwch\fP\fB);\fP
++\fBint getbkgrnd(cchar_t *\fIwch\fB);\fR
+ .br
+-\fBint wgetbkgrnd(WINDOW *\fP\fIwin\fP\fB, cchar_t *\fP\fIwch\fP\fB);\fP
++\fBint wgetbkgrnd(WINDOW *\fIwin\fB, cchar_t *\fIwch\fB);\fR
+ .br
+ .SH DESCRIPTION
+ .SS bkgrndset
+Index: man/curs_border.3x
+Prereq:  1.29 
+--- ncurses-6.3-20220205+/man/curs_border.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_border.3x	2022-02-12 20:06:41.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_border.3x,v 1.29 2021/12/25 21:49:32 tom Exp $
++.\" $Id: curs_border.3x,v 1.30 2022/02/12 20:06:41 tom Exp $
+ .TH curs_border 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -52,30 +52,30 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint border(chtype \fP\fIls\fP\fB, chtype \fP\fIrs\fP\fB, chtype \fP\fIts\fP\fB, chtype \fP\fIbs\fP\fB,\fP
+-           \fBchtype \fP\fItl\fP\fB, chtype \fP\fItr\fP\fB, chtype \fP\fIbl\fP\fB, chtype \fP\fIbr\fP\fB);\fP
++\fBint border(chtype \fIls\fB, chtype \fIrs\fB, chtype \fIts\fB, chtype \fIbs\fB,\fR
++           \fBchtype \fItl\fB, chtype \fItr\fB, chtype \fIbl\fB, chtype \fIbr\fB);\fR
+ .br
+-\fBint wborder(WINDOW *\fP\fIwin\fP\fB, chtype \fP\fIls\fP\fB, chtype \fP\fIrs\fP\fB,\fP
+-            \fBchtype \fP\fIts\fP\fB, chtype \fP\fIbs\fP\fB, chtype \fP\fItl\fP\fB, chtype \fP\fItr\fP\fB,\fP
+-            \fBchtype \fP\fIbl\fP\fB, chtype \fP\fIbr\fP\fB);\fP
++\fBint wborder(WINDOW *\fIwin\fB, chtype \fIls\fB, chtype \fIrs\fB,\fR
++            \fBchtype \fIts\fB, chtype \fIbs\fB, chtype \fItl\fB, chtype \fItr\fB,\fR
++            \fBchtype \fIbl\fB, chtype \fIbr\fB);\fR
+ .sp
+-\fBint box(WINDOW *\fP\fIwin\fP\fB, chtype \fP\fIverch\fP\fB, chtype \fP\fIhorch\fP\fB);\fP
++\fBint box(WINDOW *\fIwin\fB, chtype \fIverch\fB, chtype \fIhorch\fB);\fR
+ .sp
+-\fBint hline(chtype \fP\fIch\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint hline(chtype \fIch\fB, int \fIn\fB);\fR
+ .br
+-\fBint whline(WINDOW *\fP\fIwin\fP\fB, chtype \fP\fIch\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint whline(WINDOW *\fIwin\fB, chtype \fIch\fB, int \fIn\fB);\fR
+ .br
+-\fBint vline(chtype \fP\fIch\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint vline(chtype \fIch\fB, int \fIn\fB);\fR
+ .br
+-\fBint wvline(WINDOW *\fP\fIwin\fP\fB, chtype \fP\fIch\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint wvline(WINDOW *\fIwin\fB, chtype \fIch\fB, int \fIn\fB);\fR
+ .sp
+-\fBint mvhline(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype \fP\fIch\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint mvhline(int \fIy\fB, int \fIx\fB, chtype \fIch\fB, int \fIn\fB);\fR
+ .br
+-\fBint mvwhline(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype \fP\fIch\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint mvwhline(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, chtype \fIch\fB, int \fIn\fB);\fR
+ .br
+-\fBint mvvline(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype \fP\fIch\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint mvvline(int \fIy\fB, int \fIx\fB, chtype \fIch\fB, int \fIn\fB);\fR
+ .br
+-\fBint mvwvline(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype \fP\fIch\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint mvwvline(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, chtype \fIch\fB, int \fIn\fB);\fR
+ .br
+ .SH DESCRIPTION
+ The \fBborder\fP, \fBwborder\fP and \fBbox\fP routines
+@@ -121,9 +121,9 @@
+ \fBACS_LRCORNER\fP.
+ .RE
+ .PP
+-\fBbox(\fP\fIwin\fP\fB, \fP\fIverch\fP\fB, \fP\fIhorch\fP\fB)\fP is a shorthand
+-for the following call: \fBwborder(\fP\fIwin\fP\fB,\fP \fIverch\fP\fB,\fP
+-\fIverch\fP\fB,\fP \fIhorch\fP\fB,\fP \fIhorch\fP\fB, 0, 0, 0, 0)\fP.
++\fBbox(\fIwin\fB, \fIverch\fB, \fIhorch\fB)\fR is a shorthand
++for the following call: \fBwborder(\fIwin\fB,\fR \fIverch\fB,\fR
++\fIverch\fB,\fR \fIhorch\fB,\fR \fIhorch\fB, 0, 0, 0, 0)\fR.
+ .PP
+ The \fBhline\fP and \fBwhline\fP functions draw a horizontal (left to right)
+ line using \fIch\fP starting at the current cursor position in the window.
+Index: man/curs_border_set.3x
+Prereq:  1.15 
+--- ncurses-6.3-20220205+/man/curs_border_set.3x	2021-12-25 21:41:58.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_border_set.3x	2022-02-12 20:06:41.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2019-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2019-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 2002-2011,2012 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_border_set.3x,v 1.15 2021/12/25 21:41:58 tom Exp $
++.\" $Id: curs_border_set.3x,v 1.16 2022/02/12 20:06:41 tom Exp $
+ .TH curs_border_set 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -54,55 +54,55 @@
+ \fB#include \fP
+ .sp
+ \fBint border_set(\fP
+-   \fBconst cchar_t *\fP\fIls\fP, \fBconst cchar_t *\fP\fIrs\fP,
+-   \fBconst cchar_t *\fP\fIts\fP, \fBconst cchar_t *\fP\fIbs\fP,
+-   \fBconst cchar_t *\fP\fItl\fP, \fBconst cchar_t *\fP\fItr\fP,
+-   \fBconst cchar_t *\fP\fIbl\fP, \fBconst cchar_t *\fP\fIbr\fP
++   \fBconst cchar_t *\fIls\fR, \fBconst cchar_t *\fIrs\fR,
++   \fBconst cchar_t *\fIts\fR, \fBconst cchar_t *\fIbs\fR,
++   \fBconst cchar_t *\fItl\fR, \fBconst cchar_t *\fItr\fR,
++   \fBconst cchar_t *\fIbl\fR, \fBconst cchar_t *\fIbr\fR
+ \fB);\fP
+ .br
+ \fBint wborder_set(\fP
+    \fBWINDOW *win\fP,
+-   \fBconst cchar_t *\fP\fIls\fP, \fBconst cchar_t *\fP\fIrs\fP,
+-   \fBconst cchar_t *\fP\fIts\fP, \fBconst cchar_t *\fP\fIbs\fP,
+-   \fBconst cchar_t *\fP\fItl\fP, \fBconst cchar_t *\fP\fItr\fP,
+-   \fBconst cchar_t *\fP\fIbl\fP, \fBconst cchar_t *\fP\fIbr\fP\fB);\fP
++   \fBconst cchar_t *\fIls\fR, \fBconst cchar_t *\fIrs\fR,
++   \fBconst cchar_t *\fIts\fR, \fBconst cchar_t *\fIbs\fR,
++   \fBconst cchar_t *\fItl\fR, \fBconst cchar_t *\fItr\fR,
++   \fBconst cchar_t *\fIbl\fR, \fBconst cchar_t *\fIbr\fB);\fR
+ .br
+ \fBint box_set(\fP
+    \fBWINDOW *win\fP,
+-   \fBconst cchar_t *\fP\fIverch\fP,
+-   \fBconst cchar_t *\fP\fIhorch\fP\fB);\fP
++   \fBconst cchar_t *\fIverch\fR,
++   \fBconst cchar_t *\fIhorch\fB);\fR
+ .br
+ \fBint hline_set(\fP
+-   \fBconst cchar_t *\fP\fIwch\fP, \fBint \fP\fIn\fP\fB);\fP
++   \fBconst cchar_t *\fIwch\fR, \fBint \fIn\fB);\fR
+ .br
+ \fBint whline_set(\fP
+-   \fBWINDOW *\fP\fIwin\fP,
+-   \fBconst cchar_t *\fP\fIwch\fP, \fBint \fP\fIn\fP\fB);\fP
++   \fBWINDOW *\fIwin\fR,
++   \fBconst cchar_t *\fIwch\fR, \fBint \fIn\fB);\fR
+ .br
+ \fBint mvhline_set(\fP
+-   \fBint \fP\fIy\fP, \fBint \fP\fIx\fP,
+-   \fBconst cchar_t *\fP\fIwch\fP, \fBint \fP\fIn\fP\fB);\fP
++   \fBint \fIy\fR, \fBint \fIx\fR,
++   \fBconst cchar_t *\fIwch\fR, \fBint \fIn\fB);\fR
+ .br
+ \fBint mvwhline_set(\fP
+-   \fBWINDOW *\fP\fIwin\fP,
+-   \fBint \fP\fIy\fP, \fBint \fP\fIx\fP,
+-   \fBconst cchar_t *\fP\fIwch\fP, \fBint \fP\fIn\fP\fB);\fP
++   \fBWINDOW *\fIwin\fR,
++   \fBint \fIy\fR, \fBint \fIx\fR,
++   \fBconst cchar_t *\fIwch\fR, \fBint \fIn\fB);\fR
+ .br
+ \fBint vline_set(\fP
+-   \fBconst cchar_t *\fP\fIwch\fP, \fBint \fP\fIn\fP\fB);\fP
++   \fBconst cchar_t *\fIwch\fR, \fBint \fIn\fB);\fR
+ .br
+ \fBint wvline_set(\fP
+-   \fBWINDOW *\fP\fIwin\fP,
+-   \fBconst cchar_t *\fP\fIwch\fP, \fBint \fP\fIn\fP\fB);\fP
++   \fBWINDOW *\fIwin\fR,
++   \fBconst cchar_t *\fIwch\fR, \fBint \fIn\fB);\fR
+ .br
+ \fBint mvvline_set(\fP
+-   \fBint \fP\fIy\fP, \fBint \fP\fIx\fP,
+-   \fBconst cchar_t *\fP\fIwch\fP, \fBint \fP\fIn\fP\fB);\fP
++   \fBint \fIy\fR, \fBint \fIx\fR,
++   \fBconst cchar_t *\fIwch\fR, \fBint \fIn\fB);\fR
+ .br
+ \fBint mvwvline_set(\fP
+-   \fBWINDOW *\fP\fIwin\fP,
+-   \fBint \fP\fIy\fP, \fBint \fP\fIx\fP,
+-   \fBconst cchar_t *\fP\fIwch\fP, \fBint \fP\fIn\fP\fB);\fP
++   \fBWINDOW *\fIwin\fR,
++   \fBint \fIy\fR, \fBint \fIx\fR,
++   \fBconst cchar_t *\fIwch\fR, \fBint \fIn\fB);\fR
+ .br
+ .SH DESCRIPTION
+ .PP
+@@ -152,11 +152,11 @@
+ \fBWACS_LRCORNER\fP.
+ .RE
+ .PP
+-\fBbox_set(\fP\fIwin\fP, \fIverch\fP\fB, \fP\fIhorch\fP\fB);\fP
++\fBbox_set(\fIwin\fR, \fIverch\fB, \fIhorch\fB);\fR
+ is a shorthand for the following call:
+ .PP
+-\fBwborder_set(\fP\fIwin\fP\fB, \fP\fIverch\fP\fB, \fP\fIverch\fP\fB,\fP
+-    \fIhorch\fP\fB, \fP\fIhorch\fP\fB, NULL, NULL, NULL, NULL);\fP
++\fBwborder_set(\fIwin\fB, \fIverch\fB, \fIverch\fB,\fR
++    \fIhorch\fB, \fIhorch\fB, NULL, NULL, NULL, NULL);\fR
+ .PP
+ The
+ \fB*line_set\fP
+Index: man/curs_clear.3x
+Prereq:  1.22 
+--- ncurses-6.3-20220205+/man/curs_clear.3x	2021-12-25 21:41:58.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_clear.3x	2022-02-12 20:06:41.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2016 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_clear.3x,v 1.22 2021/12/25 21:41:58 tom Exp $
++.\" $Id: curs_clear.3x,v 1.23 2022/02/12 20:06:41 tom Exp $
+ .TH curs_clear 3X ""
+ .na
+ .hy 0
+@@ -51,19 +51,19 @@
+ .sp
+ \fBint erase(void);\fP
+ .br
+-\fBint werase(WINDOW *\fP\fIwin\fP\fB);\fP
++\fBint werase(WINDOW *\fIwin\fB);\fR
+ .sp
+ \fBint clear(void);\fP
+ .br
+-\fBint wclear(WINDOW *\fP\fIwin\fP\fB);\fP
++\fBint wclear(WINDOW *\fIwin\fB);\fR
+ .sp
+ \fBint clrtobot(void);\fP
+ .br
+-\fBint wclrtobot(WINDOW *\fP\fIwin\fP\fB);\fP
++\fBint wclrtobot(WINDOW *\fIwin\fB);\fR
+ .sp
+ \fBint clrtoeol(void);\fP
+ .br
+-\fBint wclrtoeol(WINDOW *\fP\fIwin\fP\fB);\fP
++\fBint wclrtoeol(WINDOW *\fIwin\fB);\fR
+ .br
+ .SH DESCRIPTION
+ The \fBerase\fP and \fBwerase\fP routines copy blanks to every
+Index: man/curs_color.3x
+Prereq:  1.67 
+--- ncurses-6.3-20220205+/man/curs_color.3x	2021-12-25 17:39:16.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_color.3x	2022-02-12 20:06:41.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_color.3x,v 1.67 2021/12/25 17:39:16 tom Exp $
++.\" $Id: curs_color.3x,v 1.68 2022/02/12 20:06:41 tom Exp $
+ .TH curs_color 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -66,33 +66,33 @@
+ .br
+ \fBbool can_change_color(void);\fP
+ .sp
+-\fBint init_pair(short \fP\fIpair\fP\fB, short \fP\fIf\fP\fB, short \fP\fIb\fP\fB);\fP
++\fBint init_pair(short \fIpair\fB, short \fIf\fB, short \fIb\fB);\fR
+ .br
+-\fBint init_color(short \fP\fIcolor\fP\fB, short \fP\fIr\fP\fB, short \fP\fIg\fP\fB, short \fP\fIb\fP\fB);\fP
++\fBint init_color(short \fIcolor\fB, short \fIr\fB, short \fIg\fB, short \fIb\fB);\fR
+ .br
+ /* extensions */
+ .br
+-\fBint init_extended_pair(int \fP\fIpair\fP\fB, int \fP\fIf\fP\fB, int \fP\fIb\fP\fB);\fP
++\fBint init_extended_pair(int \fIpair\fB, int \fIf\fB, int \fIb\fB);\fR
+ .br
+-\fBint init_extended_color(int \fP\fIcolor\fP\fB, int \fP\fIr\fP\fB, int \fP\fIg\fP\fB, int \fP\fIb\fP\fB);\fP
++\fBint init_extended_color(int \fIcolor\fB, int \fIr\fB, int \fIg\fB, int \fIb\fB);\fR
+ .sp
+-\fBint color_content(short \fP\fIcolor\fP\fB, short *\fP\fIr\fP\fB, short *\fP\fIg\fP\fB, short *\fP\fIb\fP\fB);\fP
++\fBint color_content(short \fIcolor\fB, short *\fIr\fB, short *\fIg\fB, short *\fIb\fB);\fR
+ .br
+-\fBint pair_content(short \fP\fIpair\fP\fB, short *\fP\fIf\fP\fB, short *\fP\fIb\fP\fB);\fP
++\fBint pair_content(short \fIpair\fB, short *\fIf\fB, short *\fIb\fB);\fR
+ .br
+ /* extensions */
+ .br
+-\fBint extended_color_content(int \fP\fIcolor\fP\fB, int *\fP\fIr\fP\fB, int *\fP\fIg\fP\fB, int *\fP\fIb\fP\fB);\fP
++\fBint extended_color_content(int \fIcolor\fB, int *\fIr\fB, int *\fIg\fB, int *\fIb\fB);\fR
+ .br
+-\fBint extended_pair_content(int \fP\fIpair\fP\fB, int *\fP\fIf\fP\fB, int *\fP\fIb\fP\fB);\fP
++\fBint extended_pair_content(int \fIpair\fB, int *\fIf\fB, int *\fIb\fB);\fR
+ .sp
+ /* extensions */
+ .br
+ \fBvoid reset_color_pairs(void);\fP
+ .sp
+-\fBint COLOR_PAIR(int \fP\fIn\fP\fB);\fP
++\fBint COLOR_PAIR(int \fIn\fB);\fR
+ .br
+-\fBPAIR_NUMBER(\fP\fIattrs\fP\fB);\fP
++\fBPAIR_NUMBER(\fIattrs\fB);\fR
+ .br
+ .SH DESCRIPTION
+ .SS Overview
+@@ -385,10 +385,10 @@
+ switch color palettes rapidly.
+ .SS PAIR_NUMBER
+ .PP
+-\fBPAIR_NUMBER(\fP\fIattrs\fP) extracts the color
++\fBPAIR_NUMBER(\fIattrs\fR) extracts the color
+ value from its \fIattrs\fP parameter and returns it as a color pair number.
+ .SS COLOR_PAIR
+-Its inverse \fBCOLOR_PAIR(\fP\fIn\fP\fB)\fP converts a color pair number
++Its inverse \fBCOLOR_PAIR(\fIn\fB)\fR converts a color pair number
+ to an attribute.
+ Attributes can hold color pairs in the range 0 to 255.
+ If you need a color pair larger than that, you must use functions
+Index: man/curs_delch.3x
+Prereq:  1.17 
+--- ncurses-6.3-20220205+/man/curs_delch.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_delch.3x	2022-02-12 20:06:41.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_delch.3x,v 1.17 2021/12/25 21:49:32 tom Exp $
++.\" $Id: curs_delch.3x,v 1.18 2022/02/12 20:06:41 tom Exp $
+ .TH curs_delch 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -43,11 +43,11 @@
+ .sp
+ \fBint delch(void);\fP
+ .br
+-\fBint wdelch(WINDOW *\fP\fIwin\fP\fB);\fP
++\fBint wdelch(WINDOW *\fIwin\fB);\fR
+ .br
+-\fBint mvdelch(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fP
++\fBint mvdelch(int \fIy\fB, int \fIx\fB);\fR
+ .br
+-\fBint mvwdelch(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fP
++\fBint mvwdelch(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
+ .br
+ .SH DESCRIPTION
+ These routines delete the character under the cursor; all characters to the
+Index: man/curs_deleteln.3x
+Prereq:  1.19 
+--- ncurses-6.3-20220205+/man/curs_deleteln.3x	2021-12-25 21:41:58.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_deleteln.3x	2022-02-12 20:06:41.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_deleteln.3x,v 1.19 2021/12/25 21:41:58 tom Exp $
++.\" $Id: curs_deleteln.3x,v 1.20 2022/02/12 20:06:41 tom Exp $
+ .TH curs_deleteln 3X ""
+ .SH NAME
+ \fBdeleteln\fP,
+@@ -41,15 +41,15 @@
+ .sp
+ \fBint deleteln(void);\fP
+ .br
+-\fBint wdeleteln(WINDOW *\fP\fIwin\fP\fB);\fP
++\fBint wdeleteln(WINDOW *\fIwin\fB);\fR
+ .sp
+-\fBint insdelln(int \fP\fIn\fP\fB);\fP
++\fBint insdelln(int \fIn\fB);\fR
+ .br
+-\fBint winsdelln(WINDOW *\fP\fIwin\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint winsdelln(WINDOW *\fIwin\fB, int \fIn\fB);\fR
+ .sp
+ \fBint insertln(void);\fP
+ .br
+-\fBint winsertln(WINDOW *\fP\fIwin\fP\fB);\fP
++\fBint winsertln(WINDOW *\fIwin\fB);\fR
+ .br
+ .SH DESCRIPTION
+ The \fBdeleteln\fP and \fBwdeleteln\fP routines delete the line under the
+Index: man/curs_extend.3x
+Prereq:  1.27 
+--- ncurses-6.3-20220205+/man/curs_extend.3x	2021-12-25 17:39:16.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_extend.3x	2022-02-12 20:07:29.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1999-2010,2016 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -29,7 +29,7 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1999-on
+ .\"
+-.\" $Id: curs_extend.3x,v 1.27 2021/12/25 17:39:16 tom Exp $
++.\" $Id: curs_extend.3x,v 1.28 2022/02/12 20:07:29 tom Exp $
+ .TH curs_extend 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -44,7 +44,7 @@
+ .sp
+ \fBconst char * curses_version(void);\fP
+ .br
+-\fBint use_extended_names(bool \fP\fIenable\fP\fB);\fP
++\fBint use_extended_names(bool \fIenable\fB);\fR
+ .SH DESCRIPTION
+ These functions are extensions to the curses library
+ which do not fit easily into other categories.
+Index: man/curs_get_wch.3x
+Prereq:  1.16 
+--- ncurses-6.3-20220205+/man/curs_get_wch.3x	2021-12-25 17:39:16.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_get_wch.3x	2022-02-12 20:07:29.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 2002-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_get_wch.3x,v 1.16 2021/12/25 17:39:16 tom Exp $
++.\" $Id: curs_get_wch.3x,v 1.17 2022/02/12 20:07:29 tom Exp $
+ .TH curs_get_wch 3X ""
+ .na
+ .hy 0
+@@ -50,15 +50,15 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint get_wch(wint_t *\fP\fIwch\fP\fB);\fP
++\fBint get_wch(wint_t *\fIwch\fB);\fR
+ .br
+-\fBint wget_wch(WINDOW *\fP\fIwin\fP\fB, wint_t *\fP\fIwch\fP\fB);\fP
++\fBint wget_wch(WINDOW *\fIwin\fB, wint_t *\fIwch\fB);\fR
+ .br
+-\fBint mvget_wch(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, wint_t *\fP\fIwch\fP\fB);\fP
++\fBint mvget_wch(int \fIy\fB, int \fIx\fB, wint_t *\fIwch\fB);\fR
+ .br
+-\fBint mvwget_wch(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, wint_t *\fP\fIwch\fP\fB);\fP
++\fBint mvwget_wch(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, wint_t *\fIwch\fB);\fR
+ .sp
+-\fBint unget_wch(const wchar_t \fP\fIwch\fP\fB);\fP
++\fBint unget_wch(const wchar_t \fIwch\fB);\fR
+ .SH DESCRIPTION
+ .SS wget_wch
+ The
+Index: man/curs_get_wstr.3x
+Prereq:  1.25 
+--- ncurses-6.3-20220205+/man/curs_get_wstr.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_get_wstr.3x	2022-02-12 20:07:29.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_get_wstr.3x,v 1.25 2021/12/25 21:49:32 tom Exp $
++.\" $Id: curs_get_wstr.3x,v 1.26 2022/02/12 20:07:29 tom Exp $
+ .TH curs_get_wstr 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -54,21 +54,21 @@
+ .nf
+ \fB#include \fP
+ .sp
+-\fBint get_wstr(wint_t *\fP\fIwstr\fP\fB);\fP
++\fBint get_wstr(wint_t *\fIwstr\fB);\fR
+ .br
+-\fBint getn_wstr(wint_t *\fP\fIwstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint getn_wstr(wint_t *\fIwstr\fB, int \fIn\fB);\fR
+ .br
+-\fBint wget_wstr(WINDOW *\fP\fIwin\fP\fB, wint_t *\fP\fIwstr\fP\fB);\fP
++\fBint wget_wstr(WINDOW *\fIwin\fB, wint_t *\fIwstr\fB);\fR
+ .br
+-\fBint wgetn_wstr(WINDOW *\fP\fIwin\fP\fB, wint_t *\fP\fIwstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint wgetn_wstr(WINDOW *\fIwin\fB, wint_t *\fIwstr\fB, int \fIn\fB);\fR
+ .sp
+-\fBint mvget_wstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, wint_t *\fP\fIwstr\fP\fB);\fP
++\fBint mvget_wstr(int \fIy\fB, int \fIx\fB, wint_t *\fIwstr\fB);\fR
+ .br
+-\fBint mvgetn_wstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, wint_t *\fP\fIwstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint mvgetn_wstr(int \fIy\fB, int \fIx\fB, wint_t *\fIwstr\fB, int \fIn\fB);\fR
+ .br
+-\fBint mvwget_wstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, wint_t *\fP\fIwstr\fP\fB);\fP
++\fBint mvwget_wstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, wint_t *\fIwstr\fB);\fR
+ .br
+-\fBint mvwgetn_wstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, wint_t *\fP\fIwstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint mvwgetn_wstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, wint_t *\fIwstr\fB, int \fIn\fB);\fR
+ .fi
+ .SH DESCRIPTION
+ The effect of
+@@ -195,7 +195,7 @@
+ All of the vendors implement this using \fBwint_t\fP, following the standard.
+ .PP
+ X/Open Curses, Issue 7 (2009) is unclear regarding whether
+-the terminating \fInull \fP\fBwchar_t\fP
++the terminating \fInull \fBwchar_t\fR
+ value is counted in the length parameter \fIn\fP.
+ X/Open Curses, Issue 7 revised the corresponding description
+ of \fBwgetnstr\fP to address this issue.
+Index: man/curs_getch.3x
+Prereq:  1.61 
+--- ncurses-6.3-20220205+/man/curs_getch.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_getch.3x	2022-02-12 20:07:45.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_getch.3x,v 1.61 2021/12/25 21:49:32 tom Exp $
++.\" $Id: curs_getch.3x,v 1.63 2022/02/12 20:07:45 tom Exp $
+ .TH curs_getch 3X ""
+ .na
+ .hy 0
+@@ -50,21 +50,21 @@
+ .ad
+ .hy
+ .SH SYNOPSIS
+-\fB#include \fP
++.B #include 
+ .PP
+-\fBint getch(void);\fP
++.B int getch(void);
+ .br
+-\fBint wgetch(WINDOW *\fP\fIwin);\fP
++.B int wgetch(WINDOW *\fIwin\fB);
+ .sp
+-\fBint mvgetch(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fP
++.B int mvgetch(int \fIy\fB, int \fIx\fB);
+ .br
+-\fBint mvwgetch(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fP
++.B int mvwgetch(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);
+ .sp
+-\fBint ungetch(int \fP\fIch\fP\fB);\fP
++.B int ungetch(int \fIch\fB);
+ .sp
+ /* extension */
+ .br
+-\fBint has_key(int \fP\fIch\fP\fB);\fP
++.B int has_key(int \fIch\fB);
+ .br
+ .SH DESCRIPTION
+ .SS Reading characters
+@@ -210,7 +210,7 @@
+ KEY_HELP/Help key
+ KEY_MARK/Mark key
+ KEY_MESSAGE/Message key
+-KEY_MOUSE/Mouse event read
++KEY_MOUSE/Mouse event occurred
+ KEY_MOVE/Move key
+ KEY_NEXT/Next object key
+ KEY_OPEN/Open key
+@@ -238,7 +238,7 @@
+ KEY_SFIND/Shifted find key
+ KEY_SHELP/Shifted help key
+ KEY_SHOME/Shifted home key
+-KEY_SIC/Shifted input key
++KEY_SIC/Shifted insert key
+ KEY_SLEFT/Shifted left arrow key
+ KEY_SMESSAGE/Shifted message key
+ KEY_SMOVE/Shifted move key
+@@ -248,7 +248,7 @@
+ KEY_SPRINT/Shifted print key
+ KEY_SREDO/Shifted redo key
+ KEY_SREPLACE/Shifted replace key
+-KEY_SRIGHT/Shifted right arrow
++KEY_SRIGHT/Shifted right arrow key
+ KEY_SRSUME/Shifted resume key
+ KEY_SSAVE/Shifted save key
+ KEY_SSUSPEND/Shifted suspend key
+Index: man/curs_getstr.3x
+Prereq:  1.35 
+--- ncurses-6.3-20220205+/man/curs_getstr.3x	2021-12-25 20:14:56.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_getstr.3x	2022-02-12 20:07:29.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_getstr.3x,v 1.35 2021/12/25 20:14:56 tom Exp $
++.\" $Id: curs_getstr.3x,v 1.36 2022/02/12 20:07:29 tom Exp $
+ .TH curs_getstr 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -53,21 +53,21 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint getstr(char *\fP\fIstr\fP\fB);\fP
++\fBint getstr(char *\fIstr\fB);\fR
+ .br
+-\fBint getnstr(char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint getnstr(char *\fIstr\fB, int \fIn\fB);\fR
+ .br
+-\fBint wgetstr(WINDOW *\fP\fIwin\fP\fB, char *\fP\fIstr\fP\fB);\fP
++\fBint wgetstr(WINDOW *\fIwin\fB, char *\fIstr\fB);\fR
+ .br
+-\fBint wgetnstr(WINDOW *\fP\fIwin\fP\fB, char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint wgetnstr(WINDOW *\fIwin\fB, char *\fIstr\fB, int \fIn\fB);\fR
+ .sp
+-\fBint mvgetstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, char *\fP\fIstr\fP\fB);\fP
++\fBint mvgetstr(int \fIy\fB, int \fIx\fB, char *\fIstr\fB);\fR
+ .br
+-\fBint mvwgetstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, char *\fP\fIstr\fP\fB);\fP
++\fBint mvwgetstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, char *\fIstr\fB);\fR
+ .br
+-\fBint mvgetnstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint mvgetnstr(int \fIy\fB, int \fIx\fB, char *\fIstr\fB, int \fIn\fB);\fR
+ .br
+-\fBint mvwgetnstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint mvwgetnstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, char *\fIstr\fB, int \fIn\fB);\fR
+ .br
+ .SH DESCRIPTION
+ The function \fBgetstr\fP is equivalent to a series of calls to \fBgetch\fP,
+Index: man/curs_getyx.3x
+Prereq:  1.22 
+--- ncurses-6.3-20220205+/man/curs_getyx.3x	2021-12-25 21:50:36.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_getyx.3x	2022-02-12 20:07:29.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2020,2021 Thomas E. Dickey                                     *
++.\" Copyright 2020-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_getyx.3x,v 1.22 2021/12/25 21:50:36 tom Exp $
++.\" $Id: curs_getyx.3x,v 1.23 2022/02/12 20:07:29 tom Exp $
+ .TH curs_getyx 3X ""
+ .SH NAME
+ \fBgetyx\fP,
+@@ -37,13 +37,13 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBvoid getyx(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fP
++\fBvoid getyx(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
+ .br
+-\fBvoid getparyx(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fP
++\fBvoid getparyx(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
+ .br
+-\fBvoid getbegyx(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fP
++\fBvoid getbegyx(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
+ .br
+-\fBvoid getmaxyx(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fP
++\fBvoid getmaxyx(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
+ .br
+ .SH DESCRIPTION
+ The \fBgetyx\fP macro places the current cursor position of the given window in
+Index: man/curs_in_wch.3x
+Prereq:  1.12 
+--- ncurses-6.3-20220205+/man/curs_in_wch.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_in_wch.3x	2022-02-12 20:07:29.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 2002-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_in_wch.3x,v 1.12 2021/12/25 21:49:32 tom Exp $
++.\" $Id: curs_in_wch.3x,v 1.13 2022/02/12 20:07:29 tom Exp $
+ .TH curs_in_wch 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -41,13 +41,13 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint in_wch(cchar_t *\fP\fIwcval\fP\fB);\fP
++\fBint in_wch(cchar_t *\fIwcval\fB);\fR
+ .br
+-\fBint win_wch(WINDOW *\fP\fIwin\fP\fB, cchar_t *\fP\fIwcval\fP\fB);\fP
++\fBint win_wch(WINDOW *\fIwin\fB, cchar_t *\fIwcval\fB);\fR
+ .sp
+-\fBint mvin_wch(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, cchar_t *\fP\fIwcval\fP\fB);\fP
++\fBint mvin_wch(int \fIy\fB, int \fIx\fB, cchar_t *\fIwcval\fB);\fR
+ .br
+-\fBint mvwin_wch(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, cchar_t *\fP\fIwcval\fP\fB);\fP
++\fBint mvwin_wch(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, cchar_t *\fIwcval\fB);\fR
+ .SH DESCRIPTION
+ These functions extract the complex character and rendition from
+ the current position in the named window into the \fBcchar_t\fP object
+Index: man/curs_in_wchstr.3x
+Prereq:  1.16 
+--- ncurses-6.3-20220205+/man/curs_in_wchstr.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_in_wchstr.3x	2022-02-12 20:07:29.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_in_wchstr.3x,v 1.16 2021/12/25 21:49:32 tom Exp $
++.\" $Id: curs_in_wchstr.3x,v 1.17 2022/02/12 20:07:29 tom Exp $
+ .TH curs_in_wchstr 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -50,21 +50,21 @@
+ .nf
+ \fB#include \fP
+ .sp
+-\fBint in_wchstr(cchar_t *\fP\fIwchstr\fP\fB);\fP
++\fBint in_wchstr(cchar_t *\fIwchstr\fB);\fR
+ .br
+-\fBint in_wchnstr(cchar_t *\fP\fIwchstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint in_wchnstr(cchar_t *\fIwchstr\fB, int \fIn\fB);\fR
+ .br
+-\fBint win_wchstr(WINDOW *\fP\fIwin\fP\fB, cchar_t *\fP\fIwchstr\fP\fB);\fP
++\fBint win_wchstr(WINDOW *\fIwin\fB, cchar_t *\fIwchstr\fB);\fR
+ .br
+-\fBint win_wchnstr(WINDOW *\fP\fIwin\fP\fB, cchar_t *\fP\fIwchstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint win_wchnstr(WINDOW *\fIwin\fB, cchar_t *\fIwchstr\fB, int \fIn\fB);\fR
+ .sp
+-\fBint mvin_wchstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, cchar_t *\fP\fIwchstr\fP\fB);\fP
++\fBint mvin_wchstr(int \fIy\fB, int \fIx\fB, cchar_t *\fIwchstr\fB);\fR
+ .br
+-\fBint mvin_wchnstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, cchar_t *\fP\fIwchstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint mvin_wchnstr(int \fIy\fB, int \fIx\fB, cchar_t *\fIwchstr\fB, int \fIn\fB);\fR
+ .br
+-\fBint mvwin_wchstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, cchar_t *\fP\fIwchstr\fP\fB);\fP
++\fBint mvwin_wchstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, cchar_t *\fIwchstr\fB);\fR
+ .br
+-\fBint mvwin_wchnstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, cchar_t *\fP\fIwchstr\fP, int \fIn\fP\fB);\fP
++\fBint mvwin_wchnstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, cchar_t *\fIwchstr\fR, int \fIn\fB);\fR
+ .fi
+ .SH DESCRIPTION
+ These functions return an array of complex characters in \fIwchstr\fP,
+Index: man/curs_inch.3x
+Prereq:  1.27 
+--- ncurses-6.3-20220205+/man/curs_inch.3x	2021-12-25 17:39:16.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_inch.3x	2022-02-12 20:07:29.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_inch.3x,v 1.27 2021/12/25 17:39:16 tom Exp $
++.\" $Id: curs_inch.3x,v 1.28 2022/02/12 20:07:29 tom Exp $
+ .TH curs_inch 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -48,11 +48,11 @@
+ .sp
+ \fBchtype inch(void);\fP
+ .br
+-\fBchtype winch(WINDOW *\fP\fIwin\fP\fB);\fP
++\fBchtype winch(WINDOW *\fIwin\fB);\fR
+ .sp
+-\fBchtype mvinch(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fP
++\fBchtype mvinch(int \fIy\fB, int \fIx\fB);\fR
+ .br
+-\fBchtype mvwinch(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fP
++\fBchtype mvwinch(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
+ .br
+ .SH DESCRIPTION
+ These routines return the character, of type \fBchtype\fP, at the current
+Index: man/curs_inchstr.3x
+Prereq:  1.23 
+--- ncurses-6.3-20220205+/man/curs_inchstr.3x	2021-12-25 21:41:58.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_inchstr.3x	2022-02-12 20:07:29.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_inchstr.3x,v 1.23 2021/12/25 21:41:58 tom Exp $
++.\" $Id: curs_inchstr.3x,v 1.24 2022/02/12 20:07:29 tom Exp $
+ .TH curs_inchstr 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -53,21 +53,21 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint inchstr(chtype *\fP\fIchstr\fP\fB);\fP
++\fBint inchstr(chtype *\fIchstr\fB);\fR
+ .br
+-\fBint inchnstr(chtype *\fP\fIchstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint inchnstr(chtype *\fIchstr\fB, int \fIn\fB);\fR
+ .br
+-\fBint winchstr(WINDOW *\fP\fIwin\fP\fB, chtype *\fP\fIchstr\fP\fB);\fP
++\fBint winchstr(WINDOW *\fIwin\fB, chtype *\fIchstr\fB);\fR
+ .br
+-\fBint winchnstr(WINDOW *\fP\fIwin\fP\fB, chtype *\fP\fIchstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint winchnstr(WINDOW *\fIwin\fB, chtype *\fIchstr\fB, int \fIn\fB);\fR
+ .sp
+-\fBint mvinchstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype *\fP\fIchstr\fP\fB);\fP
++\fBint mvinchstr(int \fIy\fB, int \fIx\fB, chtype *\fIchstr\fB);\fR
+ .br
+-\fBint mvinchnstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype *\fP\fIchstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint mvinchnstr(int \fIy\fB, int \fIx\fB, chtype *\fIchstr\fB, int \fIn\fB);\fR
+ .br
+-\fBint mvwinchstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype *\fP\fIchstr\fP\fB);\fP
++\fBint mvwinchstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, chtype *\fIchstr\fB);\fR
+ .br
+-\fBint mvwinchnstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype *\fP\fIchstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint mvwinchnstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, chtype *\fIchstr\fB, int \fIn\fB);\fR
+ .br
+ .SH DESCRIPTION
+ These routines return a NULL-terminated array of \fBchtype\fP quantities,
+Index: man/curs_initscr.3x
+Prereq:  1.36 
+--- ncurses-6.3-20220205+/man/curs_initscr.3x	2021-12-25 21:41:58.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_initscr.3x	2022-02-12 20:07:29.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_initscr.3x,v 1.36 2021/12/25 21:41:58 tom Exp $
++.\" $Id: curs_initscr.3x,v 1.37 2022/02/12 20:07:29 tom Exp $
+ .TH curs_initscr 3X ""
+ .de bP
+ .ie n  .IP \(bu 4
+@@ -57,11 +57,11 @@
+ .sp
+ \fBbool isendwin(void);\fP
+ .sp
+-\fBSCREEN *newterm(const char *\fP\fItype\fP\fB, FILE *\fP\fIoutfd\fP\fB, FILE *\fP\fIinfd\fP\fB);\fP
++\fBSCREEN *newterm(const char *\fItype\fB, FILE *\fIoutfd\fB, FILE *\fIinfd\fB);\fR
+ .br
+-\fBSCREEN *set_term(SCREEN *\fP\fInew\fP\fB);\fP
++\fBSCREEN *set_term(SCREEN *\fInew\fB);\fR
+ .br
+-\fBvoid delscreen(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBvoid delscreen(SCREEN* \fIsp\fB);\fR
+ .br
+ .SH DESCRIPTION
+ .SS initscr
+@@ -193,19 +193,23 @@
+ .PP
+ Quoting from X/Open Curses, section 3.1.1:
+ .RS 5
++.hy 0
+ .PP
+-\fICurses implementations may provide for special handling of the \fBSIGINT\fP,
+-\fBSIGQUIT\fP and \fBSIGTSTP\fP signals
+-if their disposition is \fBSIG_DFL\fP at the time
+-\fBinitscr\fP is called \fP...
+-.PP
+-\fIAny special handling for these signals may remain in effect for the
+-life of the process or until the process changes the disposition of
+-the signal.\fP
++.I Curses implementations may provide for special handling of the
++.I \fBSIGINT\fP,
++.I \fBSIGQUIT\fP and
++.I \fBSIGTSTP\fP signals
++.I if their disposition is \fBSIG_DFL\fP at the time
++\fBinitscr\fI is called \fR...
++.PP
++.I Any special handling for these signals may remain in effect for the
++.I life of the process or until the process changes the disposition of
++.I the signal.
+ .PP
+-\fINone of the Curses functions are required to be safe
+-with respect to signals \fP...
++.I None of the Curses functions are required to be safe
++.I with respect to signals \fP...
+ .RE
++.hy
+ .PP
+ This implementation establishes signal handlers during initialization,
+ e.g., \fBinitscr\fP or \fBnewterm\fP.
+Index: man/curs_inopts.3x
+Prereq:  1.35 
+--- ncurses-6.3-20220205+/man/curs_inopts.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_inopts.3x	2022-02-12 20:07:29.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_inopts.3x,v 1.35 2021/12/25 21:49:32 tom Exp $
++.\" $Id: curs_inopts.3x,v 1.36 2022/02/12 20:07:29 tom Exp $
+ .TH curs_inopts 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -68,15 +68,15 @@
+ .br
+ \fBint noecho(void);\fP
+ .sp
+-\fBint intrflush(WINDOW *\fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fP
++\fBint intrflush(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
+ .br
+-\fBint keypad(WINDOW *\fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fP
++\fBint keypad(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
+ .br
+-\fBint meta(WINDOW *\fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fP
++\fBint meta(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
+ .br
+-\fBint nodelay(WINDOW *\fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fP
++\fBint nodelay(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
+ .br
+-\fBint notimeout(WINDOW *\fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fP
++\fBint notimeout(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
+ .sp
+ \fBint nl(void);\fP
+ .br
+@@ -90,13 +90,13 @@
+ .br
+ \fBvoid noqiflush(void);\fP
+ .sp
+-\fBint halfdelay(int \fP\fItenths\fP\fB);\fP
++\fBint halfdelay(int \fItenths\fB);\fR
+ .br
+-\fBvoid timeout(int \fP\fIdelay\fP\fB);\fP
++\fBvoid timeout(int \fIdelay\fB);\fR
+ .br
+-\fBvoid wtimeout(WINDOW *\fP\fIwin\fP\fB, int \fP\fIdelay\fP\fB);\fP
++\fBvoid wtimeout(WINDOW *\fIwin\fB, int \fIdelay\fB);\fR
+ .sp
+-\fBint typeahead(int \fP\fIfd\fP\fB);\fP
++\fBint typeahead(int \fIfd\fB);\fR
+ .br
+ .SH DESCRIPTION
+ The \fBncurses\fP library provides several functions which let an application
+@@ -215,7 +215,7 @@
+ .PP
+ When interpreting an escape sequence, \fBwgetch\fP(3X) sets a timer
+ while waiting for the next character.
+-If \fBnotimeout(\fP\fIwin\fP,
++If \fBnotimeout(\fIwin\fR,
+ \fBTRUE\fP) is called, then \fBwgetch\fP does not set a timer.
+ The
+ purpose of the timeout is to differentiate between sequences received
+Index: man/curs_ins_wch.3x
+Prereq:  1.12 
+--- ncurses-6.3-20220205+/man/curs_ins_wch.3x	2021-12-25 21:41:58.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_ins_wch.3x	2022-02-12 20:05:11.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2019-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2019-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 2002-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_ins_wch.3x,v 1.12 2021/12/25 21:41:58 tom Exp $
++.\" $Id: curs_ins_wch.3x,v 1.13 2022/02/12 20:05:11 tom Exp $
+ .TH curs_ins_wch 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -41,13 +41,13 @@
+ .SH SYNOPSIS
+ #include 
+ .sp
+-\fBint ins_wch(const cchar_t *\fP\fIwch\fP\fB);\fP
++\fBint ins_wch(const cchar_t *\fIwch\fB);\fR
+ .br
+-\fBint wins_wch(WINDOW *\fP\fIwin\fP\fB, const cchar_t *\fP\fIwch\fP\fB);\fP
++\fBint wins_wch(WINDOW *\fIwin\fB, const cchar_t *\fIwch\fB);\fR
+ .sp
+-\fBint mvins_wch(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const cchar_t *\fP\fIwch\fP\fB);\fP
++\fBint mvins_wch(int \fIy\fB, int \fIx\fB, const cchar_t *\fIwch\fB);\fR
+ .br
+-\fBint mvwins_wch(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const cchar_t *\fP\fIwch\fP\fB);\fP
++\fBint mvwins_wch(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const cchar_t *\fIwch\fB);\fR
+ .SH DESCRIPTION
+ These routines, insert the complex character \fIwch\fP with rendition
+ before the character under the cursor.
+Index: man/curs_ins_wstr.3x
+Prereq:  1.13 
+--- ncurses-6.3-20220205+/man/curs_ins_wstr.3x	2021-12-25 21:41:58.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_ins_wstr.3x	2022-02-12 20:05:11.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2019-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2019-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_ins_wstr.3x,v 1.13 2021/12/25 21:41:58 tom Exp $
++.\" $Id: curs_ins_wstr.3x,v 1.14 2022/02/12 20:05:11 tom Exp $
+ .TH curs_ins_wstr 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -50,21 +50,21 @@
+ .nf
+ \fB#include \fP
+ .sp
+-\fBint ins_wstr(const wchar_t *\fP\fIwstr);\fP
++\fBint ins_wstr(const wchar_t *\fIwstr);\fR
+ .br
+-\fBint ins_nwstr(const wchar_t *\fP\fIwstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint ins_nwstr(const wchar_t *\fIwstr\fB, int \fIn\fB);\fR
+ .br
+-\fBint wins_wstr(WINDOW *\fP\fIwin\fP\fB, const wchar_t *\fP\fIwstr\fP\fB);\fP
++\fBint wins_wstr(WINDOW *\fIwin\fB, const wchar_t *\fIwstr\fB);\fR
+ .br
+-\fBint wins_nwstr(WINDOW *\fP\fIwin\fP\fB, const wchar_t *\fP\fIwstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint wins_nwstr(WINDOW *\fIwin\fB, const wchar_t *\fIwstr\fB, int \fIn\fB);\fR
+ .sp
+-\fBint mvins_wstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const wchar_t *\fP\fIwstr\fP\fB);\fP
++\fBint mvins_wstr(int \fIy\fB, int \fIx\fB, const wchar_t *\fIwstr\fB);\fR
+ .br
+-\fBint mvins_nwstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const wchar_t *\fP\fIwstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint mvins_nwstr(int \fIy\fB, int \fIx\fB, const wchar_t *\fIwstr\fB, int \fIn\fB);\fR
+ .br
+-\fBint mvwins_wstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const wchar_t *\fP\fIwstr\fP\fB);\fP
++\fBint mvwins_wstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const wchar_t *\fIwstr\fB);\fR
+ .br
+-\fBint mvwins_nwstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const wchar_t *\fP\fIwstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint mvwins_nwstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const wchar_t *\fIwstr\fB, int \fIn\fB);\fR
+ .fi
+ .SH DESCRIPTION
+ These routines insert a \fBwchar_t\fP character string
+@@ -84,7 +84,7 @@
+ A newline also does a \fBclrtoeol\fP before moving.
+ Tabs are considered to be at every eighth column.
+ If a character in \fIwstr\fP is another control character,
+-it is drawn in the \fB^\fP\fIX\fP notation.
++it is drawn in the \fB^\fIX\fR notation.
+ Calling \fBwin_wch\fP after adding a control character
+ (and moving to it, if necessary)
+ does not return the control character,
+Index: man/curs_insch.3x
+Prereq:  1.21 
+--- ncurses-6.3-20220205+/man/curs_insch.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_insch.3x	2022-02-12 20:05:11.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_insch.3x,v 1.21 2021/12/25 21:49:32 tom Exp $
++.\" $Id: curs_insch.3x,v 1.22 2022/02/12 20:05:11 tom Exp $
+ .TH curs_insch 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -41,13 +41,13 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint insch(chtype \fP\fIch\fP\fB);\fP
++\fBint insch(chtype \fIch\fB);\fR
+ .br
+-\fBint winsch(WINDOW *\fP\fIwin\fP\fB, chtype \fP\fIch\fP\fB);\fP
++\fBint winsch(WINDOW *\fIwin\fB, chtype \fIch\fB);\fR
+ .sp
+-\fBint mvinsch(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype \fP\fIch\fP\fB);\fP
++\fBint mvinsch(int \fIy\fB, int \fIx\fB, chtype \fIch\fB);\fR
+ .br
+-\fBint mvwinsch(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, chtype \fP\fIch\fP\fB);\fP
++\fBint mvwinsch(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, chtype \fIch\fB);\fR
+ .br
+ .SH DESCRIPTION
+ These routines insert the character \fIch\fP before the character under the
+Index: man/curs_insstr.3x
+Prereq:  1.28 
+--- ncurses-6.3-20220205+/man/curs_insstr.3x	2021-12-25 17:39:16.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_insstr.3x	2022-02-12 20:05:11.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2019-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2019-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_insstr.3x,v 1.28 2021/12/25 17:39:16 tom Exp $
++.\" $Id: curs_insstr.3x,v 1.29 2022/02/12 20:05:11 tom Exp $
+ .TH curs_insstr 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -45,21 +45,21 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .br
+-\fBint insstr(const char *\fP\fIstr\fP\fB);\fP
++\fBint insstr(const char *\fIstr\fB);\fR
+ .br
+-\fBint insnstr(const char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint insnstr(const char *\fIstr\fB, int \fIn\fB);\fR
+ .br
+-\fBint winsstr(WINDOW *\fP\fIwin\fP\fB, const char *\fP\fIstr\fP\fB);\fP
++\fBint winsstr(WINDOW *\fIwin\fB, const char *\fIstr\fB);\fR
+ .br
+-\fBint winsnstr(WINDOW *\fP\fIwin\fP\fB, const char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint winsnstr(WINDOW *\fIwin\fB, const char *\fIstr\fB, int \fIn\fB);\fR
+ .sp
+-\fBint mvinsstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const char *\fP\fIstr\fP\fB);\fP
++\fBint mvinsstr(int \fIy\fB, int \fIx\fB, const char *\fIstr\fB);\fR
+ .br
+-\fBint mvinsnstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint mvinsnstr(int \fIy\fB, int \fIx\fB, const char *\fIstr\fB, int \fIn\fB);\fR
+ .br
+-\fBint mvwinsstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const char *\fP\fIstr\fP\fB);\fP
++\fBint mvwinsstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const char *\fIstr\fB);\fR
+ .br
+-\fBint mvwinsnstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint mvwinsnstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const char *\fIstr\fB, int \fIn\fB);\fR
+ .br
+ .SH DESCRIPTION
+ These routines insert a character string
+Index: man/curs_instr.3x
+Prereq:  1.24 
+--- ncurses-6.3-20220205+/man/curs_instr.3x	2021-12-25 21:41:58.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_instr.3x	2022-02-12 20:05:11.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_instr.3x,v 1.24 2021/12/25 21:41:58 tom Exp $
++.\" $Id: curs_instr.3x,v 1.25 2022/02/12 20:05:11 tom Exp $
+ .TH curs_instr 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -49,21 +49,21 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint instr(char *\fP\fIstr\fP\fB);\fP
++\fBint instr(char *\fIstr\fB);\fR
+ .br
+-\fBint innstr(char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint innstr(char *\fIstr\fB, int \fIn\fB);\fR
+ .br
+-\fBint winstr(WINDOW *\fP\fIwin\fP\fB, char *\fP\fIstr\fP\fB);\fP
++\fBint winstr(WINDOW *\fIwin\fB, char *\fIstr\fB);\fR
+ .br
+-\fBint winnstr(WINDOW *\fP\fIwin\fP\fB, char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint winnstr(WINDOW *\fIwin\fB, char *\fIstr\fB, int \fIn\fB);\fR
+ .sp
+-\fBint mvinstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, char *\fP\fIstr\fP\fB);\fP
++\fBint mvinstr(int \fIy\fB, int \fIx\fB, char *\fIstr\fB);\fR
+ .br
+-\fBint mvinnstr(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint mvinnstr(int \fIy\fB, int \fIx\fB, char *\fIstr\fB, int \fIn\fB);\fR
+ .br
+-\fBint mvwinstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, char *\fP\fIstr\fP\fB);\fP
++\fBint mvwinstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, char *\fIstr\fB);\fR
+ .br
+-\fBint mvwinnstr(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, char *\fP\fIstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint mvwinnstr(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, char *\fIstr\fB, int \fIn\fB);\fR
+ .br
+ .SH DESCRIPTION
+ These routines return a string of characters in \fIstr\fP, extracted starting
+Index: man/curs_inwstr.3x
+Prereq:  1.16 
+--- ncurses-6.3-20220205+/man/curs_inwstr.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_inwstr.3x	2022-02-12 20:05:11.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 2002-2012,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_inwstr.3x,v 1.16 2021/12/25 21:49:32 tom Exp $
++.\" $Id: curs_inwstr.3x,v 1.17 2022/02/12 20:05:11 tom Exp $
+ .TH curs_inwstr 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -46,21 +46,21 @@
+ .nf
+ \fB#include  \fP
+ .sp
+-\fBint inwstr(\fP\fBwchar_t *\fP\fIwstr\fP\fB);\fP
++\fBint inwstr(\fBwchar_t *\fIwstr\fB);\fR
+ .br
+-\fBint innwstr(\fP\fBwchar_t *\fP\fIwstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint innwstr(\fBwchar_t *\fIwstr\fB, int \fIn\fB);\fR
+ .br
+-\fBint winwstr(\fP\fBWINDOW *\fP\fIwin\fP\fB, wchar_t *\fP\fIwstr\fP\fB);\fP
++\fBint winwstr(\fBWINDOW *\fIwin\fB, wchar_t *\fIwstr\fB);\fR
+ .br
+-\fBint winnwstr(\fP\fBWINDOW *\fP\fIwin\fP\fB, wchar_t *\fP\fIwstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint winnwstr(\fBWINDOW *\fIwin\fB, wchar_t *\fIwstr\fB, int \fIn\fB);\fR
+ .sp
+-\fBint mvinwstr(\fP\fBint \fP\fIy\fP\fB, int \fP\fIx\fP\fB, wchar_t *\fP\fIwstr\fP\fB);\fP
++\fBint mvinwstr(\fBint \fIy\fB, int \fIx\fB, wchar_t *\fIwstr\fB);\fR
+ .br
+-\fBint mvinnwstr(\fP\fBint \fP\fIy\fP\fB, int \fP\fIx\fP\fB, wchar_t *\fP\fIwstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint mvinnwstr(\fBint \fIy\fB, int \fIx\fB, wchar_t *\fIwstr\fB, int \fIn\fB);\fR
+ .br
+-\fBint mvwinwstr(\fP\fBWINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, wchar_t *\fP\fIwstr\fP\fB);\fP
++\fBint mvwinwstr(\fBWINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, wchar_t *\fIwstr\fB);\fR
+ .br
+-\fBint mvwinnwstr(\fP\fBWINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, wchar_t *\fP\fIwstr\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint mvwinnwstr(\fBWINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, wchar_t *\fIwstr\fB, int \fIn\fB);\fR
+ .fi
+ .SH DESCRIPTION
+ .PP
+Index: man/curs_kernel.3x
+Prereq:  1.31 
+--- ncurses-6.3-20220205+/man/curs_kernel.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_kernel.3x	2022-02-12 20:05:11.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_kernel.3x,v 1.31 2021/12/25 21:49:32 tom Exp $
++.\" $Id: curs_kernel.3x,v 1.32 2022/02/12 20:05:11 tom Exp $
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+ .ie \n(.g .ds '' \(rq
+@@ -68,15 +68,15 @@
+ .br
+ \fBint savetty(void);\fP
+ .sp
+-\fBvoid getsyx(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fP
++\fBvoid getsyx(int \fIy\fB, int \fIx\fB);\fR
+ .br
+-\fBvoid setsyx(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fP
++\fBvoid setsyx(int \fIy\fB, int \fIx\fB);\fR
+ .sp
+-\fBint ripoffline(int \fP\fIline\fP\fB, int (*\fP\fIinit\fP\fB)(WINDOW *, int));\fP
++\fBint ripoffline(int \fIline\fB, int (*\fIinit\fB)(WINDOW *, int));\fR
+ .br
+-\fBint curs_set(int \fP\fIvisibility\fP\fB);\fP
++\fBint curs_set(int \fIvisibility\fB);\fR
+ .br
+-\fBint napms(int \fP\fIms\fP\fB);\fP
++\fBint napms(int \fIms\fB);\fR
+ .br
+ .SH DESCRIPTION
+ The following routines give low-level access
+Index: man/curs_legacy.3x
+Prereq:  1.12 
+--- ncurses-6.3-20220205+/man/curs_legacy.3x	2020-10-18 00:16:04.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_legacy.3x	2022-02-12 20:05:11.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2019,2020 Thomas E. Dickey                                     *
++.\" Copyright 2019-2020,2022 Thomas E. Dickey                                *
+ .\" Copyright 2007-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_legacy.3x,v 1.12 2020/10/18 00:16:04 tom Exp $
++.\" $Id: curs_legacy.3x,v 1.13 2022/02/12 20:05:11 tom Exp $
+ .de bP
+ .ie n  .IP \(bu 4
+ .el    .IP \(bu 2
+@@ -38,23 +38,23 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint getattrs(const WINDOW *\fP\fIwin\fP\fB);\fP
++\fBint getattrs(const WINDOW *\fIwin\fB);\fR
+ .sp
+-\fBint getbegx(const WINDOW *\fP\fIwin\fP\fB);\fP
++\fBint getbegx(const WINDOW *\fIwin\fB);\fR
+ .br
+-\fBint getbegy(const WINDOW *\fP\fIwin\fP\fB);\fP
++\fBint getbegy(const WINDOW *\fIwin\fB);\fR
+ .sp
+-\fBint getcurx(const WINDOW *\fP\fIwin\fP\fB);\fP
++\fBint getcurx(const WINDOW *\fIwin\fB);\fR
+ .br
+-\fBint getcury(const WINDOW *\fP\fIwin\fP\fB);\fP
++\fBint getcury(const WINDOW *\fIwin\fB);\fR
+ .sp
+-\fBint getmaxx(const WINDOW *\fP\fIwin\fP\fB);\fP
++\fBint getmaxx(const WINDOW *\fIwin\fB);\fR
+ .br
+-\fBint getmaxy(const WINDOW *\fP\fIwin\fP\fB);\fP
++\fBint getmaxy(const WINDOW *\fIwin\fB);\fR
+ .sp
+-\fBint getparx(const WINDOW *\fP\fIwin\fP\fB);\fP
++\fBint getparx(const WINDOW *\fIwin\fB);\fR
+ .br
+-\fBint getpary(const WINDOW *\fP\fIwin\fP\fB);\fP
++\fBint getpary(const WINDOW *\fIwin\fB);\fR
+ .br
+ .SH DESCRIPTION
+ These legacy functions are simpler to use than the X/Open Curses functions:
+Index: man/curs_memleaks.3x
+Prereq:  1.12 
+--- ncurses-6.3-20220205+/man/curs_memleaks.3x	2021-12-25 17:39:16.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_memleaks.3x	2022-02-12 20:05:11.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2019-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2019-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 2008-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_memleaks.3x,v 1.12 2021/12/25 17:39:16 tom Exp $
++.\" $Id: curs_memleaks.3x,v 1.13 2022/02/12 20:05:11 tom Exp $
+ .TH curs_memleaks 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -43,19 +43,19 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .br
+-\fBvoid exit_curses(int \fP\fIcode\fP\fB);\fP
++\fBvoid exit_curses(int \fIcode\fB);\fR
+ .sp
+ \fB#include \fP
+ .br
+-\fBvoid exit_terminfo(int \fP\fIcode\fP\fB);\fP
++\fBvoid exit_terminfo(int \fIcode\fB);\fR
+ .sp
+ /* deprecated (intentionally not declared in curses.h or term.h) */
+ .br
+ \fBvoid _nc_freeall(void);\fP
+ .br
+-\fBvoid _nc_free_and_exit(int \fP\fIcode\fP\fB);\fP
++\fBvoid _nc_free_and_exit(int \fIcode\fB);\fR
+ .br
+-\fBvoid _nc_free_tinfo(int \fP\fIcode\fP\fB);\fP
++\fBvoid _nc_free_tinfo(int \fIcode\fB);\fR
+ .SH DESCRIPTION
+ These functions are used to simplify analysis of memory leaks in the ncurses
+ library.
+Index: man/curs_mouse.3x
+Prereq:  1.58 
+--- ncurses-6.3-20220205+/man/curs_mouse.3x	2022-01-16 01:40:48.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_mouse.3x	2022-02-12 20:05:11.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
++.\" Copyright 2018-2022,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_mouse.3x,v 1.58 2022/01/16 01:40:48 tom Exp $
++.\" $Id: curs_mouse.3x,v 1.59 2022/02/12 20:05:11 tom Exp $
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+ .ie \n(.g .ds '' \(rq
+@@ -69,28 +69,28 @@
+ .PP
+ .nf
+ \fBtypedef struct {\fP
+-\fB    short id;         \fP\fI/* ID to distinguish multiple devices */\fP
+-\fB    int x, y, z;      \fP\fI/* event coordinates */\fP
+-\fB    mmask_t bstate;   \fP\fI/* button state bits */\fP
++\fB    short id;         \fI/* ID to distinguish multiple devices */\fR
++\fB    int x, y, z;      \fI/* event coordinates */\fR
++\fB    mmask_t bstate;   \fI/* button state bits */\fR
+ \fB} MEVENT;\fP
+ .fi
+ .PP
+ \fBbool has_mouse(void);\fP
+ .sp
+-\fBint getmouse(MEVENT *\fP\fIevent\fP\fB);\fP
++\fBint getmouse(MEVENT *\fIevent\fB);\fR
+ .br
+-\fBint ungetmouse(MEVENT *\fP\fIevent\fP\fB);\fP
++\fBint ungetmouse(MEVENT *\fIevent\fB);\fR
+ .sp
+-\fBmmask_t mousemask(mmask_t \fP\fInewmask\fP\fB, mmask_t *\fP\fIoldmask\fP\fB);\fP
++\fBmmask_t mousemask(mmask_t \fInewmask\fB, mmask_t *\fIoldmask\fB);\fR
+ .sp
+-\fBbool wenclose(const WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fP
++\fBbool wenclose(const WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
+ .sp
+-\fBbool mouse_trafo(int* \fP\fIpY\fP\fB, int* \fP\fIpX\fP\fB, bool \fP\fIto_screen\fP\fB);\fP
++\fBbool mouse_trafo(int* \fIpY\fB, int* \fIpX\fB, bool \fIto_screen\fB);\fR
+ .br
+-\fBbool wmouse_trafo(const WINDOW* \fP\fIwin\fP\fB,\fP
+-                  \fBint* \fP\fIpY\fP\fB, int* \fP\fIpX\fP\fB, bool \fP\fIto_screen\fP\fB);\fP
++\fBbool wmouse_trafo(const WINDOW* \fIwin\fB,\fR
++                  \fBint* \fIpY\fB, int* \fIpX\fB, bool \fIto_screen\fB);\fR
+ .sp
+-\fBint mouseinterval(int \fP\fIerval\fP\fB);\fP
++\fBint mouseinterval(int \fIerval\fB);\fR
+ .br
+ .SH DESCRIPTION
+ These functions provide an interface to mouse events from
+Index: man/curs_move.3x
+Prereq:  1.21 
+--- ncurses-6.3-20220205+/man/curs_move.3x	2021-12-25 21:41:58.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_move.3x	2022-02-12 20:05:11.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_move.3x,v 1.21 2021/12/25 21:41:58 tom Exp $
++.\" $Id: curs_move.3x,v 1.22 2022/02/12 20:05:11 tom Exp $
+ .TH curs_move 3X ""
+ .na
+ .hy 0
+@@ -39,9 +39,9 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint move(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fP
++\fBint move(int \fIy\fB, int \fIx\fB);\fR
+ .br
+-\fBint wmove(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fP
++\fBint wmove(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
+ .br
+ .SH DESCRIPTION
+ These routines move the cursor associated with the window to line \fIy\fP and
+Index: man/curs_opaque.3x
+Prereq:  1.17 
+--- ncurses-6.3-20220205+/man/curs_opaque.3x	2021-12-25 21:50:36.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_opaque.3x	2022-02-12 20:05:11.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2020,2021 Thomas E. Dickey                                     *
++.\" Copyright 2020-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 2007-2014,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_opaque.3x,v 1.17 2021/12/25 21:50:36 tom Exp $
++.\" $Id: curs_opaque.3x,v 1.18 2022/02/12 20:05:11 tom Exp $
+ .TH curs_opaque 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -56,35 +56,35 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBbool is_cleared(const WINDOW *\fP\fIwin\fP\fB);\fP
++\fBbool is_cleared(const WINDOW *\fIwin\fB);\fR
+ .br
+-\fBbool is_idcok(const WINDOW *\fP\fIwin\fP\fB);\fP
++\fBbool is_idcok(const WINDOW *\fIwin\fB);\fR
+ .br
+-\fBbool is_idlok(const WINDOW *\fP\fIwin\fP\fB);\fP
++\fBbool is_idlok(const WINDOW *\fIwin\fB);\fR
+ .br
+-\fBbool is_immedok(const WINDOW *\fP\fIwin\fP\fB);\fP
++\fBbool is_immedok(const WINDOW *\fIwin\fB);\fR
+ .br
+-\fBbool is_keypad(const WINDOW *\fP\fIwin\fP\fB);\fP
++\fBbool is_keypad(const WINDOW *\fIwin\fB);\fR
+ .br
+-\fBbool is_leaveok(const WINDOW *\fP\fIwin\fP\fB);\fP
++\fBbool is_leaveok(const WINDOW *\fIwin\fB);\fR
+ .br
+-\fBbool is_nodelay(const WINDOW *\fP\fIwin\fP\fB);\fP
++\fBbool is_nodelay(const WINDOW *\fIwin\fB);\fR
+ .br
+-\fBbool is_notimeout(const WINDOW *\fP\fIwin\fP\fB);\fP
++\fBbool is_notimeout(const WINDOW *\fIwin\fB);\fR
+ .br
+-\fBbool is_pad(const WINDOW *\fP\fIwin\fP\fB);\fP
++\fBbool is_pad(const WINDOW *\fIwin\fB);\fR
+ .br
+-\fBbool is_scrollok(const WINDOW *\fP\fIwin\fP\fB);\fP
++\fBbool is_scrollok(const WINDOW *\fIwin\fB);\fR
+ .br
+-\fBbool is_subwin(const WINDOW *\fP\fIwin\fP\fB);\fP
++\fBbool is_subwin(const WINDOW *\fIwin\fB);\fR
+ .br
+-\fBbool is_syncok(const WINDOW *\fP\fIwin\fP\fB);\fP
++\fBbool is_syncok(const WINDOW *\fIwin\fB);\fR
+ .br
+-\fBWINDOW * wgetparent(const WINDOW *\fP\fIwin\fP\fB);\fP
++\fBWINDOW * wgetparent(const WINDOW *\fIwin\fB);\fR
+ .br
+-\fBint wgetdelay(const WINDOW *\fP\fIwin\fP\fB);\fP
++\fBint wgetdelay(const WINDOW *\fIwin\fB);\fR
+ .br
+-\fBint wgetscrreg(const WINDOW *\fP\fIwin\fP\fB, int *\fP\fItop\fP\fB, int *\fP\fIbottom\fP\fB);\fP
++\fBint wgetscrreg(const WINDOW *\fIwin\fB, int *\fItop\fB, int *\fIbottom\fB);\fR
+ .br
+ .SH DESCRIPTION
+ This implementation provides functions which return properties
+Index: man/curs_outopts.3x
+Prereq:  1.35 
+--- ncurses-6.3-20220205+/man/curs_outopts.3x	2021-12-25 21:41:58.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_outopts.3x	2022-02-12 20:05:11.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_outopts.3x,v 1.35 2021/12/25 21:41:58 tom Exp $
++.\" $Id: curs_outopts.3x,v 1.36 2022/02/12 20:05:11 tom Exp $
+ .TH curs_outopts 3X ""
+ .na
+ .hy 0
+@@ -49,21 +49,21 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint clearok(WINDOW *\fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fP
++\fBint clearok(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
+ .br
+-\fBint idlok(WINDOW *\fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fP
++\fBint idlok(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
+ .br
+-\fBvoid idcok(WINDOW *\fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fP
++\fBvoid idcok(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
+ .br
+-\fBvoid immedok(WINDOW *\fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fP
++\fBvoid immedok(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
+ .br
+-\fBint leaveok(WINDOW *\fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fP
++\fBint leaveok(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
+ .br
+-\fBint scrollok(WINDOW *\fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fP
++\fBint scrollok(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
+ .sp
+-\fBint setscrreg(int \fP\fItop\fP\fB, int \fP\fIbot\fP\fB);\fP
++\fBint setscrreg(int \fItop\fB, int \fIbot\fB);\fR
+ .br
+-\fBint wsetscrreg(WINDOW *\fP\fIwin\fP\fB, int \fP\fItop\fP\fB, int \fP\fIbot\fP\fB);\fP
++\fBint wsetscrreg(WINDOW *\fIwin\fB, int \fItop\fB, int \fIbot\fB);\fR
+ .br
+ .SH DESCRIPTION
+ .PP
+Index: man/curs_overlay.3x
+Prereq:  1.21 
+--- ncurses-6.3-20220205+/man/curs_overlay.3x	2021-12-25 21:50:36.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_overlay.3x	2022-02-12 20:05:11.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2020,2021 Thomas E. Dickey                                     *
++.\" Copyright 2020-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2013,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_overlay.3x,v 1.21 2021/12/25 21:50:36 tom Exp $
++.\" $Id: curs_overlay.3x,v 1.22 2022/02/12 20:05:11 tom Exp $
+ .TH curs_overlay 3X ""
+ .na
+ .hy 0
+@@ -40,13 +40,13 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint overlay(const WINDOW *\fP\fIsrcwin\fP\fB, WINDOW *\fP\fIdstwin\fP\fB);\fP
++\fBint overlay(const WINDOW *\fIsrcwin\fB, WINDOW *\fIdstwin\fB);\fR
+ .br
+-\fBint overwrite(const WINDOW *\fP\fIsrcwin\fP\fB, WINDOW *\fP\fIdstwin\fP\fB);\fP
++\fBint overwrite(const WINDOW *\fIsrcwin\fB, WINDOW *\fIdstwin\fB);\fR
+ .br
+-\fBint copywin(const WINDOW *\fP\fIsrcwin\fP\fB, WINDOW *\fP\fIdstwin\fP\fB, int \fP\fIsminrow\fP\fB,\fP
+-      \fBint \fP\fIsmincol\fP\fB, int \fP\fIdminrow\fP\fB, int \fP\fIdmincol\fP\fB, int \fP\fIdmaxrow\fP\fB,\fP
+-      \fBint \fP\fIdmaxcol\fP\fB, int \fP\fIoverlay\fP\fB);\fP
++\fBint copywin(const WINDOW *\fIsrcwin\fB, WINDOW *\fIdstwin\fB, int \fIsminrow\fB,\fR
++      \fBint \fIsmincol\fB, int \fIdminrow\fB, int \fIdmincol\fB, int \fIdmaxrow\fB,\fR
++      \fBint \fIdmaxcol\fB, int \fIoverlay\fB);\fR
+ .SH DESCRIPTION
+ .SS overlay, overwrite
+ The \fBoverlay\fP and \fBoverwrite\fP routines overlay \fIsrcwin\fP on
+Index: man/curs_pad.3x
+Prereq:  1.28 
+--- ncurses-6.3-20220205+/man/curs_pad.3x	2021-12-25 21:41:58.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_pad.3x	2022-02-12 20:05:11.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_pad.3x,v 1.28 2021/12/25 21:41:58 tom Exp $
++.\" $Id: curs_pad.3x,v 1.29 2022/02/12 20:05:11 tom Exp $
+ .de bP
+ .ie n  .IP \(bu 4
+ .el    .IP \(bu 2
+@@ -47,20 +47,20 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBWINDOW *newpad(int \fP\fInlines\fP\fB, int \fP\fIncols\fP\fB);\fP
++\fBWINDOW *newpad(int \fInlines\fB, int \fIncols\fB);\fR
+ .br
+-\fBWINDOW *subpad(WINDOW *\fP\fIorig\fP\fB, int \fP\fInlines\fP\fB, int \fP\fIncols\fP\fB,\fP
+-      \fBint \fP\fIbegin_y\fP\fB, int \fP\fIbegin_x\fP\fB);\fP
++\fBWINDOW *subpad(WINDOW *\fIorig\fB, int \fInlines\fB, int \fIncols\fB,\fR
++      \fBint \fIbegin_y\fB, int \fIbegin_x\fB);\fR
+ .br
+-\fBint prefresh(WINDOW *\fP\fIpad\fP\fB, int \fP\fIpminrow\fP\fB, int \fP\fIpmincol\fP\fB,\fP
+-      \fBint \fP\fIsminrow\fP\fB, int \fP\fIsmincol\fP\fB, int \fP\fIsmaxrow\fP\fB, int \fP\fIsmaxcol\fP\fB);\fP
++\fBint prefresh(WINDOW *\fIpad\fB, int \fIpminrow\fB, int \fIpmincol\fB,\fR
++      \fBint \fIsminrow\fB, int \fIsmincol\fB, int \fIsmaxrow\fB, int \fIsmaxcol\fB);\fR
+ .br
+-\fBint pnoutrefresh(WINDOW *\fP\fIpad\fP\fB, int \fP\fIpminrow\fP\fB, int \fP\fIpmincol\fP\fB,\fP
+-      \fBint \fP\fIsminrow\fP\fB, int \fP\fIsmincol\fP\fB, int \fP\fIsmaxrow\fP\fB, int \fP\fIsmaxcol\fP\fB);\fP
++\fBint pnoutrefresh(WINDOW *\fIpad\fB, int \fIpminrow\fB, int \fIpmincol\fB,\fR
++      \fBint \fIsminrow\fB, int \fIsmincol\fB, int \fIsmaxrow\fB, int \fIsmaxcol\fB);\fR
+ .br
+-\fBint pechochar(WINDOW *\fP\fIpad\fP\fB, chtype \fP\fIch\fP\fB);\fP
++\fBint pechochar(WINDOW *\fIpad\fB, chtype \fIch\fB);\fR
+ .br
+-\fBint pecho_wchar(WINDOW *\fP\fIpad\fP\fB, const cchar_t *\fP\fIwch\fP\fB);\fP
++\fBint pecho_wchar(WINDOW *\fIpad\fB, const cchar_t *\fIwch\fB);\fR
+ .SH DESCRIPTION
+ .SS newpad
+ The \fBnewpad\fP routine creates and returns a pointer to a new pad data
+@@ -85,7 +85,7 @@
+ The \fBsubpad\fP routine creates and returns a pointer to a subwindow within a
+ pad with the given number of lines, \fInlines\fP, and columns, \fIncols\fP.
+ Unlike \fBsubwin\fP, which uses screen coordinates, the window is at position
+-(\fIbegin\fR_\fIx\fP\fB,\fP \fIbegin\fR_\fIy\fP) on the pad.
++(\fIbegin\fR_\fIx\fB,\fR \fIbegin\fR_\fIy\fR) on the pad.
+ The window is
+ made in the middle of the window \fIorig\fP, so that changes made to one window
+ affect both windows.
+Index: man/curs_print.3x
+Prereq:  1.18 
+--- ncurses-6.3-20220205+/man/curs_print.3x	2021-12-25 21:41:58.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_print.3x	2022-02-12 20:05:11.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,14 +27,14 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_print.3x,v 1.18 2021/12/25 21:41:58 tom Exp $
++.\" $Id: curs_print.3x,v 1.19 2022/02/12 20:05:11 tom Exp $
+ .TH curs_print 3X ""
+ .SH NAME
+ \fBmcprint\fP \- ship binary data to printer
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint mcprint(char *\fP\fIdata\fP\fB, int \fP\fIlen\fP\fB);\fP
++\fBint mcprint(char *\fIdata\fB, int \fIlen\fB);\fR
+ .SH DESCRIPTION
+ This function uses the \fBmc5p\fP or \fBmc4\fP and \fBmc5\fP capabilities,
+ if they are present, to ship given data to a printer attached to the terminal.
+Index: man/curs_printw.3x
+Prereq:  1.31 
+--- ncurses-6.3-20220205+/man/curs_printw.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_printw.3x	2022-02-12 20:05:11.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_printw.3x,v 1.31 2021/12/25 21:49:32 tom Exp $
++.\" $Id: curs_printw.3x,v 1.32 2022/02/12 20:05:11 tom Exp $
+ .TH curs_printw 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -50,19 +50,19 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint printw(const char *\fP\fIfmt\fP\fB, ...);\fP
++\fBint printw(const char *\fIfmt\fB, ...);\fR
+ .br
+-\fBint wprintw(WINDOW *\fP\fIwin\fP\fB, const char *\fP\fIfmt\fP\fB, ...);\fP
++\fBint wprintw(WINDOW *\fIwin\fB, const char *\fIfmt\fB, ...);\fR
+ .br
+-\fBint mvprintw(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const char *\fP\fIfmt\fP\fB, ...);\fP
++\fBint mvprintw(int \fIy\fB, int \fIx\fB, const char *\fIfmt\fB, ...);\fR
+ .br
+-\fBint mvwprintw(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const char *\fP\fIfmt\fP\fB, ...);\fP
++\fBint mvwprintw(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const char *\fIfmt\fB, ...);\fR
+ .br
+-\fBint vw_printw(WINDOW *\fP\fIwin\fP\fB, const char *\fP\fIfmt\fP\fB, va_list \fP\fIvarglist\fP\fB);\fP
++\fBint vw_printw(WINDOW *\fIwin\fB, const char *\fIfmt\fB, va_list \fIvarglist\fB);\fR
+ .sp
+ /* obsolete */
+ .br
+-\fBint vwprintw(WINDOW *\fP\fIwin\fP\fB, const char *\fP\fIfmt\fP\fB, va_list \fP\fIvarglist\fP\fB);\fP
++\fBint vwprintw(WINDOW *\fIwin\fB, const char *\fIfmt\fB, va_list \fIvarglist\fB);\fR
+ .SH DESCRIPTION
+ The \fBprintw\fP, \fBwprintw\fP, \fBmvprintw\fP and \fBmvwprintw\fP
+ routines are analogous to \fBprintf\fP [see \fBprintf\fP(3)].
+Index: man/curs_refresh.3x
+Prereq:  1.24 
+--- ncurses-6.3-20220205+/man/curs_refresh.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_refresh.3x	2022-02-12 20:05:11.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2016 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_refresh.3x,v 1.24 2021/12/25 21:49:32 tom Exp $
++.\" $Id: curs_refresh.3x,v 1.25 2022/02/12 20:05:11 tom Exp $
+ .TH curs_refresh 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -53,15 +53,15 @@
+ .sp
+ \fBint refresh(void);\fP
+ .br
+-\fBint wrefresh(WINDOW *\fP\fIwin\fP\fB);\fP
++\fBint wrefresh(WINDOW *\fIwin\fB);\fR
+ .br
+-\fBint wnoutrefresh(WINDOW *\fP\fIwin\fP\fB);\fP
++\fBint wnoutrefresh(WINDOW *\fIwin\fB);\fR
+ .br
+ \fBint doupdate(void);\fP
+ .sp
+-\fBint redrawwin(WINDOW *\fP\fIwin\fP\fB);\fP
++\fBint redrawwin(WINDOW *\fIwin\fB);\fR
+ .br
+-\fBint wredrawln(WINDOW *\fP\fIwin\fP\fB, int \fP\fIbeg_line\fP\fB, int \fP\fInum_lines\fP\fB);\fP
++\fBint wredrawln(WINDOW *\fIwin\fB, int \fIbeg_line\fB, int \fInum_lines\fB);\fR
+ .br
+ .SH DESCRIPTION
+ .SS refresh/wrefresh
+Index: man/curs_scanw.3x
+Prereq:  1.31 
+--- ncurses-6.3-20220205+/man/curs_scanw.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_scanw.3x	2022-02-12 20:05:11.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_scanw.3x,v 1.31 2021/12/25 21:49:32 tom Exp $
++.\" $Id: curs_scanw.3x,v 1.32 2022/02/12 20:05:11 tom Exp $
+ .TH curs_scanw 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -46,19 +46,19 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint scanw(const char *\fP\fIfmt\fP\fB, ...);\fP
++\fBint scanw(const char *\fIfmt\fB, ...);\fR
+ .br
+-\fBint wscanw(WINDOW *\fP\fIwin\fP\fB, const char *\fP\fIfmt\fP\fB, ...);\fP
++\fBint wscanw(WINDOW *\fIwin\fB, const char *\fIfmt\fB, ...);\fR
+ .br
+-\fBint mvscanw(int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const char *\fP\fIfmt\fP\fB, ...);\fP
++\fBint mvscanw(int \fIy\fB, int \fIx\fB, const char *\fIfmt\fB, ...);\fR
+ .br
+-\fBint mvwscanw(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB, const char *\fP\fIfmt\fP\fB, ...);\fP
++\fBint mvwscanw(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB, const char *\fIfmt\fB, ...);\fR
+ .sp
+-\fBint vw_scanw(WINDOW *\fP\fIwin\fP\fB, const char *\fP\fIfmt\fP\fB, va_list \fP\fIvarglist\fP\fB);\fP
++\fBint vw_scanw(WINDOW *\fIwin\fB, const char *\fIfmt\fB, va_list \fIvarglist\fB);\fR
+ .sp
+ /* obsolete */
+ .br
+-\fBint vwscanw(WINDOW *\fP\fIwin\fP\fB, const char *\fP\fIfmt\fP\fB, va_list \fP\fIvarglist\fP\fB);\fP
++\fBint vwscanw(WINDOW *\fIwin\fB, const char *\fIfmt\fB, va_list \fIvarglist\fB);\fR
+ .SH DESCRIPTION
+ The \fBscanw\fP, \fBwscanw\fP and \fBmvscanw\fP routines are analogous to
+ \fBscanf\fP [see \fBscanf\fP(3)].
+Index: man/curs_scr_dump.3x
+Prereq:  1.19 
+--- ncurses-6.3-20220205+/man/curs_scr_dump.3x	2021-12-25 21:12:41.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_scr_dump.3x	2022-02-12 20:05:11.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_scr_dump.3x,v 1.19 2021/12/25 21:12:41 tom Exp $
++.\" $Id: curs_scr_dump.3x,v 1.20 2022/02/12 20:05:11 tom Exp $
+ .TH curs_scr_dump 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -49,13 +49,13 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint scr_dump(const char *\fP\fIfilename\fP\fB);\fP
++\fBint scr_dump(const char *\fIfilename\fB);\fR
+ .br
+-\fBint scr_restore(const char *\fP\fIfilename\fP\fB);\fP
++\fBint scr_restore(const char *\fIfilename\fB);\fR
+ .br
+-\fBint scr_init(const char *\fP\fIfilename\fP\fB);\fP
++\fBint scr_init(const char *\fIfilename\fB);\fR
+ .br
+-\fBint scr_set(const char *\fP\fIfilename\fP\fB);\fP
++\fBint scr_set(const char *\fIfilename\fB);\fR
+ .br
+ .SH DESCRIPTION
+ .SS scr_dump
+Index: man/curs_scroll.3x
+Prereq:  1.21 
+--- ncurses-6.3-20220205+/man/curs_scroll.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_scroll.3x	2022-02-12 20:05:11.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_scroll.3x,v 1.21 2021/12/25 21:49:32 tom Exp $
++.\" $Id: curs_scroll.3x,v 1.22 2022/02/12 20:05:11 tom Exp $
+ .TH curs_scroll 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -44,11 +44,11 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint scroll(WINDOW *\fP\fIwin\fP\fB);\fP
++\fBint scroll(WINDOW *\fIwin\fB);\fR
+ .sp
+-\fBint scrl(int \fP\fIn\fP\fB);\fP
++\fBint scrl(int \fIn\fB);\fR
+ .br
+-\fBint wscrl(WINDOW *\fP\fIwin\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint wscrl(WINDOW *\fIwin\fB, int \fIn\fB);\fR
+ .br
+ .SH DESCRIPTION
+ The \fBscroll\fP routine scrolls the window up one line.
+Index: man/curs_slk.3x
+Prereq:  1.39 
+--- ncurses-6.3-20220205+/man/curs_slk.3x	2021-12-25 17:39:16.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_slk.3x	2022-02-12 20:05:11.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_slk.3x,v 1.39 2021/12/25 17:39:16 tom Exp $
++.\" $Id: curs_slk.3x,v 1.40 2022/02/12 20:05:11 tom Exp $
+ .TH curs_slk 3X ""
+ .de bP
+ .ie n  .IP \(bu 4
+@@ -59,15 +59,15 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint slk_init(int \fP\fIfmt\fP\fB);\fP
++\fBint slk_init(int \fIfmt\fB);\fR
+ .sp
+-\fBint slk_set(int \fP\fIlabnum\fP\fB, const char *\fP\fIlabel\fP\fB, int \fP\fIfmt\fP\fB);\fP
++\fBint slk_set(int \fIlabnum\fB, const char *\fIlabel\fB, int \fIfmt\fB);\fR
+ .br
+ /* extension */
+ .br
+-\fBint slk_wset(int \fP\fIlabnum\fP\fB, const wchar_t *\fP\fIlabel\fP\fB, int \fP\fIfmt\fP\fB);\fP
++\fBint slk_wset(int \fIlabnum\fB, const wchar_t *\fIlabel\fB, int \fIfmt\fB);\fR
+ .sp
+-\fBchar *slk_label(int \fP\fIlabnum\fP\fB);\fP
++\fBchar *slk_label(int \fIlabnum\fB);\fR
+ .sp
+ \fBint slk_refresh(void);\fP
+ .br
+@@ -79,25 +79,25 @@
+ .br
+ \fBint slk_touch(void);\fP
+ .sp
+-\fBint slk_attron(const chtype \fP\fIattrs\fP\fB);\fP
++\fBint slk_attron(const chtype \fIattrs\fB);\fR
+ .br
+-\fBint slk_attroff(const chtype \fP\fIattrs\fP\fB);\fP
++\fBint slk_attroff(const chtype \fIattrs\fB);\fR
+ .br
+-\fBint slk_attrset(const chtype \fP\fIattrs\fP\fB);\fP
++\fBint slk_attrset(const chtype \fIattrs\fB);\fR
+ .br
+-\fBint slk_attr_on(attr_t \fP\fIattrs\fP\fB, void* \fP\fIopts\fP\fB);\fP
++\fBint slk_attr_on(attr_t \fIattrs\fB, void* \fIopts\fB);\fR
+ .br
+-\fBint slk_attr_off(const attr_t \fP\fIattrs\fP\fB, void * \fP\fIopts\fP\fB);\fP
++\fBint slk_attr_off(const attr_t \fIattrs\fB, void * \fIopts\fB);\fR
+ .br
+-\fBint slk_attr_set(const attr_t \fP\fIattrs\fP\fB, short \fP\fIpair\fP\fB, void* \fP\fIopts\fP\fB);\fP
++\fBint slk_attr_set(const attr_t \fIattrs\fB, short \fIpair\fB, void* \fIopts\fB);\fR
+ .sp
+ \fBattr_t slk_attr(void);\fP
+ .sp
+-\fBint slk_color(short \fP\fIpair\fP\fB);\fP
++\fBint slk_color(short \fIpair\fB);\fR
+ .br
+ /* extension */
+ .br
+-\fBint extended_slk_color(int \fP\fIpair\fP\fB);\fP
++\fBint extended_slk_color(int \fIpair\fB);\fR
+ .SH DESCRIPTION
+ The slk* functions manipulate the set of soft function-key labels that exist on
+ many terminals.
+Index: man/curs_sp_funcs.3x
+Prereq:  1.26 
+--- ncurses-6.3-20220205+/man/curs_sp_funcs.3x	2021-12-25 17:54:00.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_sp_funcs.3x	2022-02-12 20:05:11.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 2010-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_sp_funcs.3x,v 1.26 2021/12/25 17:54:00 tom Exp $
++.\" $Id: curs_sp_funcs.3x,v 1.27 2022/02/12 20:05:11 tom Exp $
+ .TH curs_sp_funcs 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -43,279 +43,279 @@
+ \fB#include \fP
+ .nf
+ .sp
+-\fBint alloc_pair_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIfg\fP\fB, int \fP\fIbg\fP\fB);\fP
++\fBint alloc_pair_sp(SCREEN* \fIsp\fB, int \fIfg\fB, int \fIbg\fB);\fR
+ .br
+-\fBint assume_default_colors_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIfg\fP\fB, int \fP\fIbg\fP\fB);\fP
++\fBint assume_default_colors_sp(SCREEN* \fIsp\fB, int \fIfg\fB, int \fIbg\fB);\fR
+ .br
+-\fBint baudrate_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBint baudrate_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBint beep_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBint beep_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBbool can_change_color_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBbool can_change_color_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBint cbreak_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBint cbreak_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBint color_content_sp(SCREEN* \fP\fIsp\fP\fB, short \fP\fIcolor\fP\fB, short* \fP\fIr\fP\fB, short* \fP\fIg\fP\fB, short* \fP\fIb\fP\fB);\fP
++\fBint color_content_sp(SCREEN* \fIsp\fB, short \fIcolor\fB, short* \fIr\fB, short* \fIg\fB, short* \fIb\fB);\fR
+ .br
+-\fBint curs_set_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIvisibility\fP);\fP
++\fBint curs_set_sp(SCREEN* \fIsp\fB, int \fIvisibility\fR);\fR
+ .br
+-\fBint def_prog_mode_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBint def_prog_mode_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBint def_shell_mode_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBint def_shell_mode_sp(SCREEN* \fIsp\fB);\fR
+ .sp
+-\fBint define_key_sp(SCREEN* \fP\fIsp\fP\fB, const char * \fP\fIdefinition\fP\fB, int \fP\fIkeycode\fP\fB);\fP
++\fBint define_key_sp(SCREEN* \fIsp\fB, const char * \fIdefinition\fB, int \fIkeycode\fB);\fR
+ .br
+-\fBint delay_output_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIms\fP\fB);\fP
++\fBint delay_output_sp(SCREEN* \fIsp\fB, int \fIms\fB);\fR
+ .br
+-\fBint doupdate_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBint doupdate_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBint echo_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBint echo_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBint endwin_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBint endwin_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBchar erasechar_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBchar erasechar_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBint erasewchar_sp(SCREEN* \fP\fIsp\fP\fB, wchar_t *\fP\fIch\fP\fB);\fP
++\fBint erasewchar_sp(SCREEN* \fIsp\fB, wchar_t *\fIch\fB);\fR
+ .br
+-\fBint extended_color_content_sp(SCREEN * \fP\fIsp\fP\fB, int \fP\fIcolor\fP\fB, int * \fP\fIr\fP\fB, int * \fP\fIg\fP\fB, int * \fP\fIb\fP\fB);\fP
++\fBint extended_color_content_sp(SCREEN * \fIsp\fB, int \fIcolor\fB, int * \fIr\fB, int * \fIg\fB, int * \fIb\fB);\fR
+ .br
+-\fBint extended_pair_content_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIpair\fP\fB, int * \fP\fIfg\fP\fB, int * \fP\fIbg\fP\fB);\fP
++\fBint extended_pair_content_sp(SCREEN* \fIsp\fB, int \fIpair\fB, int * \fIfg\fB, int * \fIbg\fB);\fR
+ .br
+-\fBint extended_slk_color_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIpair\fP\fB);\fP
++\fBint extended_slk_color_sp(SCREEN* \fIsp\fB, int \fIpair\fB);\fR
+ .sp
+-\fBvoid filter_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBvoid filter_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBint find_pair_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIfg\fP\fB, int \fP\fIbg\fP\fB);\fP
++\fBint find_pair_sp(SCREEN* \fIsp\fB, int \fIfg\fB, int \fIbg\fB);\fR
+ .br
+-\fBint flash_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBint flash_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBint flushinp_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBint flushinp_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBint free_pair_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIpair\fP\fB);\fP
++\fBint free_pair_sp(SCREEN* \fIsp\fB, int \fIpair\fB);\fR
+ .br
+-\fBint get_escdelay_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBint get_escdelay_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBint getmouse_sp(SCREEN* \fP\fIsp\fP\fB, MEVENT* \fP\fBevent\fP\fB);\fP
++\fBint getmouse_sp(SCREEN* \fIsp\fB, MEVENT* \fBevent\fB);\fR
+ .br
+-\fBWINDOW* getwin_sp(SCREEN* \fP\fIsp\fP\fB, FILE* \fP\fIfilep\fP\fB);\fP
++\fBWINDOW* getwin_sp(SCREEN* \fIsp\fB, FILE* \fIfilep\fB);\fR
+ .br
+-\fBint halfdelay_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fItenths\fP\fB);\fP
++\fBint halfdelay_sp(SCREEN* \fIsp\fB, int \fItenths\fB);\fR
+ .br
+-\fBbool has_colors_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBbool has_colors_sp(SCREEN* \fIsp\fB);\fR
+ .sp
+-\fBbool has_ic_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBbool has_ic_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBbool has_il_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBbool has_il_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBint has_key_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIch\fP\fB);\fP
++\fBint has_key_sp(SCREEN* \fIsp\fB, int \fIch\fB);\fR
+ .br
+-\fBbool has_mouse_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBbool has_mouse_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBint init_color_sp(SCREEN* \fP\fIsp\fP\fB, short \fP\fIcolor\fP\fB, short \fP\fIr\fP\fB, short \fP\fIg\fP\fB, short \fP\fIb\fP\fB);\fP
++\fBint init_color_sp(SCREEN* \fIsp\fB, short \fIcolor\fB, short \fIr\fB, short \fIg\fB, short \fIb\fB);\fR
+ .br
+-\fBint init_extended_color_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIcolor\fP\fB, int \fP\fIr\fP\fB, int \fP\fIg\fP\fB, int \fP\fIb\fP\fB);\fP
++\fBint init_extended_color_sp(SCREEN* \fIsp\fB, int \fIcolor\fB, int \fIr\fB, int \fIg\fB, int \fIb\fB);\fR
+ .br
+-\fBint init_extended_pair_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIpair\fP\fB, int \fP\fIfg\fP\fB, int \fP\fIbg\fP\fB);\fP
++\fBint init_extended_pair_sp(SCREEN* \fIsp\fB, int \fIpair\fB, int \fIfg\fB, int \fIbg\fB);\fR
+ .br
+-\fBint init_pair_sp(SCREEN* \fP\fIsp\fP\fB, short \fP\fIpair\fP\fB, short \fP\fIfg\fP\fB, short \fP\fIbg\fP\fB);\fP
++\fBint init_pair_sp(SCREEN* \fIsp\fB, short \fIpair\fB, short \fIfg\fB, short \fIbg\fB);\fR
+ .br
+-\fBint intrflush_sp(SCREEN* \fP\fIsp\fP\fB, WINDOW* \fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fP
++\fBint intrflush_sp(SCREEN* \fIsp\fB, WINDOW* \fIwin\fB, bool \fIbf\fB);\fR
+ .br
+-\fBbool is_term_resized_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIlines\fP\fB, int \fP\fIcolumns\fP\fB);\fP
++\fBbool is_term_resized_sp(SCREEN* \fIsp\fB, int \fIlines\fB, int \fIcolumns\fB);\fR
+ .sp
+-\fBbool isendwin_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBbool isendwin_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBint key_defined_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIdefinition\fP\fB);\fP
++\fBint key_defined_sp(SCREEN* \fIsp\fB, const char *\fIdefinition\fB);\fR
+ .br
+-\fBchar* keybound_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIkeycode\fP\fB, int \fP\fIcount\fP\fB);\fP
++\fBchar* keybound_sp(SCREEN* \fIsp\fB, int \fIkeycode\fB, int \fIcount\fB);\fR
+ .br
+-\fBNCURSES_CONST char * keyname_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIc\fP\fB);\fP
++\fBNCURSES_CONST char * keyname_sp(SCREEN* \fIsp\fB, int \fIc\fB);\fR
+ .br
+-\fBint keyok_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIkeycode\fP\fB, bool \fP\fIenable\fP\fB);\fP
++\fBint keyok_sp(SCREEN* \fIsp\fB, int \fIkeycode\fB, bool \fIenable\fB);\fR
+ .br
+-\fBchar killchar_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBchar killchar_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBint killwchar_sp(SCREEN* \fP\fIsp\fP\fB, wchar_t *\fP\fIch\fP\fB);\fP
++\fBint killwchar_sp(SCREEN* \fIsp\fB, wchar_t *\fIch\fB);\fR
+ .br
+-\fBchar* longname_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBchar* longname_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBint mcprint_sp(SCREEN* \fP\fIsp\fP\fB, char *\fP\fIdata\fP\fB, int \fP\fIlen\fP\fB);\fP
++\fBint mcprint_sp(SCREEN* \fIsp\fB, char *\fIdata\fB, int \fIlen\fB);\fR
+ .br
+-\fBint mouseinterval_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIerval\fP\fB);\fP
++\fBint mouseinterval_sp(SCREEN* \fIsp\fB, int \fIerval\fB);\fR
+ .sp
+-\fBmmask_t mousemask_sp(SCREEN* \fP\fIsp\fP\fB, mmask_t \fP\fInewmask\fP\fB, mmask_t *\fP\fIoldmask\fP\fB);\fP
++\fBmmask_t mousemask_sp(SCREEN* \fIsp\fB, mmask_t \fInewmask\fB, mmask_t *\fIoldmask\fB);\fR
+ .br
+-\fBint mvcur_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIoldrow\fP\fB, int \fP\fIoldcol\fP\fB, int \fP\fInewrow\fP\fB, int \fP\fInewcol\fP\fB);\fP
++\fBint mvcur_sp(SCREEN* \fIsp\fB, int \fIoldrow\fB, int \fIoldcol\fB, int \fInewrow\fB, int \fInewcol\fB);\fR
+ .br
+-\fBint napms_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIms\fP\fB);\fP
++\fBint napms_sp(SCREEN* \fIsp\fB, int \fIms\fB);\fR
+ .br
+-\fBWINDOW* newpad_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fInrows\fP\fB, int \fP\fIncols\fP\fB);\fP
++\fBWINDOW* newpad_sp(SCREEN* \fIsp\fB, int \fInrows\fB, int \fIncols\fB);\fR
+ .br
+ \fBSCREEN* new_prescr(void);\fP
+ .br
+-\fBSCREEN* newterm_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fItype\fP\fB, FILE *\fP\fIoutfd\fP\fB, FILE *\fP\fIinfd\fP\fB);\fP
++\fBSCREEN* newterm_sp(SCREEN* \fIsp\fB, const char *\fItype\fB, FILE *\fIoutfd\fB, FILE *\fIinfd\fB);\fR
+ .br
+-\fBWINDOW* newwin_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fInlines\fP\fB, int \fP\fIncols\fP\fB, int \fP\fIbegin_y\fP\fB, int \fP\fIbegin_x\fP\fB);\fP
++\fBWINDOW* newwin_sp(SCREEN* \fIsp\fB, int \fInlines\fB, int \fIncols\fB, int \fIbegin_y\fB, int \fIbegin_x\fB);\fR
+ .br
+-\fBint nl_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBint nl_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBint nocbreak_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBint nocbreak_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBint noecho_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBint noecho_sp(SCREEN* \fIsp\fB);\fR
+ .sp
+-\fBvoid nofilter_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBvoid nofilter_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBint nonl_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBint nonl_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBvoid noqiflush_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBvoid noqiflush_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBint noraw_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBint noraw_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBint pair_content_sp(SCREEN* \fP\fIsp\fP\fB, short \fP\fIpair\fP\fB, short* \fP\fIfg\fP\fB, short* \fP\fIbg\fP\fB);\fP
++\fBint pair_content_sp(SCREEN* \fIsp\fB, short \fIpair\fB, short* \fIfg\fB, short* \fIbg\fB);\fR
+ .br
+-\fBvoid qiflush_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBvoid qiflush_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBint raw_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBint raw_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBint reset_prog_mode_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBint reset_prog_mode_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBvoid reset_color_pairs_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBvoid reset_color_pairs_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBint reset_shell_mode_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBint reset_shell_mode_sp(SCREEN* \fIsp\fB);\fR
+ .sp
+-\fBint resetty_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBint resetty_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBint resize_term_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIlines\fP\fB, int \fP\fIcolumns\fP\fB);\fP
++\fBint resize_term_sp(SCREEN* \fIsp\fB, int \fIlines\fB, int \fIcolumns\fB);\fR
+ .br
+-\fBint resizeterm_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIlines\fP\fB, int \fP\fIcolumns\fP\fB);\fP
++\fBint resizeterm_sp(SCREEN* \fIsp\fB, int \fIlines\fB, int \fIcolumns\fB);\fR
+ .br
+-\fBint ripoffline_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIline\fP\fB, int (*\fP\fIinit\fP\fB)(WINDOW* \fP\fIwin\fP\fB, int \fP\fIfmt\fP\fB));\fP
++\fBint ripoffline_sp(SCREEN* \fIsp\fB, int \fIline\fB, int (*\fIinit\fB)(WINDOW* \fIwin\fB, int \fIfmt\fB));\fR
+ .br
+-\fBint savetty_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBint savetty_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBint scr_init_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIfilename\fP\fB);\fP
++\fBint scr_init_sp(SCREEN* \fIsp\fB, const char *\fIfilename\fB);\fR
+ .br
+-\fBint scr_restore_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIfilename\fP\fB);\fP
++\fBint scr_restore_sp(SCREEN* \fIsp\fB, const char *\fIfilename\fB);\fR
+ .br
+-\fBint scr_set_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIfilename\fP\fB);\fP
++\fBint scr_set_sp(SCREEN* \fIsp\fB, const char *\fIfilename\fB);\fR
+ .br
+-\fBint set_escdelay_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIms\fP\fB);\fP
++\fBint set_escdelay_sp(SCREEN* \fIsp\fB, int \fIms\fB);\fR
+ .br
+-\fBint set_tabsize_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIcols\fP\fB);\fP
++\fBint set_tabsize_sp(SCREEN* \fIsp\fB, int \fIcols\fB);\fR
+ .sp
+-\fBint slk_attr_set_sp(SCREEN* \fP\fIsp\fP\fB, const attr_t \fP\fIattrs\fP\fB, short \fP\fIpair\fP\fB, void*\fP\fIopts\fP\fB);\fP
++\fBint slk_attr_set_sp(SCREEN* \fIsp\fB, const attr_t \fIattrs\fB, short \fIpair\fB, void*\fIopts\fB);\fR
+ .br
+-\fBint slk_attrset_sp(SCREEN* \fP\fIsp\fP\fB, const chtype \fP\fIa\fP\fB);\fP
++\fBint slk_attrset_sp(SCREEN* \fIsp\fB, const chtype \fIa\fB);\fR
+ .br
+-\fBint slk_attroff_sp(SCREEN* \fP\fIsp\fP\fB, const chtype \fP\fIa\fP\fB);\fP
++\fBint slk_attroff_sp(SCREEN* \fIsp\fB, const chtype \fIa\fB);\fR
+ .br
+-\fBint slk_attron_sp(SCREEN* \fP\fIsp\fP\fB, const chtype \fP\fIa\fP\fB);\fP
++\fBint slk_attron_sp(SCREEN* \fIsp\fB, const chtype \fIa\fB);\fR
+ .br
+-\fBattr_t slk_attr_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBattr_t slk_attr_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBint slk_clear_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBint slk_clear_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBint slk_color_sp(SCREEN* \fP\fIsp\fP\fB, short \fP\fIpair\fP\fB);\fP
++\fBint slk_color_sp(SCREEN* \fIsp\fB, short \fIpair\fB);\fR
+ .br
+-\fBint slk_init_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIfmt\fP\fB);\fP
++\fBint slk_init_sp(SCREEN* \fIsp\fB, int \fIfmt\fB);\fR
+ .br
+-\fBchar* slk_label_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIlabnum\fP\fB);\fP
++\fBchar* slk_label_sp(SCREEN* \fIsp\fB, int \fIlabnum\fB);\fR
+ .br
+-\fBint slk_noutrefresh_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBint slk_noutrefresh_sp(SCREEN* \fIsp\fB);\fR
+ .sp
+-\fBint slk_refresh_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBint slk_refresh_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBint slk_restore_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBint slk_restore_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBint slk_set_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIlabnum\fP\fB, const char * \fP\fIlabel\fP\fB, int \fP\fIfmt\fP\fB);\fP
++\fBint slk_set_sp(SCREEN* \fIsp\fB, int \fIlabnum\fB, const char * \fIlabel\fB, int \fIfmt\fB);\fR
+ .br
+-\fBint slk_touch_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBint slk_touch_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBint start_color_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBint start_color_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBattr_t term_attrs_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBattr_t term_attrs_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBchtype termattrs_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBchtype termattrs_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBchar* termname_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBchar* termname_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBint typeahead_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIfd\fP\fB);\fP
++\fBint typeahead_sp(SCREEN* \fIsp\fB, int \fIfd\fB);\fR
+ .br
+-\fBint unget_wch_sp(SCREEN* \fP\fIsp\fP\fB, const wchar_t \fP\fIwch\fP\fB);\fP
++\fBint unget_wch_sp(SCREEN* \fIsp\fB, const wchar_t \fIwch\fB);\fR
+ .sp
+-\fBint ungetch_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIch\fP\fB);\fP
++\fBint ungetch_sp(SCREEN* \fIsp\fB, int \fIch\fB);\fR
+ .br
+-\fBint ungetmouse_sp(SCREEN* \fP\fIsp\fP\fB,MEVENT * \fP\fBevent\fP\fB);\fP
++\fBint ungetmouse_sp(SCREEN* \fIsp\fB,MEVENT * \fBevent\fB);\fR
+ .br
+-\fBint use_default_colors_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBint use_default_colors_sp(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBvoid use_env_sp(SCREEN* \fP\fIsp\fP\fB, bool \fP\fIbf\fP\fB);\fP
++\fBvoid use_env_sp(SCREEN* \fIsp\fB, bool \fIbf\fB);\fR
+ .br
+-\fBint use_legacy_coding_sp(SCREEN* \fP\fIsp\fP\fB, int \fP\fIlevel\fP\fB);\fP
++\fBint use_legacy_coding_sp(SCREEN* \fIsp\fB, int \fIlevel\fB);\fR
+ .br
+-\fBvoid use_tioctl_sp(SCREEN *\fP\fIsp\fP\fB, bool \fP\fIbf\fP\fB);\fP
++\fBvoid use_tioctl_sp(SCREEN *\fIsp\fB, bool \fIbf\fB);\fR
+ .br
+-\fBint vid_attr_sp(SCREEN* \fP\fIsp\fP\fB, attr_t \fP\fIattrs\fP\fB, short \fP\fIpair\fP\fB, void * \fP\fIopts\fP\fB);\fP
++\fBint vid_attr_sp(SCREEN* \fIsp\fB, attr_t \fIattrs\fB, short \fIpair\fB, void * \fIopts\fB);\fR
+ .br
+-\fBint vid_puts_sp(SCREEN* \fP\fIsp\fP\fB, attr_t \fP\fIattrs\fP\fB, short \fP\fIpair\fP\fB, void * \fP\fIopts\fP\fB, NCURSES_SP_OUTC \fP\fIputc\fP\fB);\fP
++\fBint vid_puts_sp(SCREEN* \fIsp\fB, attr_t \fIattrs\fB, short \fIpair\fB, void * \fIopts\fB, NCURSES_SP_OUTC \fIputc\fB);\fR
+ .br
+-\fBint vidattr_sp(SCREEN* \fP\fIsp\fP\fB, chtype \fP\fIattrs\fP\fB);\fP
++\fBint vidattr_sp(SCREEN* \fIsp\fB, chtype \fIattrs\fB);\fR
+ .br
+-\fBint vidputs_sp(SCREEN* \fP\fIsp\fP\fB, chtype \fP\fIattrs\fP\fB, NCURSES_SP_OUTC \fP\fIputc\fP\fB);\fP
++\fBint vidputs_sp(SCREEN* \fIsp\fB, chtype \fIattrs\fB, NCURSES_SP_OUTC \fIputc\fB);\fR
+ .br
+-\fBwchar_t* wunctrl_sp(SCREEN* \fP\fIsp\fP\fB, cchar_t *\fP\fIch\fP\fB);\fP
++\fBwchar_t* wunctrl_sp(SCREEN* \fIsp\fB, cchar_t *\fIch\fB);\fR
+ .sp
+ \fB#include \fP
+ .sp
+-\fBFORM* new_form_sp(SCREEN* \fP\fIsp\fP\fB, FIELD **\fP\fIfields\fP\fB);\fP
++\fBFORM* new_form_sp(SCREEN* \fIsp\fB, FIELD **\fIfields\fB);\fR
+ .sp
+ \fB#include \fP
+ .sp
+-\fBMENU* new_menu_sp(SCREEN* \fP\fIsp\fP\fB, ITEM **\fP\fIitems\fP\fB);\fP
++\fBMENU* new_menu_sp(SCREEN* \fIsp\fB, ITEM **\fIitems\fB);\fR
+ .sp
+ \fB#include \fP
+ .sp
+-\fBPANEL* ceiling_panel(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBPANEL* ceiling_panel(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBPANEL* ground_panel(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBPANEL* ground_panel(SCREEN* \fIsp\fB);\fR
+ .br
+-\fBvoid update_panels_sp(SCREEN* \fP\fIsp\fP\fB);\fP
++\fBvoid update_panels_sp(SCREEN* \fIsp\fB);\fR
+ .sp
+ \fB#include \fP
+ .sp
+-\fBint del_curterm_sp(SCREEN* \fP\fIsp\fP\fB, TERMINAL *\fP\fIoterm\fP\fB);\fP
++\fBint del_curterm_sp(SCREEN* \fIsp\fB, TERMINAL *\fIoterm\fB);\fR
+ .br
+-\fBint putp_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIstr\fP\fB);\fP
++\fBint putp_sp(SCREEN* \fIsp\fB, const char *\fIstr\fB);\fR
+ .br
+-\fBint restartterm_sp(SCREEN* \fP\fIsp\fP\fB, NCURSES_CONST char*\fP\fIterm\fP\fB, int \fP\fIfiledes\fP\fB, int *\fP\fIerrret\fP\fB);\fP
++\fBint restartterm_sp(SCREEN* \fIsp\fB, NCURSES_CONST char*\fIterm\fB, int \fIfiledes\fB, int *\fIerrret\fB);\fR
+ .br
+-\fBTERMINAL* set_curterm_sp(SCREEN* \fP\fIsp\fP\fB, TERMINAL*\fP\fInterm\fP\fB);\fP
++\fBTERMINAL* set_curterm_sp(SCREEN* \fIsp\fB, TERMINAL*\fInterm\fB);\fR
+ .br
+-\fBint tgetent_sp(SCREEN* \fP\fIsp\fP\fB, char *\fP\fIbp\fP\fB, const char *\fP\fIname\fP\fB);\fP
++\fBint tgetent_sp(SCREEN* \fIsp\fB, char *\fIbp\fB, const char *\fIname\fB);\fR
+ .br
+-\fBint tgetflag_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIcapname\fP\fB);\fP
++\fBint tgetflag_sp(SCREEN* \fIsp\fB, const char *\fIcapname\fB);\fR
+ .br
+-\fBint tgetnum_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIcapname\fP\fB);\fP
++\fBint tgetnum_sp(SCREEN* \fIsp\fB, const char *\fIcapname\fB);\fR
+ .br
+-\fBchar* tgetstr_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIcapname\fP\fB, char **\fP\fIarea\fP\fB);\fP
++\fBchar* tgetstr_sp(SCREEN* \fIsp\fB, const char *\fIcapname\fB, char **\fIarea\fB);\fR
+ .br
+-\fBchar* tgoto_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIcapname\fP\fB, int \fP\fIcol\fP\fB, int \fP\fIrow\fP\fB);\fP
++\fBchar* tgoto_sp(SCREEN* \fIsp\fB, const char *\fIcapname\fB, int \fIcol\fB, int \fIrow\fB);\fR
+ .br
+-\fBint tigetflag_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIcapname\fP\fB);\fP
++\fBint tigetflag_sp(SCREEN* \fIsp\fB, const char *\fIcapname\fB);\fR
+ .br
+-\fBint tigetnum_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIcapname\fP\fB);\fP
++\fBint tigetnum_sp(SCREEN* \fIsp\fB, const char *\fIcapname\fB);\fR
+ .br
+-\fBchar* tigetstr_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIcapname\fP\fB);\fP
++\fBchar* tigetstr_sp(SCREEN* \fIsp\fB, const char *\fIcapname\fB);\fR
+ .br
+ \fR/* may instead use 9 long parameters */\fP
+ .br
+-\fBchar* tparm_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIstr\fP\fB, ...);\fP
++\fBchar* tparm_sp(SCREEN* \fIsp\fB, const char *\fIstr\fB, ...);\fR
+ .br
+-\fBint tputs_sp(SCREEN* \fP\fIsp\fP\fB, const char *\fP\fIstr\fP\fB, int \fP\fIaffcnt\fP\fB, NCURSES_SP_OUTC \fP\fIputc\fP\fB);\fP
++\fBint tputs_sp(SCREEN* \fIsp\fB, const char *\fIstr\fB, int \fIaffcnt\fB, NCURSES_SP_OUTC \fIputc\fB);\fR
+ .sp
+ \fB#include \fP
+ .sp
+-\fBNCURSES_CONST char* unctrl_sp(SCREEN* \fP\fIsp\fP\fB, chtype \fP\fIc\fP\fB);\fP
++\fBNCURSES_CONST char* unctrl_sp(SCREEN* \fIsp\fB, chtype \fIc\fB);\fR
+ .ad
+ .br
+ .SH DESCRIPTION
+Index: man/curs_termattrs.3x
+Prereq:  1.18 
+--- ncurses-6.3-20220205+/man/curs_termattrs.3x	2021-12-25 21:41:58.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_termattrs.3x	2022-02-12 20:05:11.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_termattrs.3x,v 1.18 2021/12/25 21:41:58 tom Exp $
++.\" $Id: curs_termattrs.3x,v 1.19 2022/02/12 20:05:11 tom Exp $
+ .TH curs_termattrs 3X ""
+ .SH NAME
+ \fBbaudrate\fP,
+@@ -48,7 +48,7 @@
+ .br
+ \fBchar erasechar(void);\fP
+ .br
+-\fBint erasewchar(wchar_t *\fP\fIch\fP\fB);\fP
++\fBint erasewchar(wchar_t *\fIch\fB);\fR
+ .br
+ \fBbool has_ic(void);\fP
+ .br
+@@ -56,7 +56,7 @@
+ .br
+ \fBchar killchar(void);\fP
+ .br
+-\fBint killwchar(wchar_t *\fP\fIch\fP\fB);\fP
++\fBint killwchar(wchar_t *\fIch\fB);\fR
+ .br
+ \fBchar *longname(void);\fP
+ .br
+Index: man/curs_termcap.3x
+Prereq:  1.55 
+--- ncurses-6.3-20220205+/man/curs_termcap.3x	2022-01-01 23:49:07.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_termcap.3x	2022-02-12 20:05:11.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
++.\" Copyright 2018-2022,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_termcap.3x,v 1.55 2022/01/01 23:49:07 tom Exp $
++.\" $Id: curs_termcap.3x,v 1.56 2022/02/12 20:05:11 tom Exp $
+ .TH curs_termcap 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -66,17 +66,17 @@
+ .br
+ \fBextern @NCURSES_OSPEED@ ospeed;\fP
+ .sp
+-\fBint tgetent(char *\fP\fIbp\fP\fB, const char *\fP\fIname\fP\fB);\fP
++\fBint tgetent(char *\fIbp\fB, const char *\fIname\fB);\fR
+ .br
+-\fBint tgetflag(const char *\fP\fIid\fP\fB);\fP
++\fBint tgetflag(const char *\fIid\fB);\fR
+ .br
+-\fBint tgetnum(const char *\fP\fIid\fP\fB);\fP
++\fBint tgetnum(const char *\fIid\fB);\fR
+ .br
+-\fBchar *tgetstr(const char *\fP\fIid\fP\fB, char **\fP\fIarea\fP\fB);\fP
++\fBchar *tgetstr(const char *\fIid\fB, char **\fIarea\fB);\fR
+ .br
+-\fBchar *tgoto(const char *\fP\fIcap\fP\fB, int \fP\fIcol\fP\fB, int \fP\fIrow\fP\fB);\fP
++\fBchar *tgoto(const char *\fIcap\fB, int \fIcol\fB, int \fIrow\fB);\fR
+ .br
+-\fBint tputs(const char *\fP\fIstr\fP\fB, int \fP\fIaffcnt\fP\fB, int (*\fP\fIputc\fP\fB)(int));\fP
++\fBint tputs(const char *\fIstr\fB, int \fIaffcnt\fB, int (*\fIputc\fB)(int));\fR
+ .br
+ .SH DESCRIPTION
+ These routines are included as a conversion aid for programs that use
+Index: man/curs_terminfo.3x
+Prereq:  1.80 
+--- ncurses-6.3-20220205+/man/curs_terminfo.3x	2022-01-01 21:50:06.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_terminfo.3x	2022-02-12 20:05:11.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
++.\" Copyright 2018-2022,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_terminfo.3x,v 1.80 2022/01/01 21:50:06 tom Exp $
++.\" $Id: curs_terminfo.3x,v 1.81 2022/02/12 20:05:11 tom Exp $
+ .TH curs_terminfo 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -76,37 +76,37 @@
+ \fBconst char * const strcodes[];\fP
+ \fBconst char * const strfnames[];\fP
+ .sp
+-\fBint setupterm(const char *\fP\fIterm\fP\fB, int \fP\fIfiledes\fP\fB, int *\fP\fIerrret\fP\fB);\fP
++\fBint setupterm(const char *\fIterm\fB, int \fIfiledes\fB, int *\fIerrret\fB);\fR
+ .br
+-\fBTERMINAL *set_curterm(TERMINAL *\fP\fInterm\fP\fB);\fP
++\fBTERMINAL *set_curterm(TERMINAL *\fInterm\fB);\fR
+ .br
+-\fBint del_curterm(TERMINAL *\fP\fIoterm\fP\fB);\fP
++\fBint del_curterm(TERMINAL *\fIoterm\fB);\fR
+ .br
+-\fBint restartterm(const char *\fP\fIterm\fP\fB, int \fP\fIfiledes\fP\fB, int *\fP\fIerrret\fP\fB);\fP
++\fBint restartterm(const char *\fIterm\fB, int \fIfiledes\fB, int *\fIerrret\fB);\fR
+ .sp
+-\fBchar *tparm(const char *\fP\fIstr\fP\fB, ...);\fP
++\fBchar *tparm(const char *\fIstr\fB, ...);\fR
+ .br
+-\fBint tputs(const char *\fP\fIstr\fP\fB, int \fP\fIaffcnt\fP\fB, int (*\fP\fIputc\fP\fB)(int));\fP
++\fBint tputs(const char *\fIstr\fB, int \fIaffcnt\fB, int (*\fIputc\fB)(int));\fR
+ .br
+-\fBint putp(const char *\fP\fIstr\fP\fB);\fP
++\fBint putp(const char *\fIstr\fB);\fR
+ .sp
+-\fBint vidputs(chtype \fP\fIattrs\fP\fB, int (*\fP\fIputc\fP\fB)(int));\fP
++\fBint vidputs(chtype \fIattrs\fB, int (*\fIputc\fB)(int));\fR
+ .br
+-\fBint vidattr(chtype \fP\fIattrs\fP\fB);\fP
++\fBint vidattr(chtype \fIattrs\fB);\fR
+ .br
+-\fBint vid_puts(attr_t \fP\fIattrs\fP\fB, short \fP\fIpair\fP\fB, void *\fP\fIopts\fP\fB, int (*\fP\fIputc\fP\fB)(int));\fP
++\fBint vid_puts(attr_t \fIattrs\fB, short \fIpair\fB, void *\fIopts\fB, int (*\fIputc\fB)(int));\fR
+ .br
+-\fBint vid_attr(attr_t \fP\fIattrs\fP\fB, short \fP\fIpair\fP\fB, void *\fP\fIopts\fP\fB);\fP
++\fBint vid_attr(attr_t \fIattrs\fB, short \fIpair\fB, void *\fIopts\fB);\fR
+ .sp
+-\fBint mvcur(int \fP\fIoldrow\fP\fB, int \fP\fIoldcol\fP\fB, int \fP\fInewrow\fP, int \fP\fInewcol\fP\fB);\fP
++\fBint mvcur(int \fIoldrow\fB, int \fIoldcol\fB, int \fInewrow\fR, int \fInewcol\fB);\fR
+ .sp
+-\fBint tigetflag(const char *\fP\fIcapname\fP\fB);\fP
++\fBint tigetflag(const char *\fIcapname\fB);\fR
+ .br
+-\fBint tigetnum(const char *\fP\fIcapname\fP\fB);\fP
++\fBint tigetnum(const char *\fIcapname\fB);\fR
+ .br
+-\fBchar *tigetstr(const char *\fP\fIcapname\fP\fB);\fP
++\fBchar *tigetstr(const char *\fIcapname\fB);\fR
+ .sp
+-\fBchar *tiparm(const char *\fP\fIstr\fP\fB, ...);\fP
++\fBchar *tiparm(const char *\fIstr\fB, ...);\fR
+ .br
+ .fi
+ .SH DESCRIPTION
+@@ -313,7 +313,7 @@
+ \fIputc\fP is a \fBputchar\fP-like routine to which
+ the characters are passed, one at a time.
+ .PP
+-The \fBputp\fP routine calls \fBtputs(\fP\fIstr\fP\fB, 1, putchar)\fP.
++The \fBputp\fR routine calls \fBtputs(\fIstr\fB, 1, putchar)\fR.
+ The output of \fBputp\fP always goes to \fBstdout\fP, rather than
+ the \fIfiledes\fP specified in \fBsetupterm\fP.
+ .PP
+@@ -487,9 +487,9 @@
+ The manual page notes that the \fBsetterm\fP routine
+ was replaced by \fBsetupterm\fP, stating that the call:
+ .sp
+-      \fBsetupterm(\fP\fIterm\fP\fB, 1, (int *)0)\fP
++      \fBsetupterm(\fIterm\fB, 1, (int *)0)\fR
+ .sp
+-provides the same functionality as \fBsetterm(\fP\fIterm\fP\fB)\fP,
++provides the same functionality as \fBsetterm(\fIterm\fB)\fR,
+ and is not recommended for new programs.
+ This implementation provides each of those symbols
+ as macros for BSD compatibility,
+Index: man/curs_threads.3x
+Prereq:  1.30 
+--- ncurses-6.3-20220205+/man/curs_threads.3x	2021-12-25 21:50:36.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_threads.3x	2022-02-12 20:05:11.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2020,2021 Thomas E. Dickey                                     *
++.\" Copyright 2021,2022 Thomas E. Dickey                                     *
+ .\" Copyright 2008-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_threads.3x,v 1.30 2021/12/25 21:50:36 tom Exp $
++.\" $Id: curs_threads.3x,v 1.31 2022/02/12 20:05:11 tom Exp $
+ .TH curs_threads 3X ""
+ .de bP
+ .ie n  .IP \(bu 4
+@@ -48,13 +48,13 @@
+ .sp
+ \fBint get_escdelay(void);\fP
+ .br
+-\fBint set_escdelay(int \fP\fIms\fP\fB);\fP
++\fBint set_escdelay(int \fIms\fB);\fR
+ .br
+-\fBint set_tabsize(int \fP\fIcols\fP\fB);\fP
++\fBint set_tabsize(int \fIcols\fB);\fR
+ .sp
+-\fBint use_screen(SCREEN *\fP\fIscr\fP\fB, NCURSES_SCREEN_CB \fP\fIfunc\fP\fB, void *\fP\fIdata\fP\fB);\fP
++\fBint use_screen(SCREEN *\fIscr\fB, NCURSES_SCREEN_CB \fIfunc\fB, void *\fIdata\fB);\fR
+ .br
+-\fBint use_window(WINDOW *\fP\fIwin\fP\fB, NCURSES_WINDOW_CB \fP\fIfunc\fP\fB, void *\fP\fIdata\fP\fB);\fP
++\fBint use_window(WINDOW *\fIwin\fB, NCURSES_WINDOW_CB \fIfunc\fB, void *\fIdata\fB);\fR
+ .br
+ .SH DESCRIPTION
+ This implementation can be configured to provide rudimentary support
+Index: man/curs_touch.3x
+Prereq:  1.25 
+--- ncurses-6.3-20220205+/man/curs_touch.3x	2021-12-25 17:39:16.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_touch.3x	2022-02-12 20:05:11.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_touch.3x,v 1.25 2021/12/25 17:39:16 tom Exp $
++.\" $Id: curs_touch.3x,v 1.26 2022/02/12 20:05:11 tom Exp $
+ .TH curs_touch 3X ""
+ .na
+ .hy 0
+@@ -43,17 +43,17 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint touchline(WINDOW *\fP\fIwin\fP\fB, int \fP\fIstart\fP\fB, int \fP\fIcount\fP\fB);\fP
++\fBint touchline(WINDOW *\fIwin\fB, int \fIstart\fB, int \fIcount\fB);\fR
+ .sp
+-\fBint touchwin(WINDOW *\fP\fIwin\fP\fB);\fP
++\fBint touchwin(WINDOW *\fIwin\fB);\fR
+ .br
+-\fBint wtouchln(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIn\fP\fB, int \fP\fIchanged\fP\fB);\fP
++\fBint wtouchln(WINDOW *\fIwin\fB, int \fIy\fB, int \fIn\fB, int \fIchanged\fB);\fR
+ .sp
+-\fBint untouchwin(WINDOW *\fP\fIwin\fP\fB);\fP
++\fBint untouchwin(WINDOW *\fIwin\fB);\fR
+ .sp
+-\fBbool is_linetouched(WINDOW *\fP\fIwin\fP\fB, int \fP\fIline\fP\fB);\fP
++\fBbool is_linetouched(WINDOW *\fIwin\fB, int \fIline\fB);\fR
+ .br
+-\fBbool is_wintouched(WINDOW *\fP\fIwin\fP\fB);\fP
++\fBbool is_wintouched(WINDOW *\fIwin\fB);\fR
+ .br
+ .SH DESCRIPTION
+ The \fBtouchwin\fP and \fBtouchline\fP routines throw away all
+@@ -71,8 +71,8 @@
+ the last call to \fBwrefresh\fP.
+ .PP
+ The \fBwtouchln\fP routine makes \fIn\fP lines in the window, starting
+-at line \fIy\fP, look as if they have (\fIchanged\fP\fB=1\fP) or have
+-not (\fIchanged\fP\fB=0\fP) been changed since the last call to
++at line \fIy\fR, look as if they have (\fIchanged\fB=1\fR) or have
++not (\fIchanged\fB=0\fR) been changed since the last call to
+ \fBwrefresh\fP.
+ .PP
+ The \fBis_linetouched\fP and \fBis_wintouched\fP routines return
+Index: man/curs_trace.3x
+Prereq:  1.24 
+--- ncurses-6.3-20220205+/man/curs_trace.3x	2021-12-25 21:41:58.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_trace.3x	2022-02-12 20:06:41.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2019-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2019-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 2000-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_trace.3x,v 1.24 2021/12/25 21:41:58 tom Exp $
++.\" $Id: curs_trace.3x,v 1.25 2022/02/12 20:06:41 tom Exp $
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+ .ie \n(.g .ds '' \(rq
+@@ -58,33 +58,33 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBunsigned curses_trace(const unsigned \fP\fIparam\fP\fB);\fP
++\fBunsigned curses_trace(const unsigned \fIparam\fB);\fR
+ .sp
+-\fBvoid _tracef(const char *\fP\fIformat\fP\fB, ...);\fP
++\fBvoid _tracef(const char *\fIformat\fB, ...);\fR
+ .sp
+-\fBchar *_traceattr(attr_t \fP\fIattr\fP\fB);\fP
++\fBchar *_traceattr(attr_t \fIattr\fB);\fR
+ .br
+-\fBchar *_traceattr2(int \fP\fIbuffer\fP\fB, chtype \fP\fIch\fP\fB);\fP
++\fBchar *_traceattr2(int \fIbuffer\fB, chtype \fIch\fB);\fR
+ .br
+-\fBchar *_tracecchar_t(const cchar_t *\fP\fIstring\fP\fB);\fP
++\fBchar *_tracecchar_t(const cchar_t *\fIstring\fB);\fR
+ .br
+-\fBchar *_tracecchar_t2(int \fP\fIbuffer\fP\fB, const cchar_t *\fP\fIstring\fP\fB);\fP
++\fBchar *_tracecchar_t2(int \fIbuffer\fB, const cchar_t *\fIstring\fB);\fR
+ .br
+-\fBchar *_tracechar(int \fP\fIch\fP\fB);\fP
++\fBchar *_tracechar(int \fIch\fB);\fR
+ .br
+-\fBchar *_tracechtype(chtype \fP\fIch\fP\fB);\fP
++\fBchar *_tracechtype(chtype \fIch\fB);\fR
+ .br
+-\fBchar *_tracechtype2(int \fP\fIbuffer\fP\fB, chtype \fP\fIch\fP\fB);\fP
++\fBchar *_tracechtype2(int \fIbuffer\fB, chtype \fIch\fB);\fR
+ .sp
+-\fBvoid _tracedump(const char *\fP\fIlabel\fP\fB, WINDOW *\fP\fIwin\fP\fB);\fP
++\fBvoid _tracedump(const char *\fIlabel\fB, WINDOW *\fIwin\fB);\fR
+ .br
+ \fBchar *_nc_tracebits(void);\fP
+ .br
+-\fBchar *_tracemouse(const MEVENT *\fP\fIevent\fP\fB);\fP
++\fBchar *_tracemouse(const MEVENT *\fIevent\fB);\fR
+ .sp
+ /* deprecated */
+ .br
+-\fBvoid trace(const unsigned int \fP\fIparam\fP\fB);\fP
++\fBvoid trace(const unsigned int \fIparam\fB);\fR
+ .SH DESCRIPTION
+ The \fIcurses trace\fP routines are used for debugging the ncurses libraries,
+ as well as applications which use the ncurses libraries.
+@@ -131,7 +131,7 @@
+ If tracing is not available, \fBcurses_trace\fP returns zero (0).
+ .SS Trace Parameter
+ The trace parameter is formed by OR'ing
+-values from the list of \fBTRACE_\fP\fIxxx\fP definitions in \fB\fP.
++values from the list of \fBTRACE_\fIxxx\fR definitions in \fB\fR.
+ These include:
+ .TP 5
+ .B TRACE_DISABLE
+Index: man/curs_util.3x
+Prereq:  1.64 
+--- ncurses-6.3-20220205+/man/curs_util.3x	2021-12-25 22:05:53.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_util.3x	2022-02-12 20:06:41.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_util.3x,v 1.64 2021/12/25 22:05:53 tom Exp $
++.\" $Id: curs_util.3x,v 1.65 2022/02/12 20:06:41 tom Exp $
+ .TH curs_util 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -58,27 +58,27 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBconst char *unctrl(chtype \fP\fIc\fP\fB);\fP
++\fBconst char *unctrl(chtype \fIc\fB);\fR
+ .br
+-\fBwchar_t *wunctrl(cchar_t *\fP\fIc\fP\fB);\fP
++\fBwchar_t *wunctrl(cchar_t *\fIc\fB);\fR
+ .sp
+-\fBconst char *keyname(int \fP\fIc\fP\fB);\fP
++\fBconst char *keyname(int \fIc\fB);\fR
+ .br
+-\fBconst char *key_name(wchar_t \fP\fIw\fP\fB);\fP
++\fBconst char *key_name(wchar_t \fIw\fB);\fR
+ .sp
+ \fBvoid filter(void);\fP
+ .br
+ \fBvoid nofilter(void);\fP
+ .sp
+-\fBvoid use_env(bool \fP\fIf\fP\fB);\fP
++\fBvoid use_env(bool \fIf\fB);\fR
+ .br
+-\fBvoid use_tioctl(bool \fP\fIf\fP\fB);\fP
++\fBvoid use_tioctl(bool \fIf\fB);\fR
+ .sp
+-\fBint putwin(WINDOW *\fP\fIwin\fP\fB, FILE *\fP\fIfilep\fP\fB);\fP
++\fBint putwin(WINDOW *\fIwin\fB, FILE *\fIfilep\fB);\fR
+ .br
+-\fBWINDOW *getwin(FILE *\fP\fIfilep\fP\fB);\fP
++\fBWINDOW *getwin(FILE *\fIfilep\fB);\fR
+ .sp
+-\fBint delay_output(int \fP\fIms\fP\fB);\fP
++\fBint delay_output(int \fIms\fB);\fR
+ .br
+ \fBint flushinp(void);\fP
+ .br
+@@ -87,7 +87,7 @@
+ .PP
+ The \fBunctrl\fP routine returns a character string which is a printable
+ representation of the character \fIc\fP, ignoring attributes.
+-Control characters are displayed in the \fB^\fP\fIX\fP notation.
++Control characters are displayed in the \fB^\fIX\fR notation.
+ Printing characters are displayed as is.
+ The corresponding \fBwunctrl\fP returns a printable representation of
+ a wide character.
+@@ -99,14 +99,14 @@
+ Printable characters are displayed as themselves,
+ e.g., a one-character string containing the key.
+ .bP
+-Control characters are displayed in the \fB^\fP\fIX\fP notation.
++Control characters are displayed in the \fB^\fIX\fR notation.
+ .bP
+ DEL (character 127) is displayed as \fB^?\fP.
+ .bP
+ Values above 128 are either meta characters
+ (if the screen has not been initialized,
+ or if \fBmeta\fP(3X) has been called with a \fBTRUE\fP parameter),
+-shown in the \fBM\-\fP\fIX\fP notation,
++shown in the \fBM\-\fIX\fR notation,
+ or are displayed as themselves.
+ In the latter case, the values may not be printable;
+ this follows the X/Open specification.
+Index: man/curs_window.3x
+Prereq:  1.24 
+--- ncurses-6.3-20220205+/man/curs_window.3x	2021-12-25 17:39:16.000000000 +0000
++++ ncurses-6.3-20220212/man/curs_window.3x	2022-02-12 20:06:41.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2020,2021 Thomas E. Dickey                                     *
++.\" Copyright 2020-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: curs_window.3x,v 1.24 2021/12/25 17:39:16 tom Exp $
++.\" $Id: curs_window.3x,v 1.25 2022/02/12 20:06:41 tom Exp $
+ .TH curs_window 3X ""
+ .de bP
+ .ie n  .IP \(bu 4
+@@ -53,32 +53,32 @@
+ \fB#include \fP
+ .sp
+ \fBWINDOW *newwin(\fP
+-      \fBint \fP\fInlines\fP\fB, int \fP\fIncols\fP\fB,\fP
+-      \fBint \fP\fIbegin_y\fP\fB, int \fP\fIbegin_x\fP\fB);\fP
++      \fBint \fInlines\fB, int \fIncols\fB,\fR
++      \fBint \fIbegin_y\fB, int \fIbegin_x\fB);\fR
+ .br
+-\fBint delwin(WINDOW *\fP\fIwin\fP\fB);\fP
++\fBint delwin(WINDOW *\fIwin\fB);\fR
+ .br
+-\fBint mvwin(WINDOW *\fP\fIwin\fP\fB, int \fP\fIy\fP\fB, int \fP\fIx\fP\fB);\fP
++\fBint mvwin(WINDOW *\fIwin\fB, int \fIy\fB, int \fIx\fB);\fR
+ .br
+-\fBWINDOW *subwin(WINDOW *\fP\fIorig\fP\fB,\fP
+-      \fBint \fP\fInlines\fP\fB, int \fP\fIncols\fP\fB,\fP
+-      \fBint \fP\fIbegin_y\fP\fB, int \fP\fIbegin_x\fP\fB);\fP
++\fBWINDOW *subwin(WINDOW *\fIorig\fB,\fR
++      \fBint \fInlines\fB, int \fIncols\fB,\fR
++      \fBint \fIbegin_y\fB, int \fIbegin_x\fB);\fR
+ .br
+-\fBWINDOW *derwin(WINDOW *\fP\fIorig\fP\fB,\fP
+-      \fBint \fP\fInlines\fP\fB, int \fP\fIncols\fP\fB,\fP
+-      \fBint \fP\fIbegin_y\fP\fB, int \fP\fIbegin_x\fP\fB);\fP
++\fBWINDOW *derwin(WINDOW *\fIorig\fB,\fR
++      \fBint \fInlines\fB, int \fIncols\fB,\fR
++      \fBint \fIbegin_y\fB, int \fIbegin_x\fB);\fR
+ .br
+-\fBint mvderwin(WINDOW *\fP\fIwin\fP\fB, int \fP\fIpar_y\fP\fB, int \fP\fIpar_x\fP\fB);\fP
++\fBint mvderwin(WINDOW *\fIwin\fB, int \fIpar_y\fB, int \fIpar_x\fB);\fR
+ .br
+-\fBWINDOW *dupwin(WINDOW *\fP\fIwin\fP\fB);\fP
++\fBWINDOW *dupwin(WINDOW *\fIwin\fB);\fR
+ .br
+-\fBvoid wsyncup(WINDOW *\fP\fIwin\fP\fB);\fP
++\fBvoid wsyncup(WINDOW *\fIwin\fB);\fR
+ .br
+-\fBint syncok(WINDOW *\fP\fIwin\fP\fB, bool \fP\fIbf\fP\fB);\fP
++\fBint syncok(WINDOW *\fIwin\fB, bool \fIbf\fB);\fR
+ .br
+-\fBvoid wcursyncup(WINDOW *\fP\fIwin\fP\fB);\fP
++\fBvoid wcursyncup(WINDOW *\fIwin\fB);\fR
+ .br
+-\fBvoid wsyncdown(WINDOW *\fP\fIwin\fP\fB);\fP
++\fBvoid wsyncdown(WINDOW *\fIwin\fB);\fR
+ .br
+ .SH DESCRIPTION
+ .SS newwin
+Index: man/default_colors.3x
+Prereq:  1.34 
+--- ncurses-6.3-20220205+/man/default_colors.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/default_colors.3x	2022-02-12 20:03:40.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 2000-2011,2016 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -29,7 +29,7 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1997,1999,2000,2005
+ .\"
+-.\" $Id: default_colors.3x,v 1.34 2021/12/25 21:49:32 tom Exp $
++.\" $Id: default_colors.3x,v 1.35 2022/02/12 20:03:40 tom Exp $
+ .TH default_colors 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -43,7 +43,7 @@
+ .sp
+ \fBint use_default_colors(void);\fP
+ .br
+-\fBint assume_default_colors(int \fP\fIfg\fP\fB, int \fP\fIbg\fP\fB);\fP
++\fBint assume_default_colors(int \fIfg\fB, int \fIbg\fB);\fR
+ .SH DESCRIPTION
+ The \fBuse_default_colors\fP and \fBassume_default_colors\fP
+ functions are extensions to the curses library.
+Index: man/define_key.3x
+Prereq:  1.20 
+--- ncurses-6.3-20220205+/man/define_key.3x	2021-12-25 21:41:58.000000000 +0000
++++ ncurses-6.3-20220212/man/define_key.3x	2022-02-12 20:03:40.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -29,14 +29,14 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1997
+ .\"
+-.\" $Id: define_key.3x,v 1.20 2021/12/25 21:41:58 tom Exp $
++.\" $Id: define_key.3x,v 1.21 2022/02/12 20:03:40 tom Exp $
+ .TH define_key 3X ""
+ .SH NAME
+ \fBdefine_key\fP \- define a keycode
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint define_key(const char *\fP\fIdefinition\fP\fB, int \fP\fIkeycode\fP\fB);\fP
++\fBint define_key(const char *\fIdefinition\fB, int \fIkeycode\fB);\fR
+ .SH DESCRIPTION
+ This is an extension to the curses library.
+ It permits an application to define keycodes with their corresponding control
+Index: man/form_cursor.3x
+Prereq:  1.16 
+--- ncurses-6.3-20220205+/man/form_cursor.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/form_cursor.3x	2022-02-12 20:03:40.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,14 +28,14 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_cursor.3x,v 1.16 2021/12/25 21:49:32 tom Exp $
++.\" $Id: form_cursor.3x,v 1.17 2022/02/12 20:03:40 tom Exp $
+ .TH form_cursor 3X ""
+ .SH NAME
+ \fBpos_form_cursor\fP \- position a form window cursor
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint pos_form_cursor(FORM *\fP\fIform\fP\fB);\fP
++\fBint pos_form_cursor(FORM *\fIform\fB);\fR
+ .br
+ .SH DESCRIPTION
+ The function \fBpos_form_cursor\fP restores the cursor to the position required
+Index: man/form_data.3x
+Prereq:  1.17 
+--- ncurses-6.3-20220205+/man/form_data.3x	2021-12-25 21:41:58.000000000 +0000
++++ ncurses-6.3-20220212/man/form_data.3x	2022-02-12 20:03:40.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_data.3x,v 1.17 2021/12/25 21:41:58 tom Exp $
++.\" $Id: form_data.3x,v 1.18 2022/02/12 20:03:40 tom Exp $
+ .TH form_data 3X ""
+ .SH NAME
+ \fBdata_ahead\fP,
+@@ -36,9 +36,9 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBbool data_ahead(const FORM *\fP\fIform\fP\fB);\fP
++\fBbool data_ahead(const FORM *\fIform\fB);\fR
+ .br
+-\fBbool data_behind(const FORM *\fP\fIform\fP\fB);\fP
++\fBbool data_behind(const FORM *\fIform\fB);\fR
+ .br
+ .SH DESCRIPTION
+ The function \fBdata_ahead\fP tests whether there is off-screen data
+Index: man/form_driver.3x
+Prereq:  1.38 
+--- ncurses-6.3-20220205+/man/form_driver.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/form_driver.3x	2022-02-12 20:03:40.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_driver.3x,v 1.38 2021/12/25 21:49:32 tom Exp $
++.\" $Id: form_driver.3x,v 1.39 2022/02/12 20:03:40 tom Exp $
+ .TH form_driver 3X ""
+ .de bP
+ .ie n  .IP \(bu 4
+@@ -39,9 +39,9 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint form_driver(FORM *\fP\fIform\fP\fB, int \fP\fIc\fP\fB);\fP
++\fBint form_driver(FORM *\fIform\fB, int \fIc\fB);\fR
+ .br
+-\fBint form_driver_w(FORM *\fP\fIform\fP\fB, int \fP\fIc\fP\fB, wchar_t \fP\fIwch\fP\fB);\fP
++\fBint form_driver_w(FORM *\fIform\fB, int \fIc\fB, wchar_t \fIwch\fB);\fR
+ .br
+ .SH DESCRIPTION
+ .SS form_driver
+Index: man/form_field.3x
+Prereq:  1.19 
+--- ncurses-6.3-20220205+/man/form_field.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/form_field.3x	2022-02-12 20:03:40.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2012 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,20 +28,20 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_field.3x,v 1.19 2021/12/25 21:49:32 tom Exp $
++.\" $Id: form_field.3x,v 1.20 2022/02/12 20:03:40 tom Exp $
+ .TH form_field 3X ""
+ .SH NAME
+ \fBform_field\fP \- make and break connections between fields and forms
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint set_form_fields(FORM *\fP\fIform\fP\fB, FIELD **\fP\fIfields\fP\fB);\fP
++\fBint set_form_fields(FORM *\fIform\fB, FIELD **\fIfields\fB);\fR
+ .br
+-\fBFIELD **form_fields(const FORM *\fP\fIform\fP\fB);\fP
++\fBFIELD **form_fields(const FORM *\fIform\fB);\fR
+ .br
+-\fBint field_count(const FORM *\fP\fIform\fP\fB);\fP
++\fBint field_count(const FORM *\fIform\fB);\fR
+ .br
+-\fBint move_field(FIELD *\fP\fIfield\fP\fB, int \fP\fIfrow\fP\fB, int \fP\fIfcol\fP\fB);\fP
++\fBint move_field(FIELD *\fIfield\fB, int \fIfrow\fB, int \fIfcol\fB);\fR
+ .br
+ .SH DESCRIPTION
+ The function \fBset_form_fields\fP changes the field pointer array of
+Index: man/form_field_attributes.3x
+Prereq:  1.20 
+--- ncurses-6.3-20220205+/man/form_field_attributes.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/form_field_attributes.3x	2022-02-12 20:03:40.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_field_attributes.3x,v 1.20 2021/12/25 21:49:32 tom Exp $
++.\" $Id: form_field_attributes.3x,v 1.21 2022/02/12 20:03:40 tom Exp $
+ .TH form_field_attributes 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -39,17 +39,17 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint set_field_fore(FIELD *\fP\fIfield\fP\fB, chtype \fP\fIattr\fP\fB);\fP
++\fBint set_field_fore(FIELD *\fIfield\fB, chtype \fIattr\fB);\fR
+ .br
+-\fBchtype field_fore(const FIELD *\fP\fIfield\fP\fB);\fP
++\fBchtype field_fore(const FIELD *\fIfield\fB);\fR
+ .sp
+-\fBint set_field_back(FIELD *\fP\fIfield\fP\fB, chtype \fP\fIattr\fP\fB);\fP
++\fBint set_field_back(FIELD *\fIfield\fB, chtype \fIattr\fB);\fR
+ .br
+-\fBchtype field_back(const FIELD *\fP\fIfield\fP\fB);\fP
++\fBchtype field_back(const FIELD *\fIfield\fB);\fR
+ .sp
+-\fBint set_field_pad(FIELD *\fP\fIfield\fP\fB, int \fP\fIpad\fP\fB);\fP
++\fBint set_field_pad(FIELD *\fIfield\fB, int \fIpad\fB);\fR
+ .br
+-\fBint field_pad(const FIELD *\fP\fIfield\fP\fB);\fP
++\fBint field_pad(const FIELD *\fIfield\fB);\fR
+ .br
+ .SH DESCRIPTION
+ The function \fBset_field_fore\fP sets the foreground attribute of
+Index: man/form_field_buffer.3x
+Prereq:  1.29 
+--- ncurses-6.3-20220205+/man/form_field_buffer.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/form_field_buffer.3x	2022-02-12 20:03:40.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_field_buffer.3x,v 1.29 2021/12/25 21:49:32 tom Exp $
++.\" $Id: form_field_buffer.3x,v 1.30 2022/02/12 20:03:40 tom Exp $
+ .TH form_field_buffer 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -43,15 +43,15 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint set_field_buffer(FIELD *\fP\fIfield\fP\fB, int \fP\fIbuf\fP\fB, const char *\fP\fIvalue\fP\fB);\fP
++\fBint set_field_buffer(FIELD *\fIfield\fB, int \fIbuf\fB, const char *\fIvalue\fB);\fR
+ .br
+-\fBchar *field_buffer(const FIELD *\fP\fIfield\fP\fB, int \fP\fIbuffer\fP\fB);\fP
++\fBchar *field_buffer(const FIELD *\fIfield\fB, int \fIbuffer\fB);\fR
+ .sp
+-\fBint set_field_status(FIELD *\fP\fIfield\fP\fB, bool \fP\fIstatus\fP\fB);\fP
++\fBint set_field_status(FIELD *\fIfield\fB, bool \fIstatus\fB);\fR
+ .br
+-\fBbool field_status(const FIELD *\fP\fIfield\fP\fB);\fP
++\fBbool field_status(const FIELD *\fIfield\fB);\fR
+ .sp
+-\fBint set_max_field(FIELD *\fP\fIfield\fP\fB, int \fP\fImax\fP\fB);\fP
++\fBint set_max_field(FIELD *\fIfield\fB, int \fImax\fB);\fR
+ .br
+ .SH DESCRIPTION
+ The function \fBset_field_buffer\fP sets the numbered buffer of the given field
+Index: man/form_field_info.3x
+Prereq:  1.20 
+--- ncurses-6.3-20220205+/man/form_field_info.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/form_field_info.3x	2022-02-12 20:03:40.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_field_info.3x,v 1.20 2021/12/25 21:49:32 tom Exp $
++.\" $Id: form_field_info.3x,v 1.21 2022/02/12 20:03:40 tom Exp $
+ .TH form_field_info 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -41,13 +41,13 @@
+ .nf
+ \fB#include \fP
+ .sp
+-\fBint field_info(const FIELD *\fP\fIfield\fP\fB,\fP
+-               \fBint *\fP\fIrows\fP\fB, int *\fP\fIcols\fP\fB,\fP
+-               \fBint *\fP\fIfrow\fP\fB, int *\fP\fIfcol\fP\fB,\fP
+-               \fBint *\fP\fInrow\fP\fB, int *\fP\fInbuf\fB);\fP
++\fBint field_info(const FIELD *\fIfield\fB,\fR
++               \fBint *\fIrows\fB, int *\fIcols\fB,\fR
++               \fBint *\fIfrow\fB, int *\fIfcol\fB,\fR
++               \fBint *\fInrow\fB, int *\fInbuf\fB);\fR
+ .sp
+-\fBint dynamic_field_info(const FIELD *\fP\fIfield\fP\fB,\fP
+-                       \fBint *\fP\fIrows\fP\fB, int *\fP\fIcols\fP\fB, int *\fImax\fB);\fP
++\fBint dynamic_field_info(const FIELD *\fIfield\fB,\fR
++                       \fBint *\fIrows\fB, int *\fIcols\fB, int *\fImax\fB);\fR
+ .fi
+ .SH DESCRIPTION
+ The function \fBfield_info\fP returns the sizes and other attributes passed in
+Index: man/form_field_just.3x
+Prereq:  1.20 
+--- ncurses-6.3-20220205+/man/form_field_just.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/form_field_just.3x	2022-02-12 20:03:40.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_field_just.3x,v 1.20 2021/12/25 21:49:32 tom Exp $
++.\" $Id: form_field_just.3x,v 1.21 2022/02/12 20:03:40 tom Exp $
+ .TH form_field_just 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -40,9 +40,9 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint set_field_just(FIELD *\fP\fIfield\fP\fB, int \fP\fIjustification\fP\fB);\fP
++\fBint set_field_just(FIELD *\fIfield\fB, int \fIjustification\fB);\fR
+ .br
+-\fBint field_just(const FIELD *\fP\fIfield\fP\fB);\fP
++\fBint field_just(const FIELD *\fIfield\fB);\fR
+ .br
+ .SH DESCRIPTION
+ The function \fBset_field_just\fP sets the justification attribute of
+Index: man/form_field_new.3x
+Prereq:  1.26 
+--- ncurses-6.3-20220205+/man/form_field_new.3x	2021-12-25 21:41:58.000000000 +0000
++++ ncurses-6.3-20220212/man/form_field_new.3x	2022-02-12 20:03:40.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_field_new.3x,v 1.26 2021/12/25 21:41:58 tom Exp $
++.\" $Id: form_field_new.3x,v 1.27 2022/02/12 20:03:40 tom Exp $
+ .TH form_field_new 3X ""
+ .SH NAME
+ \fBnew_field\fP,
+@@ -38,15 +38,15 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBFIELD *new_field(int \fP\fIheight\fP\fB, int \fP\fIwidth\fP\fB,\fP
+-                 \fBint \fP\fItoprow\fP\fB, int \fP\fIleftcol\fP\fB,\fP
+-                 \fBint \fP\fIoffscreen\fP\fB, int \fP\fInbuffers\fP\fB);\fP
++\fBFIELD *new_field(int \fIheight\fB, int \fIwidth\fB,\fR
++                 \fBint \fItoprow\fB, int \fIleftcol\fB,\fR
++                 \fBint \fIoffscreen\fB, int \fInbuffers\fB);\fR
+ .br
+-\fBFIELD *dup_field(FIELD *\fP\fIfield\fP\fB, int \fP\fItoprow\fP\fB, int \fP\fIleftcol\fP\fB);\fP
++\fBFIELD *dup_field(FIELD *\fIfield\fB, int \fItoprow\fB, int \fIleftcol\fB);\fR
+ .br
+-\fBFIELD *link_field(FIELD *\fP\fIfield\fP\fB, int \fP\fItoprow\fP\fB, int \fP\fIleftcol\fP\fB);\fP
++\fBFIELD *link_field(FIELD *\fIfield\fB, int \fItoprow\fB, int \fIleftcol\fB);\fR
+ .br
+-\fBint free_field(FIELD *\fP\fIfield\fP\fB);\fP
++\fBint free_field(FIELD *\fIfield\fB);\fR
+ .br
+ .SH DESCRIPTION
+ The function \fBnew_field\fP allocates a new field and initializes it from the
+Index: man/form_field_opts.3x
+Prereq:  1.29 
+--- ncurses-6.3-20220205+/man/form_field_opts.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/form_field_opts.3x	2022-02-12 20:03:40.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2014,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_field_opts.3x,v 1.29 2021/12/25 21:49:32 tom Exp $
++.\" $Id: form_field_opts.3x,v 1.30 2022/02/12 20:03:40 tom Exp $
+ .TH form_field_opts 3X ""
+ .SH NAME
+ \fBset_field_opts\fP,
+@@ -38,13 +38,13 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint set_field_opts(FIELD *\fP\fIfield\fP\fB, Field_Options \fP\fIopts\fP\fB);\fP
++\fBint set_field_opts(FIELD *\fIfield\fB, Field_Options \fIopts\fB);\fR
+ .br
+-\fBField_Options field_opts(const FIELD *\fP\fIfield\fP\fB);\fP
++\fBField_Options field_opts(const FIELD *\fIfield\fB);\fR
+ .sp
+-\fBint field_opts_on(FIELD *\fP\fIfield\fP\fB, Field_Options \fP\fIopts\fP\fB);\fP
++\fBint field_opts_on(FIELD *\fIfield\fB, Field_Options \fIopts\fB);\fR
+ .br
+-\fBint field_opts_off(FIELD *\fP\fIfield\fP\fB, Field_Options \fP\fIopts\fP\fB);\fP
++\fBint field_opts_off(FIELD *\fIfield\fB, Field_Options \fIopts\fB);\fR
+ .br
+ .SH DESCRIPTION
+ The function \fBset_field_opts\fP sets all the given field's option bits (field
+Index: man/form_field_userptr.3x
+Prereq:  1.18 
+--- ncurses-6.3-20220205+/man/form_field_userptr.3x	2021-12-25 21:41:58.000000000 +0000
++++ ncurses-6.3-20220212/man/form_field_userptr.3x	2022-02-12 20:03:40.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_field_userptr.3x,v 1.18 2021/12/25 21:41:58 tom Exp $
++.\" $Id: form_field_userptr.3x,v 1.19 2022/02/12 20:03:40 tom Exp $
+ .TH form_field_userptr 3X ""
+ .SH NAME
+ \fBset_field_userptr\fP,
+@@ -36,9 +36,9 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint set_field_userptr(FIELD *\fP\fIfield\fP\fB, void *\fP\fIuserptr\fP\fB);\fP
++\fBint set_field_userptr(FIELD *\fIfield\fB, void *\fIuserptr\fB);\fR
+ .br
+-\fBvoid *field_userptr(const FIELD *\fP\fIfield\fP\fB);\fP
++\fBvoid *field_userptr(const FIELD *\fIfield\fB);\fR
+ .SH DESCRIPTION
+ Every form field has a field that can be used to hold application-specific data
+ (that is, the form-driver code leaves it alone).
+Index: man/form_field_validation.3x
+Prereq:  1.35 
+--- ncurses-6.3-20220205+/man/form_field_validation.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/form_field_validation.3x	2022-02-12 20:03:40.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_field_validation.3x,v 1.35 2021/12/25 21:49:32 tom Exp $
++.\" $Id: form_field_validation.3x,v 1.36 2022/02/12 20:03:40 tom Exp $
+ .TH form_field_validation 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -42,11 +42,11 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBvoid *field_arg(const FIELD *\fP\fIfield\fP\fB);\fP
++\fBvoid *field_arg(const FIELD *\fIfield\fB);\fR
+ .br
+-\fBFIELDTYPE *field_type(const FIELD *\fP\fIfield\fP\fB);\fP
++\fBFIELDTYPE *field_type(const FIELD *\fIfield\fB);\fR
+ .br
+-\fBint set_field_type(FIELD *\fP\fIfield\fP\fB, FIELDTYPE *\fP\fItype\fP\fB, ...);\fP
++\fBint set_field_type(FIELD *\fIfield\fB, FIELDTYPE *\fItype\fB, ...);\fR
+ .sp
+ /* predefined field types */
+ .br
+Index: man/form_fieldtype.3x
+Prereq:  1.30 
+--- ncurses-6.3-20220205+/man/form_fieldtype.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/form_fieldtype.3x	2022-02-12 20:03:40.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_fieldtype.3x,v 1.30 2021/12/25 21:49:32 tom Exp $
++.\" $Id: form_fieldtype.3x,v 1.31 2022/02/12 20:03:40 tom Exp $
+ .de bP
+ .ie n  .IP \(bu 4
+ .el    .IP \(bu 2
+@@ -40,24 +40,24 @@
+ \fB#include \fP
+ .sp
+ \fBFIELDTYPE *new_fieldtype(\fP
+-    \fBbool (* const \fP\fIfield_check\fP\fB)(FIELD *, const void *),\fP
+-    \fBbool (* const \fP\fIchar_check\fP\fB)(int, const void *));\fP
++    \fBbool (* const \fIfield_check\fB)(FIELD *, const void *),\fR
++    \fBbool (* const \fIchar_check\fB)(int, const void *));\fR
+ .br
+-\fBint free_fieldtype(FIELDTYPE *\fP\fIfieldtype\fP\fB);\fP
++\fBint free_fieldtype(FIELDTYPE *\fIfieldtype\fB);\fR
+ .sp
+ \fBint set_fieldtype_arg(\fP
+-    \fBFIELDTYPE *\fP\fIfieldtype\fP\fB,\fP
+-    \fBvoid *(* const \fP\fImake_arg\fP\fB)(va_list *),\fP
+-    \fBvoid *(* const \fP\fIcopy_arg\fP\fB)(const void *),\fP
+-    \fBvoid  (* const \fP\fIfree_arg\fP\fB)(void *));\fP
++    \fBFIELDTYPE *\fIfieldtype\fB,\fR
++    \fBvoid *(* const \fImake_arg\fB)(va_list *),\fR
++    \fBvoid *(* const \fIcopy_arg\fB)(const void *),\fR
++    \fBvoid  (* const \fIfree_arg\fB)(void *));\fR
+ .br
+ \fBint set_fieldtype_choice(\fP
+-    \fBFIELDTYPE *\fP\fIfieldtype\fP\fB,\fP
+-    \fBbool (* const \fP\fInext_choice\fP\fB)(FIELD *, const void *),\fP
+-    \fBbool (* const \fP\fIprev_choice\fP\fB)(FIELD *, const void *));\fP
++    \fBFIELDTYPE *\fIfieldtype\fB,\fR
++    \fBbool (* const \fInext_choice\fB)(FIELD *, const void *),\fR
++    \fBbool (* const \fIprev_choice\fB)(FIELD *, const void *));\fR
+ .sp
+-\fBFIELDTYPE *link_fieldtype(FIELDTYPE *\fP\fItype1\fP\fB,\fP
+-                          \fBFIELDTYPE *\fP\fItype2\fP\fB);\fP
++\fBFIELDTYPE *link_fieldtype(FIELDTYPE *\fItype1\fB,\fR
++                          \fBFIELDTYPE *\fItype2\fB);\fR
+ .SH DESCRIPTION
+ .SS new_fieldtype
+ The function \fBnew_fieldtype\fP creates a new field type usable for data
+Index: man/form_hook.3x
+Prereq:  1.18 
+--- ncurses-6.3-20220205+/man/form_hook.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/form_hook.3x	2022-02-12 20:03:40.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,28 +28,28 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_hook.3x,v 1.18 2021/12/25 21:49:32 tom Exp $
++.\" $Id: form_hook.3x,v 1.19 2022/02/12 20:03:40 tom Exp $
+ .TH form_hook 3X ""
+ .SH NAME
+ \fBform_hook\fP \- set hooks for automatic invocation by applications
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint set_field_init(FORM *\fP\fIform\fP\fB, Form_Hook \fP\fIfunc\fP\fB);\fP
++\fBint set_field_init(FORM *\fIform\fB, Form_Hook \fIfunc\fB);\fR
+ .br
+-\fBForm_Hook field_init(const FORM *\fP\fIform\fP\fB);\fP
++\fBForm_Hook field_init(const FORM *\fIform\fB);\fR
+ .sp
+-\fBint set_field_term(FORM *\fP\fIform\fP\fB, Form_Hook \fP\fIfunc\fP\fB);\fP
++\fBint set_field_term(FORM *\fIform\fB, Form_Hook \fIfunc\fB);\fR
+ .br
+-\fBForm_Hook field_term(const FORM *\fP\fIform\fP\fB);\fP
++\fBForm_Hook field_term(const FORM *\fIform\fB);\fR
+ .sp
+-\fBint set_form_init(FORM *\fP\fIform\fP\fB, Form_Hook \fP\fIfunc\fP\fB);\fP
++\fBint set_form_init(FORM *\fIform\fB, Form_Hook \fIfunc\fB);\fR
+ .br
+-\fBForm_Hook form_init(const FORM *\fP\fIform\fP\fB);\fP
++\fBForm_Hook form_init(const FORM *\fIform\fB);\fR
+ .sp
+-\fBint set_form_term(FORM *\fP\fIform\fP\fB, Form_Hook \fP\fIfunc\fP\fB);\fP
++\fBint set_form_term(FORM *\fIform\fB, Form_Hook \fIfunc\fB);\fR
+ .br
+-\fBForm_Hook form_term(const FORM *\fP\fIform\fP\fB);\fP
++\fBForm_Hook form_term(const FORM *\fIform\fB);\fR
+ .br
+ .SH DESCRIPTION
+ These functions make it possible to set hook functions to be called at various
+Index: man/form_new.3x
+Prereq:  1.17 
+--- ncurses-6.3-20220205+/man/form_new.3x	2021-12-25 21:41:58.000000000 +0000
++++ ncurses-6.3-20220212/man/form_new.3x	2022-02-12 20:03:40.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_new.3x,v 1.17 2021/12/25 21:41:58 tom Exp $
++.\" $Id: form_new.3x,v 1.18 2022/02/12 20:03:40 tom Exp $
+ .TH form_new 3X ""
+ .SH NAME
+ \fBnew_form\fP,
+@@ -36,9 +36,9 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBFORM *new_form(FIELD **\fP\fIfields\fP\fB);\fP
++\fBFORM *new_form(FIELD **\fIfields\fB);\fR
+ .br
+-\fBint free_form(FORM *\fP\fIform\fP\fB);\fP
++\fBint free_form(FORM *\fIform\fB);\fR
+ .br
+ .SH DESCRIPTION
+ The function \fBnew_form\fP creates a new form connected to a specified field
+Index: man/form_new_page.3x
+Prereq:  1.19 
+--- ncurses-6.3-20220205+/man/form_new_page.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/form_new_page.3x	2022-02-12 20:03:40.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_new_page.3x,v 1.19 2021/12/25 21:49:32 tom Exp $
++.\" $Id: form_new_page.3x,v 1.20 2022/02/12 20:03:40 tom Exp $
+ .TH form_new_page 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -40,9 +40,9 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint set_new_page(FIELD *\fP\fIfield\fP\fB, bool \fP\fInew_page_flag\fP\fB);\fP
++\fBint set_new_page(FIELD *\fIfield\fB, bool \fInew_page_flag\fB);\fR
+ .br
+-\fBbool new_page(const FIELD *\fP\fIfield\fP\fB);\fP
++\fBbool new_page(const FIELD *\fIfield\fB);\fR
+ .br
+ .SH DESCRIPTION
+ The function \fBset_new_page\fP sets or resets a flag marking the given field
+Index: man/form_opts.3x
+Prereq:  1.19 
+--- ncurses-6.3-20220205+/man/form_opts.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/form_opts.3x	2022-02-12 20:03:40.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_opts.3x,v 1.19 2021/12/25 21:49:32 tom Exp $
++.\" $Id: form_opts.3x,v 1.20 2022/02/12 20:03:40 tom Exp $
+ .TH form_opts 3X ""
+ .SH NAME
+ \fBset_form_opts\fP,
+@@ -38,13 +38,13 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint set_form_opts(FORM *\fP\fIform\fP\fB, Field_Options \fP\fIopts\fP\fB);\fP
++\fBint set_form_opts(FORM *\fIform\fB, Field_Options \fIopts\fB);\fR
+ .br
+-\fBField_Options form_opts(const FORM *\fP\fIform\fP\fB);\fP
++\fBField_Options form_opts(const FORM *\fIform\fB);\fR
+ .sp
+-\fBint form_opts_on(FORM *\fP\fIform\fP\fB, Field_Options \fP\fIopts\fP\fB);\fP
++\fBint form_opts_on(FORM *\fIform\fB, Field_Options \fIopts\fB);\fR
+ .br
+-\fBint form_opts_off(FORM *\fP\fIform\fP\fB, Field_Options \fP\fIopts\fP\fB);\fP
++\fBint form_opts_off(FORM *\fIform\fB, Field_Options \fIopts\fB);\fR
+ .br
+ .SH DESCRIPTION
+ The function \fBset_form_opts\fP sets all the given form's option bits (form
+Index: man/form_page.3x
+Prereq:  1.21 
+--- ncurses-6.3-20220205+/man/form_page.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/form_page.3x	2022-02-12 20:03:40.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2016 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,24 +28,24 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_page.3x,v 1.21 2021/12/25 21:49:32 tom Exp $
++.\" $Id: form_page.3x,v 1.22 2022/02/12 20:03:40 tom Exp $
+ .TH form_page 3X ""
+ .SH NAME
+ \fBform_page\fP \- set and get form page number
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint set_current_field(FORM *\fP\fIform\fP\fB, FIELD *\fP\fIfield\fP\fB);\fP
++\fBint set_current_field(FORM *\fIform\fB, FIELD *\fIfield\fB);\fR
+ .br
+-\fBFIELD *current_field(const FORM *\fP\fIform\fP\fB);\fP
++\fBFIELD *current_field(const FORM *\fIform\fB);\fR
+ .sp
+-\fBint unfocus_current_field(FORM *\fP\fIform\fP\fB);\fP
++\fBint unfocus_current_field(FORM *\fIform\fB);\fR
+ .sp
+-\fBint set_form_page(FORM *\fP\fIform\fP\fB, int \fP\fIn\fP\fB);\fP
++\fBint set_form_page(FORM *\fIform\fB, int \fIn\fB);\fR
+ .br
+-\fBint form_page(const FORM *\fP\fIform\fP\fB);\fP
++\fBint form_page(const FORM *\fIform\fB);\fR
+ .sp
+-\fBint field_index(const FIELD *\fP\fIfield\fP\fB);\fP
++\fBint field_index(const FIELD *\fIfield\fB);\fR
+ .br
+ .SH DESCRIPTION
+ The function \fBset_current_field\fP sets the current field of the given
+Index: man/form_post.3x
+Prereq:  1.18 
+--- ncurses-6.3-20220205+/man/form_post.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/form_post.3x	2022-02-12 20:03:40.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_post.3x,v 1.18 2021/12/25 21:49:32 tom Exp $
++.\" $Id: form_post.3x,v 1.19 2022/02/12 20:03:40 tom Exp $
+ .TH form_post 3X ""
+ .SH NAME
+ \fBpost_form\fP,
+@@ -36,9 +36,9 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint post_form(FORM *\fP\fIform\fP\fB);\fP
++\fBint post_form(FORM *\fIform\fB);\fR
+ .br
+-\fBint unpost_form(FORM *\fP\fIform\fP\fB);\fP
++\fBint unpost_form(FORM *\fIform\fB);\fR
+ .br
+ .SH DESCRIPTION
+ The function \fBpost_form\fP displays a form to its associated subwindow.
+Index: man/form_requestname.3x
+Prereq:  1.18 
+--- ncurses-6.3-20220205+/man/form_requestname.3x	2021-12-25 21:41:58.000000000 +0000
++++ ncurses-6.3-20220212/man/form_requestname.3x	2022-02-12 20:03:40.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_requestname.3x,v 1.18 2021/12/25 21:41:58 tom Exp $
++.\" $Id: form_requestname.3x,v 1.19 2022/02/12 20:03:40 tom Exp $
+ .TH form_requestname 3X ""
+ .SH NAME
+ \fBform_request_by_name\fP,
+@@ -36,9 +36,9 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBconst char *form_request_name(int \fP\fIrequest\fP\fB);\fP
++\fBconst char *form_request_name(int \fIrequest\fB);\fR
+ .br
+-\fBint form_request_by_name(const char *\fP\fIname\fP\fB);\fP
++\fBint form_request_by_name(const char *\fIname\fB);\fR
+ .br
+ .SH DESCRIPTION
+ .SS form_request_name
+Index: man/form_userptr.3x
+Prereq:  1.21 
+--- ncurses-6.3-20220205+/man/form_userptr.3x	2021-12-25 21:41:58.000000000 +0000
++++ ncurses-6.3-20220212/man/form_userptr.3x	2022-02-12 20:03:40.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_userptr.3x,v 1.21 2021/12/25 21:41:58 tom Exp $
++.\" $Id: form_userptr.3x,v 1.22 2022/02/12 20:03:40 tom Exp $
+ .TH form_userptr 3X ""
+ .SH NAME
+ \fBset_form_userptr\fP,
+@@ -36,9 +36,9 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint set_form_userptr(FORM *\fP\fIform\fP\fB, void *\fP\fIuserptr\fP\fB);\fP
++\fBint set_form_userptr(FORM *\fIform\fB, void *\fIuserptr\fB);\fR
+ .br
+-\fBvoid* form_userptr(const FORM *\fP\fIform\fP\fB);\fP
++\fBvoid* form_userptr(const FORM *\fIform\fB);\fR
+ .br
+ .SH DESCRIPTION
+ Every form and every form item has a field that can be used to hold
+Index: man/form_win.3x
+Prereq:  1.20 
+--- ncurses-6.3-20220205+/man/form_win.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/form_win.3x	2022-02-12 20:03:40.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,22 +28,22 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: form_win.3x,v 1.20 2021/12/25 21:49:32 tom Exp $
++.\" $Id: form_win.3x,v 1.21 2022/02/12 20:03:40 tom Exp $
+ .TH form_win 3X ""
+ .SH NAME
+ \fBform_win\fP \- make and break form window and subwindow associations
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint set_form_win(FORM *\fP\fIform\fP\fB, WINDOW *\fP\fIwin\fP\fB);\fP
++\fBint set_form_win(FORM *\fIform\fB, WINDOW *\fIwin\fB);\fR
+ .br
+-\fBWINDOW *form_win(const FORM *\fP\fIform\fP\fB);\fP
++\fBWINDOW *form_win(const FORM *\fIform\fB);\fR
+ .sp
+-\fBint set_form_sub(FORM *\fP\fIform\fP\fB, WINDOW *\fP\fIsub\fP\fB);\fP
++\fBint set_form_sub(FORM *\fIform\fB, WINDOW *\fIsub\fB);\fR
+ .br
+-\fBWINDOW *form_sub(const FORM *\fP\fIform\fP\fB);\fP
++\fBWINDOW *form_sub(const FORM *\fIform\fB);\fR
+ .sp
+-\fBint scale_form(const FORM *\fP\fIform\fP\fB, int *\fP\fIrows\fP\fB, int *\fP\fIcolumns\fP\fB);\fP
++\fBint scale_form(const FORM *\fIform\fB, int *\fIrows\fB, int *\fIcolumns\fB);\fR
+ .br
+ .SH DESCRIPTION
+ Every form has an associated pair of \fBcurses\fP windows.
+Index: man/infocmp.1m
+Prereq:  1.80 
+--- ncurses-6.3-20220205+/man/infocmp.1m	2021-12-25 18:55:27.000000000 +0000
++++ ncurses-6.3-20220212/man/infocmp.1m	2022-02-12 20:02:20.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: infocmp.1m,v 1.80 2021/12/25 18:55:27 tom Exp $
++.\" $Id: infocmp.1m,v 1.81 2022/02/12 20:02:20 tom Exp $
+ .TH @INFOCMP@ 1M ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -86,7 +86,7 @@
+ x\
+ \fP]
+ .br
+-      [\fB\-v\fP \fIn\fP] [\fB\-s d\fP| \fBi\fP| \fBl\fP| \fBc\fP] [\fB\-Q\fP \fIn\fP] [\fB\-R \fP\fBsubset\fP]
++      [\fB\-v\fR \fIn\fR] [\fB\-s d\fR| \fBi\fR| \fBl\fR| \fBc\fR] [\fB\-Q\fR \fIn\fR] [\fB\-R \fBsubset\fR]
+ .br
+       [\fB\-w\fP\ \fIwidth\fP] [\fB\-A\fP\ \fIdirectory\fP] [\fB\-B\fP\ \fIdirectory\fP]
+ .br
+@@ -473,7 +473,7 @@
+ Omit the \*(``Reconstructed from\*('' comment for source listings.
+ .RE
+ .TP 5
+-\fB\-R\fP\fIsubset\fP
++\fB\-R\fIsubset\fR
+ Restrict output to a given subset.
+ This option is for use with archaic
+ versions of terminfo like those on SVr1, Ultrix, or HP-UX that do not support
+@@ -494,7 +494,7 @@
+ The \fB\-I\fP option likewise selects no subset as a side-effect.
+ .RE
+ .TP
+-\fB\-s \fP\fI[d|i|l|c]\fP
++\fB\-s \fI[d|i|l|c]\fR
+ The \fB\-s\fP option sorts the fields within each type according to the argument
+ below:
+ .br
+Index: man/infotocap.1m
+Prereq:  1.19 
+--- ncurses-6.3-20220205+/man/infotocap.1m	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/infotocap.1m	2022-02-12 20:02:20.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1999-2010,2016 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,14 +28,14 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: infotocap.1m,v 1.19 2021/12/25 21:49:32 tom Exp $
++.\" $Id: infotocap.1m,v 1.20 2022/02/12 20:02:20 tom Exp $
+ .TH @INFOTOCAP@ 1M ""
+ .ds n 5
+ .ds d @TERMINFO@
+ .SH NAME
+ \fB@INFOTOCAP@\fP \- convert a \fIterminfo\fP description into a \fItermcap\fP description
+ .SH SYNOPSIS
+-\fB@INFOTOCAP@\fP [\fB\-v\fP\fIn\fP \fIwidth\fP]  [\fB\-V\fP] [\fB\-1\fP] [\fB\-w\fP \fIwidth\fP] \fIfile\fP ...
++\fB@INFOTOCAP@\fR [\fB\-v\fIn\fR \fIwidth\fR]  [\fB\-V\fR] [\fB\-1\fR] [\fB\-w\fR \fIwidth\fR] \fIfile\fR ...
+ .SH DESCRIPTION
+ \fB@INFOTOCAP@\fP looks in each given text
+ \fIfile\fP for \fBterminfo\fP descriptions.
+Index: man/key_defined.3x
+Prereq:  1.12 
+--- ncurses-6.3-20220205+/man/key_defined.3x	2021-12-25 21:41:58.000000000 +0000
++++ ncurses-6.3-20220212/man/key_defined.3x	2022-02-12 20:03:40.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 2003-2006,2010 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -29,14 +29,14 @@
+ .\"
+ .\" Author: Thomas E. Dickey 2003
+ .\"
+-.\" $Id: key_defined.3x,v 1.12 2021/12/25 21:41:58 tom Exp $
++.\" $Id: key_defined.3x,v 1.13 2022/02/12 20:03:40 tom Exp $
+ .TH key_defined 3X ""
+ .SH NAME
+ \fBkey_defined\fP \- check if a keycode is defined
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint key_defined(const char *\fP\fIdefinition\fP\fB);\fP
++\fBint key_defined(const char *\fIdefinition\fB);\fR
+ .SH DESCRIPTION
+ This is an extension to the curses library.
+ It permits an application to determine if a string is currently bound
+Index: man/keybound.3x
+Prereq:  1.13 
+--- ncurses-6.3-20220205+/man/keybound.3x	2021-12-25 21:41:58.000000000 +0000
++++ ncurses-6.3-20220212/man/keybound.3x	2022-02-12 20:03:40.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1999-2008,2010 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -29,14 +29,14 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1999
+ .\"
+-.\" $Id: keybound.3x,v 1.13 2021/12/25 21:41:58 tom Exp $
++.\" $Id: keybound.3x,v 1.14 2022/02/12 20:03:40 tom Exp $
+ .TH keybound 3X ""
+ .SH NAME
+ \fBkeybound\fP \- return definition of keycode
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBchar * keybound(int \fP\fIkeycode\fP\fB, int \fP\fIcount);\fP
++\fBchar * keybound(int \fIkeycode\fB, int \fIcount);\fR
+ .SH DESCRIPTION
+ This is an extension to the curses library.
+ It permits an application to determine the string which is defined
+Index: man/keyok.3x
+Prereq:  1.18 
+--- ncurses-6.3-20220205+/man/keyok.3x	2021-12-25 21:41:58.000000000 +0000
++++ ncurses-6.3-20220212/man/keyok.3x	2022-02-12 20:03:40.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -29,14 +29,14 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1997
+ .\"
+-.\" $Id: keyok.3x,v 1.18 2021/12/25 21:41:58 tom Exp $
++.\" $Id: keyok.3x,v 1.19 2022/02/12 20:03:40 tom Exp $
+ .TH keyok 3X ""
+ .SH NAME
+ \fBkeyok\fP \- enable or disable a keycode
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint keyok(int \fP\fIkeycode\fP\fB, bool \fP\fIenable\fP\fB);\fP
++\fBint keyok(int \fIkeycode\fB, bool \fIenable\fB);\fR
+ .SH DESCRIPTION
+ This is an extension to the curses library.
+ It permits an application to disable specific keycodes, rather than
+Index: man/legacy_coding.3x
+Prereq:  1.10 
+--- ncurses-6.3-20220205+/man/legacy_coding.3x	2021-12-25 17:39:16.000000000 +0000
++++ ncurses-6.3-20220212/man/legacy_coding.3x	2022-02-12 20:07:56.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2020,2021 Thomas E. Dickey                                     *
++.\" Copyright 2020-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 2005-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -29,14 +29,14 @@
+ .\"
+ .\" Author: Thomas E. Dickey
+ .\"
+-.\" $Id: legacy_coding.3x,v 1.10 2021/12/25 17:39:16 tom Exp $
++.\" $Id: legacy_coding.3x,v 1.11 2022/02/12 20:07:56 tom Exp $
+ .TH legacy_coding 3X ""
+ .SH NAME
+ \fBuse_legacy_coding\fP \- override locale-encoding checks
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint use_legacy_coding(int \fP\fIlevel\fP\fB);\fP
++\fBint use_legacy_coding(int \fIlevel\fB);\fR
+ .SH DESCRIPTION
+ The \fBuse_legacy_coding\fP function is an extension to the curses library.
+ It allows the caller to change the result of \fBunctrl\fP,
+Index: man/menu_attributes.3x
+Prereq:  1.21 
+--- ncurses-6.3-20220205+/man/menu_attributes.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/menu_attributes.3x	2022-02-12 20:05:11.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_attributes.3x,v 1.21 2021/12/25 21:49:32 tom Exp $
++.\" $Id: menu_attributes.3x,v 1.22 2022/02/12 20:05:11 tom Exp $
+ .TH menu_attributes 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -46,21 +46,21 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint set_menu_fore(MENU *\fP\fImenu\fP\fB, chtype \fP\fIattr\fP\fB);\fP
++\fBint set_menu_fore(MENU *\fImenu\fB, chtype \fIattr\fB);\fR
+ .br
+-\fBchtype menu_fore(const MENU *\fP\fImenu\fP\fB);\fP
++\fBchtype menu_fore(const MENU *\fImenu\fB);\fR
+ .sp
+-\fBint set_menu_back(MENU *\fP\fImenu\fP\fB, chtype \fP\fIattr\fP\fB);\fP
++\fBint set_menu_back(MENU *\fImenu\fB, chtype \fIattr\fB);\fR
+ .br
+-\fBchtype menu_back(const MENU *\fP\fImenu\fP\fB);\fP
++\fBchtype menu_back(const MENU *\fImenu\fB);\fR
+ .sp
+-\fBint set_menu_grey(MENU *\fP\fImenu\fP\fB, chtype \fP\fIattr\fP\fB);\fP
++\fBint set_menu_grey(MENU *\fImenu\fB, chtype \fIattr\fB);\fR
+ .br
+-\fBchtype menu_grey(const MENU *\fP\fImenu\fP\fB);\fP
++\fBchtype menu_grey(const MENU *\fImenu\fB);\fR
+ .sp
+-\fBint set_menu_pad(MENU *\fP\fImenu\fP\fB, int \fP\fIpad\fP\fB);\fP
++\fBint set_menu_pad(MENU *\fImenu\fB, int \fIpad\fB);\fR
+ .br
+-\fBint menu_pad(const MENU *\fP\fImenu\fP\fB);\fP
++\fBint menu_pad(const MENU *\fImenu\fB);\fR
+ .br
+ .SH DESCRIPTION
+ The function \fBset_menu_fore\fP sets the foreground attribute of
+Index: man/menu_cursor.3x
+Prereq:  1.15 
+--- ncurses-6.3-20220205+/man/menu_cursor.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/menu_cursor.3x	2022-02-12 20:05:11.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,14 +28,14 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_cursor.3x,v 1.15 2021/12/25 21:49:32 tom Exp $
++.\" $Id: menu_cursor.3x,v 1.16 2022/02/12 20:05:11 tom Exp $
+ .TH menu_cursor 3X ""
+ .SH NAME
+ \fBpos_menu_cursor\fP \- position a menu's cursor
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint pos_menu_cursor(const MENU *\fP\fImenu\fP\fB);\fP
++\fBint pos_menu_cursor(const MENU *\fImenu\fB);\fR
+ .br
+ .SH DESCRIPTION
+ The function \fBpos_menu_cursor\fP restores the cursor to the current position
+Index: man/menu_driver.3x
+Prereq:  1.30 
+--- ncurses-6.3-20220205+/man/menu_driver.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/menu_driver.3x	2022-02-12 20:05:11.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_driver.3x,v 1.30 2021/12/25 21:49:32 tom Exp $
++.\" $Id: menu_driver.3x,v 1.31 2022/02/12 20:05:11 tom Exp $
+ .TH menu_driver 3X ""
+ .de bP
+ .ie n  .IP \(bu 4
+@@ -38,7 +38,7 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint menu_driver(MENU *\fP\fImenu\fP\fB, int \fP\fIc\fP\fB);\fP
++\fBint menu_driver(MENU *\fImenu\fB, int \fIc\fB);\fR
+ .br
+ .SH DESCRIPTION
+ Once a menu has been posted (displayed), you should funnel input events to it
+Index: man/menu_format.3x
+Prereq:  1.20 
+--- ncurses-6.3-20220205+/man/menu_format.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/menu_format.3x	2022-02-12 20:05:11.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_format.3x,v 1.20 2021/12/25 21:49:32 tom Exp $
++.\" $Id: menu_format.3x,v 1.21 2022/02/12 20:05:11 tom Exp $
+ .TH menu_format 3X ""
+ .SH NAME
+ \fBset_menu_format\fP,
+@@ -36,9 +36,9 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint set_menu_format(MENU *\fP\fImenu\fP\fB, int \fP\fIrows\fP\fB, int \fP\fIcols\fP\fB);\fP
++\fBint set_menu_format(MENU *\fImenu\fB, int \fIrows\fB, int \fIcols\fB);\fR
+ .br
+-\fBvoid menu_format(const MENU *\fP\fImenu\fP\fB, int *\fP\fIrows\fP\fB, int *\fP\fIcols\fP\fB);\fP
++\fBvoid menu_format(const MENU *\fImenu\fB, int *\fIrows\fB, int *\fIcols\fB);\fR
+ .br
+ .SH DESCRIPTION
+ The function \fBset_menu_format\fP sets the maximum display size of the given
+Index: man/menu_hook.3x
+Prereq:  1.17 
+--- ncurses-6.3-20220205+/man/menu_hook.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/menu_hook.3x	2022-02-12 20:05:11.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2007,2010 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,28 +28,28 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_hook.3x,v 1.17 2021/12/25 21:49:32 tom Exp $
++.\" $Id: menu_hook.3x,v 1.18 2022/02/12 20:05:11 tom Exp $
+ .TH menu_hook 3X ""
+ .SH NAME
+ \fBmenu_hook\fP \- set hooks for automatic invocation by applications
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint set_item_init(MENU *\fP\fImenu\fP\fB, Menu_Hook \fP\fIfunc);\fP
++\fBint set_item_init(MENU *\fImenu\fB, Menu_Hook \fIfunc);\fR
+ .br
+-\fBMenu_Hook item_init(const MENU *\fP\fImenu);\fP
++\fBMenu_Hook item_init(const MENU *\fImenu);\fR
+ .sp
+-\fBint set_item_term(MENU *\fP\fImenu\fP\fB, Menu_Hook \fP\fIfunc);\fP
++\fBint set_item_term(MENU *\fImenu\fB, Menu_Hook \fIfunc);\fR
+ .br
+-\fBMenu_Hook item_term(const MENU *\fP\fImenu);\fP
++\fBMenu_Hook item_term(const MENU *\fImenu);\fR
+ .sp
+-\fBint set_menu_init(MENU *\fP\fImenu\fP\fB, Menu_Hook \fP\fIfunc);\fP
++\fBint set_menu_init(MENU *\fImenu\fB, Menu_Hook \fIfunc);\fR
+ .br
+-\fBMenu_Hook menu_init(const MENU *\fP\fImenu);\fP
++\fBMenu_Hook menu_init(const MENU *\fImenu);\fR
+ .sp
+-\fBint set_menu_term(MENU *\fP\fImenu\fP\fB, Menu_Hook \fP\fIfunc);\fP
++\fBint set_menu_term(MENU *\fImenu\fB, Menu_Hook \fIfunc);\fR
+ .br
+-\fBMenu_Hook menu_term(const MENU *\fP\fImenu);\fP
++\fBMenu_Hook menu_term(const MENU *\fImenu);\fR
+ .br
+ .SH DESCRIPTION
+ These functions make it possible to set hook functions to be called at various
+Index: man/menu_items.3x
+Prereq:  1.19 
+--- ncurses-6.3-20220205+/man/menu_items.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/menu_items.3x	2022-02-12 20:05:11.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2012,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_items.3x,v 1.19 2021/12/25 21:49:32 tom Exp $
++.\" $Id: menu_items.3x,v 1.20 2022/02/12 20:05:11 tom Exp $
+ .TH menu_items 3X ""
+ .SH NAME
+ \fBset_menu_items\fP,
+@@ -37,11 +37,11 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint set_menu_items(MENU *\fP\fImenu\fP\fB, ITEM **\fP\fIitems\fP\fB);\fP
++\fBint set_menu_items(MENU *\fImenu\fB, ITEM **\fIitems\fB);\fR
+ .br
+-\fBITEM **menu_items(const MENU *\fP\fImenu\fP\fB);\fP
++\fBITEM **menu_items(const MENU *\fImenu\fB);\fR
+ .br
+-\fBint item_count(const MENU *\fP\fImenu\fP\fB);\fP
++\fBint item_count(const MENU *\fImenu\fB);\fR
+ .br
+ .SH DESCRIPTION
+ The function \fBset_menu_items\fP changes the item pointer array of the given
+Index: man/menu_mark.3x
+Prereq:  1.20 
+--- ncurses-6.3-20220205+/man/menu_mark.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/menu_mark.3x	2022-02-12 20:02:20.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_mark.3x,v 1.20 2021/12/25 21:49:32 tom Exp $
++.\" $Id: menu_mark.3x,v 1.21 2022/02/12 20:02:20 tom Exp $
+ .TH menu_mark 3X ""
+ .SH NAME
+ \fBset_menu_mark\fP,
+@@ -36,9 +36,9 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint set_menu_mark(MENU *\fP\fImenu\fP\fB, const char *\fP\fImark\fP\fB);\fP
++\fBint set_menu_mark(MENU *\fImenu\fB, const char *\fImark\fB);\fR
+ .br
+-\fBconst char *menu_mark(const MENU *\fP\fImenu\fP\fB);\fP
++\fBconst char *menu_mark(const MENU *\fImenu\fB);\fR
+ .br
+ .SH DESCRIPTION
+ In order to make menu selections visible on older terminals without
+Index: man/menu_new.3x
+Prereq:  1.20 
+--- ncurses-6.3-20220205+/man/menu_new.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/menu_new.3x	2022-02-12 20:02:20.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_new.3x,v 1.20 2021/12/25 21:49:32 tom Exp $
++.\" $Id: menu_new.3x,v 1.21 2022/02/12 20:02:20 tom Exp $
+ .TH menu_new 3X ""
+ .SH NAME
+ \fBnew_menu\fP,
+@@ -36,9 +36,9 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBMENU *new_menu(ITEM **\fP\fIitems\fP\fB);\fP
++\fBMENU *new_menu(ITEM **\fIitems\fB);\fR
+ .br
+-\fBint free_menu(MENU *\fP\fImenu\fP\fB);\fP
++\fBint free_menu(MENU *\fImenu\fB);\fR
+ .br
+ .SH DESCRIPTION
+ The function \fBnew_menu\fP creates a new menu connected to a specified item
+Index: man/menu_opts.3x
+Prereq:  1.20 
+--- ncurses-6.3-20220205+/man/menu_opts.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/menu_opts.3x	2022-02-12 20:02:20.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2015,2016 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_opts.3x,v 1.20 2021/12/25 21:49:32 tom Exp $
++.\" $Id: menu_opts.3x,v 1.21 2022/02/12 20:02:20 tom Exp $
+ .TH menu_opts 3X ""
+ .SH NAME
+ \fBset_menu_opts\fP,
+@@ -38,13 +38,13 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint set_menu_opts(MENU *\fP\fImenu\fP\fB, Menu_Options \fP\fIopts\fP\fB);\fP
++\fBint set_menu_opts(MENU *\fImenu\fB, Menu_Options \fIopts\fB);\fR
+ .br
+-\fBMenu_Options menu_opts(const MENU *\fP\fImenu\fP\fB);\fP
++\fBMenu_Options menu_opts(const MENU *\fImenu\fB);\fR
+ .sp
+-\fBint menu_opts_on(MENU *\fP\fImenu\fP\fB, Menu_Options \fP\fIopts\fP\fB);\fP
++\fBint menu_opts_on(MENU *\fImenu\fB, Menu_Options \fIopts\fB);\fR
+ .br
+-\fBint menu_opts_off(MENU *\fP\fImenu\fP\fB, Menu_Options \fP\fIopts\fP\fB);\fP
++\fBint menu_opts_off(MENU *\fImenu\fB, Menu_Options \fIopts\fB);\fR
+ .br
+ .SH DESCRIPTION
+ The function \fBset_menu_opts\fP sets all the given menu's option bits (menu
+Index: man/menu_pattern.3x
+Prereq:  1.23 
+--- ncurses-6.3-20220205+/man/menu_pattern.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/menu_pattern.3x	2022-02-12 20:02:20.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_pattern.3x,v 1.23 2021/12/25 21:49:32 tom Exp $
++.\" $Id: menu_pattern.3x,v 1.24 2022/02/12 20:02:20 tom Exp $
+ .TH menu_pattern 3X ""
+ .SH NAME
+ \fBset_menu_pattern\fP,
+@@ -35,9 +35,9 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint set_menu_pattern(MENU *\fP\fImenu\fP\fB, const char *\fP\fIpattern\fP\fB);\fP
++\fBint set_menu_pattern(MENU *\fImenu\fB, const char *\fIpattern\fB);\fR
+ .br
+-\fBchar *menu_pattern(const MENU *\fP\fImenu\fP\fB);\fP
++\fBchar *menu_pattern(const MENU *\fImenu\fB);\fR
+ .br
+ .SH DESCRIPTION
+ Every menu has an associated pattern match buffer.
+Index: man/menu_post.3x
+Prereq:  1.21 
+--- ncurses-6.3-20220205+/man/menu_post.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/menu_post.3x	2022-02-12 20:02:20.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_post.3x,v 1.21 2021/12/25 21:49:32 tom Exp $
++.\" $Id: menu_post.3x,v 1.22 2022/02/12 20:02:20 tom Exp $
+ .TH menu_post 3X ""
+ .SH NAME
+ \fBpost_menu\fP,
+@@ -36,9 +36,9 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint post_menu(MENU *\fP\fImenu\fP\fB);\fP
++\fBint post_menu(MENU *\fImenu\fB);\fR
+ .br
+-\fBint unpost_menu(MENU *\fP\fImenu\fP\fB);\fP
++\fBint unpost_menu(MENU *\fImenu\fB);\fR
+ .br
+ .SH DESCRIPTION
+ The function \fBpost_menu\fP displays a menu to its associated subwindow.
+Index: man/menu_requestname.3x
+Prereq:  1.17 
+--- ncurses-6.3-20220205+/man/menu_requestname.3x	2021-12-25 21:42:57.000000000 +0000
++++ ncurses-6.3-20220212/man/menu_requestname.3x	2022-02-12 20:02:20.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_requestname.3x,v 1.17 2021/12/25 21:42:57 tom Exp $
++.\" $Id: menu_requestname.3x,v 1.18 2022/02/12 20:02:20 tom Exp $
+ .TH menu_requestname 3X ""
+ .SH NAME
+ \fBmenu_request_by_name\fP,
+@@ -36,9 +36,9 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBconst char *menu_request_name(int \fP\fIrequest\fP\fB);\fP
++\fBconst char *menu_request_name(int \fIrequest\fB);\fR
+ .br
+-\fBint menu_request_by_name(const char *\fP\fIname\fP\fB);\fP
++\fBint menu_request_by_name(const char *\fIname\fB);\fR
+ .br
+ .SH DESCRIPTION
+ The function \fBmenu_request_name\fP returns the printable name of a menu
+Index: man/menu_spacing.3x
+Prereq:  1.19 
+--- ncurses-6.3-20220205+/man/menu_spacing.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/menu_spacing.3x	2022-02-12 20:02:20.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_spacing.3x,v 1.19 2021/12/25 21:49:32 tom Exp $
++.\" $Id: menu_spacing.3x,v 1.20 2022/02/12 20:02:20 tom Exp $
+ .TH menu_spacing 3X ""
+ .SH NAME
+ \fBset_menu_spacing\fP,
+@@ -36,15 +36,15 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint set_menu_spacing(MENU *\fP\fImenu\fP\fB,\fP
+-                     \fBint \fP\fIspc_description\fP\fB,\fP
+-                     \fBint \fP\fIspc_rows\fP\fB,\fP
+-                     \fBint \fP\fIspc_columns\fP\fB);\fP
++\fBint set_menu_spacing(MENU *\fImenu\fB,\fR
++                     \fBint \fIspc_description\fB,\fR
++                     \fBint \fIspc_rows\fB,\fR
++                     \fBint \fIspc_columns\fB);\fR
+ .br
+-\fBint menu_spacing(const MENU *\fP\fImenu\fP\fB,\fP
+-                 \fBint* \fP\fIspc_description\fP\fB,\fP
+-                 \fBint* \fP\fIspc_rows\fP\fB,\fP
+-                 \fBint* \fP\fIspc_columns\fP\fB);\fP
++\fBint menu_spacing(const MENU *\fImenu\fB,\fR
++                 \fBint* \fIspc_description\fB,\fR
++                 \fBint* \fIspc_rows\fB,\fR
++                 \fBint* \fIspc_columns\fB);\fR
+ .br
+ .SH DESCRIPTION
+ The function \fBset_menu_spacing\fP sets the spacing information for the menu.
+Index: man/menu_userptr.3x
+Prereq:  1.18 
+--- ncurses-6.3-20220205+/man/menu_userptr.3x	2021-12-25 21:42:57.000000000 +0000
++++ ncurses-6.3-20220212/man/menu_userptr.3x	2022-02-12 20:02:20.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_userptr.3x,v 1.18 2021/12/25 21:42:57 tom Exp $
++.\" $Id: menu_userptr.3x,v 1.19 2022/02/12 20:02:20 tom Exp $
+ .TH menu_userptr 3X ""
+ .SH NAME
+ \fBset_menu_userptr\fP,
+@@ -36,9 +36,9 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint set_menu_userptr(MENU *\fP\fImenu\fP\fB, void *\fP\fIuserptr\fP\fB);\fP
++\fBint set_menu_userptr(MENU *\fImenu\fB, void *\fIuserptr\fB);\fR
+ .br
+-\fBvoid *menu_userptr(const MENU *\fP\fImenu\fP\fB);\fP
++\fBvoid *menu_userptr(const MENU *\fImenu\fB);\fR
+ .br
+ .SH DESCRIPTION
+ Every menu and every menu item has a field that can be used to hold
+Index: man/menu_win.3x
+Prereq:  1.17 
+--- ncurses-6.3-20220205+/man/menu_win.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/menu_win.3x	2022-02-12 20:02:20.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,22 +28,22 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: menu_win.3x,v 1.17 2021/12/25 21:49:32 tom Exp $
++.\" $Id: menu_win.3x,v 1.18 2022/02/12 20:02:20 tom Exp $
+ .TH menu_win 3X ""
+ .SH NAME
+ \fBmenu_win\fP \- make and break menu window and subwindow associations
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint set_menu_win(MENU *\fP\fImenu\fP\fB, WINDOW *\fP\fIwin\fP\fB);\fP
++\fBint set_menu_win(MENU *\fImenu\fB, WINDOW *\fIwin\fB);\fR
+ .br
+-\fBWINDOW *menu_win(const MENU *\fP\fImenu\fP\fB);\fP
++\fBWINDOW *menu_win(const MENU *\fImenu\fB);\fR
+ .sp
+-\fBint set_menu_sub(MENU *\fP\fImenu\fP\fB, WINDOW *\fP\fIsub\fP\fB);\fP
++\fBint set_menu_sub(MENU *\fImenu\fB, WINDOW *\fIsub\fB);\fR
+ .br
+-\fBWINDOW *menu_sub(const MENU *\fP\fImenu\fP\fB);\fP
++\fBWINDOW *menu_sub(const MENU *\fImenu\fB);\fR
+ .sp
+-\fBint scale_menu(const MENU *\fP\fImenu, int *\fP\fIrows\fP\fB, int *\fP\fIcolumns);\fP
++\fBint scale_menu(const MENU *\fImenu, int *\fIrows\fB, int *\fIcolumns);\fR
+ .br
+ .SH DESCRIPTION
+ Every menu has an associated pair of \fBcurses\fP windows.
+Index: man/mitem_current.3x
+Prereq:  1.22 
+--- ncurses-6.3-20220205+/man/mitem_current.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/mitem_current.3x	2022-02-12 20:02:20.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2006,2010 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,22 +28,22 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: mitem_current.3x,v 1.22 2021/12/25 21:49:32 tom Exp $
++.\" $Id: mitem_current.3x,v 1.23 2022/02/12 20:02:20 tom Exp $
+ .TH mitem_current 3X ""
+ .SH NAME
+ \fBmitem_current\fP \- set and get current_menu_item
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint set_current_item(MENU *\fP\fImenu\fP\fB, ITEM *\fP\fIitem\fP\fB);\fP
++\fBint set_current_item(MENU *\fImenu\fB, ITEM *\fIitem\fB);\fR
+ .br
+-\fBITEM *current_item(const MENU *\fP\fImenu\fP\fB);\fP
++\fBITEM *current_item(const MENU *\fImenu\fB);\fR
+ .sp
+-\fBint set_top_row(MENU *\fP\fImenu\fP\fB, int \fP\fIrow\fP\fB);\fP
++\fBint set_top_row(MENU *\fImenu\fB, int \fIrow\fB);\fR
+ .br
+-\fBint top_row(const MENU *\fP\fImenu\fP\fB);\fP
++\fBint top_row(const MENU *\fImenu\fB);\fR
+ .sp
+-\fBint item_index(const ITEM *\fP\fIitem\fP\fB);\fP
++\fBint item_index(const ITEM *\fIitem\fB);\fR
+ .br
+ .SH DESCRIPTION
+ The function \fBset_current_item\fP sets the current item (the item on which
+Index: man/mitem_name.3x
+Prereq:  1.16 
+--- ncurses-6.3-20220205+/man/mitem_name.3x	2021-12-25 21:42:57.000000000 +0000
++++ ncurses-6.3-20220212/man/mitem_name.3x	2022-02-12 20:02:20.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: mitem_name.3x,v 1.16 2021/12/25 21:42:57 tom Exp $
++.\" $Id: mitem_name.3x,v 1.17 2022/02/12 20:02:20 tom Exp $
+ .TH mitem_name 3X ""
+ .SH NAME
+ \fBitem_name\fP,
+@@ -36,9 +36,9 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBconst char *item_name(const ITEM *\fP\fIitem\fP\fB);\fP
++\fBconst char *item_name(const ITEM *\fIitem\fB);\fR
+ .br
+-\fBconst char *item_description(const ITEM *\fP\fIitem\fP\fB);\fP
++\fBconst char *item_description(const ITEM *\fIitem\fB);\fR
+ .br
+ .SH DESCRIPTION
+ The function \fBitem_name\fP returns the name part of the given item.
+Index: man/mitem_new.3x
+Prereq:  1.21 
+--- ncurses-6.3-20220205+/man/mitem_new.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/mitem_new.3x	2022-02-12 20:02:20.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: mitem_new.3x,v 1.21 2021/12/25 21:49:32 tom Exp $
++.\" $Id: mitem_new.3x,v 1.22 2022/02/12 20:02:20 tom Exp $
+ .TH mitem_new 3X ""
+ .SH NAME
+ \fBnew_item\fP,
+@@ -36,9 +36,9 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBITEM *new_item(const char *\fP\fIname\fP\fB, const char *\fP\fIdescription\fP\fB);\fP
++\fBITEM *new_item(const char *\fIname\fB, const char *\fIdescription\fB);\fR
+ .br
+-\fBint free_item(ITEM *\fP\fIitem\fP\fB);\fP
++\fBint free_item(ITEM *\fIitem\fB);\fR
+ .br
+ .SH DESCRIPTION
+ The function \fBnew_item\fP allocates a new item and initializes it from the
+Index: man/mitem_opts.3x
+Prereq:  1.18 
+--- ncurses-6.3-20220205+/man/mitem_opts.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/mitem_opts.3x	2022-02-12 20:02:20.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: mitem_opts.3x,v 1.18 2021/12/25 21:49:32 tom Exp $
++.\" $Id: mitem_opts.3x,v 1.19 2022/02/12 20:02:20 tom Exp $
+ .TH mitem_opts 3X ""
+ .SH NAME
+ \fBset_item_opts\fP,
+@@ -38,13 +38,13 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint set_item_opts(ITEM *\fP\fIitem\fP\fB, Item_Options \fP\fIopts\fP\fB);\fP
++\fBint set_item_opts(ITEM *\fIitem\fB, Item_Options \fIopts\fB);\fR
+ .br
+-\fBItem_Options item_opts(const ITEM *\fP\fIitem\fP\fB);\fP
++\fBItem_Options item_opts(const ITEM *\fIitem\fB);\fR
+ .sp
+-\fBint item_opts_on(ITEM *\fP\fIitem\fP\fB, Item_Options \fP\fIopts\fP\fB);\fP
++\fBint item_opts_on(ITEM *\fIitem\fB, Item_Options \fIopts\fB);\fR
+ .br
+-\fBint item_opts_off(ITEM *\fP\fIitem\fP\fB, Item_Options \fP\fIopts\fP\fB);\fP
++\fBint item_opts_off(ITEM *\fIitem\fB, Item_Options \fIopts\fB);\fR
+ .br
+ .SH DESCRIPTION
+ The function \fBset_item_opts\fP sets all the given item's option bits (menu
+Index: man/mitem_userptr.3x
+Prereq:  1.19 
+--- ncurses-6.3-20220205+/man/mitem_userptr.3x	2021-12-25 21:42:57.000000000 +0000
++++ ncurses-6.3-20220212/man/mitem_userptr.3x	2022-02-12 20:02:20.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: mitem_userptr.3x,v 1.19 2021/12/25 21:42:57 tom Exp $
++.\" $Id: mitem_userptr.3x,v 1.20 2022/02/12 20:02:20 tom Exp $
+ .TH mitem_userptr 3X ""
+ .SH NAME
+ \fBset_item_userptr\fP,
+@@ -36,9 +36,9 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint set_item_userptr(ITEM *\fP\fIitem\fP\fB, void *\fP\fIuserptr\fP\fB);\fP
++\fBint set_item_userptr(ITEM *\fIitem\fB, void *\fIuserptr\fB);\fR
+ .br
+-\fBvoid *item_userptr(const ITEM *\fP\fIitem\fP\fB);\fP
++\fBvoid *item_userptr(const ITEM *\fIitem\fB);\fR
+ .br
+ .SH DESCRIPTION
+ Every menu item has a field that can be used to hold application-specific data
+Index: man/mitem_value.3x
+Prereq:  1.17 
+--- ncurses-6.3-20220205+/man/mitem_value.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/mitem_value.3x	2022-02-12 20:02:20.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: mitem_value.3x,v 1.17 2021/12/25 21:49:32 tom Exp $
++.\" $Id: mitem_value.3x,v 1.18 2022/02/12 20:02:20 tom Exp $
+ .TH mitem_value 3X ""
+ .SH NAME
+ \fBset_item_value\fP,
+@@ -35,9 +35,9 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint set_item_value(ITEM *\fP\fIitem\fP\fB, bool \fP\fIvalue\fP\fB);\fP
++\fBint set_item_value(ITEM *\fIitem\fB, bool \fIvalue\fB);\fR
+ .br
+-\fBbool item_value(const ITEM *\fP\fIitem\fP\fB);\fP
++\fBbool item_value(const ITEM *\fIitem\fB);\fR
+ .br
+ .SH DESCRIPTION
+ If you turn off the menu option \fBO_ONEVALUE\fP (e.g., with
+Index: man/mitem_visible.3x
+Prereq:  1.12 
+--- ncurses-6.3-20220205+/man/mitem_visible.3x	2021-12-25 21:42:57.000000000 +0000
++++ ncurses-6.3-20220212/man/mitem_visible.3x	2022-02-12 20:03:40.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998,2010 Free Software Foundation, Inc.                       *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,14 +28,14 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: mitem_visible.3x,v 1.12 2021/12/25 21:42:57 tom Exp $
++.\" $Id: mitem_visible.3x,v 1.13 2022/02/12 20:03:40 tom Exp $
+ .TH mitem_visible 3X ""
+ .SH NAME
+ \fBmitem_visible\fP \- check visibility of a menu item
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBbool item_visible(const ITEM *\fP\fIitem\fP\fB);\fP
++\fBbool item_visible(const ITEM *\fIitem\fB);\fR
+ .br
+ .SH DESCRIPTION
+ A menu item is visible when it is in the portion of a posted menu that
+Index: man/new_pair.3x
+Prereq:  1.18 
+--- ncurses-6.3-20220205+/man/new_pair.3x	2021-12-25 20:10:40.000000000 +0000
++++ ncurses-6.3-20220212/man/new_pair.3x	2022-02-12 20:03:40.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 2017 Free Software Foundation, Inc.                            *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -29,7 +29,7 @@
+ .\"
+ .\" Author: Thomas E. Dickey
+ .\"
+-.\" $Id: new_pair.3x,v 1.18 2021/12/25 20:10:40 tom Exp $
++.\" $Id: new_pair.3x,v 1.19 2022/02/12 20:03:40 tom Exp $
+ .TH new_pair 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -60,11 +60,11 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint alloc_pair(int \fP\fIfg\fP\fB, int \fP\fIbg\fP\fB);\fP
++\fBint alloc_pair(int \fIfg\fB, int \fIbg\fB);\fR
+ .br
+-\fBint find_pair(int \fP\fIfg\fP\fB, int \fP\fIbg\fP\fB);\fP
++\fBint find_pair(int \fIfg\fB, int \fIbg\fB);\fR
+ .br
+-\fBint free_pair(int \fP\fIpair\fP\fB);\fP
++\fBint free_pair(int \fIpair\fB);\fR
+ .SH DESCRIPTION
+ These functions are an extension to the curses library.
+ They permit an application to dynamically allocate a color pair using
+@@ -90,14 +90,14 @@
+ it is convenient to use the maximum number of combinations
+ as the limit on color pairs:
+ .NS
+-\fBCOLORS\fP\fI * \fP\fBCOLORS\fP
++\fBCOLORS\fI * \fBCOLORS\fR
+ .NE
+ .bP
+ Terminals which support \fIdefault colors\fP distinct
+ from \*(``ANSI colors\*(''
+ add to the possible combinations, producing this total:
+ .NS
+-\fI( \fP\fBCOLORS\fP\fI + 1 ) * ( \fP\fBCOLORS\fP\fI + 1 )\fP
++\fI( \fBCOLORS\fI + 1 ) * ( \fBCOLORS\fI + 1 )\fR
+ .NE
+ .bP
+ An application might use up to a few dozen color pairs to
+Index: man/panel.3x
+Prereq:  1.41 
+--- ncurses-6.3-20220205+/man/panel.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/panel.3x	2022-02-12 20:03:40.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: panel.3x,v 1.41 2021/12/25 21:49:32 tom Exp $
++.\" $Id: panel.3x,v 1.42 2022/02/12 20:03:40 tom Exp $
+ .TH panel 3X ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -44,41 +44,41 @@
+ .P
+ \fBcc [flags] sourcefiles \-lpanel \-lncurses\fP
+ .P
+-\fBPANEL *new_panel(WINDOW *\fIwin\fP\fB);\fP
++\fBPANEL *new_panel(WINDOW *\fIwin\fB);\fR
+ .sp
+-\fBint bottom_panel(PANEL *\fP\fIpan\fP\fB);\fP
++\fBint bottom_panel(PANEL *\fIpan\fB);\fR
+ .br
+-\fBint top_panel(PANEL *\fP\fIpan\fP\fB);\fP
++\fBint top_panel(PANEL *\fIpan\fB);\fR
+ .br
+-\fBint show_panel(PANEL *\fP\fIpan\fP\fB);\fP
++\fBint show_panel(PANEL *\fIpan\fB);\fR
+ .br
+ \fBvoid update_panels(void);\fP
+ .br
+-\fBint hide_panel(PANEL *\fP\fIpan\fP\fB);\fP
++\fBint hide_panel(PANEL *\fIpan\fB);\fR
+ .sp
+-\fBWINDOW *panel_window(const PANEL *\fIpan\fP\fB);\fP
++\fBWINDOW *panel_window(const PANEL *\fIpan\fB);\fR
+ .br
+-\fBint replace_panel(PANEL *\fIpan\fP\fB, WINDOW *\fIwindow\fP\fB);\fP
++\fBint replace_panel(PANEL *\fIpan\fB, WINDOW *\fIwindow\fB);\fR
+ .br
+-\fBint move_panel(PANEL *\fIpan\fP\fB, int \fIstarty\fP\fB, int \fIstartx\fP\fB);\fP
++\fBint move_panel(PANEL *\fIpan\fB, int \fIstarty\fB, int \fIstartx\fB);\fR
+ .br
+-\fBint panel_hidden(const PANEL *\fIpan\fP\fB);\fP
++\fBint panel_hidden(const PANEL *\fIpan\fB);\fR
+ .sp
+-\fBPANEL *panel_above(const PANEL *\fIpan\fP\fB);\fP
++\fBPANEL *panel_above(const PANEL *\fIpan\fB);\fR
+ .br
+-\fBPANEL *panel_below(const PANEL *\fIpan\fP\fB);\fP
++\fBPANEL *panel_below(const PANEL *\fIpan\fB);\fR
+ .sp
+-\fBint set_panel_userptr(PANEL *\fIpan\fP\fB, const void *\fIptr\fP\fB);\fP
++\fBint set_panel_userptr(PANEL *\fIpan\fB, const void *\fIptr\fB);\fR
+ .br
+-\fBconst void *panel_userptr(const PANEL *\fIpan\fP\fB);\fP
++\fBconst void *panel_userptr(const PANEL *\fIpan\fB);\fR
+ .sp
+-\fBint del_panel(PANEL *\fIpan\fP\fB);\fP
++\fBint del_panel(PANEL *\fIpan\fB);\fR
+ .sp
+ \fR/* ncurses-extensions */\fP
+ .br
+-\fBPANEL *ground_panel(SCREEN *\fIsp\fP\fB);\fP
++\fBPANEL *ground_panel(SCREEN *\fIsp\fB);\fR
+ .br
+-\fBPANEL *ceiling_panel(SCREEN *\fIsp\fP\fB);\fP
++\fBPANEL *ceiling_panel(SCREEN *\fIsp\fB);\fR
+ .br
+ .SH DESCRIPTION
+ Panels are \fBcurses\fP(3X) windows with the added feature of
+@@ -101,69 +101,69 @@
+ .SH FUNCTIONS
+ .\" ---------
+ .SS bottom_panel
+-\fBbottom_panel(\fIpan\fP\fB)\fR
++\fBbottom_panel(\fIpan\fB)\fR
+ puts panel \fIpan\fP at the bottom of all panels.
+ .\" ---------
+ .SS ceiling_panel
+-\fBceiling_panel(\fIsp\fP\fB)\fR
++\fBceiling_panel(\fIsp\fB)\fR
+ acts like \fBpanel_below(NULL)\fP, for the given \fBSCREEN\fP \fIsp\fP.
+ .\" ---------
+ .SS del_panel
+-\fBdel_panel(\fIpan\fP\fB)\fR
++\fBdel_panel(\fIpan\fB)\fR
+ removes the given panel \fIpan\fP from the  stack and deallocates the
+ \fBPANEL\fP structure (but not its associated window).
+ .\" ---------
+ .SS ground_panel
+-\fBground_panel(\fIsp\fP\fB)\fR
++\fBground_panel(\fIsp\fB)\fR
+ acts like \fBpanel_above(NULL)\fP, for the given \fBSCREEN\fP \fIsp\fP.
+ .\" ---------
+ .SS hide_panel
+-\fBhide_panel(\fIpan\fP\fB)\fR
++\fBhide_panel(\fIpan\fB)\fR
+ removes the given panel \fIpan\fP from the panel stack
+ and thus hides it from view.
+ The \fBPANEL\fP structure is not lost, merely removed from the stack.
+ .\" ---------
+ .SS move_panel
+-\fBmove_panel(\fIpan\fP\fB,\fIstarty\fP\fB,\fIstartx\fP\fB)\fR
++\fBmove_panel(\fIpan\fB,\fIstarty\fB,\fIstartx\fB)\fR
+ moves the given panel \fIpan\fP's window so that its upper-left corner is at
+ \fIstarty\fP, \fIstartx\fP.
+ It does not change the position of the panel in the stack.
+ Be sure to use this function, not \fBmvwin\fP(3X), to move a panel window.
+ .\" ---------
+ .SS new_panel
+-\fBnew_panel(\fIwin\fP\fB)\fR allocates a \fBPANEL\fP structure,
++\fBnew_panel(\fIwin\fB)\fR allocates a \fBPANEL\fR structure,
+ associates it with \fIwin\fP, places the panel on the top of the stack
+ (causes  it to  be  displayed above any other panel) and returns a
+ pointer to the new panel.
+ .\" ---------
+ .SS panel_above
+-\fBpanel_above(\fIpan\fP\fB)\fR
++\fBpanel_above(\fIpan\fB)\fR
+ returns a pointer to the panel above \fIpan\fP.
+ If the panel argument is
+ \fB(PANEL *)0\fP, it returns a pointer to the bottom panel in the stack.
+ .\" ---------
+ .SS panel_below
+-\fBpanel_below(\fIpan\fP\fB)\fR
++\fBpanel_below(\fIpan\fB)\fR
+ returns a pointer to the panel just below \fIpan\fP.
+ If the panel argument
+ is \fB(PANEL *)0\fP, it returns a pointer to the top panel in the stack.
+ .\" ---------
+ .SS panel_hidden
+-\fBpanel_hidden(\fIpan\fP\fB)\fR
++\fBpanel_hidden(\fIpan\fB)\fR
+ returns \fBTRUE\fP if the panel \fIpan\fP is in the panel stack,
+ \fBFALSE\fP if it is not.
+ If the panel is a null pointer, return \fBERR\fP.
+ .\" ---------
+ .SS panel_userptr
+-\fBpanel_userptr(\fIpan\fP\fB)\fR
++\fBpanel_userptr(\fIpan\fB)\fR
+ returns the user pointer for a given panel \fIpan\fP.
+ .\" ---------
+ .SS panel_window
+-\fBpanel_window(\fIpan\fP\fB)\fR
++\fBpanel_window(\fIpan\fB)\fR
+ returns a pointer to the window of the given panel \fIpan\fP.
+ .\" ---------
+ .SS replace_panel
+-\fBreplace_panel(\fIpan\fP\fB,\fIwindow\fP\fB)\fR
++\fBreplace_panel(\fIpan\fB,\fIwindow\fB)\fR
+ replaces the current window of panel \fIpan\fP with \fIwindow\fP
+ This is useful, for example if you want to resize a panel.
+ In \fBncurses\fP, you can call \fBreplace_panel\fP
+@@ -171,17 +171,17 @@
+ It does not change the position of the panel in the stack.
+ .\" ---------
+ .SS set_panel_userptr
+-\fBset_panel_userptr(\fIpan\fP\fB,\fIptr\fP\fB)\fR
++\fBset_panel_userptr(\fIpan\fB,\fIptr\fB)\fR
+ sets the panel's user pointer.
+ .\" ---------
+ .SS show_panel
+-\fBshow_panel(\fIpan\fP\fB)\fR
++\fBshow_panel(\fIpan\fB)\fR
+ makes a hidden panel visible by placing it on top of the panels in the
+ panel stack.
+ See \fBCOMPATIBILITY\fP below.
+ .\" ---------
+ .SS top_panel
+-\fBtop_panel(\fIpan\fP\fB)\fR
++\fBtop_panel(\fIpan\fB)\fR
+ puts the given visible panel \fIpan\fP on top of all panels in the stack.
+ See \fBCOMPATIBILITY\fP below.
+ .\" ---------
+Index: man/resizeterm.3x
+Prereq:  1.30 
+--- ncurses-6.3-20220205+/man/resizeterm.3x	2021-12-25 21:49:32.000000000 +0000
++++ ncurses-6.3-20220212/man/resizeterm.3x	2022-02-12 20:07:29.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -29,7 +29,7 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1996-on
+ .\"
+-.\" $Id: resizeterm.3x,v 1.30 2021/12/25 21:49:32 tom Exp $
++.\" $Id: resizeterm.3x,v 1.31 2022/02/12 20:07:29 tom Exp $
+ .TH resizeterm 3X ""
+ .de bP
+ .ie n  .IP \(bu 4
+@@ -42,11 +42,11 @@
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBbool is_term_resized(int \fP\fIlines\fP\fB, int \fP\fIcolumns\fP\fB);\fP
++\fBbool is_term_resized(int \fIlines\fB, int \fIcolumns\fB);\fR
+ .br
+-\fBint resize_term(int \fP\fIlines\fP\fB, int \fP\fIcolumns\fP\fB);\fP
++\fBint resize_term(int \fIlines\fB, int \fIcolumns\fB);\fR
+ .br
+-\fBint resizeterm(int \fP\fIlines\fP\fB, int \fP\fIcolumns\fP\fB);\fP
++\fBint resizeterm(int \fIlines\fB, int \fIcolumns\fB);\fR
+ .SH DESCRIPTION
+ .PP
+ This is an extension to the curses library.
+Index: man/tic.1m
+Prereq:  1.81 
+--- ncurses-6.3-20220205+/man/tic.1m	2021-12-25 17:39:16.000000000 +0000
++++ ncurses-6.3-20220212/man/tic.1m	2022-02-12 20:02:20.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tic.1m,v 1.81 2021/12/25 17:39:16 tom Exp $
++.\" $Id: tic.1m,v 1.82 2022/02/12 20:02:20 tom Exp $
+ .TH @TIC@ 1M ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -206,7 +206,7 @@
+ it will print a diagnostic and exit with an error rather than
+ printing a list of database locations.
+ .TP
+-\fB\-e \fP\fInames\fP
++\fB\-e \fInames\fR
+ Limit writes and translations to the following comma-separated list of
+ terminals.
+ If any name or alias of a terminal matches one of the names in
+@@ -253,11 +253,11 @@
+ This option forces a more literal translation that also preserves the
+ obsolete capabilities.
+ .TP
+-\fB\-o\fP\fIdir\fP
++\fB\-o\fIdir\fR
+ Write compiled entries to given database location.
+ Overrides the TERMINFO environment variable.
+ .TP
+-\fB\-Q\fP\fIn\fP
++\fB\-Q\fIn\fR
+ Rather than show source in terminfo (text) format,
+ print the compiled (binary) format in hexadecimal or base64 form,
+ depending on the option's value:
+@@ -276,7 +276,7 @@
+ \fB\-q\fP
+ Suppress comments and blank lines when showing translated source.
+ .TP
+-\fB\-R\fP\fIsubset\fP
++\fB\-R\fIsubset\fR
+ Restrict output to a given subset.
+ This option is for use with archaic
+ versions of terminfo like those on SVr1, Ultrix, or HP-UX that do not support
+@@ -316,7 +316,7 @@
+ \fB\-V\fP
+ reports the version of ncurses which was used in this program, and exits.
+ .TP
+-\fB\-v\fP\fIn\fP
++\fB\-v\fIn\fR
+ specifies that (verbose) output be written to standard error trace
+ information showing \fB@TIC@\fP's progress.
+ .IP
+@@ -361,7 +361,7 @@
+ If you specify both \fB\-f\fP and \fB\-W\fP options,
+ the latter is ignored when \fB\-f\fP has already split the line.
+ .TP
+-\fB\-w\fP\fIn\fP
++\fB\-w\fIn\fR
+ specifies the width of the output.
+ The parameter is optional.
+ If it is omitted, it defaults to 60.
+@@ -399,7 +399,7 @@
+ those capabilities that explicitly are defined in the current entry.
+ .PP
+ When an entry, e.g., \fBentry_name_1\fP, contains a
+-\fBuse=\fP\fIentry\fR_\fIname\fR_\fI2\fP field, any canceled
++\fBuse=\fIentry\fR_\fIname\fR_\fI2\fR field, any canceled
+ capabilities in \fIentry\fR_\fIname\fR_\fI2\fP must also appear in
+ \fBentry_name_1\fP before \fBuse=\fP for these capabilities to be
+ canceled in \fBentry_name_1\fP.
+Index: man/toe.1m
+Prereq:  1.35 
+--- ncurses-6.3-20220205+/man/toe.1m	2021-12-25 17:39:16.000000000 +0000
++++ ncurses-6.3-20220212/man/toe.1m	2022-02-12 20:02:20.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2019-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2019-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: toe.1m,v 1.35 2021/12/25 17:39:16 tom Exp $
++.\" $Id: toe.1m,v 1.36 2022/02/12 20:02:20 tom Exp $
+ .TH @TOE@ 1M ""
+ .de bP
+ .ie n  .IP \(bu 4
+@@ -111,7 +111,7 @@
+ whitespace-separated primary names of all terminals which depend on it,
+ followed by a newline.
+ .TP
+-\fB\-v\fP\fIn\fP
++\fB\-v\fIn\fR
+ specifies that (verbose) output be written to standard error,
+ showing \fB@TOE@\fP's progress.
+ .IP
+Index: man/tput.1
+Prereq:  1.75 
+--- ncurses-6.3-20220205+/man/tput.1	2021-12-25 21:31:59.000000000 +0000
++++ ncurses-6.3-20220212/man/tput.1	2022-02-12 20:02:20.000000000 +0000
+@@ -1,6 +1,6 @@
+ '\" t
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -28,7 +28,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tput.1,v 1.75 2021/12/25 21:31:59 tom Exp $
++.\" $Id: tput.1,v 1.76 2022/02/12 20:02:20 tom Exp $
+ .TH @TPUT@ 1 ""
+ .ds d @TERMINFO@
+ .ds n 1
+@@ -43,15 +43,15 @@
+ .SH NAME
+ \fB@TPUT@\fP, \fBreset\fP \- initialize a terminal or query terminfo database
+ .SH SYNOPSIS
+-\fB@TPUT@\fP [\fB\-T\fP\fItype\fP] \fIcapname\fP [\fIparameters\fP]
++\fB@TPUT@\fR [\fB\-T\fItype\fR] \fIcapname\fR [\fIparameters\fR]
+ .br
+-\fB@TPUT@\fP [\fB\-T\fP\fItype\fP] [\fB\-x\fP] \fBclear\fP
++\fB@TPUT@\fR [\fB\-T\fItype\fR] [\fB\-x\fR] \fBclear\fR
+ .br
+-\fB@TPUT@\fP [\fB\-T\fP\fItype\fP] \fBinit\fP
++\fB@TPUT@\fR [\fB\-T\fItype\fR] \fBinit\fR
+ .br
+-\fB@TPUT@\fP [\fB\-T\fP\fItype\fP] \fBreset\fP
++\fB@TPUT@\fR [\fB\-T\fItype\fR] \fBreset\fR
+ .br
+-\fB@TPUT@\fP [\fB\-T\fP\fItype\fP] \fBlongname\fP
++\fB@TPUT@\fR [\fB\-T\fItype\fR] \fBlongname\fR
+ .br
+ \fB@TPUT@ \-S\fP  \fB<<\fP
+ .br
+@@ -103,7 +103,7 @@
+ to decide whether to use \fBtparm\fP(3X),
+ and how to interpret the parameters.
+ .TP
+-\fB\-T\fP\fItype\fP
++\fB\-T\fItype\fR
+ indicates the \fItype\fP of terminal.
+ Normally this option is
+ unnecessary, because the default is taken from the environment
+@@ -140,7 +140,7 @@
+ .TP
+ \fBinit\fP
+ If the terminal database is present and an entry for the user's
+-terminal exists (see \fB\-T\fP\fItype\fP, above), the following will
++terminal exists (see \fB\-T\fItype\fR, above), the following will
+ occur:
+ .RS
+ .TP 5
+@@ -226,7 +226,7 @@
+ .TP
+ \fBlongname\fP
+ If the terminal database is present and an entry for the
+-user's terminal exists (see \fB\-T\fP\fItype\fP above), then the long name
++user's terminal exists (see \fB\-T\fItype\fR above), then the long name
+ of the terminal will be put out.
+ The long name is the last
+ name in the first line of the terminal's description in the
+Index: man/tset.1
+Prereq:  1.61 
+--- ncurses-6.3-20220205+/man/tset.1	2021-12-25 21:27:03.000000000 +0000
++++ ncurses-6.3-20220212/man/tset.1	2022-02-12 20:02:20.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -27,7 +27,7 @@
+ .\" authorization.                                                           *
+ .\"***************************************************************************
+ .\"
+-.\" $Id: tset.1,v 1.61 2021/12/25 21:27:03 tom Exp $
++.\" $Id: tset.1,v 1.62 2022/02/12 20:02:20 tom Exp $
+ .TH @TSET@ 1 ""
+ .ie \n(.g .ds `` \(lq
+ .el       .ds `` ``
+@@ -137,7 +137,7 @@
+ .bP
+ you may have to type
+ .sp
+-    \fI\fP\fB@RESET@\fP\fI\fP
++    \fI\fB@RESET@\fI\fR
+ .sp
+ (the line-feed character is normally control-J) to get the terminal
+ to work, as carriage-return may no longer work in the abnormal state.
+Index: man/wresize.3x
+Prereq:  1.19 
+--- ncurses-6.3-20220205+/man/wresize.3x	2021-12-25 21:42:57.000000000 +0000
++++ ncurses-6.3-20220212/man/wresize.3x	2022-02-12 20:07:29.000000000 +0000
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
++.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ .\" Copyright 1998-2010,2015 Free Software Foundation, Inc.                  *
+ .\"                                                                          *
+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -29,14 +29,14 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1996
+ .\"
+-.\" $Id: wresize.3x,v 1.19 2021/12/25 21:42:57 tom Exp $
++.\" $Id: wresize.3x,v 1.20 2022/02/12 20:07:29 tom Exp $
+ .TH wresize 3X ""
+ .SH NAME
+ \fBwresize\fP \- resize a curses window
+ .SH SYNOPSIS
+ \fB#include \fP
+ .sp
+-\fBint wresize(WINDOW *\fP\fIwin\fP\fB, int \fP\fIlines\fP\fB, int \fP\fIcolumns\fP\fB);\fP
++\fBint wresize(WINDOW *\fIwin\fB, int \fIlines\fB, int \fIcolumns\fB);\fR
+ .SH DESCRIPTION
+ This is an extension to the curses library.
+ It reallocates storage for an \fBncurses\fP
+Index: package/debian-mingw/changelog
+--- ncurses-6.3-20220205+/package/debian-mingw/changelog	2022-02-05 11:10:39.000000000 +0000
++++ ncurses-6.3-20220212/package/debian-mingw/changelog	2022-02-12 15:31:08.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.3+20220205) unstable; urgency=low
++ncurses6 (6.3+20220212) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 05 Feb 2022 06:10:39 -0500
++ -- Thomas E. Dickey   Sat, 12 Feb 2022 10:31:08 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.3-20220205+/package/debian-mingw64/changelog	2022-02-05 11:10:39.000000000 +0000
++++ ncurses-6.3-20220212/package/debian-mingw64/changelog	2022-02-12 15:31:08.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.3+20220205) unstable; urgency=low
++ncurses6 (6.3+20220212) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 05 Feb 2022 06:10:39 -0500
++ -- Thomas E. Dickey   Sat, 12 Feb 2022 10:31:08 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.3-20220205+/package/debian/changelog	2022-02-05 11:10:39.000000000 +0000
++++ ncurses-6.3-20220212/package/debian/changelog	2022-02-12 15:31:08.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.3+20220205) unstable; urgency=low
++ncurses6 (6.3+20220212) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 05 Feb 2022 06:10:39 -0500
++ -- Thomas E. Dickey   Sat, 12 Feb 2022 10:31:08 -0500
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.505 
+--- ncurses-6.3-20220205+/package/mingw-ncurses.nsi	2022-02-05 11:10:39.000000000 +0000
++++ ncurses-6.3-20220212/package/mingw-ncurses.nsi	2022-02-12 15:31:08.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.505 2022/02/05 11:10:39 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.506 2022/02/12 15:31:08 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "3"
+ !define VERSION_YYYY  "2022"
+-!define VERSION_MMDD  "0205"
++!define VERSION_MMDD  "0212"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.3-20220205+/package/mingw-ncurses.spec	2022-02-05 11:10:39.000000000 +0000
++++ ncurses-6.3-20220212/package/mingw-ncurses.spec	2022-02-12 15:31:08.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.3
+-Release: 20220205
++Release: 20220212
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.3-20220205+/package/ncurses.spec	2022-02-05 11:10:39.000000000 +0000
++++ ncurses-6.3-20220212/package/ncurses.spec	2022-02-12 15:31:08.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.3
+-Release: 20220205
++Release: 20220212
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncursest.spec
+--- ncurses-6.3-20220205+/package/ncursest.spec	2022-02-05 11:10:39.000000000 +0000
++++ ncurses-6.3-20220212/package/ncursest.spec	2022-02-12 15:31:08.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.3
+-Release: 20220205
++Release: 20220212
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
diff --git a/system/ncurses/ncurses-6.3-20220219.patch b/system/ncurses/ncurses-6.3-20220219.patch
new file mode 100644
index 000000000..c044434d8
--- /dev/null
+++ b/system/ncurses/ncurses-6.3-20220219.patch
@@ -0,0 +1,691 @@
+# ncurses 6.3 - patch 20220219 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.3 is at
+# 	ftp://ftp.invisible-island.net/ncurses/
+#	https://invisible-mirror.net/archives/ncurses/
+#	https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.3 can be found at
+# 	ftp://ftp.invisible-island.net/ncurses/6.3
+#	https://invisible-mirror.net/archives/ncurses/6.3
+#
+# ------------------------------------------------------------------------------
+# ftp://ftp.invisible-island.net/ncurses/6.3/ncurses-6.3-20220219.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Feb 20 02:01:54 UTC 2022
+# ------------------------------------------------------------------------------
+# NEWS                                  |    6 ++
+# VERSION                               |    2 
+# dist.mk                               |    4 -
+# doc/html/man/adacurses6-config.1.html |    2 
+# doc/html/man/captoinfo.1m.html        |    2 
+# doc/html/man/clear.1.html             |    2 
+# doc/html/man/form.3x.html             |    2 
+# doc/html/man/infocmp.1m.html          |    2 
+# doc/html/man/infotocap.1m.html        |    2 
+# doc/html/man/menu.3x.html             |    2 
+# doc/html/man/ncurses.3x.html          |    2 
+# doc/html/man/ncurses6-config.1.html   |    2 
+# doc/html/man/panel.3x.html            |    2 
+# doc/html/man/resizeterm.3x.html       |   71 +++++++++++++++++++++++---------
+# doc/html/man/tabs.1.html              |    2 
+# doc/html/man/terminfo.5.html          |    2 
+# doc/html/man/tic.1m.html              |    2 
+# doc/html/man/toe.1m.html              |    2 
+# doc/html/man/tput.1.html              |    2 
+# doc/html/man/tset.1.html              |    2 
+# man/manhtml.aliases                   |    5 +-
+# man/resizeterm.3x                     |   60 ++++++++++++++++++++++-----
+# package/debian-mingw/changelog        |    4 -
+# package/debian-mingw64/changelog      |    4 -
+# package/debian/changelog              |    4 -
+# package/mingw-ncurses.nsi             |    4 -
+# package/mingw-ncurses.spec            |    2 
+# package/ncurses.spec                  |    2 
+# package/ncursest.spec                 |    2 
+# test/picsmap.c                        |   32 +++++++++-----
+# 30 files changed, 159 insertions(+), 75 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.3778 
+--- ncurses-6.3-20220212+/NEWS	2022-02-12 20:15:29.000000000 +0000
++++ ncurses-6.3-20220219/NEWS	2022-02-20 00:40:32.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.3778 2022/02/12 20:15:29 tom Exp $
++-- $Id: NEWS,v 1.3780 2022/02/20 00:40:32 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -46,6 +46,10 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20220219
++	+ expanded description in man/resizeterm.3x
++	+ additional workaround for ImageMagick in test/picsmap.c
++
+ 20220212
+ 	+ improve font-formatting in other manpages, for consistency.
+ 	+ correct/improve font-formatting in curs_wgetch.3x (patch by Benno
+Index: VERSION
+--- ncurses-6.3-20220212+/VERSION	2022-02-12 15:31:08.000000000 +0000
++++ ncurses-6.3-20220219/VERSION	2022-02-19 12:13:47.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.3	20220212
++5:0:10	6.3	20220219
+Index: dist.mk
+Prereq:  1.1466 
+--- ncurses-6.3-20220212+/dist.mk	2022-02-12 15:31:08.000000000 +0000
++++ ncurses-6.3-20220219/dist.mk	2022-02-19 12:13:47.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1466 2022/02/12 15:31:08 tom Exp $
++# $Id: dist.mk,v 1.1467 2022/02/19 12:13:47 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -38,7 +38,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 3
+-NCURSES_PATCH = 20220212
++NCURSES_PATCH = 20220219
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/man/adacurses6-config.1.html
+--- ncurses-6.3-20220212+/doc/html/man/adacurses6-config.1.html	2022-02-12 19:58:31.000000000 +0000
++++ ncurses-6.3-20220219/doc/html/man/adacurses6-config.1.html	2022-02-20 00:42:56.000000000 +0000
+@@ -126,7 +126,7 @@
+

    SEE ALSO

    +        curses(3x)
+ 
+-       This describes ncurses version 6.3 (patch 20220212).
++       This describes ncurses version 6.3 (patch 20220219).
+ 
+ 
+ 
+Index: doc/html/man/captoinfo.1m.html
+--- ncurses-6.3-20220212+/doc/html/man/captoinfo.1m.html	2022-02-12 20:17:47.000000000 +0000
++++ ncurses-6.3-20220219/doc/html/man/captoinfo.1m.html	2022-02-20 00:42:56.000000000 +0000
+@@ -199,7 +199,7 @@
+

    SEE ALSO

    +        infocmp(1m), curses(3x), terminfo(5)
+ 
+-       This describes ncurses version 6.3 (patch 20220212).
++       This describes ncurses version 6.3 (patch 20220219).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/clear.1.html
+--- ncurses-6.3-20220212+/doc/html/man/clear.1.html	2022-02-12 20:17:47.000000000 +0000
++++ ncurses-6.3-20220219/doc/html/man/clear.1.html	2022-02-20 00:42:56.000000000 +0000
+@@ -150,7 +150,7 @@
+

    SEE ALSO

    +        tput(1), terminfo(5), xterm(1).
+ 
+-       This describes ncurses version 6.3 (patch 20220212).
++       This describes ncurses version 6.3 (patch 20220219).
+ 
+ 
+ 
+Index: doc/html/man/form.3x.html
+--- ncurses-6.3-20220212+/doc/html/man/form.3x.html	2022-02-12 19:58:34.000000000 +0000
++++ ncurses-6.3-20220219/doc/html/man/form.3x.html	2022-02-20 00:42:59.000000000 +0000
+@@ -248,7 +248,7 @@
+        curses(3x) and related pages whose names  begin  "form_"  for  detailed
+        descriptions of the entry points.
+ 
+-       This describes ncurses version 6.3 (patch 20220212).
++       This describes ncurses version 6.3 (patch 20220219).
+ 
+ 
+ 
+Index: doc/html/man/infocmp.1m.html
+--- ncurses-6.3-20220212+/doc/html/man/infocmp.1m.html	2022-02-12 20:17:51.000000000 +0000
++++ ncurses-6.3-20220219/doc/html/man/infocmp.1m.html	2022-02-20 00:43:00.000000000 +0000
+@@ -514,7 +514,7 @@
+ 
+        https://invisible-island.net/ncurses/tctest.html
+ 
+-       This describes ncurses version 6.3 (patch 20220212).
++       This describes ncurses version 6.3 (patch 20220219).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/infotocap.1m.html
+--- ncurses-6.3-20220212+/doc/html/man/infotocap.1m.html	2022-02-12 20:17:51.000000000 +0000
++++ ncurses-6.3-20220219/doc/html/man/infotocap.1m.html	2022-02-20 00:43:00.000000000 +0000
+@@ -91,7 +91,7 @@
+

    SEE ALSO

    +        infocmp(1m), tic(1m), curses(3x), terminfo(5)
+ 
+-       This describes ncurses version 6.3 (patch 20220212).
++       This describes ncurses version 6.3 (patch 20220219).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/menu.3x.html
+--- ncurses-6.3-20220212+/doc/html/man/menu.3x.html	2022-02-12 19:58:35.000000000 +0000
++++ ncurses-6.3-20220219/doc/html/man/menu.3x.html	2022-02-20 00:43:00.000000000 +0000
+@@ -223,7 +223,7 @@
+        curses(3x) and related pages whose names  begin  "menu_"  for  detailed
+        descriptions of the entry points.
+ 
+-       This describes ncurses version 6.3 (patch 20220212).
++       This describes ncurses version 6.3 (patch 20220219).
+ 
+ 
+ 
+Index: doc/html/man/ncurses.3x.html
+--- ncurses-6.3-20220212+/doc/html/man/ncurses.3x.html	2022-02-12 19:58:36.000000000 +0000
++++ ncurses-6.3-20220219/doc/html/man/ncurses.3x.html	2022-02-20 00:43:01.000000000 +0000
+@@ -60,7 +60,7 @@
+        method of updating  character  screens  with  reasonable  optimization.
+        This  implementation  is  "new  curses"  (ncurses)  and is the approved
+        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
+-       This describes ncurses version 6.3 (patch 20220212).
++       This describes ncurses version 6.3 (patch 20220219).
+ 
+        The  ncurses  library emulates the curses library of System V Release 4
+        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
+Index: doc/html/man/ncurses6-config.1.html
+--- ncurses-6.3-20220212+/doc/html/man/ncurses6-config.1.html	2022-02-12 19:58:36.000000000 +0000
++++ ncurses-6.3-20220219/doc/html/man/ncurses6-config.1.html	2022-02-20 00:43:01.000000000 +0000
+@@ -113,7 +113,7 @@
+

    SEE ALSO

    +        curses(3x)
+ 
+-       This describes ncurses version 6.3 (patch 20220212).
++       This describes ncurses version 6.3 (patch 20220219).
+ 
+ 
+ 
+Index: doc/html/man/panel.3x.html
+--- ncurses-6.3-20220212+/doc/html/man/panel.3x.html	2022-02-12 20:17:52.000000000 +0000
++++ ncurses-6.3-20220219/doc/html/man/panel.3x.html	2022-02-20 00:43:01.000000000 +0000
+@@ -281,7 +281,7 @@
+

    SEE ALSO

    +        curses(3x), curs_variables(3x),
+ 
+-       This describes ncurses version 6.3 (patch 20220212).
++       This describes ncurses version 6.3 (patch 20220219).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/resizeterm.3x.html
+--- ncurses-6.3-20220212+/doc/html/man/resizeterm.3x.html	2022-02-12 20:17:52.000000000 +0000
++++ ncurses-6.3-20220219/doc/html/man/resizeterm.3x.html	2022-02-20 00:43:01.000000000 +0000
+@@ -28,7 +28,7 @@
+   * authorization.                                                           *
+   ****************************************************************************
+   * Author: Thomas E. Dickey 1996-on
+-  * @Id: resizeterm.3x,v 1.31 2022/02/12 20:07:29 tom Exp @
++  * @Id: resizeterm.3x,v 1.32 2022/02/20 00:32:18 tom Exp @
+ -->
+ 
+ 
+@@ -63,28 +63,60 @@
+

    DESCRIPTION

    +        This is an extension to the curses library.  It provides callers with a
+        hook  into  the  ncurses  data  to resize windows, primarily for use by
+-       programs running in an X Window terminal (e.g., xterm).
++       programs running in  an  X  Window  terminal  (e.g.,  xterm)  when  the
++       terminal's screen size is changed by the user:
+ 
++       o   Curses  windows  cannot extend outside the screen.  If the terminal
++           is shrunk, curses windows must be shrunk to fit.
++
++       o   If the terminal is stretched, rows and/or columns can be  added  to
++           existing  windows.   The  added  cells  should  match  the  current
++           attributes of the windows.
++
++       If the calling program has not set up a handler for  SIGWINCH  when  it
++       initializes  ncurses  (e.g.,  using  initscr(3x)  or newterm(3x)), then
++       ncurses sets a handler for SIGWINCH which notifies the library  when  a
++       window-size   event   has   occurred.   The  library  checks  for  this
++       notification
++
++       o   when reading input data,
++
++       o   when implicitly resuming program mode (e.g., between endwin(3x) and
++           wrefresh(3x)), and
++
++       o   when explicitly resuming program mode in restartterm(3x).
++
++       When the library has found that the terminal's window-size has changed,
++       it calls resizeterm to update its data structures.
++
++       An application which establishes its  own  SIGWINCH  handler  can  call
++       resizeterm,  but  in  that case, the library will not see SIGWINCH, and
++       proper layout will rely upon the application.
++
++
++

    FUNCTIONS

    + 
+

    resizeterm

    +-       The function resizeterm resizes the standard and current windows to the
+-       specified  dimensions,  and  adjusts other bookkeeping data used by the
+-       ncurses library that record the window dimensions such as the LINES and
+-       COLS variables.
++       The function resizeterm resizes the standard and current windows (i.e.,
++       stdscr  and  curscr)  to  the  specified  dimensions, and adjusts other
++       bookkeeping data used by the ncurses library  that  record  the  window
++       dimensions such as the LINES and COLS variables.
+ 
+ 
+

    resize_term

    +-       Most  of the work is done by the inner function resize_term.  The outer
+-       function resizeterm adds bookkeeping for the SIGWINCH handler, as  well
+-       as repainting the soft-key area (see slk_touch(3x)).
+-
+-       When  resizing  the windows, resize_term blank-fills the areas that are
+-       extended.  The calling application should  fill  in  these  areas  with
+-       appropriate data.
+-
+-       The  resize_term function attempts to resize all windows.  However, due
+-       to the calling convention of pads, it is not possible to  resize  these
+-       without additional interaction with the application.
++       Most  of  the  work  for  resizeterm  is  done  by  the  inner function
++       resize_term.  The outer function resizeterm adds  bookkeeping  for  the
++       SIGWINCH  handler,  as  well  as  repainting  the  soft-key  area  (see
++       slk_touch(3x)).
++
++       The resize_term function attempts to resize all  windows.   This  helps
++       with simple applications.  However:
++
++       o   It is not possible to automatically resize pads.
++
++       o   Applications  which  have  complicated  layouts  should  check  for
++           KEY_RESIZE returned from wgetch, and  adjust  their  layout,  e.g.,
++           using wresize and mvwin, or by recreating the windows.
+ 
+        When  resizing  windows,  resize_term  recursively  adjusts subwindows,
+        keeping them within the updated parent window's limits.  If a top-level
+@@ -116,7 +148,7 @@
+ 
+        o   on receipt of a SIGWINCH, the handler sets a flag
+ 
+-       o   which is tested in wgetch(3x) and doupdate,
++       o   which is tested in wgetch(3x), doupdate(3x) and restartterm(3x),
+ 
+        o   in turn, calling the resizeterm function,
+ 
+@@ -166,7 +198,8 @@
+

    SEE ALSO

    +        infocmp(1m), tset(1), curses(3x), terminfo(5).
+ 
+-       This describes ncurses version 6.3 (patch 20220212).
++       This describes ncurses version 6.3 (patch 20220219).
+ 
+ 
+ 
+Index: doc/html/man/terminfo.5.html
+--- ncurses-6.3-20220212+/doc/html/man/terminfo.5.html	2022-02-12 19:58:36.000000000 +0000
++++ ncurses-6.3-20220219/doc/html/man/terminfo.5.html	2022-02-20 00:43:02.000000000 +0000
+@@ -106,7 +106,7 @@
+        have, by specifying how to perform screen operations, and by specifying
+        padding requirements and initialization sequences.
+ 
+-       This manual describes ncurses version 6.3 (patch 20220212).
++       This manual describes ncurses version 6.3 (patch 20220219).
+ 
+ 
+

    Terminfo Entry Syntax

    +Index: doc/html/man/tic.1m.html
+--- ncurses-6.3-20220212+/doc/html/man/tic.1m.html	2022-02-12 20:17:52.000000000 +0000
++++ ncurses-6.3-20220219/doc/html/man/tic.1m.html	2022-02-20 00:43:02.000000000 +0000
+@@ -461,7 +461,7 @@
+        captoinfo(1m),   infocmp(1m),   infotocap(1m),   toe(1m),   curses(3x),
+        term(5).  terminfo(5).  user_caps(5).
+ 
+-       This describes ncurses version 6.3 (patch 20220212).
++       This describes ncurses version 6.3 (patch 20220219).
+ 
+ 
+

    AUTHOR

    +Index: doc/html/man/toe.1m.html
+--- ncurses-6.3-20220212+/doc/html/man/toe.1m.html	2022-02-12 20:17:52.000000000 +0000
++++ ncurses-6.3-20220219/doc/html/man/toe.1m.html	2022-02-20 00:43:02.000000000 +0000
+@@ -171,7 +171,7 @@
+        captoinfo(1m),   infocmp(1m),   infotocap(1m),   tic(1m),   curses(3x),
+        terminfo(5).
+ 
+-       This describes ncurses version 6.3 (patch 20220212).
++       This describes ncurses version 6.3 (patch 20220219).
+ 
+ 
+ 
+Index: doc/html/man/tput.1.html
+--- ncurses-6.3-20220212+/doc/html/man/tput.1.html	2022-02-12 20:17:52.000000000 +0000
++++ ncurses-6.3-20220219/doc/html/man/tput.1.html	2022-02-20 00:43:02.000000000 +0000
+@@ -545,7 +545,7 @@
+

    SEE ALSO

    +        clear(1), stty(1), tabs(1), tset(1), curs_termcap(3x), terminfo(5).
+ 
+-       This describes ncurses version 6.3 (patch 20220212).
++       This describes ncurses version 6.3 (patch 20220219).
+ 
+ 
+ 
+Index: doc/html/man/tset.1.html
+--- ncurses-6.3-20220212+/doc/html/man/tset.1.html	2022-02-12 20:17:52.000000000 +0000
++++ ncurses-6.3-20220219/doc/html/man/tset.1.html	2022-02-20 00:43:02.000000000 +0000
+@@ -391,7 +391,7 @@
+        csh(1),   sh(1),   stty(1),   curs_terminfo(3x),  tty(4),  terminfo(5),
+        ttys(5), environ(7)
+ 
+-       This describes ncurses version 6.3 (patch 20220212).
++       This describes ncurses version 6.3 (patch 20220219).
+ 
+ 
+ 
+Index: man/manhtml.aliases
+Prereq:  1.19 
+--- ncurses-6.3-20220212+/man/manhtml.aliases	2020-12-12 14:45:55.000000000 +0000
++++ ncurses-6.3-20220219/man/manhtml.aliases	2022-02-20 00:39:41.000000000 +0000
+@@ -1,6 +1,6 @@
+-# $Id: manhtml.aliases,v 1.19 2020/12/12 14:45:55 tom Exp $
++# $Id: manhtml.aliases,v 1.20 2022/02/20 00:39:41 tom Exp $
+ #***************************************************************************
+-# Copyright 2019,2020 Thomas E. Dickey                                     *
++# Copyright 2019-2020,2022 Thomas E. Dickey                                *
+ # Copyright 2013,2017 Free Software Foundation, Inc.                       *
+ #                                                                          *
+ # Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -50,6 +50,7 @@
+ newterm(3X)		curs_initscr(3X)
+ refresh(3X)		curs_refresh(3X)
+ reset_shell_mode(3X)	curs_kernel(3X)
++restartterm(3X)		curs_terminfo(3X)
+ set_term(3X)		curs_initscr(3X)
+ setcchar(3X)		curs_getcchar(3X)
+ setupterm(3X)		curs_terminfo(3X)
+Index: man/resizeterm.3x
+Prereq:  1.31 
+--- ncurses-6.3-20220212+/man/resizeterm.3x	2022-02-12 20:07:29.000000000 +0000
++++ ncurses-6.3-20220219/man/resizeterm.3x	2022-02-20 00:32:18.000000000 +0000
+@@ -29,7 +29,7 @@
+ .\"
+ .\" Author: Thomas E. Dickey 1996-on
+ .\"
+-.\" $Id: resizeterm.3x,v 1.31 2022/02/12 20:07:29 tom Exp $
++.\" $Id: resizeterm.3x,v 1.32 2022/02/20 00:32:18 tom Exp $
+ .TH resizeterm 3X ""
+ .de bP
+ .ie n  .IP \(bu 4
+@@ -51,28 +51,63 @@
+ .PP
+ This is an extension to the curses library.
+ It provides callers with a hook into the \fBncurses\fP data to resize windows,
+-primarily for use by programs running in an X Window terminal (e.g., xterm).
++primarily for use by programs running in an X Window terminal (e.g., xterm)
++when the terminal's screen size is changed by the user:
++.bP
++Curses windows cannot extend outside the screen.
++If the terminal is shrunk, curses windows must be shrunk to fit.
++.bP
++If the terminal is stretched,
++rows and/or columns can be added to existing windows.
++The added cells should match the current attributes of the windows.
++.PP
++If the calling program has not set up a handler for \fBSIGWINCH\fP
++when it initializes \fBncurses\fP
++(e.g., using \fBinitscr\fP(3X) or \fBnewterm\fP(3X)),
++then \fBncurses\fP sets a handler for \fBSIGWINCH\fP which notifies
++the library when a window-size event has occurred.
++The library checks for this notification
++.bP
++when reading input data,
++.bP
++when implicitly resuming program mode
++(e.g., between \fBendwin\fP(3X) and \fBwrefresh\fP(3X)),
++and
++.bP
++when explicitly resuming program mode in \fBrestartterm\fP(3X).
++.PP
++When the library has found that the terminal's window-size has
++changed, it calls \fBresizeterm\fP to update its data structures.
++.PP
++An application which establishes its own \fBSIGWINCH\fP handler
++can call \fBresizeterm\fP, but in that case, the library will not
++see \fBSIGWINCH\fP, and proper layout will rely upon the application.
++.SH FUNCTIONS
+ .SS resizeterm
+ .PP
+ The function \fBresizeterm\fP resizes the standard and current windows
++(i.e., \fBstdscr\fP and \fBcurscr\fP)
+ to the specified dimensions, and adjusts other bookkeeping data used by
+ the \fBncurses\fP library that record the window dimensions
+ such as the \fBLINES\fP and \fBCOLS\fP variables.
+ .SS resize_term
+ .PP
+-Most of the work is done by the inner function \fBresize_term\fP.
++Most of the work for \fBresizeterm\fP is
++done by the inner function \fBresize_term\fP.
+ The outer function \fBresizeterm\fP adds bookkeeping
+ for the \fBSIGWINCH\fP handler,
+ as well as repainting the soft-key area (see \fBslk_touch\fP(3X)).
+ .PP
+-When resizing the windows,
+-\fBresize_term\fP blank-fills the areas that are extended.
+-The calling application should fill in these areas with appropriate data.
+-.PP
+ The \fBresize_term\fP function attempts to resize all windows.
+-However, due to the calling convention of pads,
+-it is not possible to resize these
+-without additional interaction with the application.
++This helps with simple applications.
++However:
++.bP
++It is not possible to automatically resize pads.
++.bP
++Applications which have complicated layouts should check for
++\fBKEY_RESIZE\fP returned from \fBwgetch\fP,
++and adjust their layout, e.g., using \fBwresize\fP and \fBmvwin\fP,
++or by recreating the windows.
+ .PP
+ When resizing windows, \fBresize_term\fP recursively adjusts subwindows,
+ keeping them within the updated parent window's limits.
+@@ -101,7 +136,10 @@
+ .bP
+ on receipt of a \fBSIGWINCH\fP, the handler sets a flag
+ .bP
+-which is tested in \fBwgetch\fP(3X) and \fBdoupdate\fP,
++which is tested in
++\fBwgetch\fP(3X),
++\fBdoupdate\fP(3X) and
++\fBrestartterm\fP(3X),
+ .bP
+ in turn, calling the \fBresizeterm\fP function,
+ .bP
+Index: package/debian-mingw/changelog
+--- ncurses-6.3-20220212+/package/debian-mingw/changelog	2022-02-12 15:31:08.000000000 +0000
++++ ncurses-6.3-20220219/package/debian-mingw/changelog	2022-02-19 12:13:47.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.3+20220212) unstable; urgency=low
++ncurses6 (6.3+20220219) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 12 Feb 2022 10:31:08 -0500
++ -- Thomas E. Dickey   Sat, 19 Feb 2022 07:13:47 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.3-20220212+/package/debian-mingw64/changelog	2022-02-12 15:31:08.000000000 +0000
++++ ncurses-6.3-20220219/package/debian-mingw64/changelog	2022-02-19 12:13:47.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.3+20220212) unstable; urgency=low
++ncurses6 (6.3+20220219) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 12 Feb 2022 10:31:08 -0500
++ -- Thomas E. Dickey   Sat, 19 Feb 2022 07:13:47 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.3-20220212+/package/debian/changelog	2022-02-12 15:31:08.000000000 +0000
++++ ncurses-6.3-20220219/package/debian/changelog	2022-02-19 12:13:47.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.3+20220212) unstable; urgency=low
++ncurses6 (6.3+20220219) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 12 Feb 2022 10:31:08 -0500
++ -- Thomas E. Dickey   Sat, 19 Feb 2022 07:13:47 -0500
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.506 
+--- ncurses-6.3-20220212+/package/mingw-ncurses.nsi	2022-02-12 15:31:08.000000000 +0000
++++ ncurses-6.3-20220219/package/mingw-ncurses.nsi	2022-02-19 12:13:47.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.506 2022/02/12 15:31:08 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.507 2022/02/19 12:13:47 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "3"
+ !define VERSION_YYYY  "2022"
+-!define VERSION_MMDD  "0212"
++!define VERSION_MMDD  "0219"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.3-20220212+/package/mingw-ncurses.spec	2022-02-12 15:31:08.000000000 +0000
++++ ncurses-6.3-20220219/package/mingw-ncurses.spec	2022-02-19 12:13:47.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.3
+-Release: 20220212
++Release: 20220219
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.3-20220212+/package/ncurses.spec	2022-02-12 15:31:08.000000000 +0000
++++ ncurses-6.3-20220219/package/ncurses.spec	2022-02-19 12:13:47.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.3
+-Release: 20220212
++Release: 20220219
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncursest.spec
+--- ncurses-6.3-20220212+/package/ncursest.spec	2022-02-12 15:31:08.000000000 +0000
++++ ncurses-6.3-20220219/package/ncursest.spec	2022-02-19 12:13:47.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.3
+-Release: 20220212
++Release: 20220219
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: test/picsmap.c
+Prereq:  1.142 
+--- ncurses-6.3-20220212+/test/picsmap.c	2022-02-06 01:44:34.000000000 +0000
++++ ncurses-6.3-20220219/test/picsmap.c	2022-02-19 21:30:04.000000000 +0000
+@@ -27,7 +27,7 @@
+  * authorization.                                                           *
+  ****************************************************************************/
+ /*
+- * $Id: picsmap.c,v 1.142 2022/02/06 01:44:34 tom Exp $
++ * $Id: picsmap.c,v 1.144 2022/02/19 21:30:04 tom Exp $
+  *
+  * Author: Thomas E. Dickey
+  *
+@@ -1383,7 +1383,6 @@
+ 		char *t;
+ 		char *s = t = strchr(buffer, '#');
+ 		bool matched = FALSE;
+-		bool blurred = FALSE;
+ 
+ 		if (s != 0) {
+ 		    /* after the "#RGB", there are differences - just ignore */
+@@ -1391,6 +1390,7 @@
+ 			++s;
+ 		    *++s = '\0';
+ 		}
++
+ 		if (match_c(buffer,
+ 			    "%d,%d: (%d,%d,%d,%d) #%x ",
+ 			    &col, &row,
+@@ -1401,25 +1401,33 @@
+ 				   "%d,%d: (%f%%,%f%%,%f%%,%d) #%x ",
+ 				   &col, &row,
+ 				   &rf, &gf, &bf, &nocolor,
++				   &check) ||
++			   match_c(buffer,
++				   "%d,%d: (%f%%,%f%%,%f%%) #%x ",
++				   &col, &row,
++				   &rf, &gf, &bf,
+ 				   &check)) {
+ 		    matched = TRUE;
+-		    blurred = TRUE;	/* 6.9.11 scaling is broken... */
++
+ #define fp_fix(n) (int) (MaxRGB * (((n) > 100.0 ? 100.0 : (n)) / 100.0))
++
+ 		    r = fp_fix(rf);
+ 		    g = fp_fix(gf);
+ 		    b = fp_fix(bf);
+ 		}
++		if ((s - t) > 8)	/* 6 hex digits vs 8 */
++		    check /= 256;
+ 		if (matched) {
+ 		    int which, c;
+-
+-		    if ((s - t) > 8)	/* 6 hex digits vs 8 */
+-			check /= 256;
+-		    if (blurred) {
+-			/* revisit this when ImageMagick is fixed */
+-		    } else if (r > MaxRGB ||
+-			       g > MaxRGB ||
+-			       b > MaxRGB ||
+-			       check != (unsigned) ((r << 16) | (g << 8) | b)) {
++		    int want_r = (check >> 16) & 0xff;
++		    int want_g = (check >> 8) & 0xff;
++		    int want_b = (check >> 0) & 0xff;
++
++#define fp_err(tst,ref) ((tst > MaxRGB) || ((tst - ref)*(tst - ref)) > 4)
++
++		    if (fp_err(r, want_r) ||
++			fp_err(g, want_g) ||
++			fp_err(b, want_b)) {
+ 			okay = FALSE;
+ 			break;
+ 		    }
diff --git a/system/ncurses/ncurses-6.3-20220226.patch b/system/ncurses/ncurses-6.3-20220226.patch
new file mode 100644
index 000000000..2f0c9c0be
--- /dev/null
+++ b/system/ncurses/ncurses-6.3-20220226.patch
@@ -0,0 +1,566 @@
+# ncurses 6.3 - patch 20220226 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.3 is at
+# 	ftp://ftp.invisible-island.net/ncurses/
+#	https://invisible-mirror.net/archives/ncurses/
+#	https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.3 can be found at
+# 	ftp://ftp.invisible-island.net/ncurses/6.3
+#	https://invisible-mirror.net/archives/ncurses/6.3
+#
+# ------------------------------------------------------------------------------
+# ftp://ftp.invisible-island.net/ncurses/6.3/ncurses-6.3-20220226.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Feb 27 01:00:55 UTC 2022
+# ------------------------------------------------------------------------------
+# NEWS                             |   13 ++++++-
+# VERSION                          |    2 -
+# c++/cursslk.cc                   |    6 ++-
+# dist.mk                          |    4 +-
+# ncurses/tinfo/alloc_entry.c      |   67 ++++++++++++++++++++-----------------
+# ncurses/tinfo/write_entry.c      |    6 +--
+# package/debian-mingw/changelog   |    4 +-
+# package/debian-mingw64/changelog |    4 +-
+# package/debian/changelog         |    4 +-
+# package/mingw-ncurses.nsi        |    4 +-
+# package/mingw-ncurses.spec       |    2 -
+# package/ncurses.spec             |    2 -
+# package/ncursest.spec            |    2 -
+# progs/infocmp.c                  |   20 ++++++-----
+# progs/tabs.c                     |    8 ++--
+# progs/tput.c                     |   14 +++++--
+# test/ncurses.c                   |    8 +++-
+# 17 files changed, 104 insertions(+), 66 deletions(-)
+# ------------------------------------------------------------------------------
+Index: NEWS
+Prereq:  1.3780 
+--- ncurses-6.3-20220219+/NEWS	2022-02-20 00:40:32.000000000 +0000
++++ ncurses-6.3-20220226/NEWS	2022-02-26 23:50:53.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.3780 2022/02/20 00:40:32 tom Exp $
++-- $Id: NEWS,v 1.3782 2022/02/26 23:50:53 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -46,6 +46,17 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20220226
++	+ fix issues found with coverity:
++	  + rewrite canonical_name() function of infocmp to ensure buffer size
++	  + corrected use of original tty-modes in tput init/reset subcommands
++	  + modify tabs program to limit tab-stop values to max-columns
++	  + add limit-checks for palette rgb values in test/ncurses.c
++	+ add a few null-pointer checks to help with static-analysis.
++	+ enforce limit on number of soft-keys used in c++ binding.
++	+ adjust a buffer-limit in write_entry.c to quiet a bogus warning from
++	  gcc 12.0.1
++
+ 20220219
+ 	+ expanded description in man/resizeterm.3x
+ 	+ additional workaround for ImageMagick in test/picsmap.c
+Index: VERSION
+--- ncurses-6.3-20220219+/VERSION	2022-02-19 12:13:47.000000000 +0000
++++ ncurses-6.3-20220226/VERSION	2022-02-26 12:23:15.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.3	20220219
++5:0:10	6.3	20220226
+Index: c++/cursslk.cc
+Prereq:  1.19 
+--- ncurses-6.3-20220219+/c++/cursslk.cc	2020-07-18 19:57:11.000000000 +0000
++++ ncurses-6.3-20220226/c++/cursslk.cc	2022-02-26 17:57:23.000000000 +0000
+@@ -1,6 +1,6 @@
+ // * this is for making emacs happy: -*-Mode: C++;-*-
+ /****************************************************************************
+- * Copyright 2019,2020 Thomas E. Dickey                                     *
++ * Copyright 2019-2020,2022 Thomas E. Dickey                                *
+  * Copyright 1998-2005,2012 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -36,7 +36,7 @@
+ #include "cursslk.h"
+ #include "cursesapp.h"
+ 
+-MODULE_ID("$Id: cursslk.cc,v 1.19 2020/07/18 19:57:11 anonymous.maarten Exp $")
++MODULE_ID("$Id: cursslk.cc,v 1.20 2022/02/26 17:57:23 tom Exp $")
+ 
+ Soft_Label_Key_Set::Soft_Label_Key&
+   Soft_Label_Key_Set::Soft_Label_Key::operator=(char *text)
+@@ -56,6 +56,8 @@
+ 
+ void Soft_Label_Key_Set::init()
+ {
++  if (num_labels > 12)
++      num_labels = 12;
+   slk_array = new Soft_Label_Key[num_labels];
+   for(int i=0; i < num_labels; i++) {
+     slk_array[i].num = i+1;
+Index: dist.mk
+Prereq:  1.1467 
+--- ncurses-6.3-20220219+/dist.mk	2022-02-19 12:13:47.000000000 +0000
++++ ncurses-6.3-20220226/dist.mk	2022-02-26 12:23:15.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1467 2022/02/19 12:13:47 tom Exp $
++# $Id: dist.mk,v 1.1468 2022/02/26 12:23:15 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -38,7 +38,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 3
+-NCURSES_PATCH = 20220219
++NCURSES_PATCH = 20220226
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: ncurses/tinfo/alloc_entry.c
+Prereq:  1.66 
+--- ncurses-6.3-20220219+/ncurses/tinfo/alloc_entry.c	2021-08-08 00:09:37.000000000 +0000
++++ ncurses-6.3-20220226/ncurses/tinfo/alloc_entry.c	2022-02-26 22:19:31.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
++ * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 1998-2013,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -48,7 +48,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: alloc_entry.c,v 1.66 2021/08/08 00:09:37 tom Exp $")
++MODULE_ID("$Id: alloc_entry.c,v 1.68 2022/02/26 22:19:31 tom Exp $")
+ 
+ #define ABSENT_OFFSET    -1
+ #define CANCELLED_OFFSET -2
+@@ -62,16 +62,18 @@
+ _nc_init_entry(ENTRY * const tp)
+ /* initialize a terminal type data block */
+ {
++    if (tp == NULL) {
+ #if NO_LEAKS
+-    if (tp == 0) {
+-	if (stringbuf != 0) {
++	if (stringbuf != NULL) {
+ 	    FreeAndNull(stringbuf);
+ 	}
+ 	return;
+-    }
++#else
++	_nc_err_abort("_nc_init_entry called without initialization");
+ #endif
++    }
+ 
+-    if (stringbuf == 0)
++    if (stringbuf == NULL)
+ 	TYPE_MALLOC(char, (size_t) MAX_STRTAB, stringbuf);
+ 
+     next_free = 0;
+@@ -84,7 +86,7 @@
+ {
+     ENTRY *newp = typeCalloc(ENTRY, 1);
+ 
+-    if (newp != 0) {
++    if (newp != NULL) {
+ 	*newp = *oldp;
+ 	_nc_copy_termtype2(&(newp->tterm), &(oldp->tterm));
+     }
+@@ -99,26 +101,28 @@
+     size_t old_next_free = next_free;
+     size_t len;
+ 
+-    if (!VALID_STRING(string))
+-	string = "";
+-    len = strlen(string) + 1;
+-
+-    if (len == 1 && next_free != 0) {
+-	/*
+-	 * Cheat a little by making an empty string point to the end of the
+-	 * previous string.
+-	 */
+-	if (next_free < MAX_STRTAB) {
+-	    result = (stringbuf + next_free - 1);
++    if (stringbuf != NULL) {
++	if (!VALID_STRING(string))
++	    string = "";
++	len = strlen(string) + 1;
++
++	if (len == 1 && next_free != 0) {
++	    /*
++	     * Cheat a little by making an empty string point to the end of the
++	     * previous string.
++	     */
++	    if (next_free < MAX_STRTAB) {
++		result = (stringbuf + next_free - 1);
++	    }
++	} else if (next_free + len < MAX_STRTAB) {
++	    _nc_STRCPY(&stringbuf[next_free], string, MAX_STRTAB);
++	    DEBUG(7, ("Saved string %s", _nc_visbuf(string)));
++	    DEBUG(7, ("at location %d", (int) next_free));
++	    next_free += len;
++	    result = (stringbuf + old_next_free);
++	} else {
++	    _nc_warning("Too much data, some is lost: %s", string);
+ 	}
+-    } else if (next_free + len < MAX_STRTAB) {
+-	_nc_STRCPY(&stringbuf[next_free], string, MAX_STRTAB);
+-	DEBUG(7, ("Saved string %s", _nc_visbuf(string)));
+-	DEBUG(7, ("at location %d", (int) next_free));
+-	next_free += len;
+-	result = (stringbuf + old_next_free);
+-    } else {
+-	_nc_warning("Too much data, some is lost: %s", string);
+     }
+     return result;
+ }
+@@ -130,9 +134,14 @@
+     int offsets[MAX_ENTRY_SIZE / sizeof(short)];
+     int useoffsets[MAX_USES];
+     unsigned i, n;
+-    unsigned nuses = ep->nuses;
+-    TERMTYPE2 *tp = &(ep->tterm);
++    unsigned nuses;
++    TERMTYPE2 *tp;
++
++    if (ep == NULL || stringbuf == NULL)
++	_nc_err_abort("_nc_wrap_entry called without initialization");
+ 
++    nuses = ep->nuses;
++    tp = &(ep->tterm);
+     if (copy_strings) {
+ 	next_free = 0;		/* clear static storage */
+ 
+@@ -294,7 +303,7 @@
+ NCURSES_EXPORT(void)
+ _nc_alloc_entry_leaks(void)
+ {
+-    if (stringbuf != 0) {
++    if (stringbuf != NULL) {
+ 	FreeAndNull(stringbuf);
+     }
+     next_free = 0;
+Index: ncurses/tinfo/write_entry.c
+Prereq:  1.118 
+--- ncurses-6.3-20220219+/ncurses/tinfo/write_entry.c	2021-08-15 20:07:11.000000000 +0000
++++ ncurses-6.3-20220226/ncurses/tinfo/write_entry.c	2022-02-26 20:59:58.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
++ * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -51,7 +51,7 @@
+ #define TRACE_NUM(n)		/* nothing */
+ #endif
+ 
+-MODULE_ID("$Id: write_entry.c,v 1.118 2021/08/15 20:07:11 tom Exp $")
++MODULE_ID("$Id: write_entry.c,v 1.119 2022/02/26 20:59:58 tom Exp $")
+ 
+ static int total_written;
+ static int total_parts;
+@@ -145,7 +145,7 @@
+ 	    rc = 0;
+ 	}
+     } else {
+-	if (strlen(top) + strlen(src) + 2 <= limit) {
++	if ((strlen(top) + strlen(src) + 6) <= limit) {
+ 	    _nc_SPRINTF(dst, _nc_SLIMIT(limit) "%s/%s", top, src);
+ 	    rc = 0;
+ 	}
+Index: package/debian-mingw/changelog
+--- ncurses-6.3-20220219+/package/debian-mingw/changelog	2022-02-19 12:13:47.000000000 +0000
++++ ncurses-6.3-20220226/package/debian-mingw/changelog	2022-02-26 12:23:15.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.3+20220219) unstable; urgency=low
++ncurses6 (6.3+20220226) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 19 Feb 2022 07:13:47 -0500
++ -- Thomas E. Dickey   Sat, 26 Feb 2022 07:23:15 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian-mingw64/changelog
+--- ncurses-6.3-20220219+/package/debian-mingw64/changelog	2022-02-19 12:13:47.000000000 +0000
++++ ncurses-6.3-20220226/package/debian-mingw64/changelog	2022-02-26 12:23:15.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.3+20220219) unstable; urgency=low
++ncurses6 (6.3+20220226) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 19 Feb 2022 07:13:47 -0500
++ -- Thomas E. Dickey   Sat, 26 Feb 2022 07:23:15 -0500
+ 
+ ncurses6 (5.9-20131005) unstable; urgency=low
+ 
+Index: package/debian/changelog
+--- ncurses-6.3-20220219+/package/debian/changelog	2022-02-19 12:13:47.000000000 +0000
++++ ncurses-6.3-20220226/package/debian/changelog	2022-02-26 12:23:15.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.3+20220219) unstable; urgency=low
++ncurses6 (6.3+20220226) unstable; urgency=low
+ 
+   * latest weekly patch
+ 
+- -- Thomas E. Dickey   Sat, 19 Feb 2022 07:13:47 -0500
++ -- Thomas E. Dickey   Sat, 26 Feb 2022 07:23:15 -0500
+ 
+ ncurses6 (5.9-20120608) unstable; urgency=low
+ 
+Index: package/mingw-ncurses.nsi
+Prereq:  1.507 
+--- ncurses-6.3-20220219+/package/mingw-ncurses.nsi	2022-02-19 12:13:47.000000000 +0000
++++ ncurses-6.3-20220226/package/mingw-ncurses.nsi	2022-02-26 12:23:15.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.507 2022/02/19 12:13:47 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.508 2022/02/26 12:23:15 tom Exp $
+ 
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "3"
+ !define VERSION_YYYY  "2022"
+-!define VERSION_MMDD  "0219"
++!define VERSION_MMDD  "0226"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+ 
+ !define MY_ABI   "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.3-20220219+/package/mingw-ncurses.spec	2022-02-19 12:13:47.000000000 +0000
++++ ncurses-6.3-20220226/package/mingw-ncurses.spec	2022-02-26 12:23:15.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.3
+-Release: 20220219
++Release: 20220226
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.3-20220219+/package/ncurses.spec	2022-02-19 12:13:47.000000000 +0000
++++ ncurses-6.3-20220226/package/ncurses.spec	2022-02-26 12:23:15.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.3
+-Release: 20220219
++Release: 20220226
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncursest.spec
+--- ncurses-6.3-20220219+/package/ncursest.spec	2022-02-19 12:13:47.000000000 +0000
++++ ncurses-6.3-20220226/package/ncursest.spec	2022-02-26 12:23:15.000000000 +0000
+@@ -1,7 +1,7 @@
+ Summary: Curses library with POSIX thread support.
+ Name: ncursest6
+ Version: 6.3
+-Release: 20220219
++Release: 20220226
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: progs/infocmp.c
+Prereq:  1.151 
+--- ncurses-6.3-20220219+/progs/infocmp.c	2021-06-17 21:11:08.000000000 +0000
++++ ncurses-6.3-20220226/progs/infocmp.c	2022-02-26 23:25:55.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2021 Thomas E. Dickey                                     *
++ * Copyright 2020-2021,2022 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -43,7 +43,7 @@
+ 
+ #include 
+ 
+-MODULE_ID("$Id: infocmp.c,v 1.151 2021/06/17 21:11:08 tom Exp $")
++MODULE_ID("$Id: infocmp.c,v 1.152 2022/02/26 23:25:55 tom Exp $")
+ 
+ #define MAX_STRING	1024	/* maximum formatted string */
+ 
+@@ -125,16 +125,20 @@
+ }
+ 
+ static char *
+-canonical_name(char *ptr, char *buf)
++canonical_name(char *source, char *target)
+ /* extract the terminal type's primary name */
+ {
+-    char *bp;
++    int limit = NAMESIZE;
+ 
+-    _nc_STRCPY(buf, ptr, NAMESIZE);
+-    if ((bp = strchr(buf, '|')) != 0)
+-	*bp = '\0';
++    while (--limit > 0) {
++	char ch = *source++;
++	if (ch == '|')
++	    break;
++	*target++ = ch;
++    }
++    *target = '\0';
+ 
+-    return (buf);
++    return (target);
+ }
+ 
+ static bool
+Index: progs/tabs.c
+Prereq:  1.50 
+--- ncurses-6.3-20220219+/progs/tabs.c	2021-10-10 00:54:41.000000000 +0000
++++ ncurses-6.3-20220226/progs/tabs.c	2022-02-26 22:44:44.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2020,2021 Thomas E. Dickey                                     *
++ * Copyright 2020-2021,2022 Thomas E. Dickey                                *
+  * Copyright 2008-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -39,7 +39,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: tabs.c,v 1.50 2021/10/10 00:54:41 tom Exp $")
++MODULE_ID("$Id: tabs.c,v 1.51 2022/02/26 22:44:44 tom Exp $")
+ 
+ static GCC_NORETURN void usage(void);
+ 
+@@ -128,7 +128,7 @@
+     int prior = 0;
+     int ch;
+ 
+-    if (result == 0)
++    if (result == NULL)
+ 	failed("decode_tabs");
+ 
+     if (margin < 0)
+@@ -138,6 +138,8 @@
+ 	if (isdigit(UChar(ch))) {
+ 	    value *= 10;
+ 	    value += (ch - '0');
++	    if (value > max_cols)
++		value = max_cols;
+ 	} else if (ch == ',') {
+ 	    result[n] = value + prior + margin;
+ 	    if (n > 0 && result[n] <= result[n - 1]) {
+Index: progs/tput.c
+Prereq:  1.97 
+--- ncurses-6.3-20220219+/progs/tput.c	2021-10-02 18:09:23.000000000 +0000
++++ ncurses-6.3-20220226/progs/tput.c	2022-02-26 23:19:31.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
++ * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -47,7 +47,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: tput.c,v 1.97 2021/10/02 18:09:23 tom Exp $")
++MODULE_ID("$Id: tput.c,v 1.99 2022/02/26 23:19:31 tom Exp $")
+ 
+ #define PUTS(s)		fputs(s, stdout)
+ 
+@@ -160,7 +160,7 @@
+     name = check_aliases(argv[0], FALSE);
+     *used = 1;
+     if (is_reset || is_init) {
+-	TTY oldmode;
++	TTY oldmode = *settings;
+ 
+ 	int terasechar = -1;	/* new erase character */
+ 	int intrchar = -1;	/* new interrupt character */
+@@ -180,6 +180,7 @@
+ #endif
+ 	set_control_chars(settings, terasechar, intrchar, tkillchar);
+ 	set_conversions(settings);
++
+ 	if (send_init_strings(fd, &oldmode)) {
+ 	    reset_flush();
+ 	}
+@@ -336,6 +337,7 @@
+     int result = 0;
+     int fd;
+     int used;
++    TTY old_settings;
+     TTY tty_settings;
+     bool opt_x = FALSE;		/* clear scrollback if possible */
+     bool is_alias;
+@@ -391,6 +393,7 @@
+ 	quit(ErrUsage, "No value for $TERM and no -T specified");
+ 
+     fd = save_tty_settings(&tty_settings, need_tty);
++    old_settings = tty_settings;
+ 
+     if (setupterm(term, fd, &errret) != OK && errret <= 0)
+ 	quit(ErrTermType, "unknown terminal \"%s\"", term);
+@@ -400,6 +403,7 @@
+ 	if ((argc <= 0) && !is_alias)
+ 	    usage(NULL);
+ 	while (argc > 0) {
++	    tty_settings = old_settings;
+ 	    code = tput_cmd(fd, &tty_settings, opt_x, argc, argv, &used);
+ 	    if (code != 0)
+ 		break;
+@@ -433,7 +437,9 @@
+ 
+ 	argnow = argvec;
+ 	while (argnum > 0) {
+-	    int code = tput_cmd(fd, &tty_settings, opt_x, argnum, argnow, &used);
++	    int code;
++	    tty_settings = old_settings;
++	    code = tput_cmd(fd, &tty_settings, opt_x, argnum, argnow, &used);
+ 	    if (code != 0) {
+ 		if (result == 0)
+ 		    result = ErrSystem(0);	/* will return value >4 */
+Index: test/ncurses.c
+Prereq:  1.527 
+--- ncurses-6.3-20220219+/test/ncurses.c	2021-09-04 10:31:03.000000000 +0000
++++ ncurses-6.3-20220226/test/ncurses.c	2022-02-26 22:41:02.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
++ * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -41,7 +41,7 @@
+    Author: Eric S. Raymond  1993
+            Thomas E. Dickey (beginning revision 1.27 in 1996).
+ 
+-$Id: ncurses.c,v 1.527 2021/09/04 10:31:03 tom Exp $
++$Id: ncurses.c,v 1.528 2022/02/26 22:41:02 tom Exp $
+ 
+ ***************************************************************************/
+ 
+@@ -2885,6 +2885,10 @@
+ 	    while (fgets(buffer, sizeof(buffer), fp) != 0) {
+ 		if (sscanf(buffer, "scale:%d", &c) == 1) {
+ 		    scale = c;
++		    if (scale < 100)
++			scale = 100;
++		    if (scale > 1000)
++			scale = 1000;
+ 		} else if (sscanf(buffer, "%d:%d %d %d",
+ 				  &c,
+ 				  &red,
diff --git a/system/ncurses/ncurses-6.3-20220305.patch b/system/ncurses/ncurses-6.3-20220305.patch
new file mode 100644
index 000000000..0ffe8cb6d
--- /dev/null
+++ b/system/ncurses/ncurses-6.3-20220305.patch
@@ -0,0 +1,377 @@
+# ncurses 6.3 - patch 20220305 - Thomas E. Dickey
+#
+# ------------------------------------------------------------------------------
+#
+# Ncurses 6.3 is at
+# 	ftp://ftp.invisible-island.net/ncurses/
+#	https://invisible-mirror.net/archives/ncurses/
+#	https://ftp.gnu.org/gnu/ncurses/
+#
+# Patches for ncurses 6.3 can be found at
+# 	ftp://ftp.invisible-island.net/ncurses/6.3
+#	https://invisible-mirror.net/archives/ncurses/6.3
+#
+# ------------------------------------------------------------------------------
+# ftp://ftp.invisible-island.net/ncurses/6.3/ncurses-6.3-20220305.patch.gz
+# patch by Thomas E. Dickey 
+# created  Sun Mar  6 02:01:23 UTC 2022
+# ------------------------------------------------------------------------------
+# Ada95/configure                  |    4 ++--
+# Ada95/configure.in               |    8 ++++----
+# NEWS                             |    8 +++++++-
+# VERSION                          |    2 +-
+# configure                        |    4 ++--
+# configure.in                     |    6 +++---
+# dist.mk                          |    4 ++--
+# doc/html/Ada95.html              |    8 ++++----
+# package/debian-mingw/changelog   |    4 ++--
+# package/debian-mingw64/changelog |    4 ++--
+# package/debian/changelog         |    4 ++--
+# package/mingw-ncurses.nsi        |    4 ++--
+# package/mingw-ncurses.spec       |    2 +-
+# package/ncurses.spec             |    2 +-
+# package/ncursest.spec            |    2 +-
+# progs/infocmp.c                  |   14 ++++++--------
+# 16 files changed, 42 insertions(+), 38 deletions(-)
+# ------------------------------------------------------------------------------
+Index: Ada95/configure
+--- ncurses-6.3-20220226+/Ada95/configure	2022-01-29 22:07:15.000000000 +0000
++++ ncurses-6.3-20220305/Ada95/configure	2022-03-05 22:27:52.000000000 +0000
+@@ -1,5 +1,5 @@
+ #! /bin/sh
+-# From configure.in Revision: 1.84 .
++# From configure.in Revision: 1.85 .
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by Autoconf 2.52.20210509.
+ #
+@@ -15826,7 +15826,7 @@
+ 
+ if test "x$enable_warnings" = "xyes"; then
+ 
+- 	ADAFLAGS="$ADAFLAGS -gnatg"
++ 	ADAFLAGS="$ADAFLAGS -gnatwa -gnatyg"
+ 
+ fi
+ 
+Index: Ada95/configure.in
+Prereq:  1.84 
+--- ncurses-6.3-20220226+/Ada95/configure.in	2021-10-30 20:47:52.000000000 +0000
++++ ncurses-6.3-20220305/Ada95/configure.in	2022-03-05 22:20:52.000000000 +0000
+@@ -1,5 +1,5 @@
+ dnl***************************************************************************
+-dnl Copyright 2018-2020,2021 Thomas E. Dickey                                *
++dnl Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ dnl Copyright 2010-2016,2018 Free Software Foundation, Inc.                  *
+ dnl                                                                          *
+ dnl Permission is hereby granted, free of charge, to any person obtaining a  *
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+-dnl $Id: configure.in,v 1.84 2021/10/30 20:47:52 tom Exp $
++dnl $Id: configure.in,v 1.85 2022/03/05 22:20:52 tom Exp $
+ dnl Process this file with autoconf to produce a configure script.
+ dnl
+ dnl For additional information, see
+@@ -38,7 +38,7 @@
+ dnl
+ dnl ---------------------------------------------------------------------------
+ AC_PREREQ(2.52.20210509)
+-AC_REVISION($Revision: 1.84 $)
++AC_REVISION($Revision: 1.85 $)
+ AC_INIT(gen/gen.c)
+ AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
+ 
+@@ -356,7 +356,7 @@
+ 
+ CF_ENABLE_WARNINGS(Wno-unknown-pragmas Wswitch-enum,yes)
+ if test "x$enable_warnings" = "xyes"; then
+- 	CF_ADD_ADAFLAGS(-gnatg)
++ 	CF_ADD_ADAFLAGS(-gnatwa -gnatyg)
+ fi
+ 
+ ###	use option --enable-assertions to turn on generation of assertion code
+Index: NEWS
+Prereq:  1.3782 
+--- ncurses-6.3-20220226+/NEWS	2022-02-26 23:50:53.000000000 +0000
++++ ncurses-6.3-20220305/NEWS	2022-03-05 22:15:20.000000000 +0000
+@@ -26,7 +26,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.3782 2022/02/26 23:50:53 tom Exp $
++-- $Id: NEWS,v 1.3784 2022/03/05 22:15:20 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -46,6 +46,12 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20220305
++	+ replace obsolescent "-gnatg" option with "-gnatwa" and "-gnatyg", to
++	  work around build problems with gnat 12.
++	+ update external links in Ada95.html
++	+ trim unused return-value from canonical_name().
++
+ 20220226
+ 	+ fix issues found with coverity:
+ 	  + rewrite canonical_name() function of infocmp to ensure buffer size
+Index: VERSION
+--- ncurses-6.3-20220226+/VERSION	2022-02-26 12:23:15.000000000 +0000
++++ ncurses-6.3-20220305/VERSION	2022-03-05 12:07:05.000000000 +0000
+@@ -1 +1 @@
+-5:0:10	6.3	20220226
++5:0:10	6.3	20220305
+Index: configure
+--- ncurses-6.3-20220226+/configure	2022-02-05 17:56:41.000000000 +0000
++++ ncurses-6.3-20220305/configure	2022-03-05 22:21:11.000000000 +0000
+@@ -1,5 +1,5 @@
+ #! /bin/sh
+-# From configure.in Revision: 1.741 .
++# From configure.in Revision: 1.742 .
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by Autoconf 2.52.20210509.
+ #
+@@ -17253,7 +17253,7 @@
+ 
+ if test "x$enable_warnings" = "xyes"; then
+ 
+- 	ADAFLAGS="$ADAFLAGS -gnatg"
++ 	ADAFLAGS="$ADAFLAGS -gnatwa -gnatyg"
+ 
+ 	if test "x$cf_with_cxx" = xyes ; then
+ 
+Index: configure.in
+Prereq:  1.741 
+--- ncurses-6.3-20220226+/configure.in	2022-01-23 00:11:08.000000000 +0000
++++ ncurses-6.3-20220305/configure.in	2022-03-05 22:13:12.000000000 +0000
+@@ -29,7 +29,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1995-on
+ dnl
+-dnl $Id: configure.in,v 1.741 2022/01/23 00:11:08 tom Exp $
++dnl $Id: configure.in,v 1.742 2022/03/05 22:13:12 tom Exp $
+ dnl Process this file with autoconf to produce a configure script.
+ dnl
+ dnl For additional information, see
+@@ -38,7 +38,7 @@
+ dnl
+ dnl ---------------------------------------------------------------------------
+ AC_PREREQ(2.52.20210101)
+-AC_REVISION($Revision: 1.741 $)
++AC_REVISION($Revision: 1.742 $)
+ AC_INIT(ncurses/base/lib_initscr.c)
+ AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
+ 
+@@ -1640,7 +1640,7 @@
+ CF_ENABLE_WARNINGS(Wno-unknown-pragmas Wswitch-enum,yes)
+ 
+ if test "x$enable_warnings" = "xyes"; then
+- 	CF_ADD_ADAFLAGS(-gnatg)
++ 	CF_ADD_ADAFLAGS(-gnatwa -gnatyg)
+ 	if test "x$cf_with_cxx" = xyes ; then
+ 		CF_GXX_WARNINGS(Wno-unused)
+ 	fi
+Index: dist.mk
+Prereq:  1.1468 
+--- ncurses-6.3-20220226+/dist.mk	2022-02-26 12:23:15.000000000 +0000
++++ ncurses-6.3-20220305/dist.mk	2022-03-05 12:07:05.000000000 +0000
+@@ -26,7 +26,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1468 2022/02/26 12:23:15 tom Exp $
++# $Id: dist.mk,v 1.1469 2022/03/05 12:07:05 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -38,7 +38,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 3
+-NCURSES_PATCH = 20220226
++NCURSES_PATCH = 20220305
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: doc/html/Ada95.html
+Prereq:  1.17 
+--- ncurses-6.3-20220226+/doc/html/Ada95.html	2021-09-04 10:52:55.000000000 +0000
++++ ncurses-6.3-20220305/doc/html/Ada95.html	2022-03-05 16:09:29.000000000 +0000
+@@ -1,7 +1,7 @@
+